From fdaeb3437d447b5a8cff31f56edc00f5ed671b1b Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Thu, 24 Feb 2022 14:04:56 -0800 Subject: [PATCH 1/3] shop_system stuff --- include/d/a/d_a_npc.h | 309 +++ include/d/a/d_a_shop_item_static.h | 48 + include/d/com/d_com_inf_game.h | 27 + include/d/d_attention.h | 1 + include/d/d_lib.h | 5 + include/d/d_select_cursor.h | 9 + include/d/meter/d_meter2_info.h | 5 + include/d/msg/d_msg_flow.h | 18 +- include/d/msg/d_msg_object.h | 25 +- include/d/particle/d_particle_copoly.h | 16 + include/d/shop/d_shop_item_ctrl.h | 20 + include/d/shop/d_shop_system.h | 161 ++ include/f_op/f_op_actor.h | 2 + include/f_op/f_op_actor_mng.h | 4 + include/f_op/f_op_msg_mng.h | 1 + include/m_Do/m_Do_lib.h | 2 + .../d/a/tag/d_a_tag_escape/d_a_tag_escape.h | 8 + .../rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h | 18 + rel/d/a/d_a_horse/d_a_horse.cpp | 5 - rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp | 38 +- .../a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp | 2 +- rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp | 111 +- src/d/a/d_a_npc.cpp | 491 +---- src/d/a/d_a_shop_item_static.cpp | 439 +--- src/d/msg/d_msg_flow.cpp | 6 +- src/d/msg/d_msg_object.cpp | 4 +- src/d/particle/d_particle_copoly.cpp | 14 - src/d/shop/d_shop_item_ctrl.cpp | 121 +- src/d/shop/d_shop_system.cpp | 1812 ++++++++++++----- src/f_op/f_op_actor.cpp | 2 +- 30 files changed, 2110 insertions(+), 1614 deletions(-) diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h index 371fecaf1f6..2c77d4d274b 100644 --- a/include/d/a/d_a_npc.h +++ b/include/d/a/d_a_npc.h @@ -2,5 +2,314 @@ #define D_A_D_A_NPC_H #include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" +#include "global.h" + +class daNpcT_MotionSeqMngr_c { +public: + struct sequenceStepData_c {}; + + /* 80145898 */ void initialize(); + /* 801458C0 */ void play(u16, int*, f32*); + /* 80145A24 */ void checkEndSequence(); + +private: + /* 0x00 */ sequenceStepData_c* field_0x0; + /* 0x04 */ int field_0x4; + /* 0x08 */ int mNo; + /* 0x0C */ int mOffset; + /* 0x10 */ int mStepNo; + /* 0x14 */ int field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ u8 field_0x1c; + +public: + /* 8014D0C0 */ virtual ~daNpcT_MotionSeqMngr_c(); +}; + +class daNpcT_ActorMngr_c { +private: + /* 0x0 */ u32 mActorID; + +public: + /* 801456D4 */ void initialize(); + /* 801456E0 */ void entry(fopAc_ac_c*); + /* 801456FC */ void remove(); + /* 80145708 */ void getActorP(); + + /* 8014D108 */ virtual ~daNpcT_ActorMngr_c(); +}; + +class daNpcT_JntAnm_c { +private: + /* 0x000 */ daNpcT_ActorMngr_c field_0x0; + /* 0x008 */ cXyz field_0x8; + /* 0x014 */ cXyz field_0x14; + /* 0x020 */ cXyz* field_0x20; + /* 0x024 */ cXyz field_0x24; + /* 0x030 */ cXyz field_0x30[3]; + /* 0x054 */ cXyz field_0x54[3]; + /* 0x078 */ cXyz field_0x78[3]; + /* 0x09C */ cXyz field_0x9c[3]; + /* 0x0C0 */ cXyz mRad[3]; + /* 0x0E4 */ cXyz field_0xe4[3]; + /* 0x108 */ cXyz field_0x108; + /* 0x114 */ cXyz field_0x114; + /* 0x120 */ cXyz field_0x120; + /* 0x12C */ csXyz mEyeAngle; + /* 0x132 */ csXyz field_0x132; + /* 0x138 */ int mMode; + /* 0x13C */ u8 field_0x13c[4]; + /* 0x140 */ int field_0x140; + /* 0x144 */ u8 field_0x144[4]; + /* 0x148 */ f32 field_0x148; + /* 0x14C */ f32 field_0x14c; + /* 0x150 */ csXyz field_0x150; + /* 0x156 */ u8 field_0x156; + /* 0x157 */ u8 mDirectFlag; + /* 0x158 */ u8 field_0x158; + +public: + /* 80146C98 */ void initialize(); + /* 80146CD8 */ void setParam(fopAc_ac_c*, J3DModel*, cXyz*, int, int, int, f32, f32, f32, f32, + f32, f32, f32, f32, f32, f32, cXyz*); + /* 80147858 */ void calc(f32); + /* 80147C38 */ void calcJntRad(f32, f32, f32); + + /* 8014D150 */ virtual ~daNpcT_JntAnm_c(); +}; + +class daNpcT_DmgStagger_c { +public: + /* 80147DCC */ void setParam(fopAc_ac_c*, fopAc_ac_c*, s16); + /* 80147E3C */ void calc(int); + +private: + /* 0x00 */ csXyz field_0x0[2]; + /* 0x0C */ f32 field_0xc[2]; + /* 0x14 */ s16 mStagger; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ u8 mRebirth; +}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_pntData_c {}; + +struct daNpcT_motionAnmData_c {}; + +class mDoExt_McaMorfSO; + +class daNpcT_c : public fopAc_ac_c { +public: + /* 0x568 */ daNpcT_faceMotionAnmData_c* field_0x568; + /* 0x56C */ daNpcT_motionAnmData_c* field_0x56c; + /* 0x570 */ daNpcT_evtData_c* field_0x570; + /* 0x574 */ char** field_0x574; + /* 0x578 */ mDoExt_McaMorfSO* mMcaMorfAnm[2]; + /* 0x580 */ Z2Creature field_0x580; + /* 0x610 */ mDoExt_bckAnm mBckAnm; + /* 0x62C */ mDoExt_btpAnm mBtpAnm; + /* 0x644 */ mDoExt_btkAnm mBtkAnm; + /* 0x65C */ mDoExt_brkAnm mBrkAnm; + /* 0x674 */ mDoExt_bpkAnm mBpkAnm; + /* 0x68C */ dBgS_ObjAcch field_0x68c; + /* 0x864 */ dCcD_Stts field_0x864; + /* 0x8A0 */ dBgS_AcchCir field_0x8a0; + /* 0x8E0 */ request_of_phase_process_class field_0x8e0[10]; + /* 0x930 */ cBgS_GndChk field_0x930; + /* 0x96C */ u8 field_0xa6c[8]; + /* 0x974 */ dMsgFlow_c mFlow; + /* 0x9C0 */ dPaPoT_c field_0x9c0; + /* 0xA40 */ dCcD_Stts field_0xa40; + /* 0xA7C */ u8 field_0xa7c[4]; + /* 0xA80 */ f32 field_0xa80; + /* 0xA84 */ f32 field_0xa84; + /* 0xA89 */ u8 field_0xa88; + /* 0xA89 */ u8 field_0xa89; + /* 0xA8C */ dBgS_GndChk field_0xa8c; + /* 0xAE0 */ dBgS_LinChk field_0xae0; + /* 0xB50 */ daNpcT_MotionSeqMngr_c field_0xb50; + /* 0xB74 */ daNpcT_MotionSeqMngr_c field_0xb74; + /* 0xB98 */ daNpcT_ActorMngr_c field_0xb98; + /* 0xBA0 */ daNpcT_ActorMngr_c field_0xba0; + /* 0xBA8 */ daNpcT_JntAnm_c field_0xba8; + /* 0xD08 */ daNpcT_DmgStagger_c field_0xd08; + /* 0xD24 */ cXyz field_0xd24; + /* 0xD30 */ cXyz field_0xd30; + /* 0xD3C */ cXyz field_0xd3c; + /* 0xD48 */ cXyz field_0xd48; + /* 0xD54 */ cXyz field_0xd54; + /* 0xD60 */ cXyz field_0xd60; + /* 0xD6C */ cXyz field_0xd6c; + /* 0xD78 */ csXyz field_0xd78; + /* 0xD7E */ csXyz field_0xd7e; + /* 0xD84 */ csXyz field_0xd84; + /* 0xD8A */ csXyz field_0xd8a; + /* 0xD90 */ u32 field_0xd90; + /* 0xD94 */ u32 field_0xd94; + /* 0xD98 */ u32 field_0xd98; + /* 0xD9C */ u32 field_0xd9c; + /* 0xDA0 */ u8 field_0xda0[8]; + /* 0xDA8 */ u32 field_0xda8; + /* 0xDAC */ int field_0xdac; + /* 0xDB0 */ int mCutType; + /* 0xDB4 */ int field_0xdb4; + /* 0xDB8 */ int field_0xdb8; + /* 0xDBC */ int mTimer; + /* 0xDC0 */ int field_0xdc0; + /* 0xDC4 */ u8 field_0xdc4[4]; + /* 0xDC8 */ s16 field_0xdc8; + /* 0xDCA */ s16 field_0xdca; + /* 0xDCC */ u8 field_0xdcc[8]; + /* 0xDD4 */ s16 field_0xdd4; + /* 0xDD8 */ s16 field_0xdd8; + /* 0xDDA */ s16 field_0xdda; + /* 0xDDC */ f32 field_0xddc; + /* 0xDE0 */ f32 field_0xde0; + /* 0xDE4 */ f32 field_0xde4; + /* 0xDE8 */ u8 field_0xde8[0xC]; + /* 0xDF4 */ f32 field_0xdf4; + /* 0xDF8 */ u8 field_0xdf8[4]; + /* 0xDFC */ f32 field_0xdfc; + /* 0xE00 */ cXyz field_0xe00; + /* 0xE0C */ cXyz field_0xe0c; + /* 0xE18 */ s16 field_0xe18; + /* 0xE1A */ s16 field_0xe1a; + /* 0xE1C */ s16 field_0xe1c; + /* 0xE1E */ u16 field_0xe1e; + /* 0xE20 */ u16 field_0xe20; + /* 0xE22 */ u16 field_0xe22; + /* 0xE24 */ u8 field_0xe24; + /* 0xE25 */ u8 field_0xe25; + /* 0xE26 */ u8 field_0xe26; + /* 0xE27 */ u8 field_0xe27; + /* 0xE28 */ u8 field_0xe28; + /* 0xE29 */ u8 field_0xe29; + /* 0xE2A */ u8 field_0xe2a; + /* 0xE2B */ u8 field_0xe2b; + /* 0xE2C */ u8 field_0xe2c; + /* 0xE2D */ u8 field_0xe2d; + /* 0xE2E */ u8 field_0xe2e[2]; + /* 0xE30 */ u16 field_0xe30; + /* 0xE32 */ u8 field_0xe32; + /* 0xE33 */ u8 field_0xe33; + /* 0xE34 */ u8 field_0xe34; + /* 0xE35 */ u8 field_0xe35[7]; + /* 0xE3C vtable */ + +public: + /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); + /* 80147FD4 */ void srchActor(void*, void*); + /* 80148058 */ void getTrnsfrmAnmP(char const*, int); + /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); + /* 801480D0 */ void getTexPtrnAnmP(char const*, int); + /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); + /* 80148148 */ void getTevRegKeyAnmP(char const*, int); + /* 80148184 */ void getColorAnmP(char const*, int); + /* 801481C0 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool); + /* 80148204 */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int); + /* 801482F8 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); + /* 80148338 */ void setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int); + /* 80148378 */ void setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int); + /* 801483B8 */ void setBpkAnm(J3DAnmColor*, J3DModelData*, f32, int); + /* 801483F8 */ void loadRes(s8 const*, char const**); + /* 801484AC */ void deleteRes(s8 const*, char const**); + /* 8014852C */ void execute(); + /* 8014886C */ void draw(int, int, f32, _GXColorS10*, f32, int, int, int); + /* 80148C70 */ void setEnvTevColor(); + /* 80148CCC */ void setRoomNo(); + /* 80148D10 */ void checkEndAnm(f32); + /* 80148DD0 */ void checkEndAnm(J3DFrameCtrl*, f32); + /* 80148E4C */ void playAllAnm(); + /* 80149190 */ void setMtx(); + /* 8014924C */ void ctrlFaceMotion(); + /* 80149300 */ void ctrlMotion(); + /* 801493B8 */ void ctrlMsgAnm(int*, int*, fopAc_ac_c*, int); + /* 8014A224 */ void evtChange(); + /* 8014A388 */ void setFaceMotionAnm(int, bool); + /* 8014A908 */ void setPos(cXyz); + /* 8014AA18 */ void setAngle(s16); + /* 8014A99C */ void setAngle(csXyz); + /* 8014AA40 */ void hitChk(dCcD_GObjInf*, u32); + /* 8014AAD0 */ void setDamage(int, int, int); + /* 8014ABD0 */ void chkActorInSight(fopAc_ac_c*, f32, s16); + /* 8014ACF0 */ void chkPointInArea(cXyz, cXyz, f32, f32, f32, s16); + /* 8014ADA0 */ void chkPointInArea(cXyz, cXyz, cXyz, s16); + /* 8014AE1C */ void chkFindActor(fopAc_ac_c*, int, s16); + /* 8014B024 */ void chkWolfAction(); + /* 8014B0C8 */ void chkFindWolf(s16, int, int, f32, f32, f32, f32, int); + /* 8014B338 */ void srchPlayerActor(); + /* 8014B3EC */ void getAttnPos(fopAc_ac_c*); + /* 8014B4A4 */ void turn(s16, int, int); + /* 8014B648 */ void step(s16, int, int, int, int); + /* 8014B808 */ void calcSpeedAndAngle(cXyz, int, s16, s16); + /* 8014BB00 */ void getActorDistance(fopAc_ac_c*, int, int); + /* 8014BBF0 */ void initTalk(int, fopAc_ac_c**); + /* 8014BC78 */ void talkProc(int*, int, fopAc_ac_c**, int); + /* 8014BE2C */ void getNearestActorP(s16); + /* 8014BEE4 */ void getEvtAreaTagP(int, int); + /* 8014BFB0 */ void getShopItemTagP(); + /* 8014C030 */ void setHitodamaPrtcl(); + + /* 8014CD20 */ virtual ~daNpcT_c(); + /* 801490D4 */ virtual void ctrlBtk(); + /* 8014CC14 */ virtual void ctrlSubFaceMotion(int); + /* 8014CC40 */ virtual bool checkChangeJoint(int); + /* 8014CC38 */ virtual bool checkRemoveJoint(int); + /* 8014CC5C */ virtual s32 getBackboneJointNo(); + /* 8014CC54 */ virtual s32 getNeckJointNo(); + /* 8014CC4C */ virtual s32 getHeadJointNo(); + /* 8014CC90 */ virtual s32 getFootLJointNo(); + /* 8014CC88 */ virtual s32 getFootRJointNo(); + /* 8014D0A8 */ virtual bool getEyeballLMaterialNo(); + /* 8014D0B0 */ virtual bool getEyeballRMaterialNo(); + /* 8014D0B8 */ virtual bool getEyeballMaterialNo(); + /* 8014951C */ virtual void ctrlJoint(J3DJoint*, J3DModel*); + /* 8014CC48 */ virtual void afterJntAnm(int); + /* 8014CC24 */ virtual void setParam(); + /* 8014CC80 */ virtual bool checkChangeEvt(); + /* 8014CC78 */ virtual bool evtTalk(); + /* 8014CC70 */ virtual bool evtEndProc(); + /* 8014CC68 */ virtual bool evtCutProc(); + /* 8014CC64 */ virtual void setAfterTalkMotion(); + /* 8014997C */ virtual void evtProc(); + /* 8014CC20 */ virtual void action(); + /* 8014CC1C */ virtual void beforeMove(); + /* 8014CC18 */ virtual void afterMoved(); + /* 8014CC10 */ virtual void setAttnPos(); + /* 80149BB4 */ virtual void setFootPos(); + /* 8014CC0C */ virtual void setCollision(); + /* 80149D7C */ virtual void setFootPrtcl(cXyz*, f32, f32); + /* 8014A05C */ virtual bool checkCullDraw(); + /* 8014A064 */ virtual void twilight(); + /* 8014CC98 */ virtual bool chkXYItems(); + /* 8014A0B0 */ virtual void evtOrder(); + /* 8014CBF4 */ virtual void decTmr(); + /* 8014A324 */ virtual void clrParam(); + /* 8014CC30 */ virtual bool drawDbgInfo(); + /* 8014CC28 */ virtual void drawOtherMdl(); + /* 8014CC2C */ virtual void drawGhost(); + /* 8014CCA0 */ virtual bool afterSetFaceMotionAnm(int, int, f32, int); + /* 8014CCE0 */ virtual bool afterSetMotionAnm(int, int, f32, int); + /* 8014CCB0 */ virtual void getFaceMotionAnm(daNpcT_faceMotionAnmData_c); + /* 8014CCF0 */ virtual void getMotionAnm(daNpcT_motionAnmData_c); + /* 8014CCEC */ virtual void changeAnm(int*, int*); + /* 8014CCAC */ virtual void changeBck(int*, int*); + /* 8014CCA8 */ virtual void changeBtp(int*, int*); + /* 8014CCE8 */ virtual void changeBtk(int*, int*); + /* 8014A628 */ virtual void setMotionAnm(int, f32, int); + + static u8 const mCcDObjData[48]; + static u8 mCcDCyl[68]; + static u8 mCcDSph[64]; + static u8 mFindActorPtrs[200]; + static u8 mSrchName[2 + 2 /* padding */]; + static u8 mFindCount[4]; +}; + +STATIC_ASSERT(sizeof(daNpcT_c) == 0xE40); #endif /* D_A_D_A_NPC_H */ diff --git a/include/d/a/d_a_shop_item_static.h b/include/d/a/d_a_shop_item_static.h index c8e7d7359c3..d6bc8342df3 100644 --- a/include/d/a/d_a_shop_item_static.h +++ b/include/d/a/d_a_shop_item_static.h @@ -2,5 +2,53 @@ #define D_A_D_A_SHOP_ITEM_STATIC_H #include "dolphin/types.h" +#include "d/a/d_a_itembase.h" + +struct ResourceData { + char* get_arcName() const { return mArcName; } + s16 get_bmdName() const { return mBmdName; } + s16 get_btk1Name() const { return mBtkName; } + s16 get_bpk1Name() const { return mBpkName; } + s16 get_bck1Name() const { return mBckName; } + s16 get_bxa1Name() const { return mBxaName; } + s16 get_brk1Name() const { return mBrkName; } + s16 get_btp1Name() const { return mBtpName; } + + /* 0x00 */ char* mArcName; + /* 0x04 */ s16 mBmdName; + /* 0x06 */ s16 mBtkName; + /* 0x08 */ s16 mBpkName; + /* 0x0A */ s16 mBckName; + /* 0x0C */ s16 mBxaName; + /* 0x0E */ s16 mBrkName; + /* 0x10 */ s16 mBtpName; + /* 0x14 */ f32 mOffsetY; + /* 0x18 */ f32 mScale; + /* 0x1C */ s16 mAngleOffsetX; + /* 0x1E */ SVec mAngle; + /* 0x24 */ u32 mFlag; + /* 0x28 */ u8 mShadowSize; + /* 0x29 */ u8 mCollisionH; + /* 0x2A */ u8 mCollisionR; + /* 0x2B */ s8 mTevFrm; + /* 0x2C */ s8 mBtpFrm; +}; // Size: 0x30 + +class daShopItem_c : public daItemBase_c { +public: + /* 80037C14 */ csXyz* getRotateP(); + /* 80037C1C */ cXyz* getPosP(); + + u8 getShopItemID() const { return mShopItemID; } + + static ResourceData const mData[23]; + +private: + /* 0x92C */ Mtx mMtx; + /* 0x95C */ int field_0x95c; + /* 0x960 */ s16 mAngleX; + /* 0x962 */ s16 mAngleY; + /* 0x964 */ u8 mShopItemID; +}; #endif /* D_A_D_A_SHOP_ITEM_STATIC_H */ diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 85a78ee2d1e..d8dc4a74785 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -252,6 +252,16 @@ public: m3DSetFlag = flag; } + void setDoStatusForce(u8 status, u8 flag) { + mDoStatusForce = status; + mDoSetFlagForce = flag; + } + + void setAStatusForce(u8 status, u8 flag) { + mAStatusForce = status; + mASetFlagForce = flag; + } + void setItemRupeeCount(int rupees) { mItemRupeeCount += rupees; } void setItemMagicCount(s16 magic) { mItemMagicCount += magic; } void setItemMaxMagicCount(s16 max) { mItemMaxMagicCount += max; } @@ -341,6 +351,7 @@ public: void offPauseFlag() { mPauseFlag = false; } void show2dOn() { mShow2D = 1; } s8 getLayerOld() { return mLayerOld; } + void setMesgCancelButton(u8 button) { mMesgCancelButton = button; } public: /* 0x00000 */ dBgS mBgs; @@ -955,6 +966,10 @@ inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no) { g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().onSwitch(i_no); } +inline void dComIfGs_onSaveSwitch(int i_no) { + g_dComIfG_gameInfo.info.getMemory().getBit().onSwitch(i_no); +} + inline void dComIfGs_offSaveSwitch(int i_stageNo, int i_no) { g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().offSwitch(i_no); } @@ -1444,6 +1459,14 @@ inline void dComIfGp_setSButtonStatusForce(u8 status, u8 flag) { g_dComIfG_gameInfo.play.setSButtonStatusForce(status, flag); } +inline void dComIfGp_setDoStatusForce(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setDoStatusForce(status, flag); +} + +inline void dComIfGp_setAStatusForce(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setAStatusForce(status, flag); +} + inline u8 dComIfGp_getAStatus() { return g_dComIfG_gameInfo.play.getAStatus(); } @@ -1676,6 +1699,10 @@ inline void dComIfGp_offPauseFlag() { g_dComIfG_gameInfo.play.offPauseFlag(); } +inline void dComIfGp_setMesgCancelButton(u8 button) { + g_dComIfG_gameInfo.play.setMesgCancelButton(button); +} + inline s32 dComIfGp_checkStatus(u16 flags) { return g_dComIfG_gameInfo.play.checkStatus(flags); } diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 4f35de56040..faafe287d95 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -200,6 +200,7 @@ public: /* 8016E424 */ void LockEdge(); /* 80182994 */ void GetCheckObjectCount(); /* 80182AD0 */ void keepLock(int); + /* 8014B010 */ void getDistTable(int); dAttCatch_c& getCatghTarget() { return mCatghTarget; } bool chkFlag(u32 flag) { return mFlags & flag; } diff --git a/include/d/d_lib.h b/include/d/d_lib.h index 27a0715dce1..028b9b68e99 100644 --- a/include/d/d_lib.h +++ b/include/d/d_lib.h @@ -7,6 +7,11 @@ struct JKRAramArchive; u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName); struct STControl { + STControl() { + setWaitParm(15, 15, 0, 0, 0.9f, 0.5f, 0, 0x2000); + init(); + } + /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16); /* 800320AC */ void init(); diff --git a/include/d/d_select_cursor.h b/include/d/d_select_cursor.h index 5cb8af07a78..eee23d7f3a5 100644 --- a/include/d/d_select_cursor.h +++ b/include/d/d_select_cursor.h @@ -42,7 +42,16 @@ public: /* 80194C30 */ virtual void draw(); /* 801949EC */ virtual ~dSelect_cursor_c(); + void setPos(f32 x, f32 y) { + field_0x58 = x; + field_0x5c = y; + } + private: + u8 field_0x4[0x54]; + f32 field_0x58; + f32 field_0x5c; + u8 field_0x60[0x58]; }; #endif /* D_D_SELECT_CURSOR_H */ diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 8028c7daffc..3615280b07e 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -148,6 +148,7 @@ public: void offLifeGaugeSE() { mLifeGaugeSE = 0; } u8 getLifeGaugeSE() { return mLifeGaugeSE; } const char* getSaveStageName() { return mSaveStageName; } + void onShopTalkFlag() { mShopTalkFlag = true; } public: /* 0x04 */ u8 unk4[4]; @@ -430,6 +431,10 @@ inline const char* dMeter2Info_getSaveStageName() { return g_meter2_info.getSaveStageName(); } +inline void dMeter2Info_onShopTalkFlag() { + g_meter2_info.onShopTalkFlag(); +} + char* dMeter2Info_getNumberTextureName(int pIndex); #endif /* D_METER_D_METER2_INFO_H */ diff --git a/include/d/msg/d_msg_flow.h b/include/d/msg/d_msg_flow.h index f387463e3e5..7682cafab4a 100644 --- a/include/d/msg/d_msg_flow.h +++ b/include/d/msg/d_msg_flow.h @@ -22,10 +22,10 @@ public: /* 80249F48 */ ~dMsgFlow_c(); /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); /* 8024A13C */ void checkOpenDoor(fopAc_ac_c*, int*); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); + /* 8024A2D8 */ int doFlow(fopAc_ac_c*, fopAc_ac_c**, int); /* 8024A424 */ void checkEventRender(int*, int*, int*, int*); /* 8024A4C4 */ void remove(); - /* 8024A528 */ void getEventId(int*); + /* 8024A528 */ u16 getEventId(int*); /* 8024A538 */ void getMsgNo(); /* 8024A540 */ void getNowMsgNo(); /* 8024A548 */ void getMsg(); @@ -47,7 +47,7 @@ public: /* 8024B180 */ void query002(mesg_flow_node_branch*, fopAc_ac_c*, int); /* 8024B208 */ void query003(mesg_flow_node_branch*, fopAc_ac_c*, int); /* 8024B250 */ void query004(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B2C0 */ void query005(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B2C0 */ u16 query005(mesg_flow_node_branch*, fopAc_ac_c*, int); /* 8024B2F8 */ void query006(mesg_flow_node_branch*, fopAc_ac_c*, int); /* 8024B32C */ void query007(mesg_flow_node_branch*, fopAc_ac_c*, int); /* 8024B45C */ void query008(mesg_flow_node_branch*, fopAc_ac_c*, int); @@ -140,19 +140,23 @@ public: /* 8024DA78 */ void event041(mesg_flow_node_event*, fopAc_ac_c*); /* 8024DAA8 */ bool event042(mesg_flow_node_event*, fopAc_ac_c*); + u8 isSelectMessage() { return mSelectMessage; } + void onNonStopJunpFlowFlag() { mNonStopJunpFlowFlag = 1; } + u16 getSelectNum() { return query005(NULL, NULL, 0); } + static u8 mQueryList[636]; static u8 mEventList[516]; private: /* 0x00 */ void* vtable; - /* 0x04 */ void* field_0x04; - /* 0x08 */ void* field_0x08; - /* 0x0C */ void* field_0x0c; + /* 0x04 */ void* mFlow_p; + /* 0x08 */ void* mLabelInfo_p; + /* 0x0C */ void* mFlowNodeTBL; /* 0x10 */ u16 field_0x10; /* 0x12 */ u16 field_0x12; /* 0x14 */ fopAc_ac_c* field_0x14; /* 0x18 */ int field_0x18; - /* 0x1C */ u16 field_0x1c; + /* 0x1C */ u16 mFlow; /* 0x1E */ u8 field_0x1e[2]; /* 0x20 */ int mMsg; /* 0x24 */ u8 mSelectMessage; diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index b9d4b0f6f95..df2380affc0 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -79,7 +79,7 @@ public: /* 8023768C */ void getSelectBombPriceLocal(); /* 8023773C */ void setEquipBombInfoLocal(); /* 80237748 */ void updateEquipBombInfoLocal(); - /* 802378B8 */ void setShopWaitTimer(u8); + /* 802378B8 */ static void setShopWaitTimer(u8); /* 802378CC */ void setSelectWordFlagLocal(u8); /* 802378D4 */ void isHowlHearingModeLocal(); /* 80237934 */ void isCameraCancelFlag(); @@ -123,12 +123,12 @@ public: /* 8023826C */ void setTalkActor(fopAc_ac_c*); /* 8023829C */ void onMsgSendControl(); /* 802382C8 */ void offMsgSendControl(); - /* 802382F4 */ void isMsgSendControl(); - /* 80238320 */ void onMsgSend(); + /* 802382F4 */ static int isMsgSendControl(); + /* 80238320 */ static void onMsgSend(); /* 8023834C */ void offMsgSend(); /* 80238378 */ void isMsgSend(); /* 802383A4 */ void isMouthCheck(); - /* 802383D0 */ void getMessageID(); + /* 802383D0 */ static u32 getMessageID(); /* 802383E4 */ void getSmellTypeMessageID(); /* 80238410 */ void setSmellType(u8); /* 80238440 */ void getSelectCursorPos(); @@ -150,7 +150,16 @@ public: /* 80238638 */ void getItemEquipButton(); /* 8023864C */ void setSelectCancelPos(u8); + void setShopWaitTimerLocal(u8 timer) { field_0x4c9 = timer; } + u8 getSelectPushFlag() { return mSelectPushFlag; } + u8 getSelectCancelPos() { return mSelectCancelPos; } + /* 0x100 */ fopAc_ac_c* field_0x100; + /* 0x104 */ u8 field_0x104[0x9D]; + /* 0x1A1 */ u8 mSelectCancelPos; + /* 0x1A2 */ u8 mSelectPushFlag; + /* 0x1A3 */ u8 field_0x1a3[0x326]; + /* 0x4C9 */ u8 field_0x4c9; }; s16 dMsgObject_getGroupID(); @@ -163,8 +172,16 @@ inline bool dMsgObject_isTalkNowCheck() { return dMsgObject_getMsgObjectClass()->getStatus() != 1 ? true : false; } +inline u32 dMsgObject_getMessageID() { + return dMsgObject_c::getMessageID(); +} + inline void dMsgObject_readMessageGroup(mDoDvdThd_mountXArchive_c** param_0) { dMsgObject_getMsgObjectClass()->readMessageGroup(param_0); } +inline void dMsgObject_setShopWaitTimer(u8 timer) { + dMsgObject_c::setShopWaitTimer(timer); +} + #endif /* D_MSG_D_MSG_OBJECT_H */ diff --git a/include/d/particle/d_particle_copoly.h b/include/d/particle/d_particle_copoly.h index 561b75ea19d..6364c0bee73 100644 --- a/include/d/particle/d_particle_copoly.h +++ b/include/d/particle/d_particle_copoly.h @@ -28,4 +28,20 @@ public: /* 0x37 */ u8 field_0x37; }; +struct dPaPoT_c { + /* 8005115C */ void setEffectTwo(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, + cXyz const*, cXyz const*, csXyz const*, cXyz const*, s8, f32, + f32); + /* 80051294 */ void clearTwoAllID(); + /* 80051470 */ void getRightEffType(int) const; + /* 8005147C */ void getLeftEffType(int) const; + /* 80051494 */ void getRightEmitter(int, int); + /* 800514DC */ void getLeftEmitter(int, int); + + static u8 m_typeTwoData[36]; + static u8 m_emitterTwoData[36]; + + u8 field_0x0[0x80]; +}; + #endif /* D_PARTICLE_D_PARTICLE_COPOLY_H */ diff --git a/include/d/shop/d_shop_item_ctrl.h b/include/d/shop/d_shop_item_ctrl.h index 662cb26b8db..72f6aa01745 100644 --- a/include/d/shop/d_shop_item_ctrl.h +++ b/include/d/shop/d_shop_item_ctrl.h @@ -2,5 +2,25 @@ #define D_SHOP_D_SHOP_ITEM_CTRL_H #include "dolphin/types.h" +#include "d/a/d_a_shop_item_static.h" + +class dShopItemCtrl_c { +public: + /* 80196914 */ dShopItemCtrl_c(); + /* 801969A0 */ cXyz getCurrentPos(int); + /* 80196A3C */ bool isHomePos(int); + /* 80196AF0 */ void setRotateAnime(int); + /* 80196BA4 */ void setZoomAnime(int, cXyz*, s16, bool); + + /* 80196958 */ virtual ~dShopItemCtrl_c(); + + void setItemIndex(int i, u32 index) { mItemIndex[i] = index; } + u32 getItemIndex(int i) { return mItemIndex[i]; } + u16 getMessageIndex(int i) { return mMessageIndex[i]; } + +private: + /* 0x04 */ u32 mItemIndex[7]; + /* 0x20 */ u16 mMessageIndex[7]; +}; #endif /* D_SHOP_D_SHOP_ITEM_CTRL_H */ diff --git a/include/d/shop/d_shop_system.h b/include/d/shop/d_shop_system.h index 9728f22184c..7408358232a 100644 --- a/include/d/shop/d_shop_system.h +++ b/include/d/shop/d_shop_system.h @@ -2,5 +2,166 @@ #define D_SHOP_D_SHOP_SYSTEM_H #include "dolphin/types.h" +#include "d/shop/d_shop_item_ctrl.h" +#include "d/a/d_a_npc.h" + +typedef int (*ShopCam_actionFunc)(void); + +class ShopCam_action_c { +public: + /* 80196544 */ void setCamDataIdx(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*, + cXyz*); + /* 80196608 */ void setCamDataIdx2(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, + fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*); + /* 801968B8 */ void setMasterCamCtrPos(cXyz*); + + void setCameraSpeed(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { + field_0xc0 = param_0; + field_0xc4 = param_1; + field_0xc8 = param_2; + field_0xcc = param_3; + } + + void SetSelectIdx(s16 idx) { + mSelectIdx = idx; + setCameraSpeed(0.25f, 20.0f, 0.25f, 5.0f); + } + + /* 0x00 */ int field_0x0; + /* 0x04 */ int field_0x4; + /* 0x08 */ ShopCam_actionFunc mCamActionFunc; + /* 0x0C */ u8 field_0xc[0xC]; + /* 0x18 */ fopAc_ac_c* field_0x18; + /* 0x1C */ fopAc_ac_c* field_0x1c; + /* 0x20 */ fopAc_ac_c* field_0x20; + /* 0x24 */ fopAc_ac_c* field_0x24; + /* 0x28 */ fopAc_ac_c* field_0x28; + /* 0x2C */ fopAc_ac_c* field_0x2c; + /* 0x30 */ fopAc_ac_c* field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ cXyz field_0x38; + /* 0x44 */ cXyz field_0x44; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ cXyz field_0x54; + /* 0x60 */ cXyz field_0x60; + /* 0x6C */ f32 field_0x6c; + /* 0x70 */ cXyz field_0x70; + /* 0x7C */ cXyz field_0x7c; + /* 0x88 */ cXyz field_0x88; + /* 0x94 */ f32 field_0x94; + /* 0x98 */ cXyz field_0x98; + /* 0xA4 */ cXyz field_0xa4; + /* 0xB0 */ cXyz field_0xb0; + /* 0xBC */ f32 field_0xbc; + /* 0xC0 */ f32 field_0xc0; + /* 0xC4 */ f32 field_0xc4; + /* 0xC8 */ f32 field_0xc8; + /* 0xCC */ f32 field_0xcc; + /* 0xD0 */ u8 field_0xd0[4]; + /* 0xD4 */ s16 mSelectIdx; + /* 0xD6 */ s16 field_0xd6; + /* 0xD8 */ s16 field_0xd8; + /* 0xDA */ u8 field_0xda; +}; + +class dShopSystem_c : public daNpcT_c { +public: + enum { + /* 0x0 */ SEQ_WAIT, + /* 0x1 */ SEQ_START, + /* 0x2 */ SEQ_SELECT_WAIT, + /* 0x3 */ SEQ_SELECT_START, + /* 0x4 */ SEQ_SELECT, + /* 0x5 */ SEQ_MOVING, + /* 0x6 */ SEQ_DECIDE, + /* 0x7 */ SEQ_CHOOSE, + /* 0x8 */ SEQ_DECIDE_YES, + /* 0x9 */ SEQ_DECIDE_NO, + /* 0xA */ SEQ_FINISH, + }; + + /* 80197338 */ void initShopSystem(); + /* 801975C0 */ void onFlag(int); + /* 801975DC */ void offFlag(int); + /* 801975F8 */ BOOL isFlag(int); + /* 80197618 */ void onSoldOutItemFlag(int); + /* 80197634 */ void offSoldOutItemFlag(int); + /* 80197650 */ BOOL isSoldOutItemFlag(int); + /* 80197670 */ int checkController(u8, dMsgFlow_c*); + /* 80197808 */ int chooseItem3(u8); + /* 80197DD0 */ int chooseItem5(u8); + /* 80198250 */ int chooseItem4(u8); + /* 80198444 */ int moveCursor(int, u8); + /* 80198488 */ int moveCursor0(int, u8); + /* 80198708 */ int moveCursor1(int, u8); + /* 80198878 */ int drawCursor(); + /* 80198950 */ int itemRotate(); + /* 80198A2C */ int itemZoom(cXyz*); + /* 801990B0 */ int seq_wait(fopAc_ac_c*, dMsgFlow_c*); + /* 801990B8 */ int seq_start(fopAc_ac_c*, dMsgFlow_c*); + /* 8019936C */ int seq_select_wait(fopAc_ac_c*, dMsgFlow_c*); + /* 801993C4 */ int seq_select_start(fopAc_ac_c*, dMsgFlow_c*); + /* 8019959C */ int seq_select(fopAc_ac_c*, dMsgFlow_c*); + /* 80199A18 */ int seq_moving(fopAc_ac_c*, dMsgFlow_c*); + /* 80199BF8 */ int seq_decide(fopAc_ac_c*, dMsgFlow_c*); + /* 80199D14 */ int seq_choose(fopAc_ac_c*, dMsgFlow_c*); + /* 80199E28 */ int seq_decide_yes(fopAc_ac_c*, dMsgFlow_c*); + /* 80199FA4 */ int seq_decide_no(fopAc_ac_c*, dMsgFlow_c*); + /* 8019A020 */ int seq_finish(fopAc_ac_c*, dMsgFlow_c*); + /* 8019A0C0 */ bool seq_event(fopAc_ac_c*, dMsgFlow_c*); + /* 8019A0D0 */ int shop_init(bool); + /* 8019A158 */ void shop_process(fopAc_ac_c*, dMsgFlow_c*); + /* 8019A238 */ void createShopItem(int); + /* 8019A344 */ void setSeq(u8); + /* 8019A354 */ void setSoldOutFlag(); + /* 8019A364 */ void setSoldOut(); + /* 8019A4F4 */ void setSoldOutItemHide(); + /* 8019A564 */ void deleteObject(); + /* 8019A5D0 */ void searchItemActor(); + /* 8019AB00 */ int getFlowNodeNum(); + /* 8019AB1C */ void setSellItemMax(u8); + /* 8019AB24 */ bool checkShopOpen(); + /* 8019AB60 */ bool checkLeftTrigger(STControl*); + /* 8019AB84 */ bool checkRightTrigger(STControl*); + /* 8019ABA8 */ bool dpdMove(); + + /* 801974E4 */ virtual ~dShopSystem_c(); + /* 8019ACF0 */ virtual bool getResName2(int); + /* 8019ACE0 */ virtual int beforeStartSeqAction(dMsgFlow_c*, int); + /* 8019ACE8 */ virtual int beforeSelectSeqAction(dMsgFlow_c*, int); + + bool chkSpMode() { return mSpMode == 1; } + void offSpMode() { mSpMode = 0; } + u8 getEventParamU8(int param_0) { return (mEventParam >> (3 - param_0) * 8) & 0xFF; } + +private: + /* 0xE40 */ STControl* mpStick; + /* 0xE44 */ dSelect_cursor_c* mpDrawCursor; + /* 0xE48 */ dShopItemCtrl_c mItemCtrl; + /* 0xE78 */ ShopCam_action_c mShopCamAction; + /* 0xF54 */ u32 mEventParam; + /* 0xF58 */ int field_0xf58; + /* 0xF5C */ int field_0xf5c; + /* 0xF60 */ int field_0xf60; + /* 0xF64 */ int field_0xf64; + /* 0xF68 */ s16 field_0xf68; + /* 0xF6A */ u16 mFlag; + /* 0xF6C */ u16 field_0xf6c; + /* 0xF6E */ u8 mCursorPos; + /* 0xF6F */ u8 mLastCursorPos; + /* 0xF70 */ u8 mSeq; + /* 0xF71 */ u8 field_0xf71; + /* 0xF72 */ u8 mWaitTimer; + /* 0xF73 */ u8 mSoldOutFlag; + /* 0xF74 */ u8 mSoldOutItemFlags; + /* 0xF75 */ u8 mSpMode; + /* 0xF76 */ u8 field_0xf76; + /* 0xF77 */ u8 field_0xf77; + /* 0xF78 */ u8 field_0xf78; + /* 0xF79 */ u8 field_0xf79; + /* 0xF7A */ u8 field_0xf7a; +}; + +typedef int (dShopSystem_c::*processFunc)(fopAc_ac_c*, dMsgFlow_c*); #endif /* D_SHOP_D_SHOP_SYSTEM_H */ diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index e452160da30..576474fc8ec 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -121,4 +121,6 @@ public: const csXyz& getAngle() const { return mCurrent.mAngle; } }; // Size: 0x568 +s32 fopAc_IsActor(void* actor); + #endif diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 1c3e630f9d6..0a238b9e16b 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -154,6 +154,10 @@ inline void fopAcM_OnCondition(fopAc_ac_c* p_actor, u32 flag) { p_actor->mCondition |= flag; } +inline BOOL fopAcM_IsActor(void* actor) { + return fopAc_IsActor(actor); +} + void* fopAcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData); void fopAcM_setStageLayer(void*); int fopAcM_setRoomLayer(void*, int); diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index c3972f23f95..d5d50f90746 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -11,5 +11,6 @@ u32 fopMsgM_Create(s16, fopMsgCreateFunc, void*); void fopMsgM_setMessageID(unsigned int); void fopMsgM_destroyExpHeap(JKRExpHeap*); void fopMsgM_setStageLayer(void*); +void fopMsgM_messageSetDemo(u32 param_0); #endif \ No newline at end of file diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h index c7259619ecf..41d18161bee 100644 --- a/include/m_Do/m_Do_lib.h +++ b/include/m_Do/m_Do_lib.h @@ -12,4 +12,6 @@ struct mDoLib_clipper { static f32 mFovyRate; }; +void mDoLib_project(Vec* param_0, Vec* param_1); + #endif /* M_DO_M_DO_LIB_H */ diff --git a/include/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.h b/include/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.h index 49a37b54f7b..30864f984a2 100644 --- a/include/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.h +++ b/include/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.h @@ -2,5 +2,13 @@ #define D_A_TAG_ESCAPE_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" + +class daTagEscape_c : public fopAc_ac_c { +public: + daTagEscape_c() {} + ~daTagEscape_c() {} +}; #endif /* D_A_TAG_ESCAPE_H */ diff --git a/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h b/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h index 095f07a61d1..02b8a8eaa95 100644 --- a/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h +++ b/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h @@ -2,5 +2,23 @@ #define D_A_TAG_TELOP_H #include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +class daTag_Telop_c : public fopAc_ac_c { +public: + daTag_Telop_c() {} + ~daTag_Telop_c() {} + + int create(); + void execute(); + + u16 getMessageNo() { + return mOrig.mAngle.z; + } + +private: + /* 0x568 */ u16 mMessageNo; + /* 0x56C */ int mMessageStatus; +}; #endif /* D_A_TAG_TELOP_H */ diff --git a/rel/d/a/d_a_horse/d_a_horse.cpp b/rel/d/a/d_a_horse/d_a_horse.cpp index 26f87659ccd..7bace47e08d 100644 --- a/rel/d/a/d_a_horse/d_a_horse.cpp +++ b/rel/d/a/d_a_horse/d_a_horse.cpp @@ -21,11 +21,6 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct mDoExt_btpAnm { - /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); - /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); -}; - struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); diff --git a/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp b/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp index a1d53ed058d..f7c2a13628b 100644 --- a/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp +++ b/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp @@ -7,17 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daTagEscape_c {}; - // // Forward References: // @@ -30,10 +19,7 @@ extern "C" extern void* g_profile_Tag_Escape[12]; // External References: // -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; // // Declarations: @@ -41,24 +27,20 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; /* 80D587D8-80D58828 000078 0050+00 1/0 0/0 0/0 .text daTagEscape_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagEscape_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape/daTagEscape_Create__FP10fopAc_ac_c.s" +static int daTagEscape_Create(fopAc_ac_c* tag) { + if (!fopAcM_CheckCondition(tag, 8)) { + new (tag) daTagEscape_c(); + fopAcM_OnCondition(tag, 8); + } + + return 4; } -#pragma pop /* 80D58828-80D58858 0000C8 0030+00 1/0 0/0 0/0 .text daTagEscape_Delete__FP13daTagEscape_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagEscape_Delete(daTagEscape_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape/daTagEscape_Delete__FP13daTagEscape_c.s" +static int daTagEscape_Delete(daTagEscape_c* tag) { + tag->~daTagEscape_c(); + return 1; } -#pragma pop /* ############################################################################################## */ /* 80D58860-80D58880 -00001 0020+00 1/0 0/0 0/0 .data l_daTagEscape_Method */ diff --git a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp index b810e10adde..7f5c5b6ea0b 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp +++ b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp @@ -116,7 +116,7 @@ int daTag_Lv5Soup_c::Draw() { /* 80D5AEA4-80D5B06C 0001C4 01C8+00 1/1 0/0 0/0 .text isAreaCheck__15daTag_Lv5Soup_cFv */ bool daTag_Lv5Soup_c::isAreaCheck() { - cXyz dist = dComIfGp_getLinkPlayer()->mCurrent.mPosition - mCurrent.mPosition; + cXyz dist = daPy_getPlayerActorClass()->mCurrent.mPosition - mCurrent.mPosition; f32 boundX = mScale.x * 100.0f; f32 boundY = mScale.y * 100.0f; diff --git a/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp b/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp index 36ccfa59a29..27b511a5594 100644 --- a/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp +++ b/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp @@ -6,24 +6,7 @@ #include "rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daTag_Telop_c { - /* 80490A58 */ void create(); - /* 80490AF8 */ void execute(); -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; +#include "f_op/f_op_msg_mng.h" // // Forward References: @@ -42,80 +25,78 @@ extern "C" extern void* g_profile_TAG_TELOP[12]; // External References: // -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopMsgM_messageSetDemo__FUl(); -extern "C" void isEventBit__11dSv_event_cCFUs(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; // // Declarations: // -/* 80490A58-80490AF8 000078 00A0+00 1/1 0/0 0/0 .text create__13daTag_Telop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Telop_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/create__13daTag_Telop_cFv.s" +inline int dComIfGs_isEventBit(u16 event) { + return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(event); +} + +/* 80490A58-80490AF8 000078 00A0+00 1/1 0/0 0/0 .text create__13daTag_Telop_cFv */ +int daTag_Telop_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daTag_Telop_c(); + fopAcM_OnCondition(this, 8); + } + + mMessageNo = getMessageNo(); + + if (dComIfGs_isTmpBit(0x1301)) { + mMessageStatus = 99; + } else if (mMessageNo != 0xFFFF) { + mMessageStatus = 0; + } else { + mMessageStatus = 99; + } + + return 4; } -#pragma pop /* 80490AF8-80490B5C 000118 0064+00 1/1 0/0 0/0 .text execute__13daTag_Telop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Telop_c::execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/execute__13daTag_Telop_cFv.s" +void daTag_Telop_c::execute() { + switch (mMessageStatus) { + case 0: + fopMsgM_messageSetDemo(mMessageNo); + mMessageStatus = 99; + break; + case 99: + fopAcM_delete(this); + mMessageStatus = -1; + break; + } } -#pragma pop /* 80490B5C-80490B64 00017C 0008+00 1/0 0/0 0/0 .text daTag_Telop_Draw__FP13daTag_Telop_c */ -static bool daTag_Telop_Draw(daTag_Telop_c* param_0) { - return true; +static int daTag_Telop_Draw(daTag_Telop_c* tag) { + return 1; } /* 80490B64-80490B88 000184 0024+00 1/0 0/0 0/0 .text daTag_Telop_Execute__FP13daTag_Telop_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Telop_Execute(daTag_Telop_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Execute__FP13daTag_Telop_c.s" +static int daTag_Telop_Execute(daTag_Telop_c* tag) { + tag->execute(); + return 1; } -#pragma pop /* 80490B88-80490B90 0001A8 0008+00 1/0 0/0 0/0 .text daTag_Telop_IsDelete__FP13daTag_Telop_c */ -static bool daTag_Telop_IsDelete(daTag_Telop_c* param_0) { - return true; +static int daTag_Telop_IsDelete(daTag_Telop_c* tag) { + return 1; } /* 80490B90-80490BC0 0001B0 0030+00 1/0 0/0 0/0 .text daTag_Telop_Delete__FP13daTag_Telop_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Telop_Delete(daTag_Telop_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Delete__FP13daTag_Telop_c.s" +static int daTag_Telop_Delete(daTag_Telop_c* tag) { + tag->~daTag_Telop_c(); + return 1; } -#pragma pop /* 80490BC0-80490BE0 0001E0 0020+00 1/0 0/0 0/0 .text daTag_Telop_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Telop_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Create__FP10fopAc_ac_c.s" +static int daTag_Telop_Create(fopAc_ac_c* tag) { + return static_cast(tag)->create(); } -#pragma pop /* ############################################################################################## */ /* 80490BE8-80490C08 -00001 0020+00 1/0 0/0 0/0 .data l_daTag_Telop_Method */ diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index d0631ae8b87..c6ff59a4949 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -11,27 +11,6 @@ // Types: // -struct request_of_phase_process_class {}; - -struct csXyz { - /* 80018BD0 */ ~csXyz(); - /* 80112C80 */ csXyz(); - /* 8026745C */ void operator+=(csXyz&); - - static u8 Zero[4]; -}; - -struct Vec {}; - -struct cXyz { - /* 80009184 */ ~cXyz(); - /* 800125DC */ cXyz(); - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266EF4 */ void normalize(); - /* 802670AC */ void isZero() const; -}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -44,59 +23,6 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct mDoExt_morf_c { - /* 8000FB7C */ void setMorf(f32); -}; - -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTexPattern {}; - -struct J3DAnmTevRegKey {}; - -struct J3DAnmColor {}; - -struct J3DMaterialTable { - /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); - /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); - /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); - /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); -}; - -struct mDoExt_btpAnm { - /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); - /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); -}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_bpkAnm { - /* 8000D47C */ void init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16); - /* 8000D518 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); - /* 8000D9E8 */ void entryJoint(J3DModelData*, u16, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - struct mDoExt_McaMorfSO { /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); /* 800110B0 */ void play(u32, s8); @@ -104,147 +30,6 @@ struct mDoExt_McaMorfSO { /* 800111EC */ void modelCalc(); }; -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daPy_py_c { - /* 8015F3FC */ void getAttentionOffsetY(); - /* 8015F424 */ void checkNowWolfEyeUp(); -}; - -struct daNpcT_pntData_c {}; - -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct dCcD_GObjInf { - /* 80084460 */ void ChkTgHit(); -}; - -struct J3DAnmTransformKey {}; - -struct _GXColorS10 {}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); -}; - -struct J3DJoint {}; - -struct daNpcT_c { - /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); - /* 80147FD4 */ void srchActor(void*, void*); - /* 80148058 */ void getTrnsfrmAnmP(char const*, int); - /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); - /* 801480D0 */ void getTexPtrnAnmP(char const*, int); - /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); - /* 80148148 */ void getTevRegKeyAnmP(char const*, int); - /* 80148184 */ void getColorAnmP(char const*, int); - /* 801481C0 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool); - /* 80148204 */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int); - /* 801482F8 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); - /* 80148338 */ void setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int); - /* 80148378 */ void setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int); - /* 801483B8 */ void setBpkAnm(J3DAnmColor*, J3DModelData*, f32, int); - /* 801483F8 */ void loadRes(s8 const*, char const**); - /* 801484AC */ void deleteRes(s8 const*, char const**); - /* 8014852C */ void execute(); - /* 8014886C */ void draw(int, int, f32, _GXColorS10*, f32, int, int, int); - /* 80148C70 */ void setEnvTevColor(); - /* 80148CCC */ void setRoomNo(); - /* 80148D10 */ void checkEndAnm(f32); - /* 80148DD0 */ void checkEndAnm(J3DFrameCtrl*, f32); - /* 80148E4C */ void playAllAnm(); - /* 801490D4 */ void ctrlBtk(); - /* 80149190 */ void setMtx(); - /* 8014924C */ void ctrlFaceMotion(); - /* 80149300 */ void ctrlMotion(); - /* 801493B8 */ void ctrlMsgAnm(int*, int*, fopAc_ac_c*, int); - /* 8014951C */ void ctrlJoint(J3DJoint*, J3DModel*); - /* 8014997C */ void evtProc(); - /* 80149BB4 */ void setFootPos(); - /* 80149D7C */ void setFootPrtcl(cXyz*, f32, f32); - /* 8014A05C */ bool checkCullDraw(); - /* 8014A064 */ void twilight(); - /* 8014A0B0 */ void evtOrder(); - /* 8014A224 */ void evtChange(); - /* 8014A324 */ void clrParam(); - /* 8014A388 */ void setFaceMotionAnm(int, bool); - /* 8014A628 */ void setMotionAnm(int, f32, int); - /* 8014A908 */ void setPos(cXyz); - /* 8014AA18 */ void setAngle(s16); - /* 8014A99C */ void setAngle(csXyz); - /* 8014AA40 */ void hitChk(dCcD_GObjInf*, u32); - /* 8014AAD0 */ void setDamage(int, int, int); - /* 8014ABD0 */ void chkActorInSight(fopAc_ac_c*, f32, s16); - /* 8014ACF0 */ void chkPointInArea(cXyz, cXyz, f32, f32, f32, s16); - /* 8014ADA0 */ void chkPointInArea(cXyz, cXyz, cXyz, s16); - /* 8014AE1C */ void chkFindActor(fopAc_ac_c*, int, s16); - /* 8014B024 */ void chkWolfAction(); - /* 8014B0C8 */ void chkFindWolf(s16, int, int, f32, f32, f32, f32, int); - /* 8014B338 */ void srchPlayerActor(); - /* 8014B3EC */ void getAttnPos(fopAc_ac_c*); - /* 8014B4A4 */ void turn(s16, int, int); - /* 8014B648 */ void step(s16, int, int, int, int); - /* 8014B808 */ void calcSpeedAndAngle(cXyz, int, s16, s16); - /* 8014BB00 */ void getActorDistance(fopAc_ac_c*, int, int); - /* 8014BBF0 */ void initTalk(int, fopAc_ac_c**); - /* 8014BC78 */ void talkProc(int*, int, fopAc_ac_c**, int); - /* 8014BE2C */ void getNearestActorP(s16); - /* 8014BEE4 */ void getEvtAreaTagP(int, int); - /* 8014BFB0 */ void getShopItemTagP(); - /* 8014C030 */ void setHitodamaPrtcl(); - /* 8014CBF4 */ void decTmr(); - /* 8014CC0C */ void setCollision(); - /* 8014CC10 */ void setAttnPos(); - /* 8014CC14 */ void ctrlSubFaceMotion(int); - /* 8014CC18 */ void afterMoved(); - /* 8014CC1C */ void beforeMove(); - /* 8014CC20 */ void action(); - /* 8014CC24 */ void setParam(); - /* 8014CC28 */ void drawOtherMdl(); - /* 8014CC2C */ void drawGhost(); - /* 8014CC30 */ bool drawDbgInfo(); - /* 8014CC38 */ bool checkRemoveJoint(int); - /* 8014CC40 */ bool checkChangeJoint(int); - /* 8014CC48 */ void afterJntAnm(int); - /* 8014CC4C */ s32 getHeadJointNo(); - /* 8014CC54 */ s32 getNeckJointNo(); - /* 8014CC5C */ s32 getBackboneJointNo(); - /* 8014CC64 */ void setAfterTalkMotion(); - /* 8014CC68 */ bool evtCutProc(); - /* 8014CC70 */ bool evtEndProc(); - /* 8014CC78 */ bool evtTalk(); - /* 8014CC80 */ bool checkChangeEvt(); - /* 8014CC88 */ s32 getFootRJointNo(); - /* 8014CC90 */ s32 getFootLJointNo(); - /* 8014CC98 */ bool chkXYItems(); - /* 8014CCA0 */ bool afterSetFaceMotionAnm(int, int, f32, int); - /* 8014CCA8 */ void changeBtp(int*, int*); - /* 8014CCAC */ void changeBck(int*, int*); - /* 8014CCB0 */ void getFaceMotionAnm(daNpcT_faceMotionAnmData_c); - /* 8014CCE0 */ bool afterSetMotionAnm(int, int, f32, int); - /* 8014CCE8 */ void changeBtk(int*, int*); - /* 8014CCEC */ void changeAnm(int*, int*); - /* 8014CCF0 */ void getMotionAnm(daNpcT_motionAnmData_c); - /* 8014CD20 */ ~daNpcT_c(); - /* 8014D0A8 */ bool getEyeballLMaterialNo(); - /* 8014D0B0 */ bool getEyeballRMaterialNo(); - /* 8014D0B8 */ bool getEyeballMaterialNo(); - - static u8 const mCcDObjData[48]; - static u8 mCcDCyl[68]; - static u8 mCcDSph[64]; - static u8 mFindActorPtrs[200]; - static u8 mSrchName[2 + 2 /* padding */]; - static u8 mFindCount[4]; -}; - struct daNpcT_Hermite_c { /* 8014CBAC */ ~daNpcT_Hermite_c(); }; @@ -262,45 +47,12 @@ struct daNpcT_Path_c { /* 801464D8 */ void chkPassed2(cXyz, cXyz*, int, int); }; -struct daNpcT_MotionSeqMngr_c { - /* 80145898 */ void initialize(); - /* 801458C0 */ void play(u16, int*, f32*); - /* 80145A24 */ void checkEndSequence(); - /* 8014D0C0 */ ~daNpcT_MotionSeqMngr_c(); -}; - -struct J3DMaterial {}; - struct daNpcT_MatAnm_c { /* 80145764 */ void initialize(); /* 80145788 */ void calc(J3DMaterial*) const; /* 8014D24C */ ~daNpcT_MatAnm_c(); }; -struct daNpcT_JntAnm_c { - /* 80146C98 */ void initialize(); - /* 80146CD8 */ void setParam(fopAc_ac_c*, J3DModel*, cXyz*, int, int, int, f32, f32, f32, f32, - f32, f32, f32, f32, f32, f32, cXyz*); - /* 80147858 */ void calc(f32); - /* 80147C38 */ void calcJntRad(f32, f32, f32); - /* 8014D150 */ ~daNpcT_JntAnm_c(); -}; - -struct daNpcT_DmgStagger_c { - /* 80147DCC */ void setParam(fopAc_ac_c*, fopAc_ac_c*, s16); - /* 80147E3C */ void calc(int); -}; - -struct daNpcT_ActorMngr_c { - /* 801456D4 */ void initialize(); - /* 801456E0 */ void entry(fopAc_ac_c*); - /* 801456FC */ void remove(); - /* 80145708 */ void getActorP(); - /* 8014D108 */ ~daNpcT_ActorMngr_c(); -}; - -struct dCcD_Cyl {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -449,15 +201,6 @@ struct daBaseNpc_path_c { /* 801503FC */ ~daBaseNpc_path_c(); }; -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - struct daBaseNpc_moveBgActor_c { /* 8014F4B4 */ daBaseNpc_moveBgActor_c(); /* 8014F518 */ void MoveBGCreateHeap(); @@ -537,59 +280,8 @@ struct daBaseNpc_acMngr_c { /* 80150524 */ ~daBaseNpc_acMngr_c(); }; -struct dSv_event_tmp_flag_c { - static u8 const tempBitLabels[370 + 2 /* padding */]; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 800349A4 */ void offEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dStage_roomControl_c { - /* 80024384 */ void getStatusRoomDt(int); -}; - -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 dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - struct dPnt {}; -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dPaPoT_c { - /* 8005115C */ void setEffectTwo(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, - cXyz const*, cXyz const*, csXyz const*, cXyz const*, s8, f32, - f32); -}; - struct dMsgObject_c { /* 8023819C */ void getActor(); /* 802382C8 */ void offMsgSendControl(); @@ -597,166 +289,10 @@ struct dMsgObject_c { /* 802383A4 */ void isMouthCheck(); }; -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); - /* 8024A424 */ void checkEventRender(int*, int*, int*, int*); - /* 8024A538 */ void getMsgNo(); - /* 8024A548 */ void getMsg(); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042518 */ void reset(void*); - /* 800432EC */ void convPId(unsigned int); - /* 8004368C */ void setPtT(void*); -}; - -struct dEvent_manager_c { - /* 80046800 */ void setObjectArchive(char*); - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 800483E8 */ void getRunEventName(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dBgW_Base {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_LinChk { - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct dAttention_c { - /* 80070880 */ void getActionBtnB(); - /* 8007353C */ void LockonTarget(s32); - /* 80073734 */ void ActionTarget(s32); - /* 8014B010 */ void getDistTable(int); - - static u8 dist_table[6552]; -}; - -struct cSGlobe { - /* 80271880 */ cSGlobe(cXyz const&); -}; - -struct cSAngle { - /* 80270F68 */ cSAngle(cSAngle const&); - /* 80270F98 */ cSAngle(s16); - /* 802710E8 */ void Inv() const; - /* 80271228 */ void operator-(s16) const; -}; - -struct cM3dGPla {}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074660 */ void ChkPolySafe(cBgS_PolyInfo const&); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0420 */ ~Z2Creature(); -}; - struct JMath { static u8 sincosTable_[65536]; }; -struct J3DTexNoAnm { - /* 8003B1F8 */ ~J3DTexNoAnm(); -}; - -struct J3DTexMtxAnm { - /* 8003B264 */ ~J3DTexMtxAnm(); -}; - -struct J3DTevKColorAnm { - /* 8003B150 */ ~J3DTevKColorAnm(); -}; - -struct J3DTevColorAnm { - /* 8003B1A4 */ ~J3DTevColorAnm(); -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DMaterialAnm { - /* 8032C3C4 */ void calc(J3DMaterial*) const; -}; - -struct J3DMatColorAnm { - /* 8003B2B8 */ ~J3DMatColorAnm(); -}; - // // Forward References: // @@ -1131,7 +667,6 @@ extern "C" extern u8 data_80450FF8[8]; // External References: // -SECTION_INIT void memset(); extern "C" void __dt__4cXyzFv(); extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); @@ -1297,13 +832,6 @@ extern "C" void removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor(); extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern(); extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXMultVec(); -extern "C" void PSMTXMultVecArray(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); extern "C" void __register_global_object(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); @@ -1331,9 +859,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 strcmp(); -extern "C" void strlen(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; extern "C" extern void* __vt__12J3DFrameCtrl[3]; extern "C" extern void* __vt__8cM3dGPla[3]; @@ -1347,16 +872,12 @@ extern "C" extern void* __vt__12dBgS_ObjAcch[9]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__14J3DMaterialAnm[4]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 Zero__5csXyz[4]; extern "C" extern u8 data_80451164[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; // // Declarations: @@ -3163,7 +2684,8 @@ asm void daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcT_c::~daNpcT_c() { +//asm daNpcT_c::~daNpcT_c() { +extern "C" asm void __dt__8daNpcT_cFv() { nofralloc #include "asm/d/a/d_a_npc/__dt__8daNpcT_cFv.s" } @@ -3191,7 +2713,8 @@ bool daNpcT_c::getEyeballMaterialNo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcT_MotionSeqMngr_c::~daNpcT_MotionSeqMngr_c() { +// asm daNpcT_MotionSeqMngr_c::~daNpcT_MotionSeqMngr_c() { +extern "C" asm void __dt__22daNpcT_MotionSeqMngr_cFv() { nofralloc #include "asm/d/a/d_a_npc/__dt__22daNpcT_MotionSeqMngr_cFv.s" } @@ -3201,7 +2724,8 @@ asm daNpcT_MotionSeqMngr_c::~daNpcT_MotionSeqMngr_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcT_ActorMngr_c::~daNpcT_ActorMngr_c() { +// asm daNpcT_ActorMngr_c::~daNpcT_ActorMngr_c() { +extern "C" asm void __dt__18daNpcT_ActorMngr_cFv() { nofralloc #include "asm/d/a/d_a_npc/__dt__18daNpcT_ActorMngr_cFv.s" } @@ -3211,7 +2735,8 @@ asm daNpcT_ActorMngr_c::~daNpcT_ActorMngr_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcT_JntAnm_c::~daNpcT_JntAnm_c() { +// asm daNpcT_JntAnm_c::~daNpcT_JntAnm_c() { +extern "C" asm void __dt__15daNpcT_JntAnm_cFv() { nofralloc #include "asm/d/a/d_a_npc/__dt__15daNpcT_JntAnm_cFv.s" } diff --git a/src/d/a/d_a_shop_item_static.cpp b/src/d/a/d_a_shop_item_static.cpp index 1141dced96b..06e96881524 100644 --- a/src/d/a/d_a_shop_item_static.cpp +++ b/src/d/a/d_a_shop_item_static.cpp @@ -7,23 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct fopAc_ac_c {}; - -struct daShopItem_c { - /* 80037C14 */ void getRotateP(); - /* 80037C1C */ void getPosP(); - - static void* const mData[276]; -}; - -struct daItemBase_c { - /* 8014475C */ void CreateItemHeap(char const*, s16, s16, s16, s16, s16, s16, s16); -}; - // // Forward References: // @@ -45,402 +28,52 @@ extern "C" void CreateItemHeap__12daItemBase_cFPCcsssssss(); // /* 80037C14-80037C1C 032554 0008+00 0/0 1/1 0/0 .text getRotateP__12daShopItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daShopItem_c::getRotateP() { - nofralloc -#include "asm/d/a/d_a_shop_item_static/getRotateP__12daShopItem_cFv.s" +csXyz* daShopItem_c::getRotateP() { + return &mCurrent.mAngle; } -#pragma pop /* 80037C1C-80037C24 03255C 0008+00 0/0 2/2 0/0 .text getPosP__12daShopItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daShopItem_c::getPosP() { - nofralloc -#include "asm/d/a/d_a_shop_item_static/getPosP__12daShopItem_cFv.s" +cXyz* daShopItem_c::getPosP() { + return &mCurrent.mPosition; } -#pragma pop - -/* ############################################################################################## */ -/* 80379738-80379742 005D98 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80379738; - -/* 80379742-8037974B 005DA2 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80379742; - -/* 8037974B-80379754 005DAB 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8037974B; - -/* 80379754-8037975E 005DB4 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80379754; - -/* 8037975E-80379768 005DBE 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8037975E; - -/* 80379768-80379771 005DC8 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80379768; - -/* 80379771-8037977A 005DD1 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80379771; - -/* 8037977A-80379783 005DDA 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8037977A; - -/* 80379783-8037978D 005DE3 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80379783; - -/* 8037978D-80379795 005DED 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8037978D; - -/* 80379795-8037979D 005DF5 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80379795; - -/* 8037979D-803797A7 005DFD 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8037979D; - -/* 803797A7-803797B1 005E07 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803797A7; - -/* 803797B1-803797BB 005E11 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803797B1; - -/* 803797BB-803797C5 005E1B 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803797BB; - -/* 803797C5-803797CF 005E25 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803797C5; - -/* 803797CF-803797D9 005E2F 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803797CF; - -/* 803797D9-803797E3 005E39 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803797D9; - -/* 803797E3-803797ED 005E43 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803797E3; - -/* 803797ED-803797F8 005E4D 000A+01 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803797ED; /* 803792E8-80379738 -00001 0450+00 1/1 0/0 9/9 .rodata mData__12daShopItem_c */ -SECTION_RODATA void* const daShopItem_c::mData[276] = { - (void*)&d_a_d_a_shop_item_static__stringBase0, - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)0x80000000, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0xA), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x13), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFF50000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x1C), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x26), - (void*)0x0006000C, - (void*)0xFFFFFFFF, - (void*)0xFFFF0009, - (void*)0x000F0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)0x00000004, - (void*)0x00000003, - (void*)0x01000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x30), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x39), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)0x41F00000, - (void*)0x3F800000, - (void*)NULL, - (void*)0x7FFF0000, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x42), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)0x41F00000, - (void*)0x3F800000, - (void*)NULL, - (void*)0x7FFF0000, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x4B), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x55), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x5D), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x65), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x6F), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x79), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x26), - (void*)0x0006000C, - (void*)0xFFFFFFFF, - (void*)0xFFFF0009, - (void*)0x000F0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)0x00000004, - (void*)0x00000001, - (void*)NULL, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x83), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x8D), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x97), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFF50000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0xA1), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0xAB), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0xAB), - (void*)0x0004FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0xB5), - (void*)0x0003FFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFFFFFF, - (void*)0xFFFF0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)0x000000FF, - (void*)0xFF000000, - (void*)(((char*)&d_a_d_a_shop_item_static__stringBase0) + 0x26), - (void*)0x0006000C, - (void*)0xFFFFFFFF, - (void*)0xFFFF0009, - (void*)0x000F0000, - (void*)NULL, - (void*)0x3F800000, - (void*)NULL, - (void*)NULL, - (void*)0x00000004, - (void*)0x0000000C, - (void*)NULL, +SECTION_RODATA ResourceData const daShopItem_c::mData[23] = { + {"B_mD_sold", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0x8000, 0}, 0, 0, 0, 0, -1, -1}, + {"B_mD_oil", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_red", 3, -1, -1, -1, -1, -1, -11, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"B_mD_milk", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_bott", 6, 12, -1, -1, -1, 9, 15, 0.0f, 1.0f, 0, {0, 0, 0}, 4, 0, 0, 0, 3, 1}, + {"O_mD_arw", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_SHB", 3, -1, -1, -1, -1, -1, -1, 30.0f, 1.0f, 0, {0, 0x7FFF, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_SHA", 3, -1, -1, -1, -1, -1, -1, 30.0f, 1.0f, 0, {0, 0x7FFF, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_bomb", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1}, + {"O_mD_pg", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1}, + {"O_mD_bi", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1}, + {"O_mD_bmcs", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1}, + {"O_mD_bmc2", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1}, + {"O_mD_jira", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, 0, -1}, + {"O_mD_bott", 6, 12, -1, -1, -1, 9, 15, 0.0f, 1.0f, 0, {0, 0, 0}, 4, 0, 0, 0, 1, 0}, + {"O_mD_hati", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_pach", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_blue", 3, -1, -1, -1, -1, -1, -11, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_hawk", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_marm", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_marm", 4, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_gren", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, + {"O_mD_bott", 6, 12, -1, -1, -1, 9, 15, 0.0f, 1.0f, 0, {0, 0, 0}, 4, 0, 0, 0, 12, 0}, }; COMPILER_STRIP_GATE(0x803792E8, &daShopItem_c::mData); -/* 80379738-80379738 005D98 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379738 = "B_mD_sold"; -SECTION_DEAD static char const* const stringBase_80379742 = "B_mD_oil"; -SECTION_DEAD static char const* const stringBase_8037974B = "O_mD_red"; -SECTION_DEAD static char const* const stringBase_80379754 = "B_mD_milk"; -SECTION_DEAD static char const* const stringBase_8037975E = "O_mD_bott"; -SECTION_DEAD static char const* const stringBase_80379768 = "O_mD_arw"; -SECTION_DEAD static char const* const stringBase_80379771 = "O_mD_SHB"; -SECTION_DEAD static char const* const stringBase_8037977A = "O_mD_SHA"; -SECTION_DEAD static char const* const stringBase_80379783 = "O_mD_bomb"; -SECTION_DEAD static char const* const stringBase_8037978D = "O_mD_pg"; -SECTION_DEAD static char const* const stringBase_80379795 = "O_mD_bi"; -SECTION_DEAD static char const* const stringBase_8037979D = "O_mD_bmcs"; -SECTION_DEAD static char const* const stringBase_803797A7 = "O_mD_bmc2"; -SECTION_DEAD static char const* const stringBase_803797B1 = "O_mD_jira"; -SECTION_DEAD static char const* const stringBase_803797BB = "O_mD_hati"; -SECTION_DEAD static char const* const stringBase_803797C5 = "O_mD_pach"; -SECTION_DEAD static char const* const stringBase_803797CF = "O_mD_blue"; -SECTION_DEAD static char const* const stringBase_803797D9 = "O_mD_hawk"; -SECTION_DEAD static char const* const stringBase_803797E3 = "O_mD_marm"; -SECTION_DEAD static char const* const stringBase_803797ED = "O_mD_gren"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803797F7 = ""; -#pragma pop - /* 80037C24-80037C7C 032564 0058+00 0/0 0/0 1/1 .text CheckShopItemCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CheckShopItemCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_shop_item_static/CheckShopItemCreateHeap__FP10fopAc_ac_c.s" +void CheckShopItemCreateHeap(fopAc_ac_c* actor) { + daShopItem_c* item = static_cast(actor); + + u8 item_id = item->getShopItemID(); + item->CreateItemHeap(daShopItem_c::mData[item_id].get_arcName(), daShopItem_c::mData[item_id].get_bmdName(), + daShopItem_c::mData[item_id].get_btk1Name(), daShopItem_c::mData[item_id].get_bpk1Name(), + daShopItem_c::mData[item_id].get_bck1Name(), daShopItem_c::mData[item_id].get_bxa1Name(), + daShopItem_c::mData[item_id].get_brk1Name(), daShopItem_c::mData[item_id].get_btp1Name()); } -#pragma pop /* 80379738-80379738 005D98 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index cfb752c2b84..6ce3e03a51f 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -1514,7 +1514,7 @@ asm void dMsgFlow_c::checkOpenDoor(fopAc_ac_c* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::doFlow(fopAc_ac_c* param_0, fopAc_ac_c** param_1, int param_2) { +asm int dMsgFlow_c::doFlow(fopAc_ac_c* param_0, fopAc_ac_c** param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci.s" } @@ -1544,7 +1544,7 @@ asm void dMsgFlow_c::remove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::getEventId(int* param_0) { +asm u16 dMsgFlow_c::getEventId(int* param_0) { nofralloc #include "asm/d/msg/d_msg_flow/getEventId__10dMsgFlow_cFPi.s" } @@ -1797,7 +1797,7 @@ asm void dMsgFlow_c::query004(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query005(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm u16 dMsgFlow_c::query005(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index 683d819692d..bb259748cc0 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -1905,7 +1905,7 @@ asm void dMsgObject_c::offMsgSendControl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::isMsgSendControl() { +asm int dMsgObject_c::isMsgSendControl() { nofralloc #include "asm/d/msg/d_msg_object/isMsgSendControl__12dMsgObject_cFv.s" } @@ -1955,7 +1955,7 @@ asm void dMsgObject_c::isMouthCheck() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getMessageID() { +asm u32 dMsgObject_c::getMessageID() { nofralloc #include "asm/d/msg/d_msg_object/getMessageID__12dMsgObject_cFv.s" } diff --git a/src/d/particle/d_particle_copoly.cpp b/src/d/particle/d_particle_copoly.cpp index fe6fcbace0d..d13dabfef1f 100644 --- a/src/d/particle/d_particle_copoly.cpp +++ b/src/d/particle/d_particle_copoly.cpp @@ -23,20 +23,6 @@ struct dPa_control_c { dKy_tevstr_c const*, u32, u32, csXyz const*, cXyz const*, s8); }; -struct dPaPoT_c { - /* 8005115C */ void setEffectTwo(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, - cXyz const*, cXyz const*, csXyz const*, cXyz const*, s8, f32, - f32); - /* 80051294 */ void clearTwoAllID(); - /* 80051470 */ void getRightEffType(int) const; - /* 8005147C */ void getLeftEffType(int) const; - /* 80051494 */ void getRightEmitter(int, int); - /* 800514DC */ void getLeftEmitter(int, int); - - static u8 m_typeTwoData[36]; - static u8 m_emitterTwoData[36]; -}; - struct dPaPoF_c { /* 800512E8 */ void setEffectFour(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, cXyz const*, cXyz const*, cXyz const*, cXyz const*, diff --git a/src/d/shop/d_shop_item_ctrl.cpp b/src/d/shop/d_shop_item_ctrl.cpp index a324c0a3c3a..b017ce27b97 100644 --- a/src/d/shop/d_shop_item_ctrl.cpp +++ b/src/d/shop/d_shop_item_ctrl.cpp @@ -7,30 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct daShopItem_c { - /* 80037C14 */ void getRotateP(); - /* 80037C1C */ void getPosP(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dShopItemCtrl_c { - /* 80196914 */ dShopItemCtrl_c(); - /* 80196958 */ ~dShopItemCtrl_c(); - /* 801969A0 */ void getCurrentPos(int); - /* 80196A3C */ void isHomePos(int); - /* 80196AF0 */ void setRotateAnime(int); - /* 80196BA4 */ void setZoomAnime(int, cXyz*, s16, bool); -}; - // // Forward References: // @@ -54,46 +30,25 @@ extern "C" void __mi__4cXyzCFRC3Vec(); extern "C" void cLib_addCalcPos2__FP4cXyzRC4cXyzff(); extern "C" void cLib_addCalcAngleS__FPsssss(); extern "C" void __dl__FPv(); -extern "C" void PSVECSquareMag(); extern "C" void _savegpr_23(); extern "C" void _savegpr_27(); extern "C" void _restgpr_23(); extern "C" void _restgpr_27(); -extern "C" extern u32 __float_nan; // // Declarations: // -/* ############################################################################################## */ -/* 803BB888-803BB898 0189A8 000C+04 2/2 0/0 0/0 .data __vt__15dShopItemCtrl_c */ -SECTION_DATA extern void* __vt__15dShopItemCtrl_c[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15dShopItemCtrl_cFv, - /* padding */ - NULL, -}; - /* 80196914-80196958 191254 0044+00 0/0 0/0 10/10 .text __ct__15dShopItemCtrl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dShopItemCtrl_c::dShopItemCtrl_c() { - nofralloc -#include "asm/d/shop/d_shop_item_ctrl/__ct__15dShopItemCtrl_cFv.s" +dShopItemCtrl_c::dShopItemCtrl_c() { + for (int i = 0; i < 7; i++) { + mItemIndex[i] = -1; + mMessageIndex[i] = 0; + } } -#pragma pop /* 80196958-801969A0 191298 0048+00 1/0 1/1 0/0 .text __dt__15dShopItemCtrl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dShopItemCtrl_c::~dShopItemCtrl_c() { - nofralloc -#include "asm/d/shop/d_shop_item_ctrl/__dt__15dShopItemCtrl_cFv.s" -} -#pragma pop +dShopItemCtrl_c::~dShopItemCtrl_c() {} /* ############################################################################################## */ /* 80453AD0-80453AD8 0020D0 0004+04 2/2 0/0 0/0 .sdata2 @3659 */ @@ -105,35 +60,57 @@ SECTION_SDATA2 static f32 lit_3659[1 + 1 /* padding */] = { /* 801969A0-80196A3C 1912E0 009C+00 0/0 3/3 3/3 .text getCurrentPos__15dShopItemCtrl_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopItemCtrl_c::getCurrentPos(int param_0) { - nofralloc -#include "asm/d/shop/d_shop_item_ctrl/getCurrentPos__15dShopItemCtrl_cFi.s" +cXyz dShopItemCtrl_c::getCurrentPos(int item_index) { + f32 tmp = lit_3659[0]; + cXyz item_pos(tmp, tmp, tmp); + + if (mItemIndex[item_index] != -1) { + fopAc_ac_c* item = fopAcM_SearchByID(mItemIndex[item_index]); + if (item != NULL) { + item_pos.set(item->mCurrent.mPosition); + } + } + + return item_pos; } -#pragma pop /* 80196A3C-80196AF0 19137C 00B4+00 0/0 2/2 0/0 .text isHomePos__15dShopItemCtrl_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopItemCtrl_c::isHomePos(int param_0) { - nofralloc -#include "asm/d/shop/d_shop_item_ctrl/isHomePos__15dShopItemCtrl_cFi.s" +bool dShopItemCtrl_c::isHomePos(int item_index) { + if (item_index >= 0 && item_index < 7 && mItemIndex[item_index] != -1) { + daShopItem_c* item = (daShopItem_c*)fopAcM_SearchByID(mItemIndex[item_index]); + if (item != NULL) { + cXyz* item_pos = item->getPosP(); + cXyz item_home = item->mOrig.mPosition; + + if (item_pos->x == item_home.x && + item_pos->y == item_home.y && + item_pos->z == item_home.z) { + return true; + } + } + } + + return false; } -#pragma pop /* 80196AF0-80196BA4 191430 00B4+00 0/0 1/1 0/0 .text setRotateAnime__15dShopItemCtrl_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopItemCtrl_c::setRotateAnime(int param_0) { - nofralloc -#include "asm/d/shop/d_shop_item_ctrl/setRotateAnime__15dShopItemCtrl_cFi.s" +void dShopItemCtrl_c::setRotateAnime(int item_index) { + for (int i = 0; i < 7; i++) { + if (mItemIndex[i] != -1) { + daShopItem_c* item = (daShopItem_c*)fopAcM_SearchByID(mItemIndex[i]); + if (item != NULL) { + csXyz* item_rot = item->getRotateP(); + + if (i == item_index - 1) { + item_rot->y += 0x200; + } else { + cLib_addCalcAngleS(&item_rot->y, item->mOrig.mAngle.y, 4, 0x800, 0x80); + } + } + } + } } -#pragma pop /* ############################################################################################## */ /* 80453AD8-80453AE0 0020D8 0008+00 1/1 0/0 0/0 .sdata2 @3838 */ diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp index 2e6b68c1c77..34e97f46d68 100644 --- a/src/d/shop/d_shop_system.cpp +++ b/src/d/shop/d_shop_system.cpp @@ -6,212 +6,14 @@ #include "d/shop/d_shop_system.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct mesg_flow_node_branch {}; - -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct fopAc_ac_c {}; - -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct daNpcT_c { - /* 801490D4 */ void ctrlBtk(); - /* 8014951C */ void ctrlJoint(J3DJoint*, J3DModel*); - /* 8014997C */ void evtProc(); - /* 80149BB4 */ void setFootPos(); - /* 80149D7C */ void setFootPrtcl(cXyz*, f32, f32); - /* 8014A05C */ bool checkCullDraw(); - /* 8014A064 */ void twilight(); - /* 8014A0B0 */ void evtOrder(); - /* 8014A224 */ void evtChange(); - /* 8014A324 */ void clrParam(); - /* 8014A628 */ void setMotionAnm(int, f32, int); - /* 8014BBF0 */ void initTalk(int, fopAc_ac_c**); - /* 8014CBF4 */ void decTmr(); - /* 8014CC0C */ void setCollision(); - /* 8014CC10 */ void setAttnPos(); - /* 8014CC14 */ void ctrlSubFaceMotion(int); - /* 8014CC18 */ void afterMoved(); - /* 8014CC1C */ void beforeMove(); - /* 8014CC20 */ void action(); - /* 8014CC24 */ void setParam(); - /* 8014CC28 */ void drawOtherMdl(); - /* 8014CC2C */ void drawGhost(); - /* 8014CC30 */ bool drawDbgInfo(); - /* 8014CC38 */ bool checkRemoveJoint(int); - /* 8014CC40 */ bool checkChangeJoint(int); - /* 8014CC48 */ void afterJntAnm(int); - /* 8014CC4C */ s32 getHeadJointNo(); - /* 8014CC54 */ s32 getNeckJointNo(); - /* 8014CC5C */ s32 getBackboneJointNo(); - /* 8014CC64 */ void setAfterTalkMotion(); - /* 8014CC68 */ bool evtCutProc(); - /* 8014CC70 */ bool evtEndProc(); - /* 8014CC78 */ bool evtTalk(); - /* 8014CC80 */ bool checkChangeEvt(); - /* 8014CC88 */ s32 getFootRJointNo(); - /* 8014CC90 */ s32 getFootLJointNo(); - /* 8014CC98 */ bool chkXYItems(); - /* 8014CCA0 */ bool afterSetFaceMotionAnm(int, int, f32, int); - /* 8014CCA8 */ void changeBtp(int*, int*); - /* 8014CCAC */ void changeBck(int*, int*); - /* 8014CCB0 */ void getFaceMotionAnm(daNpcT_faceMotionAnmData_c); - /* 8014CCE0 */ bool afterSetMotionAnm(int, int, f32, int); - /* 8014CCE8 */ void changeBtk(int*, int*); - /* 8014CCEC */ void changeAnm(int*, int*); - /* 8014CCF0 */ void getMotionAnm(daNpcT_motionAnmData_c); - /* 8014CD20 */ ~daNpcT_c(); - /* 8014D0A8 */ bool getEyeballLMaterialNo(); - /* 8014D0B0 */ bool getEyeballRMaterialNo(); - /* 8014D0B8 */ bool getEyeballMaterialNo(); -}; - -struct daItemBase_c { - /* 80037A64 */ void hide(); -}; - -struct dSv_memBit_c { - /* 80034810 */ void onSwitch(int); - /* 80034860 */ void isSwitch(int) const; -}; - -struct STControl { - /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16); - /* 800320AC */ void init(); - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - -struct dMsgFlow_c { - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A528 */ void getEventId(int*); - /* 8024B2C0 */ void query005(mesg_flow_node_branch*, fopAc_ac_c*, int); -}; - -struct dShopSystem_c { - /* 80197338 */ void initShopSystem(); - /* 801974E4 */ ~dShopSystem_c(); - /* 801975C0 */ void onFlag(int); - /* 801975DC */ void offFlag(int); - /* 801975F8 */ void isFlag(int); - /* 80197618 */ void onSoldOutItemFlag(int); - /* 80197634 */ void offSoldOutItemFlag(int); - /* 80197650 */ void isSoldOutItemFlag(int); - /* 80197670 */ void checkController(u8, dMsgFlow_c*); - /* 80197808 */ void chooseItem3(u8); - /* 80197DD0 */ void chooseItem5(u8); - /* 80198250 */ void chooseItem4(u8); - /* 80198444 */ void moveCursor(int, u8); - /* 80198488 */ void moveCursor0(int, u8); - /* 80198708 */ void moveCursor1(int, u8); - /* 80198878 */ void drawCursor(); - /* 80198950 */ void itemRotate(); - /* 80198A2C */ void itemZoom(cXyz*); - /* 801990B0 */ bool seq_wait(fopAc_ac_c*, dMsgFlow_c*); - /* 801990B8 */ void seq_start(fopAc_ac_c*, dMsgFlow_c*); - /* 8019936C */ void seq_select_wait(fopAc_ac_c*, dMsgFlow_c*); - /* 801993C4 */ void seq_select_start(fopAc_ac_c*, dMsgFlow_c*); - /* 8019959C */ void seq_select(fopAc_ac_c*, dMsgFlow_c*); - /* 80199A18 */ void seq_moving(fopAc_ac_c*, dMsgFlow_c*); - /* 80199BF8 */ void seq_decide(fopAc_ac_c*, dMsgFlow_c*); - /* 80199D14 */ void seq_choose(fopAc_ac_c*, dMsgFlow_c*); - /* 80199E28 */ void seq_decide_yes(fopAc_ac_c*, dMsgFlow_c*); - /* 80199FA4 */ void seq_decide_no(fopAc_ac_c*, dMsgFlow_c*); - /* 8019A020 */ void seq_finish(fopAc_ac_c*, dMsgFlow_c*); - /* 8019A0C0 */ void seq_event(fopAc_ac_c*, dMsgFlow_c*); - /* 8019A0D0 */ void shop_init(bool); - /* 8019A158 */ void shop_process(fopAc_ac_c*, dMsgFlow_c*); - /* 8019A238 */ void createShopItem(int); - /* 8019A344 */ void setSeq(u8); - /* 8019A354 */ void setSoldOutFlag(); - /* 8019A364 */ void setSoldOut(); - /* 8019A4F4 */ void setSoldOutItemHide(); - /* 8019A564 */ void deleteObject(); - /* 8019A5D0 */ void searchItemActor(); - /* 8019AB00 */ void getFlowNodeNum(); - /* 8019AB1C */ void setSellItemMax(u8); - /* 8019AB24 */ void checkShopOpen(); - /* 8019AB60 */ void checkLeftTrigger(STControl*); - /* 8019AB84 */ void checkRightTrigger(STControl*); - /* 8019ABA8 */ bool dpdMove(); - /* 8019ACE0 */ bool beforeStartSeqAction(dMsgFlow_c*, int); - /* 8019ACE8 */ bool beforeSelectSeqAction(dMsgFlow_c*, int); - /* 8019ACF0 */ bool getResName2(int); -}; - -struct dShopItemCtrl_c { - /* 80196958 */ ~dShopItemCtrl_c(); - /* 801969A0 */ void getCurrentPos(int); - /* 80196A3C */ void isHomePos(int); - /* 80196AF0 */ void setRotateAnime(int); - /* 80196BA4 */ void setZoomAnime(int, cXyz*, s16, bool); -}; - -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); - /* 80195330 */ void addAlpha(); - /* 801953CC */ void decAlpha(); -}; - -struct dMsgObject_c { - /* 802378B8 */ void setShopWaitTimer(u8); - /* 8023822C */ void getStatus(); - /* 802382F4 */ void isMsgSendControl(); - /* 80238320 */ void onMsgSend(); - /* 802383D0 */ void getMessageID(); -}; - -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - -struct csXyz {}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct ShopCam_action_c { - /* 80196544 */ void setCamDataIdx(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*, - cXyz*); - /* 80196608 */ void setCamDataIdx2(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, - fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*); - /* 801968B8 */ void setMasterCamCtrPos(cXyz*); -}; +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "d/d_item.h" +#include "d/msg/d_msg_object.h" +#include "m_Do/m_Do_audio.h" +#include "d/meter/d_meter_HIO.h" +#include "SSystem/SComponent/c_math.h" +#include "m_Do/m_Do_lib.h" // // Forward References: @@ -385,12 +187,8 @@ extern "C" void _restgpr_21(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); extern "C" extern void* __vt__9STControl[4]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */]; -extern "C" extern u8 g_meter2_info[248]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -404,35 +202,70 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { }; /* 803BB8A4-803BB8C0 0189C4 001C+00 6/6 0/0 0/0 .data dShopSystem_itemActor */ -SECTION_DATA static u8 dShopSystem_itemActor[28] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +SECTION_DATA static fopAc_ac_c* dShopSystem_itemActor[7] = { + NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; /* 804506E8-804506F0 000168 0007+01 7/7 0/0 0/0 .sdata dShopSystem_itemNo */ -SECTION_SDATA static u8 dShopSystem_itemNo[7 + 1 /* padding */] = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - /* padding */ - 0x00, +SECTION_SDATA static u8 dShopSystem_itemNo[7] = { + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, }; /* 80451058-8045105C 000558 0004+00 9/9 0/0 0/0 .sbss None */ -static u8 data_80451058[4]; +static u8 data_80451058; // sSellItemMax /* 8045105C-80451060 00055C 0004+00 6/6 0/0 0/0 .sbss dShopSystem_item_count */ -static u8 dShopSystem_item_count[4]; +static int dShopSystem_item_count; /* 80451060-80451064 000560 0004+00 4/4 0/0 0/0 .sbss None */ -static u8 data_80451060[4]; +static u8 data_80451060; /* 80197098-80197270 1919D8 01D8+00 1/1 0/0 0/0 .text dShopSystem_searchItemActor__FPvPv */ +#ifdef NONMATCHING +static int dShopSystem_searchItemActor(void* param_0, void* param_1) { + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_TAG_SHOPITM) { + u32 param = fopAcM_GetParam(param_0); + if ((param & 0xF0000000) == (fopAcM_GetParam(param_1) & 0xF0000000) && + dShopSystem_item_count < data_80451058) { + u32 param2 = (param >> 0x18) & 0xF; + + if (dShopSystem_itemActor[0] != param_0 && dShopSystem_itemActor[1] != param_0 && + dShopSystem_itemActor[2] != param_0 && dShopSystem_itemActor[3] != param_0 && + dShopSystem_itemActor[4] != param_0 && dShopSystem_itemActor[5] != param_0 && + dShopSystem_itemActor[6] != param_0) { + u8 sw = static_cast(param_0)->mOrig.mAngle.z; + u8 sw2 = static_cast(param_0)->mOrig.mAngle.z >> 8; + u8 item_no = param; + + if ((sw == 0xFF || !dComIfGs_isSaveSwitch(sw)) && (sw2 == 0xFF || dComIfGs_isSaveSwitch(sw2))) { + if (sw != 0xFF && item_no == HYLIA_SHIELD && checkItemGet(item_no, true)) { + dComIfGs_onSaveSwitch(sw); + } + + if (param2 == 0) { + data_80451060 = 1; + dShopSystem_itemActor[dShopSystem_item_count] = param_0; + dShopSystem_itemNo[dShopSystem_item_count] = item_no; + } else if (dShopSystem_itemActor[param2 - 1] == NULL) { + dShopSystem_itemActor[param2 - 1] = param_0; + dShopSystem_itemNo[param2 - 1] = item_no; + } + dShopSystem_item_count++; + } + } + } + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -441,15 +274,16 @@ static asm void dShopSystem_searchItemActor(void* param_0, void* param_1) { #include "asm/d/shop/d_shop_system/dShopSystem_searchItemActor__FPvPv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804506F0-804506F8 000170 0008+00 6/6 0/0 0/0 .sdata dShopSystem_cameraActor */ -SECTION_SDATA static u8 dShopSystem_cameraActor[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +SECTION_SDATA static fopAc_ac_c* dShopSystem_cameraActor[2] = { + NULL, NULL }; /* 80451064-80451068 000564 0004+00 5/5 0/0 0/0 .sbss dShopSystem_camera_count */ -static u8 dShopSystem_camera_count[4]; +static int dShopSystem_camera_count; /* 80197270-80197338 191BB0 00C8+00 1/1 0/0 0/0 .text dShopSystem_searchCameraActor__FPvPv */ #pragma push @@ -479,6 +313,54 @@ SECTION_SDATA2 static f32 lit_4101 = 7.0f / 10.0f; /* 80197338-801974E4 191C78 01AC+00 0/0 0/0 19/19 .text initShopSystem__13dShopSystem_cFv */ +// matches with literals +#ifdef NONMATCHING +void dShopSystem_c::initShopSystem() { + data_80451058 = 3; + data_80451060 = 0; + + for (int i = 0; i < 7; i++) { + dShopSystem_itemActor[i] = NULL; + dShopSystem_itemNo[i] = NO_ITEM; + } + dShopSystem_item_count = 0; + + for (int i = 0; i < 2; i++) { + dShopSystem_cameraActor[i] = NULL; + } + dShopSystem_camera_count = 0; + + if (mpStick == NULL) { + mpStick = new STControl(); + } + + if (mpDrawCursor == NULL) { + mpDrawCursor = new dSelect_cursor_c(1, 1.0f, NULL); + mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.7f, 0.7f); + } + + field_0xf64 = -1; + mEventParam = 0; + field_0xf58 = 0; + mFlag = 0; + mCursorPos = 0; + mLastCursorPos = 0; + field_0xf68 = 0; + mSeq = 0; + field_0xf71 = mSeq; + field_0xf79 = 0; + field_0xf7a = 0; + mWaitTimer = 0; + mSoldOutFlag = -1; + mSoldOutItemFlags = 0; + offSpMode(); + field_0xf6c = 0; + field_0xf76 = 0; + field_0xf77 = 9; + field_0xf78 = -1; + mFlow.onNonStopJunpFlowFlag(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -487,13 +369,16 @@ asm void dShopSystem_c::initShopSystem() { #include "asm/d/shop/d_shop_system/initShopSystem__13dShopSystem_cFv.s" } #pragma pop +#endif + +struct shop_item_data { + Vec mItemPos[3]; +}; /* ############################################################################################## */ /* 803BB8C0-803BB8E4 0189E0 0024+00 1/0 0/0 0/0 .data item_seira_shop */ -SECTION_DATA static u8 item_seira_shop[36] = { - 0x42, 0xDC, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0xC2, 0xE6, 0x00, 0x00, - 0x43, 0x20, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0xC2, 0xE6, 0x00, 0x00, - 0x43, 0x52, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0xC2, 0xE6, 0x00, 0x00, +SECTION_DATA static shop_item_data item_seira_shop = { + {{110.0f, 150.0f, -115.0f}, {160.0f, 150.0f, -115.0f}, {210.0f, 150.0f, -115.0f}} }; /* 803BB8E4-803BB8F0 -00001 000C+00 0/1 0/0 0/0 .data @4056 */ @@ -885,144 +770,105 @@ SECTION_DATA static u8 process[144 + 120 /* padding */] = { 0x00, }; -/* 803BBA7C-803BBB50 018B9C 00D0+04 1/1 0/0 10/10 .data __vt__13dShopSystem_c */ -SECTION_DATA extern void* __vt__13dShopSystem_c[52 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__13dShopSystem_cFv, - (void*)ctrlBtk__8daNpcT_cFv, - (void*)ctrlSubFaceMotion__8daNpcT_cFi, - (void*)checkChangeJoint__8daNpcT_cFi, - (void*)checkRemoveJoint__8daNpcT_cFi, - (void*)getBackboneJointNo__8daNpcT_cFv, - (void*)getNeckJointNo__8daNpcT_cFv, - (void*)getHeadJointNo__8daNpcT_cFv, - (void*)getFootLJointNo__8daNpcT_cFv, - (void*)getFootRJointNo__8daNpcT_cFv, - (void*)getEyeballLMaterialNo__8daNpcT_cFv, - (void*)getEyeballRMaterialNo__8daNpcT_cFv, - (void*)getEyeballMaterialNo__8daNpcT_cFv, - (void*)ctrlJoint__8daNpcT_cFP8J3DJointP8J3DModel, - (void*)afterJntAnm__8daNpcT_cFi, - (void*)setParam__8daNpcT_cFv, - (void*)checkChangeEvt__8daNpcT_cFv, - (void*)evtTalk__8daNpcT_cFv, - (void*)evtEndProc__8daNpcT_cFv, - (void*)evtCutProc__8daNpcT_cFv, - (void*)setAfterTalkMotion__8daNpcT_cFv, - (void*)evtProc__8daNpcT_cFv, - (void*)action__8daNpcT_cFv, - (void*)beforeMove__8daNpcT_cFv, - (void*)afterMoved__8daNpcT_cFv, - (void*)setAttnPos__8daNpcT_cFv, - (void*)setFootPos__8daNpcT_cFv, - (void*)setCollision__8daNpcT_cFv, - (void*)setFootPrtcl__8daNpcT_cFP4cXyzff, - (void*)checkCullDraw__8daNpcT_cFv, - (void*)twilight__8daNpcT_cFv, - (void*)chkXYItems__8daNpcT_cFv, - (void*)evtOrder__8daNpcT_cFv, - (void*)decTmr__8daNpcT_cFv, - (void*)clrParam__8daNpcT_cFv, - (void*)drawDbgInfo__8daNpcT_cFv, - (void*)drawOtherMdl__8daNpcT_cFv, - (void*)drawGhost__8daNpcT_cFv, - (void*)afterSetFaceMotionAnm__8daNpcT_cFiifi, - (void*)afterSetMotionAnm__8daNpcT_cFiifi, - (void*)getFaceMotionAnm__8daNpcT_cF26daNpcT_faceMotionAnmData_c, - (void*)getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c, - (void*)changeAnm__8daNpcT_cFPiPi, - (void*)changeBck__8daNpcT_cFPiPi, - (void*)changeBtp__8daNpcT_cFPiPi, - (void*)changeBtk__8daNpcT_cFPiPi, - (void*)setMotionAnm__8daNpcT_cFifi, - (void*)getResName2__13dShopSystem_cFi, - (void*)beforeStartSeqAction__13dShopSystem_cFP10dMsgFlow_ci, - (void*)beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci, - /* padding */ - NULL, -}; - /* 801974E4-801975C0 191E24 00DC+00 1/0 0/0 10/10 .text __dt__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dShopSystem_c::~dShopSystem_c() { - nofralloc -#include "asm/d/shop/d_shop_system/__dt__13dShopSystem_cFv.s" +dShopSystem_c::~dShopSystem_c() { + deleteObject(); + data_80451058 = 0; + data_80451060 = 0; + + for (int i = 0; i < 7; i++) { + dShopSystem_itemActor[i] = NULL; + dShopSystem_itemNo[i] = NO_ITEM; + } + dShopSystem_item_count = 0; + + for (int i = 0; i < 2; i++) { + dShopSystem_cameraActor[i] = NULL; + } + dShopSystem_camera_count = 0; } -#pragma pop /* 801975C0-801975DC 191F00 001C+00 6/6 0/0 0/0 .text onFlag__13dShopSystem_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::onFlag(int param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/onFlag__13dShopSystem_cFi.s" +void dShopSystem_c::onFlag(int flag) { + mFlag |= (u16)(1 << flag); } -#pragma pop /* 801975DC-801975F8 191F1C 001C+00 7/7 0/0 0/0 .text offFlag__13dShopSystem_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::offFlag(int param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/offFlag__13dShopSystem_cFi.s" +void dShopSystem_c::offFlag(int flag) { + mFlag &= ~(u16)(1 << flag); } -#pragma pop /* 801975F8-80197618 191F38 0020+00 8/8 1/1 0/0 .text isFlag__13dShopSystem_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::isFlag(int param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/isFlag__13dShopSystem_cFi.s" +BOOL dShopSystem_c::isFlag(int flag) { + return mFlag & (u16)(1 << flag) ? TRUE : FALSE; } -#pragma pop /* 80197618-80197634 191F58 001C+00 1/1 0/0 0/0 .text onSoldOutItemFlag__13dShopSystem_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::onSoldOutItemFlag(int param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/onSoldOutItemFlag__13dShopSystem_cFi.s" +void dShopSystem_c::onSoldOutItemFlag(int flag) { + mSoldOutItemFlags |= (u8)(1 << flag); } -#pragma pop /* 80197634-80197650 191F74 001C+00 1/1 0/0 0/0 .text offSoldOutItemFlag__13dShopSystem_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::offSoldOutItemFlag(int param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/offSoldOutItemFlag__13dShopSystem_cFi.s" +void dShopSystem_c::offSoldOutItemFlag(int flag) { + mSoldOutItemFlags &= ~(u8)(1 << flag); } -#pragma pop /* 80197650-80197670 191F90 0020+00 2/2 0/0 0/0 .text isSoldOutItemFlag__13dShopSystem_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::isSoldOutItemFlag(int param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/isSoldOutItemFlag__13dShopSystem_cFi.s" +BOOL dShopSystem_c::isSoldOutItemFlag(int flag) { + return mSoldOutItemFlags & (u8)(1 << flag) ? TRUE : FALSE; } -#pragma pop /* 80197670-80197808 191FB0 0198+00 3/3 0/0 0/0 .text * checkController__13dShopSystem_cFUcP10dMsgFlow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::checkController(u8 param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/checkController__13dShopSystem_cFUcP10dMsgFlow_c.s" +int dShopSystem_c::checkController(u8 seq, dMsgFlow_c* p_flow) { + if (mWaitTimer != 0) { + if (mDoCPd_c::getTrigA(0)) { + dMsgObject_setShopWaitTimer(1); + } + return 0; + } + + if (!dpdMove()) { + mpStick->checkTrigger(); + } + + int control_status; + if (data_80451058 == 4) { + control_status = chooseItem4(seq); + } else if (data_80451058 == 5) { + control_status = chooseItem5(seq); + } else { + control_status = chooseItem3(seq); + } + + if (control_status != 0) { + return control_status; + } + + dMsgObject_c* msg = dMsgObject_getMsgObjectClass(); + if (msg->getSelectPushFlag() != 0) { + return msg->getSelectPushFlag() == 2 ? 2 : 1; + } + + if (mDoCPd_c::getTrigA(0)) { + if (msg->getStatus() != 6 && msg->getStatus() != 8 && msg->getStatus() != 9 && msg->getStatus() != 20 && seq != SEQ_WAIT) { + return 1; + } + } + + if (mDoCPd_c::getTrigB(0)) { + if (seq != SEQ_SELECT_WAIT) { + mLastCursorPos = mCursorPos; + mCursorPos = 0; + } + + if (!p_flow->isSelectMessage()) { + return 2; + } + } + + return 0; } -#pragma pop /* ############################################################################################## */ /* 80453B14-80453B18 002114 0004+00 4/4 0/0 0/0 .sdata2 @4493 */ @@ -1038,84 +884,515 @@ SECTION_SDATA2 static f32 lit_4495 = 20.0f; SECTION_SDATA2 static f32 lit_4496 = 5.0f; /* 80197808-80197DD0 192148 05C8+00 1/1 0/0 0/0 .text chooseItem3__13dShopSystem_cFUc */ +// matches with literals +#ifdef NONMATCHING +int dShopSystem_c::chooseItem3(u8 seq) { + u8 old_cursor = mLastCursorPos; + if (checkLeftTrigger(mpStick) && seq != SEQ_SELECT_WAIT) { + u8 cursor_pos = mCursorPos; + + if (cursor_pos == 7) { + mCursorPos = mLastCursorPos; + mLastCursorPos = 7; + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto right; + } else if (seq != SEQ_START) { + if (mCursorPos != 0) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + } + + mShopCamAction.SetSelectIdx(mCursorPos); + } + + return 3; + } else if (cursor_pos == 4) { + mLastCursorPos = cursor_pos; + mCursorPos = 0; + + if (seq != SEQ_START) { + if (mCursorPos != 0) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + } + + mShopCamAction.SetSelectIdx(mCursorPos); + } + + return 3; + } else if (cursor_pos != 0) { + mLastCursorPos = cursor_pos; + mCursorPos--; + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto right; + } else if (seq != SEQ_START) { + if (mCursorPos != 0) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + } + + mShopCamAction.SetSelectIdx(mCursorPos); + } + return 3; + } + } + +right: + if (checkRightTrigger(mpStick) && seq != SEQ_SELECT_WAIT) { + u8 cursor_pos = mCursorPos; + + if (cursor_pos != 7) { + if (cursor_pos != 3 && cursor_pos != 6) { + mLastCursorPos = cursor_pos; + mCursorPos++; + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto up; + } else if (seq != SEQ_START) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + mShopCamAction.SetSelectIdx(mCursorPos); + } + return 4; + } + + if (data_80451058 == 7) { + mLastCursorPos = cursor_pos; + mCursorPos = 7; + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto up; + } else if (seq != SEQ_START) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + mShopCamAction.SetSelectIdx(mCursorPos); + } + return 4; + } + } + } + +up: + if (data_80451058 >= 6) { + if (mpStick->checkUpTrigger() && seq != SEQ_SELECT_WAIT && mCursorPos <= 3) { + mLastCursorPos = mCursorPos; + mCursorPos += 3; + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto down; + } else if (seq != SEQ_START) { + if (mCursorPos != 0) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + } + + mShopCamAction.SetSelectIdx(mCursorPos); + } + + return 5; + } + + down: + if (mpStick->checkDownTrigger() && seq != SEQ_SELECT_WAIT) { + u8 cursor_pos = mCursorPos; + + if (cursor_pos > 3 && cursor_pos <= 6) { + mLastCursorPos = cursor_pos; + mCursorPos -= 3; + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto ret; + } else if (seq != SEQ_START) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + mShopCamAction.SetSelectIdx(mCursorPos); + } + return 6; + } + } + } + +ret: + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::chooseItem3(u8 param_0) { +asm int dShopSystem_c::chooseItem3(u8 param_0) { nofralloc #include "asm/d/shop/d_shop_system/chooseItem3__13dShopSystem_cFUc.s" } #pragma pop +#endif /* 80197DD0-80198250 192710 0480+00 1/1 0/0 0/0 .text chooseItem5__13dShopSystem_cFUc */ +// matches with literals +#ifdef NONMATCHING +int dShopSystem_c::chooseItem5(u8 seq) { + u8 old_cursor = mLastCursorPos; + if (checkLeftTrigger(mpStick) && seq != SEQ_SELECT_WAIT) { + u8 cursor_pos = mCursorPos; + + if (cursor_pos == 3) { + mLastCursorPos = cursor_pos; + mCursorPos = 0; + if (seq != SEQ_START) { + if (mCursorPos != 0) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + } + + mShopCamAction.SetSelectIdx(mCursorPos); + } + return 3; + } + + if (cursor_pos != 0) { + mLastCursorPos = cursor_pos; + mCursorPos--; + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto right; + } else if (seq != SEQ_START) { + if (mCursorPos != 0) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + } + + mShopCamAction.SetSelectIdx(mCursorPos); + } + return 3; + } + } + +right: + if (checkRightTrigger(mpStick) && seq != SEQ_SELECT_WAIT) { + u8 cursor_pos = mCursorPos; + + if (cursor_pos != 2 && cursor_pos != 5) { + mLastCursorPos = cursor_pos; + mCursorPos++; + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto up; + } else if (seq != SEQ_START) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + mShopCamAction.SetSelectIdx(mCursorPos); + } + return 4; + } + } + +up: + if (mpStick->checkUpTrigger() && seq != SEQ_SELECT_WAIT) { + u8 cursor_pos = mCursorPos; + + if (cursor_pos == 3 || cursor_pos == 5) { + mLastCursorPos = cursor_pos; + + if (mCursorPos == 3) { + mCursorPos = 1; + } else if (mCursorPos == 5) { + mCursorPos = 2; + } + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto down; + } else if (seq != SEQ_START) { + if (mCursorPos != 0) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + } + + mShopCamAction.SetSelectIdx(mCursorPos); + } + return 5; + } + } + +down: + if (mpStick->checkDownTrigger() && seq != SEQ_SELECT_WAIT) { + u8 cursor_pos = mCursorPos; + + if (cursor_pos == 1 || cursor_pos == 2) { + mLastCursorPos = cursor_pos; + + if (mCursorPos == 1) { + mCursorPos = 3; + } else if (mCursorPos == 2) { + mCursorPos = 5; + } + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto ret; + } else if (seq != SEQ_START) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + mShopCamAction.SetSelectIdx(mCursorPos); + } + return 6; + } + } + +ret: + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::chooseItem5(u8 param_0) { +asm int dShopSystem_c::chooseItem5(u8 seq) { nofralloc #include "asm/d/shop/d_shop_system/chooseItem5__13dShopSystem_cFUc.s" } #pragma pop +#endif /* 80198250-80198444 192B90 01F4+00 1/1 0/0 0/0 .text chooseItem4__13dShopSystem_cFUc */ +// matches with literals. gotos can probably be removed +#ifdef NONMATCHING +int dShopSystem_c::chooseItem4(u8 seq) { + u8 old_cursor = mLastCursorPos; + if (checkLeftTrigger(mpStick) && seq != SEQ_SELECT_WAIT && mCursorPos != 0) { + mLastCursorPos = mCursorPos; + mCursorPos--; + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto right; + } else if (seq != SEQ_START) { + if (mCursorPos != 0) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + } + + mShopCamAction.SetSelectIdx(mCursorPos); + } + + return 3; + } + +right: + if (checkRightTrigger(mpStick) && seq != SEQ_SELECT_WAIT && mCursorPos < 4) { + mLastCursorPos = mCursorPos; + mCursorPos++; + + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { + mCursorPos = mLastCursorPos; + mLastCursorPos = old_cursor; + goto ret; + } else if (seq != SEQ_START) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + mShopCamAction.SetSelectIdx(mCursorPos); + } + + return 4; + } + +ret: + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::chooseItem4(u8 param_0) { +asm int dShopSystem_c::chooseItem4(u8 seq) { nofralloc #include "asm/d/shop/d_shop_system/chooseItem4__13dShopSystem_cFUc.s" } #pragma pop +#endif /* 80198444-80198488 192D84 0044+00 5/5 0/0 0/0 .text moveCursor__13dShopSystem_cFiUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::moveCursor(int param_0, u8 param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/moveCursor__13dShopSystem_cFiUc.s" +int dShopSystem_c::moveCursor(int control_status, u8 param_1) { + int cursor_status; + if (field_0xf60 >= 0) { + cursor_status = moveCursor0(control_status, param_1); + } else { + cursor_status = moveCursor1(control_status, param_1); + } + + field_0xf6c = cursor_status; + return cursor_status; } -#pragma pop /* 80198488-80198708 192DC8 0280+00 1/1 0/0 0/0 .text moveCursor0__13dShopSystem_cFiUc */ +// matches with literals +#ifdef NONMATCHING +int dShopSystem_c::moveCursor0(int control_status, u8 param_1) { + offFlag(7); + + switch (control_status) { + case 3: + if (mCursorPos == 0) { + return getEventParamU8(mCursorPos) + 0x52; + } + + return (getEventParamU8(mCursorPos) - 1) * 2 + 0x66; + + case 4: + if (mCursorPos == 0) { + return getEventParamU8(mCursorPos) + 0x52; + } + + return (getEventParamU8(mCursorPos) - 1) * 2 + 0x66; + + case 7: + if (mCursorPos == 0) { + return getEventParamU8(mCursorPos) + 0x52; + } + + return (getEventParamU8(mCursorPos) - 1) * 2 + 0x66; + + case 1: + if (mCursorPos == 0) { + return getEventParamU8(mCursorPos) + 0x52; + } + + if (param_1 != 2) { + return (getEventParamU8(mCursorPos) - 1) * 2 + 0x65; + } + + return (getEventParamU8(mCursorPos) - 1) * 2 + 0x66; + + case 2: + onFlag(7); + mShopCamAction.SetSelectIdx(mCursorPos); + + if (mCursorPos == 0) { + return getEventParamU8(mCursorPos) + 0x52; + } + + if (param_1 != 2) { + return (getEventParamU8(mCursorPos) - 1) * 2 + 0x65; + } + + return (getEventParamU8(mCursorPos) - 1) * 2 + 0x66; + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::moveCursor0(int param_0, u8 param_1) { +asm int dShopSystem_c::moveCursor0(int param_0, u8 param_1) { nofralloc #include "asm/d/shop/d_shop_system/moveCursor0__13dShopSystem_cFiUc.s" } #pragma pop +#endif /* 80198708-80198878 193048 0170+00 1/1 0/0 0/0 .text moveCursor1__13dShopSystem_cFiUc */ +#ifdef NONMATCHING +int dShopSystem_c::moveCursor1(int control_status, u8 param_1) { + offFlag(7); + + switch (control_status) { + case 7: + if (mCursorPos == 0) { + return getFlowNodeNum() + 1; + } + + return mItemCtrl.getMessageIndex(mCursorPos - 1) + 1; + + case 1: + if (mCursorPos == 0) { + return getFlowNodeNum() + 1; + } else if (param_1 != 2) { + return mItemCtrl.getMessageIndex(mCursorPos - 1); + } + + return mItemCtrl.getMessageIndex(mCursorPos - 1) + 1; + + case 2: + onFlag(7); + mShopCamAction.SetSelectIdx(mCursorPos); + + if (mCursorPos == 0) { + return getFlowNodeNum() + 1; + } else if (param_1 != 2) { + return mItemCtrl.getMessageIndex(mCursorPos - 1); + } + + return mItemCtrl.getMessageIndex(mCursorPos - 1) + 1; + + default: + return 0; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::moveCursor1(int param_0, u8 param_1) { +asm int dShopSystem_c::moveCursor1(int param_0, u8 param_1) { nofralloc #include "asm/d/shop/d_shop_system/moveCursor1__13dShopSystem_cFiUc.s" } #pragma pop +#endif /* 80198878-80198950 1931B8 00D8+00 0/0 0/0 9/9 .text drawCursor__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::drawCursor() { - nofralloc -#include "asm/d/shop/d_shop_system/drawCursor__13dShopSystem_cFv.s" +int dShopSystem_c::drawCursor() { + if ((mSeq == 4 || mSeq == 5 || ((mSeq == 6 || mSeq == SEQ_SELECT_WAIT) && isFlag(mCursorPos - 1))) && mCursorPos != 0 && mItemCtrl.isHomePos(mCursorPos - 1)) { + mpDrawCursor->addAlpha(); + } else { + mpDrawCursor->decAlpha(); + } + + mpDrawCursor->setScale(g_cursorHIO.mShopCursorScale); + if (mCursorPos != 0) { + dComIfGd_set2DOpa(mpDrawCursor); + } + + return 1; } -#pragma pop /* 80198950-80198A2C 193290 00DC+00 0/0 0/0 9/9 .text itemRotate__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::itemRotate() { - nofralloc -#include "asm/d/shop/d_shop_system/itemRotate__13dShopSystem_cFv.s" +int dShopSystem_c::itemRotate() { + u8 item_index = 0; + u8 cursor_pos = mCursorPos; + + if (cursor_pos != 0 && mSeq != SEQ_WAIT) { + if (dShopSystem_itemNo[cursor_pos - 1] == ARMOR) { + int tmp_index; + if (isFlag(8) == false) { + tmp_index = 0; + } else { + tmp_index = mCursorPos; + } + item_index = tmp_index; + } else { + bool no_rotate = false; + int tmp_index; + if (isFlag(cursor_pos - 1) || isSoldOutItemFlag(mCursorPos - 1)) { + no_rotate = true; + } + + if (no_rotate) { + tmp_index = 0; + } else { + tmp_index = mCursorPos; + } + item_index = tmp_index; + } + } + + mItemCtrl.setRotateAnime(item_index); + return 1; } -#pragma pop /* ############################################################################################## */ /* 80394C10-80394C10 021270 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -1149,19 +1426,123 @@ SECTION_SDATA2 static f32 lit_5006 = 215.0f; SECTION_SDATA2 static f32 lit_5007 = 15.0f; /* 80198A2C-801990B0 19336C 0684+00 0/0 0/0 9/9 .text itemZoom__13dShopSystem_cFP4cXyz */ +// matches with literals +#ifdef NONMATCHING +int dShopSystem_c::itemZoom(cXyz* param_0) { + cXyz local_1c; + + if (field_0xf60 >= 0) { + local_1c.set(*param_0); + + if (dShopSystem_itemNo[mCursorPos - 1] == OIL_BOTTLE) { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mSeraShopObjZoomAngleX + -5000, isFlag(8) ? true : false); + } else { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mSeraShopObjZoomAngleX, isFlag(8) ? true : false); + } + } else { + cXyz local_28; + cXyz local_34; + + if (dShopSystem_itemActor[1] != NULL && dShopSystem_cameraActor[1] != NULL) { + cXyz local_40; + local_40.set(dShopSystem_itemActor[1]->mOrig.mPosition); + + f32 tmp_05 = 0.5f; + if (data_80451058 == 4) { + if (dShopSystem_itemActor[2] != NULL) { + f32 tmp = (dShopSystem_itemActor[2]->mOrig.mPosition.x + dShopSystem_itemActor[1]->mOrig.mPosition.x); + local_40.x = tmp * tmp_05; + + f32 tmp2 = (dShopSystem_itemActor[2]->mOrig.mPosition.y + dShopSystem_itemActor[1]->mOrig.mPosition.y); + local_40.y = tmp2 * tmp_05; + + f32 tmp3 = (dShopSystem_itemActor[2]->mOrig.mPosition.z + dShopSystem_itemActor[1]->mOrig.mPosition.z); + local_40.z = tmp3 * tmp_05; + } + } else if (data_80451058 == 5) { + f32 tmp = (dShopSystem_itemActor[2]->mOrig.mPosition.x + dShopSystem_itemActor[3]->mOrig.mPosition.x); + local_40.x = tmp * tmp_05; + + local_40.y = dShopSystem_itemActor[0]->mOrig.mPosition.y; + + f32 tmp3 = (dShopSystem_itemActor[2]->mOrig.mPosition.z + dShopSystem_itemActor[3]->mOrig.mPosition.z); + local_40.z = tmp3 * tmp_05; + } + + cXyz local_4c = local_40 - dShopSystem_cameraActor[1]->mCurrent.mPosition; + s16 atan = cM_atan2s(local_4c.x, local_4c.z); + + if (!strcmp("R_SP01", dComIfGp_getStartStageName())) { + local_34.set(g_cursorHIO.mObjZoom.x, g_cursorHIO.mObjZoom.y + -25.0f, g_cursorHIO.mObjZoom.z + 150.0f); + } else { + if (field_0xf77 == 5) { + if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_30) { + local_34.set(g_cursorHIO.mObjZoom.x, 5.0f + g_cursorHIO.mObjZoom.y + -50.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); + } else { + local_34.set(g_cursorHIO.mObjZoom.x, 20.0f + g_cursorHIO.mObjZoom.y + -50.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); + } + } else if (mCursorPos == 7) { + local_34.set(g_cursorHIO.mMagicArmorObjZoom.x, g_cursorHIO.mMagicArmorObjZoom.y + -130.0f, g_cursorHIO.mMagicArmorObjZoom.z + 215.0f); + } else { + local_34.set(g_cursorHIO.mObjZoom.x, g_cursorHIO.mObjZoom.y + -50.0f, g_cursorHIO.mObjZoom.z + 250.0f); + } + } + + cLib_offsetPos(&local_28, &dShopSystem_cameraActor[1]->mCurrent.mPosition, atan, &local_34); + if (data_80451058 == 6 || data_80451058 == 5) { + param_0->y += 15.0f; + } + local_1c.set(local_28.x + param_0->x, local_28.y + param_0->y, local_28.z + param_0->z); + } else { + local_28.set(*param_0); + local_1c.set(*param_0); + } + + u8 dvar1 = field_0xf77; + if (dvar1 == 1) { + if (dShopSystem_itemNo[mCursorPos - 1] == OIL_BOTTLE) { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX + -7000, isFlag(8) ? true : false); + } else { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX, isFlag(8) ? true : false); + } + } else if (dvar1 == 2) { + if (dShopSystem_itemNo[mCursorPos - 1] == RED_BOTTLE) { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 3000, isFlag(8) ? true : false); + } else { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX, isFlag(8) ? true : false); + } + } else if (dvar1 == 5) { + if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_30) { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 4000, isFlag(8) ? true : false); + } else { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 2000, isFlag(8) ? true : false); + } + } else if (mCursorPos == 7) { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mMagicArmorObjZoomAngleX, isFlag(8) ? true : false); + } else if (data_80451058 == 7) { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 3000, isFlag(8) ? true : false); + } else { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX, isFlag(8) ? true : false); + } + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::itemZoom(cXyz* param_0) { +asm int dShopSystem_c::itemZoom(cXyz* param_0) { nofralloc #include "asm/d/shop/d_shop_system/itemZoom__13dShopSystem_cFP4cXyz.s" } #pragma pop +#endif /* 801990B0-801990B8 1939F0 0008+00 1/0 0/0 0/0 .text * seq_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -bool dShopSystem_c::seq_wait(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - return false; +int dShopSystem_c::seq_wait(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { + return 0; } /* ############################################################################################## */ @@ -1173,49 +1554,282 @@ SECTION_SDATA2 static u8 lit_5084[4] = { 0x00, }; +inline void pos3Dto2D(Vec* a, Vec* b) { + mDoLib_project(a, b); +} + /* 801990B8-8019936C 1939F8 02B4+00 1/0 0/0 0/0 .text * seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ +// matches with literals +#ifdef NONMATCHING +int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { + if (field_0xf79 != 0) { + dComIfGp_setDoStatusForce(0, 0); + dComIfGp_setAStatusForce(0, 0); + field_0xf79 = 0; + } + + cXyz pos3d; + cXyz pos2d; + pos3d.set(mItemCtrl.getCurrentPos(0)); + pos3Dto2D(&pos3d, &pos2d); + mpDrawCursor->setPos(pos2d.x, pos2d.y + g_cursorHIO.mShopCursorOffsetY); + + if (chkSpMode() && !beforeStartSeqAction(p_flow, field_0xf5c)) { + return 0; + } else { + if (dMsgObject_c::isMsgSendControl()) { + dComIfGp_setDoStatusForce(0, 0); + dComIfGp_setAStatusForce(0x2A, 0); + + int control_status = checkController(SEQ_WAIT, p_flow); + if (control_status != 0) { + dMsgObject_c::onMsgSend(); + int cursor_status = moveCursor(control_status, 0); + + if (chkSpMode()) { + if (mCursorPos != 0) { + field_0xf5c = cursor_status; + mShopCamAction.setCameraSpeed(0.0f, 0.0f, 0.0f, 0.0f); + setSeq(SEQ_SELECT); + } else if (p_flow->doFlow(actor, NULL, cursor_status)) { + mShopCamAction.setCameraSpeed(0.0f, 0.0f, 0.0f, 0.0f); + setSeq(SEQ_FINISH); + } + } else if (p_flow->doFlow(actor, NULL, cursor_status)) { + if (mCursorPos == 0) { + setSeq(SEQ_FINISH); + } else { + setSeq(SEQ_SELECT); + } + } + } + } else { + if (p_flow->doFlow(actor, NULL, 0)) { + int itemNo; + if (mFlow.getEventId(&itemNo) == 1) { + if (field_0xd90 == -1) { + field_0xd90 = fopAcM_createItemForPresentDemo(&mCurrent.mPosition, itemNo, 0, -1, -1, NULL, NULL); + } + + if (fpcEx_IsExist(field_0xd90)) { + field_0xe30 = 1; + evtChange(); + return 1; + } else { + return 0; + } + } else { + return 1; + } + } + } + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::seq_start(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { +asm int dShopSystem_c::seq_start(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { nofralloc #include "asm/d/shop/d_shop_system/seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" } #pragma pop +#endif /* 8019936C-801993C4 193CAC 0058+00 1/0 0/0 0/0 .text * seq_select_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::seq_select_wait(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_select_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" +int dShopSystem_c::seq_select_wait(fopAc_ac_c*, dMsgFlow_c*) { + if (mItemCtrl.isHomePos(mCursorPos - 1)) { + setSoldOut(); + setSeq(SEQ_SELECT); + } + + return 0; } -#pragma pop /* 801993C4-8019959C 193D04 01D8+00 1/0 0/0 0/0 .text * seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ +// matches with literals +#ifdef NONMATCHING +int dShopSystem_c::seq_select_start(fopAc_ac_c*, dMsgFlow_c*) { + if (field_0xf60 < 0 && field_0xf76 == 0 && dShopSystem_item_count != -1) { + if (dShopSystem_item_count != data_80451058) { + return 0; + } + searchItemActor(); + } + + if (isFlag(mCursorPos - 1)) { + switch (mCursorPos) { + case 1: + mCursorPos = 2; + if (isFlag(mCursorPos - 1)) { + mCursorPos = 3; + if (isFlag(mCursorPos - 1)) { + mCursorPos = 0; + } + } + break; + + case 2: + mCursorPos = 1; + if (isFlag(mCursorPos - 1)) { + mCursorPos = 3; + if (isFlag(mCursorPos - 1)) { + mCursorPos = 0; + } + } + break; + + case 3: + mCursorPos = 2; + if (isFlag(mCursorPos - 1)) { + mCursorPos = 1; + if (isFlag(mCursorPos - 1)) { + mCursorPos = 0; + } + } + break; + } + } + + mShopCamAction.SetSelectIdx(mCursorPos); + int cursor_status = moveCursor(4, 0); + initTalk(cursor_status, NULL); + setSeq(SEQ_SELECT); + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::seq_select_start(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { +asm int dShopSystem_c::seq_select_start(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { nofralloc #include "asm/d/shop/d_shop_system/seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" } #pragma pop +#endif /* 8019959C-80199A18 193EDC 047C+00 1/0 0/0 0/0 .text * seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ +// matches with literals +#ifdef NONMATCHING +int dShopSystem_c::seq_select(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { + if (chkSpMode() && !beforeSelectSeqAction(p_flow, field_0xf5c)) { + return 0; + } + + if (field_0xf76 != 0) { + field_0xf76 = 0; + } + + int control_status = checkController(SEQ_START, p_flow); + dComIfGp_setDoStatusForce(0x22, 0); + dComIfGp_setAStatusForce(0x2A, 0); + + if (control_status != 0) { + int cursor_status = moveCursor(control_status, 1); + + int spMode = chkSpMode(); + if (spMode && control_status == 2) { + field_0xf5c = cursor_status; + mShopCamAction.setCameraSpeed(0.0f, 0.0f, 0.0f, 0.0f); + setSeq(SEQ_FINISH); + } else if (spMode && mCursorPos == 0) { + field_0xf5c = cursor_status; + mShopCamAction.SetSelectIdx(mCursorPos); + mShopCamAction.setCameraSpeed(0.0f, 0.0f, 0.0f, 0.0f); + setSeq(SEQ_START); + } else if (p_flow->doFlow(actor, NULL, cursor_status)) { + if (control_status == 3) { + if (mCursorPos != 0) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + } + + mShopCamAction.SetSelectIdx(mCursorPos); + } else if (control_status == 4 || control_status == 5 || control_status == 6) { + mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); + + mShopCamAction.SetSelectIdx(mCursorPos); + } + + dComIfGp_setMesgCancelButton(1); + + if (control_status == 1) { + if (!isFlag(mCursorPos - 1) && !isSoldOutItemFlag(mCursorPos - 1)) { + onFlag(8); + } + dMeter2Info_set2DVibrationM(); + setSeq(SEQ_DECIDE); + } else if (control_status == 2) { + setSeq(SEQ_FINISH); + } else if (mCursorPos == 0) { + setSeq(SEQ_START); + } else { + field_0xf68 = 0; + setSeq(SEQ_MOVING); + + if (mLastCursorPos != 0) { + return 0; + } + } + } else if (control_status == 3 || control_status == 4 || control_status == 5 || control_status == 6 || control_status == 7 || control_status == 2) { + if (mLastCursorPos == 7) { + mLastCursorPos = mCursorPos; + mCursorPos = 7; + } else { + mCursorPos = mLastCursorPos; + } + + field_0xf7a = 0; + + if (control_status == 2) { + mShopCamAction.SetSelectIdx(mCursorPos); + } + } + } else { + p_flow->doFlow(actor, NULL, 0); + } + + u8 old_cursor = 0; + if (mCursorPos != 0) { + old_cursor = mCursorPos; + } else if (mLastCursorPos != 0) { + old_cursor = mLastCursorPos; + } + + if (old_cursor != 0) { + cXyz pos3d; + cXyz pos2d; + pos3d.set(mItemCtrl.getCurrentPos(old_cursor - 1)); + pos3Dto2D(&pos3d, &pos2d); + + if (old_cursor == 7) { + pos2d.x += g_cursorHIO.mMagicArmorCursorOffsetX; + pos2d.y += g_cursorHIO.mMagicArmorCursorOffsetY; + } else { + pos2d.y += g_cursorHIO.mShopCursorOffsetY; + } + + mpDrawCursor->setPos(pos2d.x, pos2d.y); + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::seq_select(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { +asm int dShopSystem_c::seq_select(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { nofralloc #include "asm/d/shop/d_shop_system/seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80453B48-80453B50 002148 0004+04 1/1 0/0 0/0 .sdata2 @5296 */ @@ -1230,90 +1844,213 @@ SECTION_SDATA2 static f64 lit_5298 = 4503601774854144.0 /* cast s32 to float */; /* 80199A18-80199BF8 194358 01E0+00 1/0 0/0 0/0 .text * seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ +// matches with literals +#ifdef NONMATCHING +int dShopSystem_c::seq_moving(fopAc_ac_c*, dMsgFlow_c*) { + field_0xf68++; + + cXyz last_pos3d; + cXyz pos3d; + cXyz last_pos2d; + cXyz pos2d; + + pos3d.set(mItemCtrl.getCurrentPos(mCursorPos - 1)); + pos3Dto2D(&pos3d, &pos2d); + + if (mCursorPos == 7) { + pos2d.x += g_cursorHIO.mMagicArmorCursorOffsetX; + pos2d.y += g_cursorHIO.mMagicArmorCursorOffsetY; + } else { + pos2d.y += g_cursorHIO.mShopCursorOffsetY; + } + + if (mLastCursorPos != 0) { + last_pos3d.set(mItemCtrl.getCurrentPos(mLastCursorPos - 1)); + pos3Dto2D(&last_pos3d, &last_pos2d); + + if (mLastCursorPos == 7) { + last_pos2d.x += g_cursorHIO.mMagicArmorCursorOffsetX; + last_pos2d.y += g_cursorHIO.mMagicArmorCursorOffsetY; + } else { + last_pos2d.y += g_cursorHIO.mShopCursorOffsetY; + } + + f32 tmp = (f32)(field_0xf68 * field_0xf68) / 9.0f; + mpDrawCursor->setPos(last_pos2d.x + tmp * (pos2d.x - last_pos2d.x), last_pos2d.y + tmp * (pos2d.y - last_pos2d.y)); + + } else { + mpDrawCursor->setPos(pos2d.x, pos2d.y); + } + + if (field_0xf68 >= 3) { + setSeq(SEQ_SELECT); + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::seq_moving(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { +asm int dShopSystem_c::seq_moving(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { nofralloc #include "asm/d/shop/d_shop_system/seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" } #pragma pop +#endif /* 80199BF8-80199D14 194538 011C+00 1/0 0/0 0/0 .text * seq_decide__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::seq_decide(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_decide__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" +int dShopSystem_c::seq_decide(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { + int control_status = checkController(SEQ_SELECT_WAIT, p_flow); + + dComIfGp_setDoStatusForce(0x22, 0); + if (!p_flow->isSelectMessage()) { + dComIfGp_setAStatusForce(0x2A, 0); + } else if (dMsgObject_getMsgObjectClass()->getSelectCancelPos() != 0) { + dComIfGp_setAStatusForce(0x2A, 0); + } + + if (control_status != 0) { + int cursor_status = moveCursor(control_status, 2); + + if (p_flow->doFlow(actor, NULL, cursor_status)) { + offFlag(8); + setSeq(SEQ_SELECT_WAIT); + } else if (p_flow->isSelectMessage()) { + field_0xf58 = control_status; + setSeq(SEQ_CHOOSE); + } + } else { + p_flow->doFlow(actor, NULL, 0); + } + + return 0; } -#pragma pop /* 80199D14-80199E28 194654 0114+00 1/0 0/0 0/0 .text * seq_choose__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::seq_choose(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_choose__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" +int dShopSystem_c::seq_choose(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { + dComIfGp_setDoStatusForce(0x22, 0); + if (!p_flow->isSelectMessage()) { + dComIfGp_setAStatusForce(0x2A, 0); + } else if (dMsgObject_getMsgObjectClass()->getSelectCancelPos() != 0) { + dComIfGp_setAStatusForce(0x2A, 0); + } + + p_flow->doFlow(actor, NULL, 0); + + u16 select_num = p_flow->getSelectNum(); + if (dMsgObject_c::getStatus() != 6 && dMsgObject_c::getStatus() != 8 && dMsgObject_c::getStatus() != 9 && dMsgObject_c::getStatus() != 20) { + if (select_num == 0) { + setSeq(SEQ_DECIDE_YES); + } else { + setSeq(SEQ_DECIDE_NO); + } + } + + return 0; } -#pragma pop /* 80199E28-80199FA4 194768 017C+00 1/0 0/0 0/0 .text * seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ +// matches with literals +#ifdef NONMATCHING +int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { + if (dMsgObject_getMessageID() == 0x1B82) { + mShopCamAction.SetSelectIdx(0); + field_0xf76 = 1; + } + + int itemNo; + if (mFlow.getEventId(&itemNo) == 1) { + if (p_flow->doFlow(actor, NULL, 0)) { + if (field_0xd90 == -1) { + field_0xd90 = fopAcM_createItemForPresentDemo(&mCurrent.mPosition, itemNo, 0, -1, -1, NULL, NULL); + } + + if (fpcEx_IsExist(field_0xd90)) { + offFlag(8); + setSoldOutItemHide(); + field_0xe30 = 1; + evtChange(); + return 2; + } + + return 0; + } + } else { + int flow; + if (field_0xf60 >= 0) { + flow = 100; + } else { + flow = mItemCtrl.getMessageIndex(mCursorPos - 1) + 1; + } + + if (p_flow->doFlow(actor, NULL, flow)) { + offFlag(8); + setSeq(SEQ_SELECT_WAIT); + } + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShopSystem_c::seq_decide_yes(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { +asm int dShopSystem_c::seq_decide_yes(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { nofralloc #include "asm/d/shop/d_shop_system/seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" } #pragma pop +#endif /* 80199FA4-8019A020 1948E4 007C+00 1/0 0/0 0/0 .text * seq_decide_no__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::seq_decide_no(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_decide_no__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" +int dShopSystem_c::seq_decide_no(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { + if (p_flow->doFlow(actor, NULL, moveCursor(field_0xf58, 2))) { + offFlag(8); + setSeq(SEQ_SELECT_WAIT); + } + + return 0; } -#pragma pop /* 8019A020-8019A0C0 194960 00A0+00 1/0 0/0 0/0 .text * seq_finish__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::seq_finish(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_finish__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" +int dShopSystem_c::seq_finish(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { + if (chkSpMode() && !beforeStartSeqAction(p_flow, field_0xf5c)) { + return 0; + } else if (p_flow->doFlow(actor, NULL, 0)) { + setSeq(SEQ_WAIT); + return 1; + } + + return 0; } -#pragma pop /* 8019A0C0-8019A0D0 194A00 0010+00 1/0 0/0 0/0 .text * seq_event__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::seq_event(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_event__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" +bool dShopSystem_c::seq_event(fopAc_ac_c*, dMsgFlow_c*) { + return field_0xe30 == 0; } -#pragma pop /* 8019A0D0-8019A158 194A10 0088+00 0/0 0/0 9/9 .text shop_init__13dShopSystem_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::shop_init(bool param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/shop_init__13dShopSystem_cFb.s" +int dShopSystem_c::shop_init(bool param_0) { + if (param_0) { + setSeq(SEQ_SELECT_START); + dMeter2Info_onShopTalkFlag(); + setSoldOut(); + return 1; + } else if (mSeq == SEQ_WAIT) { + setSeq(SEQ_START); + dMeter2Info_onShopTalkFlag(); + return 1; + } else { + return 0; + } } -#pragma pop /* 8019A158-8019A238 194A98 00E0+00 0/0 0/0 9/9 .text * shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ @@ -1328,87 +2065,124 @@ asm void dShopSystem_c::shop_process(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { /* ############################################################################################## */ /* 804506F8-80450700 -00001 0004+04 1/1 0/0 0/0 .sdata shop_item_pos_data_tbl */ -SECTION_SDATA static void* shop_item_pos_data_tbl[1 + 1 /* padding */] = { - (void*)&item_seira_shop, - /* padding */ - NULL, -}; +SECTION_SDATA static shop_item_data* shop_item_pos_data_tbl = &item_seira_shop; /* 80453B58-80453B60 002158 0006+02 1/1 0/0 0/0 .sdata2 item_no$5460 */ -SECTION_SDATA2 static u8 item_no[6 + 2 /* padding */] = { - 0x64, - 0x76, - 0x4B, - 0x64, - 0x76, - 0xFF, - /* padding */ - 0x00, - 0x00, +SECTION_SDATA2 static u8 item_no[6] = { + MILK_BOTTLE, + BEE_CHILD, + PACHINKO, + MILK_BOTTLE, + BEE_CHILD, + NO_ITEM, }; /* 8019A238-8019A344 194B78 010C+00 0/0 0/0 1/1 .text createShopItem__13dShopSystem_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::createShopItem(int param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/createShopItem__13dShopSystem_cFi.s" +void dShopSystem_c::createShopItem(int itemType) { + if (itemType != -1) { + field_0xf60 = itemType; + mSoldOutFlag = -1; + + cXyz pos; + for (int i = 0; i < 3; i++) { + u8* itemTbl = item_no + (itemType * 3); + + pos.x = shop_item_pos_data_tbl->mItemPos[i].x + mCurrent.mPosition.x; + pos.y = shop_item_pos_data_tbl->mItemPos[i].y + mCurrent.mPosition.y; + pos.z = shop_item_pos_data_tbl->mItemPos[i].z + mCurrent.mPosition.z; + + if (itemTbl[i] != NO_ITEM) { + u32 index = fopAcM_create(PROC_ShopItem, itemTbl[i], &pos, fopAcM_GetRoomNo(this), &mCurrent.mAngle, NULL, -1); + mItemCtrl.setItemIndex(i, index); + offFlag(i); + } else { + mItemCtrl.setItemIndex(i, -1); + onFlag(i); + } + } + } } -#pragma pop /* 8019A344-8019A354 194C84 0010+00 12/12 0/0 0/0 .text setSeq__13dShopSystem_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::setSeq(u8 param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/setSeq__13dShopSystem_cFUc.s" +void dShopSystem_c::setSeq(u8 seq) { + mSeq = seq; + mWaitTimer = 2; } -#pragma pop /* 8019A354-8019A364 194C94 0010+00 0/0 1/1 0/0 .text setSoldOutFlag__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::setSoldOutFlag() { - nofralloc -#include "asm/d/shop/d_shop_system/setSoldOutFlag__13dShopSystem_cFv.s" +void dShopSystem_c::setSoldOutFlag() { + mSoldOutFlag = mCursorPos - 1; } -#pragma pop /* 8019A364-8019A4F4 194CA4 0190+00 2/2 0/0 0/0 .text setSoldOut__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::setSoldOut() { - nofralloc -#include "asm/d/shop/d_shop_system/setSoldOut__13dShopSystem_cFv.s" +void dShopSystem_c::setSoldOut() { + if (mSoldOutFlag != 0xFF) { + if (field_0xf60 < 0) { + u8 sw = (u8)dShopSystem_itemActor[mSoldOutFlag]->mOrig.mAngle.z & 0xFF; + if (sw != 0xFF && !dComIfGs_isSaveSwitch(sw)) { + dComIfGs_onSaveSwitch(sw); + } + } + + int index = mSoldOutFlag; + mSoldOutFlag = -1; + if (field_0xf60 >= 0) { + fopAcM_delete(mItemCtrl.getItemIndex(index)); + mItemCtrl.setItemIndex(index, -1); + onFlag(index); + return; + } else if (index == 0) { + dShopSystem_itemActor[0] = NULL; + dShopSystem_itemNo[0] = NO_ITEM; + dShopSystem_item_count = 2; + } else if (index == 1) { + dShopSystem_itemActor[1] = NULL; + dShopSystem_itemNo[1] = NO_ITEM; + dShopSystem_item_count = 2; + } else if (index == 2) { + dShopSystem_itemActor[2] = NULL; + dShopSystem_itemNo[2] = NO_ITEM; + dShopSystem_item_count = 2; + } else if (index == 6) { + dShopSystem_itemActor[6] = NULL; + dShopSystem_itemNo[6] = NO_ITEM; + dShopSystem_item_count = 6; + } + + if (field_0xf76 != 0) { + onFlag(index); + } + } } -#pragma pop /* 8019A4F4-8019A564 194E34 0070+00 1/1 0/0 0/0 .text setSoldOutItemHide__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::setSoldOutItemHide() { - nofralloc -#include "asm/d/shop/d_shop_system/setSoldOutItemHide__13dShopSystem_cFv.s" +void dShopSystem_c::setSoldOutItemHide() { + if (field_0xf60 < 0) { + fopAcM_delete(mItemCtrl.getItemIndex(mSoldOutFlag)); + } else { + daShopItem_c* item = (daShopItem_c*)fopAcM_SearchByID(mItemCtrl.getItemIndex(mSoldOutFlag)); + + if (item != NULL) { + item->hide(); + } + } } -#pragma pop /* 8019A564-8019A5D0 194EA4 006C+00 1/1 0/0 10/10 .text deleteObject__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::deleteObject() { - nofralloc -#include "asm/d/shop/d_shop_system/deleteObject__13dShopSystem_cFv.s" +void dShopSystem_c::deleteObject() { + if (mpStick != NULL) { + delete mpStick; + mpStick = NULL; + } + + if (mpDrawCursor != NULL) { + delete mpDrawCursor; + mpDrawCursor = NULL; + } } -#pragma pop /* ############################################################################################## */ /* 80453B60-80453B64 002160 0004+00 1/1 0/0 0/0 .sdata2 @5687 */ @@ -1448,57 +2222,43 @@ asm void dShopSystem_c::searchItemActor() { /* 8019AB00-8019AB1C 195440 001C+00 1/1 0/0 0/0 .text getFlowNodeNum__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::getFlowNodeNum() { - nofralloc -#include "asm/d/shop/d_shop_system/getFlowNodeNum__13dShopSystem_cFv.s" +int dShopSystem_c::getFlowNodeNum() { + u16 num = mOrig.mAngle.x; + if (num == 0xFFFF) { + return -1; + } + + return num; } -#pragma pop /* 8019AB1C-8019AB24 19545C 0008+00 0/0 0/0 8/8 .text setSellItemMax__13dShopSystem_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::setSellItemMax(u8 param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/setSellItemMax__13dShopSystem_cFUc.s" +void dShopSystem_c::setSellItemMax(u8 max) { + data_80451058 = max; } -#pragma pop /* 8019AB24-8019AB60 195464 003C+00 0/0 0/0 9/9 .text checkShopOpen__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::checkShopOpen() { - nofralloc -#include "asm/d/shop/d_shop_system/checkShopOpen__13dShopSystem_cFv.s" +bool dShopSystem_c::checkShopOpen() { + for (int i = 0; i < 2; i++) { + if (dShopSystem_cameraActor[i] != NULL) { + return true; + } + } + + return dShopSystem_camera_count != 0; } -#pragma pop /* 8019AB60-8019AB84 1954A0 0024+00 3/3 0/0 0/0 .text * checkLeftTrigger__13dShopSystem_cFP9STControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::checkLeftTrigger(STControl* param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/checkLeftTrigger__13dShopSystem_cFP9STControl.s" +bool dShopSystem_c::checkLeftTrigger(STControl* stick) { + return stick->checkLeftTrigger(); } -#pragma pop /* 8019AB84-8019ABA8 1954C4 0024+00 3/3 0/0 0/0 .text * checkRightTrigger__13dShopSystem_cFP9STControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::checkRightTrigger(STControl* param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/checkRightTrigger__13dShopSystem_cFP9STControl.s" +bool dShopSystem_c::checkRightTrigger(STControl* stick) { + return stick->checkRightTrigger(); } -#pragma pop /* 8019ABA8-8019ABB0 1954E8 0008+00 1/1 0/0 0/0 .text dpdMove__13dShopSystem_cFv */ bool dShopSystem_c::dpdMove() { @@ -1522,14 +2282,14 @@ REGISTER_CTORS(0x8019ABB0, __sinit_d_shop_system_cpp); /* 8019ACE0-8019ACE8 195620 0008+00 1/0 0/0 0/0 .text * beforeStartSeqAction__13dShopSystem_cFP10dMsgFlow_ci */ -bool dShopSystem_c::beforeStartSeqAction(dMsgFlow_c* param_0, int param_1) { - return true; +int dShopSystem_c::beforeStartSeqAction(dMsgFlow_c* param_0, int param_1) { + return 1; } /* 8019ACE8-8019ACF0 195628 0008+00 1/0 0/0 0/0 .text * beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci */ -bool dShopSystem_c::beforeSelectSeqAction(dMsgFlow_c* param_0, int param_1) { - return true; +int dShopSystem_c::beforeSelectSeqAction(dMsgFlow_c* param_0, int param_1) { + return 1; } /* 8019ACF0-8019ACF8 195630 0008+00 1/0 0/0 0/0 .text getResName2__13dShopSystem_cFi */ diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index d7bbf88c786..ea987b19bb6 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -218,7 +218,7 @@ static u8 g_fopAc_type[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void fopAc_IsActor(void* param_0) { +asm s32 fopAc_IsActor(void* param_0) { nofralloc #include "asm/f_op/f_op_actor/fopAc_IsActor__FPv.s" } From 985d47a5c87d070682b0212dffe346132158b7b4 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 15 Mar 2022 02:25:25 -0700 Subject: [PATCH 2/3] msg_flow wip --- include/JSystem/JMessage/control.h | 17 + include/JSystem/JMessage/data.h | 6 + include/JSystem/JMessage/locale.h | 9 + include/JSystem/JMessage/processor.h | 106 + include/JSystem/JMessage/resource.h | 29 + include/d/a/d_a_alink.h | 16 +- include/d/a/d_a_player.h | 5 +- include/d/com/d_com_inf_game.h | 75 +- include/d/com/d_com_static.h | 2 + include/d/d_stage.h | 4 +- include/d/meter/d_meter2_info.h | 22 + include/d/msg/d_msg_class.h | 17 +- include/d/msg/d_msg_flow.h | 261 +-- include/d/msg/d_msg_object.h | 119 +- include/d/save/d_save.h | 4 +- include/d/shop/d_shop_system.h | 1 + include/f_op/f_op_msg_mng.h | 2 + include/m_Do/m_Do_audio.h | 4 + libs/JSystem/JMessage/control.cpp | 33 +- libs/JSystem/JMessage/data.cpp | 10 - libs/JSystem/JMessage/locale.cpp | 11 - libs/JSystem/JMessage/processor.cpp | 102 +- libs/JSystem/JMessage/resource.cpp | 42 +- src/d/a/d_a_alink.cpp | 6 +- src/d/com/d_com_inf_game.cpp | 2 +- src/d/com/d_com_static.cpp | 2 +- src/d/d_stage.cpp | 2 +- src/d/meter/d_meter2_info.cpp | 2 +- src/d/msg/d_msg_class.cpp | 7 - src/d/msg/d_msg_flow.cpp | 2699 +++++++++++--------------- src/d/msg/d_msg_object.cpp | 58 +- src/d/shop/d_shop_system.cpp | 4 +- src/f_op/f_op_msg_mng.cpp | 2 +- 33 files changed, 1675 insertions(+), 2006 deletions(-) diff --git a/include/JSystem/JMessage/control.h b/include/JSystem/JMessage/control.h index 17c271167cc..e1a49e2fa43 100644 --- a/include/JSystem/JMessage/control.h +++ b/include/JSystem/JMessage/control.h @@ -3,4 +3,21 @@ #include "dolphin/types.h" +namespace JMessage { + struct TProcessor; + + struct TControl { + /* 802A7548 */ TControl(); + /* 802A758C */ ~TControl(); + /* 802A75D4 */ void reset(); + /* 802A7634 */ void update(); + /* 802A76BC */ void render(); + /* 802A77E8 */ void setMessageCode(u16, u16); + /* 802A78F4 */ void setMessageID(u32, u32, bool*); + /* 802A7A20 */ void setMessageCode_inSequence_(JMessage::TProcessor const*, u16, u16); + }; +}; + +struct jmessage_tControl {}; + #endif /* CONTROL_H */ diff --git a/include/JSystem/JMessage/data.h b/include/JSystem/JMessage/data.h index 078c133eecf..1281f2419b8 100644 --- a/include/JSystem/JMessage/data.h +++ b/include/JSystem/JMessage/data.h @@ -3,4 +3,10 @@ #include "dolphin/types.h" +namespace JMessage { + struct data { + static f32 ga4cSignature[1 + 1 /* padding */]; + }; +}; + #endif /* DATA_H */ diff --git a/include/JSystem/JMessage/locale.h b/include/JSystem/JMessage/locale.h index ba4cad85ce0..321a3bda582 100644 --- a/include/JSystem/JMessage/locale.h +++ b/include/JSystem/JMessage/locale.h @@ -3,4 +3,13 @@ #include "dolphin/types.h" +namespace JMessage { + struct locale { + /* 802A9490 */ void parseCharacter_1Byte(char const**); + /* 802A94A8 */ void parseCharacter_2Byte(char const**); + /* 802A9528 */ void parseCharacter_ShiftJIS(char const**); + /* 802A958C */ void parseCharacter_UTF8(char const**); + }; +}; + #endif /* LOCALE_H */ diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h index ee4ddd2ba64..90e8aee8af4 100644 --- a/include/JSystem/JMessage/processor.h +++ b/include/JSystem/JMessage/processor.h @@ -2,5 +2,111 @@ #define PROCESSOR_H #include "dolphin/types.h" +#include "SSystem/SComponent/c_xyz.h" + +namespace JMessage { + struct TProcessor { + /* 802A7B48 */ ~TProcessor(); + /* 802A7B90 */ void reset(); + /* 802A7BF8 */ void stack_pushCurrent(char const*); + /* 802A7C30 */ void stack_popCurrent(); + /* 802A7C54 */ void getResource_groupID(u16) const; + /* 802A7CD4 */ void toMessageCode_messageID(u32, u32, bool*) const; + /* 802A7E38 */ void on_select_begin(char const* (*)(JMessage::TProcessor*), void const*, + char const*, u32); + /* 802A7EDC */ void on_select_end(); + /* 802A7F34 */ void on_select_separate(); + /* 802A7FC0 */ void do_reset(); + /* 802A7FC4 */ void do_begin(void const*, char const*); + /* 802A7FC8 */ void do_end(); + /* 802A7FCC */ void do_character(int); + /* 802A7FD0 */ bool do_tag(u32, void const*, u32); + /* 802A7FD8 */ void do_select_begin(u32); + /* 802A7FDC */ void do_select_end(); + /* 802A7FE0 */ void do_select_separate(); + /* 802A7FE4 */ void on_tag_(); + /* 802A8084 */ void do_resetStatus_(char const*); + /* 802A8088 */ bool do_setBegin_isReady_() const; + /* 802A8090 */ void do_tag_(u32, void const*, u32); + /* 802A81EC */ void process_character_(); + /* 802A828C */ void process_onCharacterEnd_normal_(JMessage::TProcessor*); + /* 802A82F4 */ void process_onCharacterEnd_select_(JMessage::TProcessor*); + /* 802A833C */ void process_onSelect_limited_(JMessage::TProcessor*); + /* 802A8358 */ void process_onSelect_(JMessage::TProcessor*); + /* 802A8C24 */ void on_message(u32) const; + /* 802A8C44 */ void getMessageText_messageCode(u32) const; + }; + + struct TReference { + /* 802A7AF8 */ ~TReference(); + /* 802A7B40 */ bool do_word(u32) const; + }; + + struct TControl; + + struct TSequenceProcessor { + /* 802A8374 */ TSequenceProcessor(JMessage::TReference const*, JMessage::TControl*); + /* 802A83B8 */ ~TSequenceProcessor(); + /* 802A8418 */ void process(char const*); + /* 802A85A4 */ void on_isReady(); + /* 802A85D0 */ void on_jump_register(void const* (*)(JMessage::TSequenceProcessor const*), + u32); + /* 802A85E4 */ void on_jump_isReady(); + /* 802A8610 */ void on_jump(void const*, char const*); + /* 802A8690 */ void on_branch_register(void const* (*)(JMessage::TSequenceProcessor const*, + u32), + void const*, u32); + /* 802A86A0 */ void on_branch_query(u32); + /* 802A86D4 */ void on_branch_queryResult(); + /* 802A8700 */ void on_branch(void const*, char const*); + /* 802A8780 */ bool do_isReady(); + /* 802A8788 */ bool do_jump_isReady(); + /* 802A8790 */ void do_jump(void const*, char const*); + /* 802A8794 */ void do_branch_query(u32); + /* 802A8798 */ s32 do_branch_queryResult(); + /* 802A87A0 */ void do_branch(void const*, char const*); + /* 802A87A4 */ void do_resetStatus_(char const*); + /* 802A87C0 */ void do_setBegin_isReady_() const; + /* 802A87D0 */ void do_begin_(void const*, char const*); + /* 802A87D4 */ void do_end_(); + /* 802A87E0 */ void do_tag_(u32, void const*, u32); + /* 802A892C */ void process_setMessageIndex_reserved_(u16); + /* 802A8944 */ void process_setMessageCode_(JMessage::TSequenceProcessor const*, u16, u16); + /* 802A89B8 */ void process_onJump_limited_(JMessage::TSequenceProcessor const*); + /* 802A89EC */ void process_onJump_(JMessage::TSequenceProcessor const*); + /* 802A8A18 */ void process_onBranch_limited_(JMessage::TSequenceProcessor const*, u32); + /* 802A8A50 */ void process_onBranch_(JMessage::TSequenceProcessor const*, u32); + }; + + struct TRenderingProcessor { + /* 802A8A84 */ TRenderingProcessor(JMessage::TReference const*); + /* 802A8AC0 */ ~TRenderingProcessor(); + /* 802A8B20 */ void process(char const*); + /* 802A8BA4 */ void do_begin_(void const*, char const*); + /* 802A8BA8 */ void do_end_(); + /* 802A8BAC */ void do_tag_(u32, void const*, u32); + }; +}; + +struct jmessage_tReference { + /* 80228B04 */ jmessage_tReference(); + /* 80229034 */ void pageSend(); + /* 80229168 */ void selectMessage(); + /* 802294A8 */ void inputNumber(); + /* 802297E4 */ void shiftCharCountBuffer(); + /* 80229810 */ void resetCharCountBuffer(); + /* 8022994C */ void isLightEnd(); + /* 80238C78 */ void setActorPos(cXyz); +}; + +struct jmessage_tControl; +struct jmessage_tSequenceProcessor { + /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*); +}; + +struct jmessage_tRenderingProcessor { + /* 8022CCB0 */ jmessage_tRenderingProcessor(jmessage_tReference const*); + /* 8022E12C */ void resetRendering(); +}; #endif /* PROCESSOR_H */ diff --git a/include/JSystem/JMessage/resource.h b/include/JSystem/JMessage/resource.h index 9af4326e35b..820b824194c 100644 --- a/include/JSystem/JMessage/resource.h +++ b/include/JSystem/JMessage/resource.h @@ -3,4 +3,33 @@ #include "dolphin/types.h" +namespace JMessage { + struct TResource { + /* 802A8CDC */ void toMessageIndex_messageID(u32, u32, bool*) const; + }; + + struct TResourceContainer { + struct TCResource { + /* 802A8EC0 */ TCResource(); + /* 802A8EF8 */ ~TCResource(); + /* 802A8F6C */ void Get_groupID(u16); + /* 802A8FFC */ void Do_create(); + /* 802A9048 */ void Do_destroy(JMessage::TResource*); + }; + + /* 802A906C */ TResourceContainer(); + /* 802A90B8 */ void setEncoding(u8); + /* 802A90F0 */ void setEncoding_(u8); + + static void* sapfnParseCharacter_[5]; + }; + + struct TParse { + /* 802A9130 */ TParse(JMessage::TResourceContainer*); + /* 802A9158 */ ~TParse(); + /* 802A91B8 */ void parseHeader_next(void const**, u32*, u32); + /* 802A92F4 */ void parseBlock_next(void const**, u32*, u32); + }; +}; + #endif /* RESOURCE_H */ diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 00f1a7861b4..4a7927419a7 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -1815,7 +1815,7 @@ public: /* 8011F0F4 */ void procDungeonWarp(); /* 8011F360 */ void procDungeonWarpSceneStartInit(); /* 8011F460 */ void procDungeonWarpSceneStart(); - /* 8011F658 */ void checkAcceptWarp(); + /* 8011F658 */ bool checkAcceptWarp(); /* 8011F7D8 */ void dungeonReturnWarp(); /* 8011F9EC */ void checkWarpStart(); /* 8011FBC0 */ void warpModelTexScroll(); @@ -2213,9 +2213,9 @@ public: virtual bool checkIronBallGroundStop() const; virtual BOOL checkSingleBoarBattleSecondBowReady() const; virtual void setClothesChange(int); - virtual void setPlayerPosAndAngle(float (*)[4]); - virtual void setPlayerPosAndAngle(cXyz const*, csXyz const*); virtual void setPlayerPosAndAngle(cXyz const*, short, int); + virtual void setPlayerPosAndAngle(cXyz const*, csXyz const*); + virtual void setPlayerPosAndAngle(float (*)[4]); virtual bool setThrowDamage(short, float, float, int, int, int); virtual bool checkSetNpcTks(cXyz*, int, int); virtual bool setRollJump(float, float, short); @@ -2259,7 +2259,7 @@ public: virtual void skipPortalObjWarp(); virtual bool checkTreasureRupeeReturn(int) const; virtual void setSumouReady(fopAc_ac_c*); - virtual void checkAcceptDungeonWarpAlink(int); + virtual bool checkAcceptDungeonWarpAlink(int); virtual s16 getSumouCounter() const; virtual s16 checkSumouWithstand() const; virtual void cancelGoronThrowEvent(); @@ -2338,6 +2338,7 @@ public: field_0x2844.clearData(); } s32 checkPlayerDemoMode() const { return mDemo.getDemoType(); } + u16 getMidnaMsgNum() const { return mMidnaMsgNum; } BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; } @@ -4372,6 +4373,8 @@ public: FORCE_PANIC = 8, }; + enum daMidna_FLG0 { NPC_NEAR = 0x100000, NPC_FAR = 0x40000 }; + enum daMidna_FLG1 { FORCE_NORMAL_COLOR = 8, FORCE_TIRED_COLOR = 4 }; enum daMidna_ANM {}; @@ -4427,12 +4430,15 @@ public: /* 804C61A4 */ ~daMidna_c(); void onEndResetStateFlg0(daMidna_ERFLG0 pFlg) { mEndResetStateFlg0 |= pFlg; } - u32 checkStateFlg1(daMidna_FLG1 pFlg) const { return mStateFlg1 & pFlg; } + u32 checkStateFlg0(daMidna_FLG0 flag) const { return mStateFlg0 & flag; } + u32 checkStateFlg1(daMidna_FLG1 flag) const { return mStateFlg1 & flag; } void setFaceNum(int num) { mFaceNum = num; } void setMotionNum(int num) { mMotionNum = num; } bool checkDemoTypeNone() const { return mDemoType == 0; } void changeOriginalDemo() { mDemoType = 3; } void changeDemoMode(u32 mode) { mDemoMode = mode; } + BOOL checkNpcNear() { return checkStateFlg0(NPC_NEAR); } + BOOL checkNpcFar() { return checkStateFlg0(NPC_FAR); } inline bool checkMidnaRealBody(); diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 4aa5cfc1e07..e731cd5086d 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -419,9 +419,9 @@ public: virtual BOOL checkSingleBoarBattleSecondBowReady() const; virtual bool checkPointSubWindowMode() const; virtual void setClothesChange(int); - virtual void setPlayerPosAndAngle(float (*)[4]); - virtual void setPlayerPosAndAngle(cXyz const*, csXyz const*); virtual void setPlayerPosAndAngle(cXyz const*, short, int); + virtual void setPlayerPosAndAngle(cXyz const*, csXyz const*); + virtual void setPlayerPosAndAngle(float (*)[4]); virtual bool setThrowDamage(short, float, float, int, int, int); virtual bool checkSetNpcTks(cXyz*, int, int); virtual bool setRollJump(float, float, short); @@ -523,6 +523,7 @@ public: bool checkCanoeSlider() const { return mSpecialMode == 0x2D; } u8 getCutType() const { return mCutType; } u16 getSwordAtUpTime() const { return mSwordUpTimer; } + bool checkWaterInMove() const { return i_checkNoResetFlg0(UNDER_WATER_MOVEMENT); } // some functions use these function as an inline // is there a better way to handle this? diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index d8dc4a74785..63c4cba8923 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -262,7 +262,7 @@ public: mASetFlagForce = flag; } - void setItemRupeeCount(int rupees) { mItemRupeeCount += rupees; } + void setItemRupeeCount(s32 rupees) { mItemRupeeCount += rupees; } void setItemMagicCount(s16 magic) { mItemMagicCount += magic; } void setItemMaxMagicCount(s16 max) { mItemMaxMagicCount += max; } void setItemArrowNumCount(s16 arrows) { mItemArrowNumCount += arrows; } @@ -277,6 +277,7 @@ public: void setItemNowLife(u16 life) { mItemNowLife = life; } void setItemNowMagic(s16 magic) { mItemNowMagicCount = magic; } void setItemNowOil(s32 oil) { mItemNowOil = oil; } + void setItemOilCount(s32 oil) { mItemOilCount += oil; } s16 getItemMaxLifeCount() { return mItemMaxLifeCount; } f32 getItemLifeCount() { return mItemLifeCount; } void clearItemMaxLifeCount() { mItemMaxLifeCount = 0; } @@ -352,6 +353,7 @@ public: void show2dOn() { mShow2D = 1; } s8 getLayerOld() { return mLayerOld; } void setMesgCancelButton(u8 button) { mMesgCancelButton = button; } + int getMessageCountNumber() { return mMessageCountNum; } public: /* 0x00000 */ dBgS mBgs; @@ -403,15 +405,15 @@ public: /* 0x04E7C */ void* mPlayerPtr[2]; // 0: Player, 1: Horse ; type may be wrong /* 0x04E84 */ dMsgObject_c* mMsgObjectClass; /* 0x04E88 */ f32 mItemLifeCount; - /* 0x04E8C */ int mItemRupeeCount; + /* 0x04E8C */ s32 mItemRupeeCount; /* 0x04E90 */ s16 mItemKeyNumCount; /* 0x04E92 */ s16 mItemMaxLifeCount; /* 0x04E94 */ s16 mItemMagicCount; /* 0x04E96 */ s16 mItemNowMagicCount; /* 0x04E98 */ s16 mItemMaxMagicCount; /* 0x04E9A */ s16 field_0x4e9a; - /* 0x04E9C */ int mItemOilCount; - /* 0x04EA0 */ int mItemNowOil; + /* 0x04E9C */ s32 mItemOilCount; + /* 0x04EA0 */ s32 mItemNowOil; /* 0x04EA4 */ int mItemMaxOilCount; /* 0x04EA8 */ int mOxygen; /* 0x04EAC */ int mNowOxygen; @@ -425,8 +427,8 @@ public: /* 0x04EC8 */ u8 field_0x4ec8[4]; /* 0x04ECC */ s16 mItemMaxBombNumCount1; /* 0x04ECE */ s16 mItemMaxBombNumCount2; - /* 0x04ED0 */ u8 field_0x4ed0[6]; - /* 0x04ED6 */ s16 mItemMaxBombNumCount3; + /* 0x04ED0 */ u8 field_0x4ed0[4]; + /* 0x04ED4 */ int mMessageCountNum; /* 0x04ED8 */ u8 field_0x4ed8[6]; /* 0x04EDE */ u16 mItemNowLife; /* 0x04EE0 */ u8 field_0x4ee0[2]; @@ -712,6 +714,11 @@ void dComIfGs_setSelectEquipShield(u8 i_itemNo); int dComIfGs_isItemFirstBit(u8 i_itemNo); u16 dComIfGs_getRupee(); BOOL dComIfGs_isVisitedRoom(int i_roomNo); +void dComIfGs_onZoneSwitch(int swBit, int roomNo); +void dComIfGs_onOneZoneSwitch(int param_0, int param_1); +void dComIfGs_offZoneSwitch(int param_0, int param_1); +void dComIfGs_offOneZoneSwitch(int param_0, int param_1); +s8 dComIfGp_getReverb(int roomNo); inline void dComIfGs_onDungeonItemMap() { g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemMap(); @@ -962,6 +969,10 @@ inline BOOL dComIfGs_isSaveTbox(int i_stageNo, int i_no) { return g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().isTbox(i_no); } +inline BOOL dComIfGs_isSaveDunSwitch(int i_no) { + return g_dComIfG_gameInfo.info.getDan().isSwitch(i_no); +} + inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no) { g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().onSwitch(i_no); } @@ -970,6 +981,10 @@ inline void dComIfGs_onSaveSwitch(int i_no) { g_dComIfG_gameInfo.info.getMemory().getBit().onSwitch(i_no); } +inline void dComIfGs_offSaveSwitch(int i_no) { + g_dComIfG_gameInfo.info.getMemory().getBit().offSwitch(i_no); +} + inline void dComIfGs_offSaveSwitch(int i_stageNo, int i_no) { g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().offSwitch(i_no); } @@ -1034,6 +1049,10 @@ inline BOOL dComIfGs_isTmpBit(u16 flag) { return g_dComIfG_gameInfo.info.getTmp().isEventBit(flag); } +inline void dComIfGs_onTmpBit(u16 flag) { + g_dComIfG_gameInfo.info.getTmp().onEventBit(flag); +} + inline BOOL dComIfGs_isTransformLV(int i_no) { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().isTransformLV(i_no); } @@ -1166,6 +1185,10 @@ inline void dComIfGs_onSaveDunSwitch(int flag) { g_dComIfG_gameInfo.info.getDan().onSwitch(flag); } +inline void dComIfGs_offSaveDunSwitch(int flag) { + g_dComIfG_gameInfo.info.getDan().offSwitch(flag); +} + inline u8 dComIfGs_getDataNum() { return g_dComIfG_gameInfo.info.getDataNum(); } @@ -1244,6 +1267,38 @@ inline void dComIfGs_initDan(s8 i_stageNo) { g_dComIfG_gameInfo.info.initDan(i_stageNo); } +inline u16 dComIfGs_getRupeeMax() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupeeMax(); +} + +inline void dComIfGs_onLightDropGetFlag(u8 level) { + g_dComIfG_gameInfo.info.getPlayer().getLightDrop().onLightDropGetFlag(level); +} + +inline void dComIfGs_setTmpReg(u16 reg, u8 flag) { + g_dComIfG_gameInfo.info.getTmp().setEventReg(reg, flag); +} + +inline u8 dComIfGs_getTmpReg(u16 reg) { + return g_dComIfG_gameInfo.info.getTmp().getEventReg(reg); +} + +inline void dComIfGs_setWarashibeItem(u8 itemNo) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setWarashibeItem(itemNo); +} + +inline void dComIfGs_setBottleItemIn(u8 curItem, u8 newItem) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setBottleItemIn(curItem, newItem); +} + +inline u8 dComIfGs_checkInsectBottle() { + return g_dComIfG_gameInfo.info.getPlayer().getItem().checkInsectBottle(); +} + +inline u8 dComIfGs_checkBombBag(u8 i_itemNo) { + return g_dComIfG_gameInfo.info.getPlayer().getItem().checkBombBag(i_itemNo); +} + void dComIfGp_setItemLifeCount(f32 amount, u8 type); void dComIfGp_setItemRupeeCount(long amount); void dComIfGp_setSelectItem(int index); @@ -1667,6 +1722,10 @@ inline void dComIfGp_setItemNowOil(s32 oil) { g_dComIfG_gameInfo.play.setItemNowOil(oil); } +inline void dComIfGp_setItemOilCount(s32 oil) { + g_dComIfG_gameInfo.play.setItemOilCount(oil); +} + inline bool dComIfGp_isDoSetFlag(u8 flag) { return g_dComIfG_gameInfo.play.isDoSetFlag(flag); } @@ -1739,6 +1798,10 @@ inline u8 dComIfGp_getItemLifeCountType() { return g_dComIfG_gameInfo.play.getItemLifeCountType(); } +inline int dComIfGp_getMessageCountNumber() { + return g_dComIfG_gameInfo.play.getMessageCountNumber(); +} + inline void dComIfGp_setCameraParamFileName(int i, char* name) { g_dComIfG_gameInfo.play.setCameraParamFileName(i, name); } diff --git a/include/d/com/d_com_static.h b/include/d/com/d_com_static.h index 62fa73bf14e..80bf69ee89e 100644 --- a/include/d/com/d_com_static.h +++ b/include/d/com/d_com_static.h @@ -4,6 +4,8 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" +int daNpcKakashi_getSwdTutorialStep(); + class daSus_c { public: class data_c { diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 8fef2d38f77..ae0e3dc679f 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -204,7 +204,7 @@ public: /* 0x04 */ f32 mSeaLevel; /* 0x08 */ f32 field_0x8; /* 0x0C */ f32 field_0xc; - /* 0x10 */ u8 field_0x10[9]; + /* 0x10 */ u8 field_0x10[10]; /* 0x1A */ u8 mDefaultCamera; /* 0x1C */ u16 mMsg; }; // Size: 0x20 @@ -827,7 +827,7 @@ static int dStage_fieldMapTresureInit(dStage_dt_c*, void*, int, void*); static int dStage_fieldMapFiliInfo2Init(dStage_dt_c*, void*, int, void*); static int dStage_fieldMapMapPathInit(dStage_dt_c*, void*, int, void*); -u8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class&, int); +s8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class&, int); int dStage_changeScene(int, f32, u32, s8, s16, int); void dStage_infoCreate(); u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer); diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 3615280b07e..58d9bdff40f 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -149,6 +149,9 @@ public: u8 getLifeGaugeSE() { return mLifeGaugeSE; } const char* getSaveStageName() { return mSaveStageName; } void onShopTalkFlag() { mShopTalkFlag = true; } + void setLightDropGetFlag(int index, u8 flag) { mLightDropGetFlag[index] = flag; } + u8 getRentalBombBag() { return mRentalBombBag; } + void setTableMapRegionNo(u8 regionNo) { mTableMapRegionNo = regionNo; } public: /* 0x04 */ u8 unk4[4]; @@ -435,6 +438,25 @@ inline void dMeter2Info_onShopTalkFlag() { g_meter2_info.onShopTalkFlag(); } +inline void dMeter2Info_setLightDropGetFlag(int index, u8 flag) { + g_meter2_info.setLightDropGetFlag(index, flag); +} + +inline u8 dMeter2Info_getRentalBombBag() { + return g_meter2_info.getRentalBombBag(); +} + +inline void dMeter2Info_resetMiniGameItem(bool param_0) { + g_meter2_info.resetMiniGameItem(param_0); +} + +inline void dMeter2Info_setTableMapRegionNo(u8 regionNo) { + g_meter2_info.setTableMapRegionNo(regionNo); +} + char* dMeter2Info_getNumberTextureName(int pIndex); +void dMeter2Info_recieveLetter(); +u8 dMeter2Info_getNewLetterNum(); +int dMeter2Info_setNewLetterSender(); #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 68a1fa3881a..9c76a8a165e 100644 --- a/include/d/msg/d_msg_class.h +++ b/include/d/msg/d_msg_class.h @@ -2,10 +2,23 @@ #define D_MSG_D_MSG_CLASS_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" class msg_class { public: - /* 0x0 */ u8 field_0x0[0x100]; -}; + /* 0x00 */ base_process_class field_0x0; + /* 0xB8 */ u8 field_0xb8[8]; + /* 0xC0 */ int field_0xc0; + /* 0xC4 */ create_tag_class field_0xc4; + /* 0xD8 */ leafdraw_method_class* field_0xd8; + /* 0xDC */ fopAc_ac_c* field_0xdc; + /* 0xE0 */ cXyz field_0xe0; + /* 0xEC */ u32 field_0xec; + /* 0xF0 */ u32 field_0xf0; + /* 0xF4 */ u32 field_0xf4; + /* 0xF8 */ u16 field_0xf8; + /* 0xFA */ u8 field_0xfa; + /* 0xFC */ int field_0xfc; +}; // Size: 0x100 #endif /* D_MSG_D_MSG_CLASS_H */ diff --git a/include/d/msg/d_msg_flow.h b/include/d/msg/d_msg_flow.h index 7682cafab4a..e518446ba28 100644 --- a/include/d/msg/d_msg_flow.h +++ b/include/d/msg/d_msg_flow.h @@ -3,162 +3,177 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" +#include "d/msg/d_msg_class.h" + +// all mesg_flow_node structs members might be wrong +struct mesg_flow_node { + /* 0x00 */ u8 type; + /* 0x01 */ u8 field_0x1; + /* 0x02 */ u16 msg_index; + /* 0x04 */ u8 params[4]; +}; // Size: 0x8 struct mesg_flow_node_branch { - /* 0x00 */ int field_0x0; - /* 0x04 */ u16 param; + /* 0x00 */ u8 type; + /* 0x01 */ u8 field_0x1; + /* 0x02 */ u16 msg_index; + /* 0x04 */ u16 params[2]; }; struct mesg_flow_node_event { - /* 0x00 */ int field_0x0; - /* 0x04 */ u8 param; -}; + /* 0x00 */ u8 type; + /* 0x01 */ u8 field_0x1; + /* 0x02 */ u16 msg_index; + /* 0x04 */ u8 params[4]; +}; // Size: 0x8 -struct mesg_flow_node {}; +class dMsgFlow_c; +typedef int (dMsgFlow_c::*queryFunc)(mesg_flow_node_branch*, fopAc_ac_c*, int); +typedef int (dMsgFlow_c::*eventFunc)(mesg_flow_node_event*, fopAc_ac_c*); class dMsgFlow_c { public: /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); + /* 80249F48 */ virtual ~dMsgFlow_c(); + /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); /* 8024A13C */ void checkOpenDoor(fopAc_ac_c*, int*); /* 8024A2D8 */ int doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A424 */ void checkEventRender(int*, int*, int*, int*); + /* 8024A424 */ int checkEventRender(int*, int*, int*, int*); /* 8024A4C4 */ void remove(); /* 8024A528 */ u16 getEventId(int*); - /* 8024A538 */ void getMsgNo(); - /* 8024A540 */ void getNowMsgNo(); - /* 8024A548 */ void getMsg(); + /* 8024A538 */ int getMsgNo(); + /* 8024A540 */ int getNowMsgNo(); + /* 8024A548 */ msg_class* getMsg(); /* 8024A580 */ void setInitValue(int); /* 8024A618 */ void setInitValueGroupChange(int, fopAc_ac_c**); - /* 8024A6EC */ void getMsgDataBlock(char const*); - /* 8024A784 */ void getInitNodeIndex(u16); + /* 8024A6EC */ u8* getMsgDataBlock(char const*); + /* 8024A784 */ u16 getInitNodeIndex(u16); /* 8024A7CC */ void setNodeIndex(u16, fopAc_ac_c**); /* 8024A95C */ void setSelectMsg(mesg_flow_node*, mesg_flow_node*, fopAc_ac_c*); /* 8024AA50 */ void setNormalMsg(mesg_flow_node*, fopAc_ac_c*); - /* 8024AB30 */ void messageNodeProc(fopAc_ac_c*, fopAc_ac_c**); - /* 8024AD54 */ void branchNodeProc(fopAc_ac_c*, fopAc_ac_c**); - /* 8024ADEC */ void eventNodeProc(fopAc_ac_c*, fopAc_ac_c**); - /* 8024AFF8 */ void nodeProc(fopAc_ac_c*, fopAc_ac_c**); + /* 8024AB30 */ int messageNodeProc(fopAc_ac_c*, fopAc_ac_c**); + /* 8024AD54 */ int branchNodeProc(fopAc_ac_c*, fopAc_ac_c**); + /* 8024ADEC */ int eventNodeProc(fopAc_ac_c*, fopAc_ac_c**); + /* 8024AFF8 */ int nodeProc(fopAc_ac_c*, fopAc_ac_c**); /* 8024B0F0 */ int getParam(u16*, u16*, u8*); - /* 8024B108 */ void getParam(u8*, u8*); + /* 8024B108 */ int getParam(u8*, u8*); /* 8024B130 */ int getParam(u8*); - /* 8024B138 */ void query001(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B180 */ void query002(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B208 */ void query003(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B250 */ void query004(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B2C0 */ u16 query005(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B2F8 */ void query006(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B32C */ void query007(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B45C */ void query008(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B4A4 */ void query009(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B4D0 */ void query010(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B504 */ void query011(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B54C */ void query012(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B584 */ void query013(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B5BC */ void query014(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B5F4 */ void query015(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B62C */ void query016(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B664 */ void query017(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B6A8 */ void query018(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B6EC */ void query019(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B730 */ void query020(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B774 */ void query021(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B8E4 */ void query022(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B918 */ void query023(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B954 */ void query024(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B974 */ void query025(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B9BC */ void query026(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B9E8 */ void query027(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BA4C */ void query028(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BAA0 */ void query029(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BAE0 */ void query030(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BB18 */ void query031(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BB74 */ void query032(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BB9C */ void query033(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BBE4 */ void query034(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BC14 */ void query035(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BC3C */ void query036(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BC80 */ void query037(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BCC4 */ void query038(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BDB0 */ void query039(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BE4C */ void query040(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BF50 */ void query041(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BFEC */ void query042(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C0A8 */ void query043(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C144 */ void query044(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C18C */ void query045(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C218 */ void query046(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C248 */ bool query047(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C250 */ void query048(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C2A0 */ void query049(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C2FC */ void query050(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C340 */ void query051(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C3A0 */ void query052(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C3D4 */ void query053(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B138 */ int query001(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B180 */ int query002(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B208 */ int query003(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B250 */ int query004(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B2C0 */ int query005(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B2F8 */ int query006(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B32C */ int query007(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B45C */ int query008(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B4A4 */ int query009(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B4D0 */ int query010(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B504 */ int query011(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B54C */ int query012(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B584 */ int query013(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B5BC */ int query014(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B5F4 */ int query015(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B62C */ int query016(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B664 */ int query017(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B6A8 */ int query018(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B6EC */ int query019(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B730 */ int query020(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B774 */ int query021(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B8E4 */ int query022(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B918 */ int query023(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B954 */ int query024(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B974 */ int query025(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B9BC */ int query026(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024B9E8 */ int query027(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BA4C */ int query028(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BAA0 */ int query029(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BAE0 */ int query030(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BB18 */ int query031(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BB74 */ int query032(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BB9C */ int query033(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BBE4 */ int query034(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BC14 */ int query035(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BC3C */ int query036(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BC80 */ int query037(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BCC4 */ int query038(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BDB0 */ int query039(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BE4C */ int query040(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BF50 */ int query041(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024BFEC */ int query042(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C0A8 */ int query043(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C144 */ int query044(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C18C */ int query045(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C218 */ int query046(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C248 */ int query047(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C250 */ int query048(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C2A0 */ int query049(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C2FC */ int query050(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C340 */ int query051(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C3A0 */ int query052(mesg_flow_node_branch*, fopAc_ac_c*, int); + /* 8024C3D4 */ int query053(mesg_flow_node_branch*, fopAc_ac_c*, int); /* 8024C3FC */ int event000(mesg_flow_node_event*, fopAc_ac_c*); /* 8024C488 */ int event001(mesg_flow_node_event*, fopAc_ac_c*); /* 8024C514 */ int event002(mesg_flow_node_event*, fopAc_ac_c*); /* 8024C550 */ int event003(mesg_flow_node_event*, fopAc_ac_c*); /* 8024C590 */ int event004(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C5F0 */ void event005(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C654 */ void event006(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C694 */ void event007(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C6D8 */ void event008(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C744 */ void event009(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C76C */ void event010(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C7F8 */ void event011(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C884 */ bool event012(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C88C */ void event013(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C8CC */ void event014(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C994 */ void event015(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CA5C */ void event016(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CA94 */ void event017(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CBB0 */ void event018(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CCA4 */ bool event019(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CCAC */ void event020(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CD84 */ void event021(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CDAC */ void event022(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CE40 */ void event023(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CF2C */ void event024(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CF54 */ void event025(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CF9C */ void event026(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D004 */ void event027(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D3C4 */ void event028(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D500 */ void event029(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D544 */ void event030(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D5BC */ void event031(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D5EC */ void event032(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D6BC */ void event033(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D788 */ void event034(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D7C8 */ void event035(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D870 */ void event036(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D8C4 */ void event037(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D918 */ void event038(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D93C */ void event039(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D970 */ void event040(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024DA78 */ void event041(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024DAA8 */ bool event042(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C5F0 */ int event005(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C654 */ int event006(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C694 */ int event007(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C6D8 */ int event008(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C744 */ int event009(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C76C */ int event010(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C7F8 */ int event011(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C884 */ int event012(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C88C */ int event013(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C8CC */ int event014(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024C994 */ int event015(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CA5C */ int event016(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CA94 */ int event017(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CBB0 */ int event018(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CCA4 */ int event019(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CCAC */ int event020(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CD84 */ int event021(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CDAC */ int event022(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CE40 */ int event023(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CF2C */ int event024(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CF54 */ int event025(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024CF9C */ int event026(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D004 */ int event027(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D3C4 */ int event028(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D500 */ int event029(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D544 */ int event030(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D5BC */ int event031(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D5EC */ int event032(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D6BC */ int event033(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D788 */ int event034(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D7C8 */ int event035(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D870 */ int event036(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D8C4 */ int event037(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D918 */ int event038(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D93C */ int event039(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024D970 */ int event040(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024DA78 */ int event041(mesg_flow_node_event*, fopAc_ac_c*); + /* 8024DAA8 */ int event042(mesg_flow_node_event*, fopAc_ac_c*); u8 isSelectMessage() { return mSelectMessage; } void onNonStopJunpFlowFlag() { mNonStopJunpFlowFlag = 1; } - u16 getSelectNum() { return query005(NULL, NULL, 0); } + int getSelectNum() { return query005(NULL, NULL, 0); } - static u8 mQueryList[636]; - static u8 mEventList[516]; + static queryFunc mQueryList[53]; + static eventFunc mEventList[43]; private: - /* 0x00 */ void* vtable; - /* 0x04 */ void* mFlow_p; - /* 0x08 */ void* mLabelInfo_p; - /* 0x0C */ void* mFlowNodeTBL; + /* 0x04 */ u8* mFlow_p; + /* 0x08 */ u8* mLabelInfo_p; + /* 0x0C */ mesg_flow_node* mFlowNodeTBL; /* 0x10 */ u16 field_0x10; /* 0x12 */ u16 field_0x12; - /* 0x14 */ fopAc_ac_c* field_0x14; + /* 0x14 */ u16* field_0x14; /* 0x18 */ int field_0x18; /* 0x1C */ u16 mFlow; /* 0x1E */ u8 field_0x1e[2]; - /* 0x20 */ int mMsg; + /* 0x20 */ u32 mMsg; /* 0x24 */ u8 mSelectMessage; /* 0x25 */ u8 field_0x25; /* 0x26 */ u8 field_0x26; @@ -169,14 +184,14 @@ private: /* 0x32 */ u16 mEventId; /* 0x34 */ int field_0x34; /* 0x38 */ u16 field_0x38; - /* 0x3A */ s16 mChoiceNo; + /* 0x3A */ u16 mChoiceNo; /* 0x3C */ int field_0x3c; /* 0x40 */ u8 field_0x40; /* 0x41 */ u8 field_0x41; - /* 0x42 */ s8 field_0x42; - /* 0x43 */ s8 field_0x43; - /* 0x44 */ s8 field_0x44; - /* 0x45 */ s8 field_0x45; + /* 0x42 */ u8 field_0x42; + /* 0x43 */ u8 field_0x43; + /* 0x44 */ u8 field_0x44; + /* 0x45 */ u8 field_0x45; /* 0x46 */ u8 field_0x46; /* 0x47 */ u8 field_0x47; /* 0x48 */ u8 mNonStopJunpFlowFlag; diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index df2380affc0..bef45d23744 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -4,6 +4,9 @@ #include "JSystem/J2DGraph/J2DTextbox.h" #include "d/com/d_com_inf_game.h" #include "d/msg/d_msg_class.h" +#include "JSystem/JMessage/control.h" +#include "JSystem/JMessage/resource.h" +#include "JSystem/JMessage/processor.h" #include "dolphin/types.h" class COutFont_c; @@ -50,7 +53,7 @@ public: /* 802370A8 */ void isGetItemMessage(); /* 802370BC */ void isKanbanMessage(); /* 802370E8 */ void isHowlMessage(); - /* 802370FC */ void isMidonaMessage(); + /* 802370FC */ bool isMidonaMessage(); /* 80237138 */ void isMidonaNormalTalkWait(); /* 802371B0 */ void isMidonaTalkWait(); /* 802371E4 */ void isPlaceMessage(); @@ -85,8 +88,8 @@ public: /* 80237934 */ void isCameraCancelFlag(); /* 80237950 */ void onCameraCancelFlag(); /* 80237968 */ void offCameraCancelFlag(); - /* 80237980 */ void isKillMessageFlag(); - /* 80237994 */ void onKillMessageFlag(); + /* 80237980 */ static bool isKillMessageFlag(); + /* 80237994 */ static void onKillMessageFlag(); /* 802379AC */ void setKillMessageFlag(); /* 802379D8 */ void setKillMessageFlagLocal(); /* 80237A74 */ void setTalkPartner(fopAc_ac_c*); @@ -105,13 +108,13 @@ public: /* 80237E68 */ void setSelectCursorPosLocal(u8); /* 80237F10 */ void setTalkActorLocal(fopAc_ac_c*); /* 8023800C */ static void readMessageGroup(mDoDvdThd_mountXArchive_c**); - /* 8023803C */ void changeFlowGroup(s32); + /* 8023803C */ static void changeFlowGroup(s32); /* 8023806C */ void demoMessageGroup(); /* 80238098 */ void endFlowGroup(); /* 802380C4 */ void changeGroup(s16); /* 802380F4 */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*, char*, char*, s16*); - /* 80238174 */ void getMsgDtPtr(); + /* 80238174 */ static u8* getMsgDtPtr(); /* 80238188 */ void setProcessID(unsigned int); /* 8023819C */ static fopAc_ac_c* getActor(); /* 802381C0 */ void getpTalkActor(); @@ -132,11 +135,11 @@ public: /* 802383E4 */ void getSmellTypeMessageID(); /* 80238410 */ void setSmellType(u8); /* 80238440 */ void getSelectCursorPos(); - /* 8023846C */ void setSelectCursorPos(u8); + /* 8023846C */ static void setSelectCursorPos(u8); /* 8023849C */ void setPortalMessageID(u16); /* 802384B0 */ void setInsectItemNo(u8); /* 802384C4 */ static void setLetterNameID(u16); - /* 802384D8 */ void setArrowNum(u8); + /* 802384D8 */ static void setArrowNum(u8); /* 802384EC */ void setMsgOutputType(u8); /* 80238500 */ void getMsgOutputType(); /* 80238514 */ void getWord(); @@ -144,25 +147,103 @@ public: /* 80238544 */ void setSelectWordFlag(u8); /* 80238574 */ void getSelectWordFlag(); /* 80238588 */ void isHowlHearingMode(); - /* 802385B4 */ void getSelectBombBagID(); - /* 802385E0 */ void getSelectBombPrice(); + /* 802385B4 */ static u8 getSelectBombBagID(); + /* 802385E0 */ static s16 getSelectBombPrice(); /* 8023860C */ void setEquipBombInfo(); /* 80238638 */ void getItemEquipButton(); - /* 8023864C */ void setSelectCancelPos(u8); + /* 8023864C */ static void setSelectCancelPos(u8); - void setShopWaitTimerLocal(u8 timer) { field_0x4c9 = timer; } + void setShopWaitTimerLocal(u8 timer) { mShopWaitTimer = timer; } u8 getSelectPushFlag() { return mSelectPushFlag; } u8 getSelectCancelPos() { return mSelectCancelPos; } - /* 0x100 */ fopAc_ac_c* field_0x100; - /* 0x104 */ u8 field_0x104[0x9D]; + /* 0x100 */ msg_class* field_0x100; + /* 0x104 */ int mpScrnDraw; + /* 0x108 */ dMsgString_c* mpMsgString; + /* 0x10C */ COutFont_c* mpOutFont; + /* 0x110 */ JMessage::TResourceContainer* mpResCont; + /* 0x114 */ JMessage::TControl* mpCtrl; + /* 0x118 */ jmessage_tReference* mpRefer; + /* 0x11C */ jmessage_tSequenceProcessor* mpSeqProc; + /* 0x120 */ jmessage_tRenderingProcessor* mpRenProc; + /* 0x124 */ JMessage::TParse* field_0x124; + /* 0x128 */ void* mpMsgRes; + /* 0x12C */ u8 field_0x12c[4]; + /* 0x130 */ void* mpMsgDt; + /* 0x134 */ u8 field_0x134[4]; + /* 0x138 */ fopAc_ac_c* mpTalkActor; + /* 0x13C */ int field_0x13c; + /* 0x140 */ fopAc_ac_c* mpTalkPartner; + /* 0x144 */ void* mpTalkHeap; + /* 0x148 */ int field_0x148; + /* 0x14C */ int mProcessID; + /* 0x150 */ f32 field_0x150; + /* 0x154 */ int mMessageID; + /* 0x158 */ int field_0x158; + /* 0x15C */ int field_0x15c; + /* 0x160 */ int mIdx; + /* 0x164 */ int mNodeIdx; + /* 0x168 */ u16 field_0x168; + /* 0x16A */ u8 field_0x16a[2]; + /* 0x16C */ u16 field_0x16c; + /* 0x16E */ u16 field_0x16e; + /* 0x170 */ u16 mNowTalkFlowNo; + /* 0x172 */ u16 field_0x172; + /* 0x174 */ u16 mInputValue; + /* 0x176 */ u16 mFundRaisingValue; + /* 0x178 */ u16 field_0x178; + /* 0x17A */ u16 mNowTotalPrice; + /* 0x17C */ u16 mNowTotalPayment; + /* 0x17E */ u16 field_0x17e; + /* 0x180 */ u16 mPortalMessageID; + /* 0x182 */ u16 mBombMessageID[3]; + /* 0x188 */ u16 mLetterNameID; + /* 0x18A */ u8 mBombNum[3]; + /* 0x18D */ u8 mBombBagID[3]; + /* 0x190 */ u8 mSelectBombBag[3]; + /* 0x193 */ u8 field_0x193; + /* 0x194 */ u8 mInsectItemNo; + /* 0x195 */ u8 mMsgSendControl; + /* 0x196 */ u8 field_0x196; + /* 0x197 */ u8 field_0x197; + /* 0x198 */ u8 field_0x198; + /* 0x199 */ u8 field_0x199; + /* 0x19A */ u8 mFukiKind; + /* 0x19B */ u8 field_0x19b; + /* 0x19C */ u8 mFlowChk; + /* 0x19D */ u8 field_0x19d; + /* 0x19E */ u8 mCameraCancelFlag; + /* 0x19F */ u8 mInputFlag; + /* 0x1A0 */ u8 mSmellType; /* 0x1A1 */ u8 mSelectCancelPos; /* 0x1A2 */ u8 mSelectPushFlag; - /* 0x1A3 */ u8 field_0x1a3[0x326]; - /* 0x4C9 */ u8 field_0x4c9; + /* 0x1A3 */ u8 field_0x1a3; + /* 0x1A4 */ u8 mItemEquipButton; + /* 0x1A5 */ u8 mArrowNum; + /* 0x1A6 */ char mWord[200]; + /* 0x26E */ char mSelectWord[3][200]; + /* 0x4C6 */ u8 mSelectWordFlag; + /* 0x4C7 */ u8 field_0x4c7; + /* 0x4C8 */ u8 mMsgOutputType; + /* 0x4C9 */ u8 mShopWaitTimer; + /* 0x4CA */ u8 field_0x4ca; + /* 0x4CB */ u8 mNoDemoFlag; + /* 0x4CC */ u8 field_0x4cc; + /* 0x4CD */ u8 field_0x4cd; + /* 0x4CE */ u8 field_0x4ce; + /* 0x4CF */ u8 mAutoMessageFlag; + /* 0x4D0 */ u8 mPaymentFlag; + /* 0x4D1 */ u8 field_0x4d1; + /* 0x4D2 */ u8 mKillMessageFlag; + /* 0x4D3 */ u8 mEquipBombInfo; + /* 0x4D4 */ u8 field_0x4d4; }; s16 dMsgObject_getGroupID(); +void dMsgObject_setFundRaising(u16 param_0); +u16 dMsgObject_getFundRaising(); +void dMsgObject_addOffering(s16 param_0); +u16 dMsgObject_getOffering(); inline dMsgObject_c* dMsgObject_getMsgObjectClass() { return dComIfGp_getMsgObjectClass(); @@ -172,6 +253,10 @@ inline bool dMsgObject_isTalkNowCheck() { return dMsgObject_getMsgObjectClass()->getStatus() != 1 ? true : false; } +inline bool dMsgObject_isKillMessageFlag() { + return dMsgObject_c::isKillMessageFlag(); +} + inline u32 dMsgObject_getMessageID() { return dMsgObject_c::getMessageID(); } @@ -184,4 +269,8 @@ inline void dMsgObject_setShopWaitTimer(u8 timer) { dMsgObject_c::setShopWaitTimer(timer); } +inline void dMsgObject_changeFlowGroup(long flow) { + dMsgObject_c::changeFlowGroup(flow); +} + #endif /* D_MSG_D_MSG_OBJECT_H */ diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 5cfe163cf4a..5079ab86ccd 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -385,9 +385,9 @@ public: u16 getMaxLife() { return mMaxLife; } u16 getLife() { return mLife; } - u16& getRupee() { return mRupee; } + u16 getRupee() { return mRupee; } u16 getOil() { return mOil; } - u16 getMaxOil() { return mMaxOil; } + u16 getMaxOil() const { return mMaxOil; } u8& getMagic() { return mMagic; } u8& getMaxMagic() { return mMaxMagic; } u8 getSelectEquip(int item) const { return mSelectEquip[item]; } diff --git a/include/d/shop/d_shop_system.h b/include/d/shop/d_shop_system.h index 7408358232a..41ebb33d550 100644 --- a/include/d/shop/d_shop_system.h +++ b/include/d/shop/d_shop_system.h @@ -133,6 +133,7 @@ public: bool chkSpMode() { return mSpMode == 1; } void offSpMode() { mSpMode = 0; } u8 getEventParamU8(int param_0) { return (mEventParam >> (3 - param_0) * 8) & 0xFF; } + void setEventParam(u32 param) { mEventParam = param; } private: /* 0xE40 */ STControl* mpStick; diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index d5d50f90746..6818b77d6b3 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -3,6 +3,7 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" +#include "d/msg/d_msg_class.h" typedef int (*fopMsgCreateFunc)(void*); @@ -12,5 +13,6 @@ void fopMsgM_setMessageID(unsigned int); void fopMsgM_destroyExpHeap(JKRExpHeap*); void fopMsgM_setStageLayer(void*); void fopMsgM_messageSetDemo(u32 param_0); +msg_class* fopMsgM_SearchByID(unsigned int param_0); #endif \ No newline at end of file diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index fee6b49fb34..8416fc3703f 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -64,6 +64,10 @@ inline void mDoAud_seStart(u32 sfx_id, const Vec* param_1, u32 param_2, s8 param -1.0f, 0); } +inline void mDoAud_messageSePlay(u16 param_0, Vec* position, s8 param_2) { + Z2AudioMgr::getInterface()->mSeMgr.messageSePlay(param_0, position, param_2); +} + inline void mDoAud_sceneBgmStart() { Z2AudioMgr::getInterface()->mSceneMgr.sceneBgmStart(); } diff --git a/libs/JSystem/JMessage/control.cpp b/libs/JSystem/JMessage/control.cpp index eff3b98a2b9..c632e78327a 100644 --- a/libs/JSystem/JMessage/control.cpp +++ b/libs/JSystem/JMessage/control.cpp @@ -4,41 +4,10 @@ // #include "JSystem/JMessage/control.h" +#include "JSystem/JMessage/processor.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JMessage { - struct TProcessor { - /* 802A7B90 */ void reset(); - /* 802A7C54 */ void getResource_groupID(u16) const; - /* 802A7CD4 */ void toMessageCode_messageID(u32, u32, bool*) const; - /* 802A828C */ void process_onCharacterEnd_normal_(JMessage::TProcessor*); - }; - - struct TControl { - /* 802A7548 */ TControl(); - /* 802A758C */ ~TControl(); - /* 802A75D4 */ void reset(); - /* 802A7634 */ void update(); - /* 802A76BC */ void render(); - /* 802A77E8 */ void setMessageCode(u16, u16); - /* 802A78F4 */ void setMessageID(u32, u32, bool*); - /* 802A7A20 */ void setMessageCode_inSequence_(JMessage::TProcessor const*, u16, u16); - }; - - struct TSequenceProcessor { - /* 802A8418 */ void process(char const*); - }; - - struct TRenderingProcessor { - /* 802A8B20 */ void process(char const*); - }; -}; - // // Forward References: // diff --git a/libs/JSystem/JMessage/data.cpp b/libs/JSystem/JMessage/data.cpp index be0c56c8fe2..1290c285c2e 100644 --- a/libs/JSystem/JMessage/data.cpp +++ b/libs/JSystem/JMessage/data.cpp @@ -7,16 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JMessage { - struct data { - static f32 ga4cSignature[1 + 1 /* padding */]; - }; -}; - // // Forward References: // diff --git a/libs/JSystem/JMessage/locale.cpp b/libs/JSystem/JMessage/locale.cpp index 9fa2ac8380a..131518b91f8 100644 --- a/libs/JSystem/JMessage/locale.cpp +++ b/libs/JSystem/JMessage/locale.cpp @@ -7,17 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JMessage { - struct locale { - /* 802A9528 */ void parseCharacter_ShiftJIS(char const**); - /* 802A958C */ void parseCharacter_UTF8(char const**); - }; -}; - // // Forward References: // diff --git a/libs/JSystem/JMessage/processor.cpp b/libs/JSystem/JMessage/processor.cpp index 2d3615db088..029f9585aa4 100644 --- a/libs/JSystem/JMessage/processor.cpp +++ b/libs/JSystem/JMessage/processor.cpp @@ -4,109 +4,11 @@ // #include "JSystem/JMessage/processor.h" +#include "JSystem/JMessage/control.h" +#include "JSystem/JMessage/resource.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JMessage { - struct TReference { - /* 802A7AF8 */ ~TReference(); - /* 802A7B40 */ bool do_word(u32) const; - }; - - struct TProcessor { - /* 802A7B48 */ ~TProcessor(); - /* 802A7B90 */ void reset(); - /* 802A7BF8 */ void stack_pushCurrent(char const*); - /* 802A7C30 */ void stack_popCurrent(); - /* 802A7C54 */ void getResource_groupID(u16) const; - /* 802A7CD4 */ void toMessageCode_messageID(u32, u32, bool*) const; - /* 802A7E38 */ void on_select_begin(char const* (*)(JMessage::TProcessor*), void const*, - char const*, u32); - /* 802A7EDC */ void on_select_end(); - /* 802A7F34 */ void on_select_separate(); - /* 802A7FC0 */ void do_reset(); - /* 802A7FC4 */ void do_begin(void const*, char const*); - /* 802A7FC8 */ void do_end(); - /* 802A7FCC */ void do_character(int); - /* 802A7FD0 */ bool do_tag(u32, void const*, u32); - /* 802A7FD8 */ void do_select_begin(u32); - /* 802A7FDC */ void do_select_end(); - /* 802A7FE0 */ void do_select_separate(); - /* 802A7FE4 */ void on_tag_(); - /* 802A8084 */ void do_resetStatus_(char const*); - /* 802A8088 */ bool do_setBegin_isReady_() const; - /* 802A8090 */ void do_tag_(u32, void const*, u32); - /* 802A81EC */ void process_character_(); - /* 802A828C */ void process_onCharacterEnd_normal_(JMessage::TProcessor*); - /* 802A82F4 */ void process_onCharacterEnd_select_(JMessage::TProcessor*); - /* 802A833C */ void process_onSelect_limited_(JMessage::TProcessor*); - /* 802A8358 */ void process_onSelect_(JMessage::TProcessor*); - /* 802A8C24 */ void on_message(u32) const; - /* 802A8C44 */ void getMessageText_messageCode(u32) const; - }; - - struct TControl { - /* 802A7A20 */ void setMessageCode_inSequence_(JMessage::TProcessor const*, u16, u16); - }; - - struct TSequenceProcessor { - /* 802A8374 */ TSequenceProcessor(JMessage::TReference const*, JMessage::TControl*); - /* 802A83B8 */ ~TSequenceProcessor(); - /* 802A8418 */ void process(char const*); - /* 802A85A4 */ void on_isReady(); - /* 802A85D0 */ void on_jump_register(void const* (*)(JMessage::TSequenceProcessor const*), - u32); - /* 802A85E4 */ void on_jump_isReady(); - /* 802A8610 */ void on_jump(void const*, char const*); - /* 802A8690 */ void on_branch_register(void const* (*)(JMessage::TSequenceProcessor const*, - u32), - void const*, u32); - /* 802A86A0 */ void on_branch_query(u32); - /* 802A86D4 */ void on_branch_queryResult(); - /* 802A8700 */ void on_branch(void const*, char const*); - /* 802A8780 */ bool do_isReady(); - /* 802A8788 */ bool do_jump_isReady(); - /* 802A8790 */ void do_jump(void const*, char const*); - /* 802A8794 */ void do_branch_query(u32); - /* 802A8798 */ s32 do_branch_queryResult(); - /* 802A87A0 */ void do_branch(void const*, char const*); - /* 802A87A4 */ void do_resetStatus_(char const*); - /* 802A87C0 */ void do_setBegin_isReady_() const; - /* 802A87D0 */ void do_begin_(void const*, char const*); - /* 802A87D4 */ void do_end_(); - /* 802A87E0 */ void do_tag_(u32, void const*, u32); - /* 802A892C */ void process_setMessageIndex_reserved_(u16); - /* 802A8944 */ void process_setMessageCode_(JMessage::TSequenceProcessor const*, u16, u16); - /* 802A89B8 */ void process_onJump_limited_(JMessage::TSequenceProcessor const*); - /* 802A89EC */ void process_onJump_(JMessage::TSequenceProcessor const*); - /* 802A8A18 */ void process_onBranch_limited_(JMessage::TSequenceProcessor const*, u32); - /* 802A8A50 */ void process_onBranch_(JMessage::TSequenceProcessor const*, u32); - }; - - struct TRenderingProcessor { - /* 802A8A84 */ TRenderingProcessor(JMessage::TReference const*); - /* 802A8AC0 */ ~TRenderingProcessor(); - /* 802A8B20 */ void process(char const*); - /* 802A8BA4 */ void do_begin_(void const*, char const*); - /* 802A8BA8 */ void do_end_(); - /* 802A8BAC */ void do_tag_(u32, void const*, u32); - }; - - struct TResource { - /* 802A8CDC */ void toMessageIndex_messageID(u32, u32, bool*) const; - }; - - struct TResourceContainer { - struct TCResource { - /* 802A8F6C */ void Get_groupID(u16); - }; - }; -}; - // // Forward References: // diff --git a/libs/JSystem/JMessage/resource.cpp b/libs/JSystem/JMessage/resource.cpp index 375362ff306..7a485f0a503 100644 --- a/libs/JSystem/JMessage/resource.cpp +++ b/libs/JSystem/JMessage/resource.cpp @@ -4,6 +4,8 @@ // #include "JSystem/JMessage/resource.h" +#include "JSystem/JMessage/locale.h" +#include "JSystem/JMessage/data.h" #include "JSystem/JGadget/binary.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -19,46 +21,6 @@ void lower_bound(/* ... */); void func_802A94D4(void* _this, u32 const*, u32 const*, u32 const&); }; // namespace std -struct JMessage { - struct TResource { - /* 802A8CDC */ void toMessageIndex_messageID(u32, u32, bool*) const; - }; - - struct TResourceContainer { - struct TCResource { - /* 802A8EC0 */ TCResource(); - /* 802A8EF8 */ ~TCResource(); - /* 802A8F6C */ void Get_groupID(u16); - /* 802A8FFC */ void Do_create(); - /* 802A9048 */ void Do_destroy(JMessage::TResource*); - }; - - /* 802A906C */ TResourceContainer(); - /* 802A90B8 */ void setEncoding(u8); - /* 802A90F0 */ void setEncoding_(u8); - - static void* sapfnParseCharacter_[5]; - }; - - struct TParse { - /* 802A9130 */ TParse(JMessage::TResourceContainer*); - /* 802A9158 */ ~TParse(); - /* 802A91B8 */ void parseHeader_next(void const**, u32*, u32); - /* 802A92F4 */ void parseBlock_next(void const**, u32*, u32); - }; - - struct locale { - /* 802A9490 */ void parseCharacter_1Byte(char const**); - /* 802A94A8 */ void parseCharacter_2Byte(char const**); - /* 802A9528 */ void parseCharacter_ShiftJIS(char const**); - /* 802A958C */ void parseCharacter_UTF8(char const**); - }; - - struct data { - static f32 ga4cSignature[1 + 1 /* padding */]; - }; -}; - // // Forward References: // diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index f2a6a563acf..1625dd21409 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -19464,8 +19464,8 @@ BOOL daAlink_c::checkCutTurnCharge() const { } /* 800D0208-800D0228 0CAB48 0020+00 1/0 0/0 0/0 .text checkAcceptDungeonWarpAlink__9daAlink_cFi */ -void daAlink_c::checkAcceptDungeonWarpAlink(int param_0) { - checkAcceptWarp(); +bool daAlink_c::checkAcceptDungeonWarpAlink(int param_0) { + return checkAcceptWarp(); } /* 800D0228-800D0274 0CAB68 004C+00 1/0 0/0 0/0 .text getSpinnerActor__9daAlink_cFv */ @@ -30958,7 +30958,7 @@ static asm void daAlink_searchPortal(fopAc_ac_c* param_0, void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkAcceptWarp() { +asm bool daAlink_c::checkAcceptWarp() { nofralloc #include "asm/d/a/d_a_alink/checkAcceptWarp__9daAlink_cFv.s" } diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 9a783342b56..a559d27c229 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -1412,7 +1412,7 @@ int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resNa return 1; } -u8 dComIfGp_getReverb(int roomNo) { +s8 dComIfGp_getReverb(int roomNo) { return dStage_roomRead_dt_c_GetReverbStage(*dComIfGp_getStageRoom(), roomNo); } diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp index 2a29c0b36c7..6c93bfcb78d 100644 --- a/src/d/com/d_com_static.cpp +++ b/src/d/com/d_com_static.cpp @@ -449,7 +449,7 @@ asm void daNpcKakashi_setSwdTutorialStep(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcKakashi_getSwdTutorialStep() { +asm int daNpcKakashi_getSwdTutorialStep() { nofralloc #include "asm/d/com/d_com_static/daNpcKakashi_getSwdTutorialStep__Fv.s" } diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index cdcd6314fe8..51d18a23b72 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -2476,7 +2476,7 @@ static asm int dStage_roomReadInit(dStage_dt_c* param_0, void* param_1, int para /* 80025E40-80025E70 020780 0030+00 0/0 1/1 0/0 .text * dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi */ -u8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class& room, int index) { +s8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class& room, int index) { if (index < 0 || index >= room.field_0x0) { index = 0; } diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp index 2b4848736cc..2cd09a7966d 100644 --- a/src/d/meter/d_meter2_info.cpp +++ b/src/d/meter/d_meter2_info.cpp @@ -1418,7 +1418,7 @@ int dMeter2Info_setNewLetterSender() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMeter2Info_setNewLetterSender() { +asm int dMeter2Info_setNewLetterSender() { nofralloc #include "asm/d/meter/d_meter2_info/dMeter2Info_setNewLetterSender__Fv.s" } diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index b13f1100c0e..fa67684d0c3 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -15,12 +15,6 @@ struct mDoCPd_c { static u8 m_cpadInfo[256]; }; -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - struct jmessage_tControl { /* 802299EC */ jmessage_tControl(); }; @@ -549,7 +543,6 @@ extern "C" void __dl__FPv(); extern "C" void getBounds__7J2DPaneFv(); extern "C" void getParentPane__7J2DPaneFv(); extern "C" void getStringPtr__10J2DTextBoxCFv(); -extern "C" void PSVECSquareMag(); extern "C" void _savefpr_27(); extern "C" void _restfpr_27(); extern "C" void _savegpr_24(); diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 6ce3e03a51f..fca73dc7103 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -7,23 +7,13 @@ #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct dShopSystem_c { - /* 801975F8 */ void isFlag(int); - /* 8019A354 */ void setSoldOutFlag(); -}; - -struct Z2SeMgr { - /* 802ADB14 */ void messageSePlay(u16, Vec*, s8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; +#include "f_op/f_op_msg_mng.h" +#include "d/msg/d_msg_object.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_static.h" +#include "d/shop/d_shop_system.h" +#include "d/d_item.h" +#include "m_Do/m_Do_audio.h" // // Forward References: @@ -266,7 +256,7 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_env_light[4880]; +extern "C" extern dScnKy_env_light_c g_env_light; extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" extern u32 g_saftyWhiteColor; extern "C" u8 m_midnaActor__9daPy_py_c[4]; @@ -276,7 +266,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // -inline void dComIfGp_setItemRupeeCount(int amount) { +inline void dComIfGp_setItemRupeeCount(s32 amount) { g_dComIfG_gameInfo.play.setItemRupeeCount(amount); } @@ -369,1045 +359,108 @@ SECTION_DATA static void* lit_4936[19] = { (void*)(((char*)messageNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c) + 0x1BC), }; -/* 803C15D0-803C15DC -00001 000C+00 0/1 0/0 0/0 .data @5023 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5023[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C15DC-803C15E8 -00001 000C+00 0/1 0/0 0/0 .data @5024 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5024[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C15E8-803C15F4 -00001 000C+00 0/1 0/0 0/0 .data @5025 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5025[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query002__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C15F4-803C1600 -00001 000C+00 0/1 0/0 0/0 .data @5026 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5026[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query003__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1600-803C160C -00001 000C+00 0/1 0/0 0/0 .data @5027 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5027[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query006__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C160C-803C1618 -00001 000C+00 0/1 0/0 0/0 .data @5028 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5028[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query007__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1618-803C1624 -00001 000C+00 0/1 0/0 0/0 .data @5029 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5029[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1624-803C1630 -00001 000C+00 0/1 0/0 0/0 .data @5030 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5030[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query008__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1630-803C163C -00001 000C+00 0/1 0/0 0/0 .data @5031 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5031[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query009__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C163C-803C1648 -00001 000C+00 0/1 0/0 0/0 .data @5032 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5032[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query010__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1648-803C1654 -00001 000C+00 0/1 0/0 0/0 .data @5033 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5033[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query011__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1654-803C1660 -00001 000C+00 0/1 0/0 0/0 .data @5034 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5034[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query012__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1660-803C166C -00001 000C+00 0/1 0/0 0/0 .data @5035 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5035[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query013__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C166C-803C1678 -00001 000C+00 0/1 0/0 0/0 .data @5036 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5036[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query014__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1678-803C1684 -00001 000C+00 0/1 0/0 0/0 .data @5037 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5037[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query015__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1684-803C1690 -00001 000C+00 0/1 0/0 0/0 .data @5038 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5038[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query016__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1690-803C169C -00001 000C+00 0/1 0/0 0/0 .data @5039 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5039[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query017__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C169C-803C16A8 -00001 000C+00 0/1 0/0 0/0 .data @5040 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5040[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query018__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C16A8-803C16B4 -00001 000C+00 0/1 0/0 0/0 .data @5041 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5041[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query019__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C16B4-803C16C0 -00001 000C+00 0/1 0/0 0/0 .data @5042 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5042[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query020__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C16C0-803C16CC -00001 000C+00 0/1 0/0 0/0 .data @5043 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5043[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query021__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C16CC-803C16D8 -00001 000C+00 0/1 0/0 0/0 .data @5044 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5044[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query022__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C16D8-803C16E4 -00001 000C+00 0/1 0/0 0/0 .data @5045 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5045[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C16E4-803C16F0 -00001 000C+00 0/1 0/0 0/0 .data @5046 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5046[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query024__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C16F0-803C16FC -00001 000C+00 0/1 0/0 0/0 .data @5047 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5047[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query025__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C16FC-803C1708 -00001 000C+00 0/1 0/0 0/0 .data @5048 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5048[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query026__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1708-803C1714 -00001 000C+00 0/1 0/0 0/0 .data @5049 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5049[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query027__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1714-803C1720 -00001 000C+00 0/1 0/0 0/0 .data @5050 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5050[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query028__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1720-803C172C -00001 000C+00 0/1 0/0 0/0 .data @5051 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5051[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query029__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C172C-803C1738 -00001 000C+00 0/1 0/0 0/0 .data @5052 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5052[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query030__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1738-803C1744 -00001 000C+00 0/1 0/0 0/0 .data @5053 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5053[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query031__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1744-803C1750 -00001 000C+00 0/1 0/0 0/0 .data @5054 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5054[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query032__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1750-803C175C -00001 000C+00 0/1 0/0 0/0 .data @5055 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5055[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query033__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C175C-803C1768 -00001 000C+00 0/1 0/0 0/0 .data @5056 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5056[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query034__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1768-803C1774 -00001 000C+00 0/1 0/0 0/0 .data @5057 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5057[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query035__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1774-803C1780 -00001 000C+00 0/1 0/0 0/0 .data @5058 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5058[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query036__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1780-803C178C -00001 000C+00 0/1 0/0 0/0 .data @5059 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5059[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query037__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C178C-803C1798 -00001 000C+00 0/1 0/0 0/0 .data @5060 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5060[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query038__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1798-803C17A4 -00001 000C+00 0/1 0/0 0/0 .data @5061 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5061[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C17A4-803C17B0 -00001 000C+00 0/1 0/0 0/0 .data @5062 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5062[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C17B0-803C17BC -00001 000C+00 0/1 0/0 0/0 .data @5063 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5063[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C17BC-803C17C8 -00001 000C+00 0/1 0/0 0/0 .data @5064 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5064[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C17C8-803C17D4 -00001 000C+00 0/1 0/0 0/0 .data @5065 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5065[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query043__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C17D4-803C17E0 -00001 000C+00 0/1 0/0 0/0 .data @5066 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5066[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query044__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C17E0-803C17EC -00001 000C+00 0/1 0/0 0/0 .data @5067 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5067[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C17EC-803C17F8 -00001 000C+00 0/1 0/0 0/0 .data @5068 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5068[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query046__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C17F8-803C1804 -00001 000C+00 0/1 0/0 0/0 .data @5069 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5069[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query047__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1804-803C1810 -00001 000C+00 0/1 0/0 0/0 .data @5070 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5070[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query048__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1810-803C181C -00001 000C+00 0/1 0/0 0/0 .data @5071 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5071[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C181C-803C1828 -00001 000C+00 0/1 0/0 0/0 .data @5072 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5072[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query050__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1828-803C1834 -00001 000C+00 0/1 0/0 0/0 .data @5073 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5073[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query051__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1834-803C1840 -00001 000C+00 0/1 0/0 0/0 .data @5074 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5074[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query052__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - -/* 803C1840-803C184C -00001 000C+00 0/1 0/0 0/0 .data @5075 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5075[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)query053__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci, -}; -#pragma pop - /* 803C184C-803C1AC8 01E96C 027C+00 2/3 0/0 0/0 .data mQueryList__10dMsgFlow_c */ -SECTION_DATA u8 dMsgFlow_c::mQueryList[636] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +SECTION_DATA queryFunc dMsgFlow_c::mQueryList[53] = { + &dMsgFlow_c::query005, + &dMsgFlow_c::query001, + &dMsgFlow_c::query002, + &dMsgFlow_c::query003, + &dMsgFlow_c::query006, + &dMsgFlow_c::query007, + &dMsgFlow_c::query004, + &dMsgFlow_c::query008, + &dMsgFlow_c::query009, + &dMsgFlow_c::query010, + &dMsgFlow_c::query011, + &dMsgFlow_c::query012, + &dMsgFlow_c::query013, + &dMsgFlow_c::query014, + &dMsgFlow_c::query015, + &dMsgFlow_c::query016, + &dMsgFlow_c::query017, + &dMsgFlow_c::query018, + &dMsgFlow_c::query019, + &dMsgFlow_c::query020, + &dMsgFlow_c::query021, + &dMsgFlow_c::query022, + &dMsgFlow_c::query023, + &dMsgFlow_c::query024, + &dMsgFlow_c::query025, + &dMsgFlow_c::query026, + &dMsgFlow_c::query027, + &dMsgFlow_c::query028, + &dMsgFlow_c::query029, + &dMsgFlow_c::query030, + &dMsgFlow_c::query031, + &dMsgFlow_c::query032, + &dMsgFlow_c::query033, + &dMsgFlow_c::query034, + &dMsgFlow_c::query035, + &dMsgFlow_c::query036, + &dMsgFlow_c::query037, + &dMsgFlow_c::query038, + &dMsgFlow_c::query039, + &dMsgFlow_c::query040, + &dMsgFlow_c::query041, + &dMsgFlow_c::query042, + &dMsgFlow_c::query043, + &dMsgFlow_c::query044, + &dMsgFlow_c::query045, + &dMsgFlow_c::query046, + &dMsgFlow_c::query047, + &dMsgFlow_c::query048, + &dMsgFlow_c::query049, + &dMsgFlow_c::query050, + &dMsgFlow_c::query051, + &dMsgFlow_c::query052, + &dMsgFlow_c::query053, }; -/* 803C1AC8-803C1AD4 -00001 000C+00 0/1 0/0 0/0 .data @5944 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5944[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event000__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1AD4-803C1AE0 -00001 000C+00 0/1 0/0 0/0 .data @5945 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5945[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event001__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1AE0-803C1AEC -00001 000C+00 0/1 0/0 0/0 .data @5946 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5946[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event002__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1AEC-803C1AF8 -00001 000C+00 0/1 0/0 0/0 .data @5947 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5947[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event003__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1AF8-803C1B04 -00001 000C+00 0/1 0/0 0/0 .data @5948 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5948[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event004__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B04-803C1B10 -00001 000C+00 0/1 0/0 0/0 .data @5949 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5949[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event005__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B10-803C1B1C -00001 000C+00 0/1 0/0 0/0 .data @5950 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5950[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event006__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B1C-803C1B28 -00001 000C+00 0/1 0/0 0/0 .data @5951 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5951[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event007__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B28-803C1B34 -00001 000C+00 0/1 0/0 0/0 .data @5952 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5952[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event008__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B34-803C1B40 -00001 000C+00 0/1 0/0 0/0 .data @5953 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5953[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event009__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B40-803C1B4C -00001 000C+00 0/1 0/0 0/0 .data @5954 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5954[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event010__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B4C-803C1B58 -00001 000C+00 0/1 0/0 0/0 .data @5955 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5955[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event011__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B58-803C1B64 -00001 000C+00 0/1 0/0 0/0 .data @5956 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5956[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event012__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B64-803C1B70 -00001 000C+00 0/1 0/0 0/0 .data @5957 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5957[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event013__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B70-803C1B7C -00001 000C+00 0/1 0/0 0/0 .data @5958 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5958[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event014__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B7C-803C1B88 -00001 000C+00 0/1 0/0 0/0 .data @5959 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5959[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event015__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B88-803C1B94 -00001 000C+00 0/1 0/0 0/0 .data @5960 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5960[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event016__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1B94-803C1BA0 -00001 000C+00 0/1 0/0 0/0 .data @5961 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5961[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event017__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1BA0-803C1BAC -00001 000C+00 0/1 0/0 0/0 .data @5962 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5962[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event018__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1BAC-803C1BB8 -00001 000C+00 0/1 0/0 0/0 .data @5963 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5963[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event019__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1BB8-803C1BC4 -00001 000C+00 0/1 0/0 0/0 .data @5964 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5964[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event020__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1BC4-803C1BD0 -00001 000C+00 0/1 0/0 0/0 .data @5965 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5965[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1BD0-803C1BDC -00001 000C+00 0/1 0/0 0/0 .data @5966 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5966[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event022__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1BDC-803C1BE8 -00001 000C+00 0/1 0/0 0/0 .data @5967 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5967[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event023__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1BE8-803C1BF4 -00001 000C+00 0/1 0/0 0/0 .data @5968 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5968[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event024__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1BF4-803C1C00 -00001 000C+00 0/1 0/0 0/0 .data @5969 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5969[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event025__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C00-803C1C0C -00001 000C+00 0/1 0/0 0/0 .data @5970 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5970[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event026__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C0C-803C1C18 -00001 000C+00 0/1 0/0 0/0 .data @5971 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5971[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event027__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C18-803C1C24 -00001 000C+00 0/1 0/0 0/0 .data @5972 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5972[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event028__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C24-803C1C30 -00001 000C+00 0/1 0/0 0/0 .data @5973 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5973[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event029__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C30-803C1C3C -00001 000C+00 0/1 0/0 0/0 .data @5974 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5974[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event030__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C3C-803C1C48 -00001 000C+00 0/1 0/0 0/0 .data @5975 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5975[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event031__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C48-803C1C54 -00001 000C+00 0/1 0/0 0/0 .data @5976 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5976[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event032__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C54-803C1C60 -00001 000C+00 0/1 0/0 0/0 .data @5977 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5977[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event033__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C60-803C1C6C -00001 000C+00 0/1 0/0 0/0 .data @5978 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5978[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event034__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C6C-803C1C78 -00001 000C+00 0/1 0/0 0/0 .data @5979 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5979[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event035__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C78-803C1C84 -00001 000C+00 0/1 0/0 0/0 .data @5980 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5980[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event036__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C84-803C1C90 -00001 000C+00 0/1 0/0 0/0 .data @5981 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5981[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event037__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C90-803C1C9C -00001 000C+00 0/1 0/0 0/0 .data @5982 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5982[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event038__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1C9C-803C1CA8 -00001 000C+00 0/1 0/0 0/0 .data @5983 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5983[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1CA8-803C1CB4 -00001 000C+00 0/1 0/0 0/0 .data @5984 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5984[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event040__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1CB4-803C1CC0 -00001 000C+00 0/1 0/0 0/0 .data @5985 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5985[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - -/* 803C1CC0-803C1CCC -00001 000C+00 0/1 0/0 0/0 .data @5986 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5986[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)event042__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c, -}; -#pragma pop - /* 803C1CCC-803C1ED0 01EDEC 0204+00 1/2 0/0 0/0 .data mEventList__10dMsgFlow_c */ -SECTION_DATA u8 dMsgFlow_c::mEventList[516] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, +SECTION_DATA eventFunc dMsgFlow_c::mEventList[43] = { + &dMsgFlow_c::event000, + &dMsgFlow_c::event001, + &dMsgFlow_c::event002, + &dMsgFlow_c::event003, + &dMsgFlow_c::event004, + &dMsgFlow_c::event005, + &dMsgFlow_c::event006, + &dMsgFlow_c::event007, + &dMsgFlow_c::event008, + &dMsgFlow_c::event009, + &dMsgFlow_c::event010, + &dMsgFlow_c::event011, + &dMsgFlow_c::event012, + &dMsgFlow_c::event013, + &dMsgFlow_c::event014, + &dMsgFlow_c::event015, + &dMsgFlow_c::event016, + &dMsgFlow_c::event017, + &dMsgFlow_c::event018, + &dMsgFlow_c::event019, + &dMsgFlow_c::event020, + &dMsgFlow_c::event021, + &dMsgFlow_c::event022, + &dMsgFlow_c::event023, + &dMsgFlow_c::event024, + &dMsgFlow_c::event025, + &dMsgFlow_c::event026, + &dMsgFlow_c::event027, + &dMsgFlow_c::event028, + &dMsgFlow_c::event029, + &dMsgFlow_c::event030, + &dMsgFlow_c::event031, + &dMsgFlow_c::event032, + &dMsgFlow_c::event033, + &dMsgFlow_c::event034, + &dMsgFlow_c::event035, + &dMsgFlow_c::event036, + &dMsgFlow_c::event037, + &dMsgFlow_c::event038, + &dMsgFlow_c::event039, + &dMsgFlow_c::event040, + &dMsgFlow_c::event041, + &dMsgFlow_c::event042, }; /* 803C1ED0-803C1EF0 -00001 0020+00 1/1 0/0 0/0 .data @6324 */ @@ -1450,34 +503,14 @@ SECTION_DATA static void* lit_6752[8] = { (void*)(((char*)event040__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c) + 0xDC), }; -/* 803C1F40-803C1F50 01F060 000C+04 2/2 0/0 0/0 .data __vt__10dMsgFlow_c */ -SECTION_DATA extern void* __vt__10dMsgFlow_c[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dMsgFlow_cFv, - /* padding */ - NULL, -}; - /* 80249F00-80249F48 244840 0048+00 0/0 5/5 154/154 .text __ct__10dMsgFlow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgFlow_c::dMsgFlow_c() { - nofralloc -#include "asm/d/msg/d_msg_flow/__ct__10dMsgFlow_cFv.s" +dMsgFlow_c::dMsgFlow_c() { + mNonStopJunpFlowFlag = 0; + setInitValue(1); } -#pragma pop /* 80249F48-80249F90 244888 0048+00 1/0 7/7 111/111 .text __dt__10dMsgFlow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgFlow_c::~dMsgFlow_c() { - nofralloc -#include "asm/d/msg/d_msg_flow/__dt__10dMsgFlow_cFv.s" -} -#pragma pop +dMsgFlow_c::~dMsgFlow_c() {} /* ############################################################################################## */ /* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -1511,84 +544,167 @@ asm void dMsgFlow_c::checkOpenDoor(fopAc_ac_c* param_0, int* param_1) { /* 8024A2D8-8024A424 244C18 014C+00 0/0 21/21 78/78 .text * doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::doFlow(fopAc_ac_c* param_0, fopAc_ac_c** param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci.s" +int dMsgFlow_c::doFlow(fopAc_ac_c* param_0, fopAc_ac_c** param_1, int flow) { + int check = false; + u16 set_flow = flow; + dMsgObject_changeFlowGroup(mFlow); + + if (dMsgObject_isKillMessageFlag()) { + field_0x27 = 1; + field_0x26 = 1; + set_flow = 0; + } + + if (field_0x26 != 0 && set_flow != 0) { + setInitValue(0); + mFlow = set_flow; + setNodeIndex(getInitNodeIndex(mFlow), param_1); + check = true; + } + + if (field_0x26 != 0 || field_0x27 != 0) { + msg_class* msg = fopMsgM_SearchByID(mMsg); + if (msg != NULL) { + if (msg->field_0xf8 != 0x12) { + return 0; + } + + msg->field_0xf8 = 0x13; + mMsg = -1; + } + field_0x27 = 0; + } + + if (field_0x26 != 0) { + daPy_py_c::setMidnaMotionNum(0); + daPy_py_c::setMidnaFaceNum(0); + return 1; + } + + int proc_status = nodeProc(param_0, param_1); + return proc_status != 0 || check; } -#pragma pop /* 8024A424-8024A4C4 244D64 00A0+00 0/0 2/2 1/1 .text checkEventRender__10dMsgFlow_cFPiPiPiPi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::checkEventRender(int* param_0, int* param_1, int* param_2, int* param_3) { - nofralloc -#include "asm/d/msg/d_msg_flow/checkEventRender__10dMsgFlow_cFPiPiPiPi.s" +int dMsgFlow_c::checkEventRender(int* param_0, int* param_1, int* param_2, int* param_3) { + if (field_0x47) { + if (param_0 != NULL) { + int tmp0; + if (field_0x42 == 0xFF) { + tmp0 = -1; + } else { + tmp0 = field_0x42; + } + *param_0 = tmp0; + } + + if (param_1 != NULL) { + int tmp1; + if (field_0x43 == 0xFF) { + tmp1 = -1; + } else { + tmp1 = field_0x43; + } + *param_1 = tmp1; + } + + if (param_2 != NULL) { + int tmp2; + if (field_0x44 == 0xFF) { + tmp2 = -1; + } else { + tmp2 = field_0x44; + } + *param_2 = tmp2; + } + + if (param_3 != NULL) { + int tmp3; + if (field_0x45 == 0xFF) { + tmp3 = -1; + } else { + tmp3 = field_0x45; + } + *param_3 = tmp3; + } + } + + return field_0x47 == 1; } -#pragma pop /* 8024A4C4-8024A528 244E04 0064+00 0/0 0/0 10/10 .text remove__10dMsgFlow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::remove() { - nofralloc -#include "asm/d/msg/d_msg_flow/remove__10dMsgFlow_cFv.s" +void dMsgFlow_c::remove() { + field_0x27 = 0; + field_0x26 = 1; + + if (fopMsgM_SearchByID(mMsg) != NULL) { + dMsgObject_c::onKillMessageFlag(); + mMsg = -1; + } + + daPy_py_c::setMidnaMotionNum(0); + daPy_py_c::setMidnaFaceNum(0); } -#pragma pop /* 8024A528-8024A538 244E68 0010+00 0/0 2/2 66/66 .text getEventId__10dMsgFlow_cFPi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 dMsgFlow_c::getEventId(int* param_0) { - nofralloc -#include "asm/d/msg/d_msg_flow/getEventId__10dMsgFlow_cFPi.s" +u16 dMsgFlow_c::getEventId(int* oItemId_p) { + *oItemId_p = field_0x30; + return mEventId; } -#pragma pop /* 8024A538-8024A540 244E78 0008+00 0/0 3/3 4/4 .text getMsgNo__10dMsgFlow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::getMsgNo() { - nofralloc -#include "asm/d/msg/d_msg_flow/getMsgNo__10dMsgFlow_cFv.s" +int dMsgFlow_c::getMsgNo() { + return mMsgNo; } -#pragma pop /* 8024A540-8024A548 244E80 0008+00 0/0 0/0 12/12 .text getNowMsgNo__10dMsgFlow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::getNowMsgNo() { - nofralloc -#include "asm/d/msg/d_msg_flow/getNowMsgNo__10dMsgFlow_cFv.s" +int dMsgFlow_c::getNowMsgNo() { + return mNowMsgNo; } -#pragma pop /* 8024A548-8024A580 244E88 0038+00 0/0 2/2 4/4 .text getMsg__10dMsgFlow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::getMsg() { - nofralloc -#include "asm/d/msg/d_msg_flow/getMsg__10dMsgFlow_cFv.s" +msg_class* dMsgFlow_c::getMsg() { + if (mMsg != -1) { + return fopMsgM_SearchByID(mMsg); + } + + return NULL; } -#pragma pop /* 8024A580-8024A618 244EC0 0098+00 5/5 0/0 0/0 .text setInitValue__10dMsgFlow_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::setInitValue(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_flow/setInitValue__10dMsgFlow_cFi.s" +void dMsgFlow_c::setInitValue(int param_0) { + if (param_0 != 0) { + mFlow_p = NULL; + mLabelInfo_p = NULL; + mFlowNodeTBL = NULL; + field_0x14 = NULL; + field_0x18 = 0; + mMsg = -1; + mMsgNo = 0; + mNowMsgNo = 0; + } + + field_0x10 = -1; + mFlow = 0; + field_0x46 = 0; + mSelectMessage = 0; + field_0x25 = 0; + field_0x26 = 0; + field_0x27 = 0; + field_0x30 = 0; + mEventId = 0; + field_0x34 = 91; + field_0x38 = 0; + mChoiceNo = -1; + field_0x3c = 0; + field_0x40 = 0; + field_0x41 = 0; + field_0x42 = -1; + field_0x43 = -1; + field_0x44 = -1; + field_0x45 = -1; + field_0x47 = 0; } -#pragma pop /* 8024A618-8024A6EC 244F58 00D4+00 1/1 0/0 0/0 .text * setInitValueGroupChange__10dMsgFlow_cFiPP10fopAc_ac_c */ @@ -1610,21 +726,43 @@ SECTION_SBSS2 static u8 data_80456BA4[4]; /* 8024A6EC-8024A784 24502C 0098+00 4/4 0/0 0/0 .text getMsgDataBlock__10dMsgFlow_cFPCc */ +#ifdef NONMATCHING +u8* dMsgFlow_c::getMsgDataBlock(char const* block_tag) { + char tag[4]; + u8* dt_p = dMsgObject_c::getMsgDtPtr(); + u32 num = *(dt_p + 0xC); + + u32 i = 0; + u8* block = dt_p + 0x20; + + for (; i < num; i++) { + memcpy(tag, block, 4); + + if (!strcmp(tag, block_tag)) { + return block; + } + block = block + *(int*)(block + 4); + } + + return NULL; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::getMsgDataBlock(char const* param_0) { +asm u8* dMsgFlow_c::getMsgDataBlock(char const* param_0) { nofralloc #include "asm/d/msg/d_msg_flow/getMsgDataBlock__10dMsgFlow_cFPCc.s" } #pragma pop +#endif /* 8024A784-8024A7CC 2450C4 0048+00 5/5 0/0 0/0 .text getInitNodeIndex__10dMsgFlow_cFUs */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::getInitNodeIndex(u16 param_0) { +asm u16 dMsgFlow_c::getInitNodeIndex(u16 param_0) { nofralloc #include "asm/d/msg/d_msg_flow/getInitNodeIndex__10dMsgFlow_cFUs.s" } @@ -1677,7 +815,7 @@ asm void dMsgFlow_c::setNormalMsg(mesg_flow_node* param_0, fopAc_ac_c* param_1) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::messageNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { +asm int dMsgFlow_c::messageNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { nofralloc #include "asm/d/msg/d_msg_flow/messageNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s" } @@ -1685,86 +823,168 @@ asm void dMsgFlow_c::messageNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) /* 8024AD54-8024ADEC 245694 0098+00 1/1 0/0 0/0 .text * branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::branchNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s" +int dMsgFlow_c::branchNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { + mesg_flow_node_branch* node = (mesg_flow_node_branch*)&mFlowNodeTBL[field_0x10]; + int proc_status = (this->*mQueryList[node->msg_index])(node, param_0, 1); + + setNodeIndex(field_0x14[(node->params[1] + proc_status) & 0xFFFF], param_1); + return 1; } -#pragma pop /* 8024ADEC-8024AFF8 24572C 020C+00 1/1 0/0 0/0 .text * eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c */ +#ifdef NONMATCHING +int dMsgFlow_c::eventNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { + mesg_flow_node_event* node = (mesg_flow_node_event*)&mFlowNodeTBL[field_0x10]; + int proc_status = (this->*mEventList[node->field_0x1])(node, param_0); + + switch (node->field_0x1) { + case 8: + getParam(&mEventId, &field_0x30, node->params); + setNodeIndex(field_0x14[node->msg_index], param_1); + + if (field_0x26 != 0) { + break; + } + + u16 tmp = field_0x10; + setNodeIndex(-1, param_1); + field_0x10 = tmp; + + break; + + + case 9: + if (getParam(node->params) == 0) { + int msgNum = daAlink_getAlinkActorClass()->getMidnaMsgNum(); + if (msgNum == 0xFFFF) { + int stayNo = dComIfGp_roomControl_getStayNo(); + msgNum = dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo()->mMsg; + } else { + daAlink_getAlinkActorClass()->setMidnaMsg(); + } + + setInitValueGroupChange(msgNum, param_1); + break; + } + + setInitValue(0); + mFlow = getParam(node->params); + setNodeIndex(getInitNodeIndex(mFlow), param_1); + + if (mNonStopJunpFlowFlag) { + break; + } + + if (dMsgObject_getMsgObjectClass()->isMidonaMessage()) { + break; + } + + return 0; + + case 21: + if (field_0x3c != 0) { + return 0; + } + setNodeIndex(field_0x14[node->msg_index], param_1); + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::eventNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { +asm int dMsgFlow_c::eventNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { nofralloc #include "asm/d/msg/d_msg_flow/eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024AFF8-8024B0F0 245938 00F8+00 1/1 0/0 0/0 .text * nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::nodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s" +int dMsgFlow_c::nodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { + fopAc_ac_c* tmp = param_0; + int proc_status = 1; + field_0x47 = 0; + field_0x42 = -1; + field_0x43 = -1; + field_0x44 = -1; + field_0x45 = -1; + + while (proc_status != 0 && field_0x26 == 0) { + if (param_1 != NULL) { + tmp = param_1[field_0x38]; + } + + switch (mFlowNodeTBL[field_0x10].type) { + case 0: + break; + case 1: + proc_status = messageNodeProc(tmp, param_1); + break; + case 2: + proc_status = branchNodeProc(tmp, param_1); + break; + case 3: + proc_status = eventNodeProc(tmp, param_1); + break; + } + } + + return 0; } -#pragma pop /* 8024B0F0-8024B108 245A30 0018+00 16/16 0/0 0/0 .text getParam__10dMsgFlow_cFPUsPUsPUc */ -// might be fake match -int dMsgFlow_c::getParam(u16* param_0, u16* param_1, u8* param_2) { - u16* tmp = (u16*)param_2; - *param_0 = *tmp; - *param_1 = *(tmp + 1); +int dMsgFlow_c::getParam(u16* prm0, u16* prm1, u8* params) { + *prm0 = *(u16*)params; + *prm1 = *(u16*)(params + 2); - int* tmp2 = (int*)param_2; - return *tmp2; + return *(int*)params; } /* 8024B108-8024B130 245A48 0028+00 3/3 0/0 0/0 .text getParam__10dMsgFlow_cFPUcPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::getParam(u8* param_0, u8* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUcPUc.s" +int dMsgFlow_c::getParam(u8* prm0, u8* params) { + for (int i = 0; i < 4; i++) { + prm0[i] = params[i]; + } + + return *(int*)params; } -#pragma pop /* 8024B130-8024B138 245A70 0008+00 20/20 0/0 0/0 .text getParam__10dMsgFlow_cFPUc */ -int dMsgFlow_c::getParam(u8* param_0) { - int* tmp2 = (int*)param_0; - return *tmp2; +int dMsgFlow_c::getParam(u8* params) { + return *(int*)params; +} + +inline BOOL dComIfGs_isEventBit(u16 id) { + return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(id); } /* 8024B138-8024B180 245A78 0048+00 1/0 0/0 0/0 .text * query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query001(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query001(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { + u16 prm0 = *(u16*)flow_node->params & 0xFFFF; + return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[prm0]) == false; +} + +BOOL daPy_py_c::checkNowWolf() { + return dComIfGp_getLinkPlayer()->i_checkWolf(); } -#pragma pop /* 8024B180-8024B208 245AC0 0088+00 1/0 0/0 0/0 .text * query002__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query002(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query002__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query002(mesg_flow_node_branch*, fopAc_ac_c*, int) { + if (daPy_py_c::checkNowWolf()) { + return 1; + } else if (daPy_getPlayerActorClass()->checkHorseRide() || daPy_getPlayerActorClass()->checkBoarRide()) { + return 2; + } + + return 0; } -#pragma pop /* ############################################################################################## */ /* 80454D90-80454D98 003390 0008+00 5/5 0/0 0/0 .sdata2 @5116 */ @@ -1772,21 +992,32 @@ SECTION_SDATA2 static f64 lit_5116 = 4503599627370496.0 /* cast u32 to float */; /* 8024B208-8024B250 245B48 0048+00 1/0 0/0 0/0 .text * query003__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ +// matches with literals +#ifdef NONMATCHING +int dMsgFlow_c::query003(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { + return cM_rndF(flow_node->params[0]); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query003(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query003(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query003__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } #pragma pop +#endif + +inline u16 dComIfGs_getRupee() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupee(); +} /* 8024B250-8024B2C0 245B90 0070+00 1/0 0/0 0/0 .text * query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query004(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query004(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1794,32 +1025,22 @@ asm void dMsgFlow_c::query004(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ /* 8024B2C0-8024B2F8 245C00 0038+00 2/1 1/1 1/1 .text * query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 dMsgFlow_c::query005(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query005(mesg_flow_node_branch*, fopAc_ac_c*, int) { + return mChoiceNo = fopMsgM_SearchByID(mMsg)->field_0xfa; } -#pragma pop /* 8024B2F8-8024B32C 245C38 0034+00 1/0 0/0 0/0 .text * query006__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query006(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query006__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query006(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int) { + mChoiceNo = query005(flow_node, param_1, 0); } -#pragma pop /* 8024B32C-8024B45C 245C6C 0130+00 1/0 0/0 0/0 .text * query007__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query007(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query007(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query007__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1827,21 +1048,28 @@ asm void dMsgFlow_c::query007(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ /* 8024B45C-8024B4A4 245D9C 0048+00 1/0 0/0 0/0 .text * query008__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ +#ifdef NONMATCHING +int dMsgFlow_c::query008(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { + u16 prm0 = flow_node->params[0]; + return (u8)daNpcKakashi_getSwdTutorialStep() != (u16)(prm0 - 1); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query008(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query008(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query008__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } #pragma pop +#endif /* 8024B4A4-8024B4D0 245DE4 002C+00 1/0 0/0 0/0 .text * query009__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query009(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query009(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query009__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1852,7 +1080,7 @@ asm void dMsgFlow_c::query009(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query010(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query010(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query010__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1863,7 +1091,7 @@ asm void dMsgFlow_c::query010(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query011(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query011(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query011__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1874,7 +1102,7 @@ asm void dMsgFlow_c::query011(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query012(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query012(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query012__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1885,7 +1113,7 @@ asm void dMsgFlow_c::query012(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query013(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query013(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query013__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1896,7 +1124,7 @@ asm void dMsgFlow_c::query013(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query014(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query014(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query014__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1907,7 +1135,7 @@ asm void dMsgFlow_c::query014(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query015(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query015(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query015__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1918,7 +1146,7 @@ asm void dMsgFlow_c::query015(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query016(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query016(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query016__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1929,7 +1157,7 @@ asm void dMsgFlow_c::query016(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query017(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query017(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query017__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1940,7 +1168,7 @@ asm void dMsgFlow_c::query017(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query018(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query018(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query018__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1951,7 +1179,7 @@ asm void dMsgFlow_c::query018(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query019(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query019(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query019__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1962,7 +1190,7 @@ asm void dMsgFlow_c::query019(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query020(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query020(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query020__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1973,7 +1201,7 @@ asm void dMsgFlow_c::query020(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query021(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query021(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query021__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1981,32 +1209,33 @@ asm void dMsgFlow_c::query021(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ /* 8024B8E4-8024B918 246224 0034+00 1/0 0/0 0/0 .text * query022__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ +#ifdef NONMATCHING +int dMsgFlow_c::query022(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { + return checkItemGet(flow_node->params[0], 1) == false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query022(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query022(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query022__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } #pragma pop +#endif /* 8024B918-8024B954 246258 003C+00 1/0 0/0 0/0 .text * query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query023(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query023(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { + return (u16)(3 - dComIfGs_checkBombBag(NO_ITEM)); } -#pragma pop /* 8024B954-8024B974 246294 0020+00 1/0 0/0 0/0 .text * query024__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query024(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query024(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query024__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2017,7 +1246,7 @@ asm void dMsgFlow_c::query024(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query025(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query025(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query025__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2025,21 +1254,17 @@ asm void dMsgFlow_c::query025(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ /* 8024B9BC-8024B9E8 2462FC 002C+00 1/0 0/0 0/0 .text * query026__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query026(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query026__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query026(mesg_flow_node_branch*, fopAc_ac_c* actor, int) { + dShopSystem_c* shop_ac = static_cast(actor); + return (u16)shop_ac->isFlag(7); } -#pragma pop /* 8024B9E8-8024BA4C 246328 0064+00 1/0 0/0 0/0 .text * query027__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query027(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query027(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query027__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2050,7 +1275,7 @@ asm void dMsgFlow_c::query027(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query028(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query028(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query028__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2061,7 +1286,7 @@ asm void dMsgFlow_c::query028(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query029(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query029(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query029__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2069,21 +1294,16 @@ asm void dMsgFlow_c::query029(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ /* 8024BAE0-8024BB18 246420 0038+00 1/0 0/0 0/0 .text * query030__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query030(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query030__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query030(mesg_flow_node_branch*, fopAc_ac_c*, int) { + return dComIfGs_getTmpReg(0xFBFF); } -#pragma pop /* 8024BB18-8024BB74 246458 005C+00 1/0 0/0 0/0 .text * query031__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query031(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query031(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query031__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2094,7 +1314,7 @@ asm void dMsgFlow_c::query031(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query032(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query032(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query032__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2102,73 +1322,58 @@ asm void dMsgFlow_c::query032(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ /* 8024BB9C-8024BBE4 2464DC 0048+00 1/0 0/0 0/0 .text * query033__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query033(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query033__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query033(mesg_flow_node_branch*, fopAc_ac_c*, int) { + return daPy_getPlayerActorClass()->checkUseKandelaar(1) == false; } -#pragma pop - -/* ############################################################################################## */ -/* 80454D98-80454DA0 003398 0004+04 1/1 0/0 0/0 .sdata2 @5608 */ -SECTION_SDATA2 static f32 lit_5608[1 + 1 /* padding */] = { - 1.0f / 15.0f, - /* padding */ - 0.0f, -}; /* 8024BBE4-8024BC14 246524 0030+00 1/0 0/0 0/0 .text * query034__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query034(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query034__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query034(mesg_flow_node_branch*, fopAc_ac_c*, int) { + u8 time = dComIfGs_getTime() * (1.0f / 15.0f); + return time; } -#pragma pop /* 8024BC14-8024BC3C 246554 0028+00 1/0 0/0 0/0 .text * query035__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query035(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query035__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query035(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { + bool check = false; + if (dComIfGs_getMagic() < flow_node->params[0]) { + check = true; + } + + return check; } -#pragma pop /* 8024BC3C-8024BC80 24657C 0044+00 1/0 0/0 0/0 .text * query036__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query036(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query036__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query036(mesg_flow_node_branch*, fopAc_ac_c*, int) { + int tmp = fopMsgM_SearchByID(mMsg)->field_0xfa; + + if (dMsgObject_getMsgObjectClass()->getSelectPushFlag() == 2) { + tmp = 2; + } + + return tmp; } -#pragma pop /* 8024BC80-8024BCC4 2465C0 0044+00 1/0 0/0 0/0 .text * query037__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query037(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query037__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query037(mesg_flow_node_branch*, fopAc_ac_c*, int) { + int tmp = fopMsgM_SearchByID(mMsg)->field_0xfa; + + if (dMsgObject_getMsgObjectClass()->getSelectPushFlag() == 2) { + tmp = 3; + } + + return tmp; } -#pragma pop /* 8024BCC4-8024BDB0 246604 00EC+00 1/0 0/0 0/0 .text * query038__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query038(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query038(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query038__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2179,7 +1384,7 @@ asm void dMsgFlow_c::query038(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query039(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query039(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2190,7 +1395,7 @@ asm void dMsgFlow_c::query039(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query040(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query040(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2201,58 +1406,64 @@ asm void dMsgFlow_c::query040(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query041(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query041(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } #pragma pop -/* ############################################################################################## */ -/* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399CC0 = "F_SP116"; -#pragma pop - /* 8024BFEC-8024C0A8 24692C 00BC+00 1/0 0/0 0/0 .text * query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query042(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query042(mesg_flow_node_branch*, fopAc_ac_c*, int) { + daMidna_c* midna = daPy_py_c::getMidnaActor(); + + u8 ret = 0; + if (!strcmp("F_SP116", dComIfGp_getStartStageName()) && dComIfGs_isSaveDunSwitch(0x3C)) { + ret = 4; + } else if (midna->checkNpcNear()) { + ret = 1; + } else if (midna->checkNpcFar()) { + ret = 2; + } else if (g_env_light.mEvilPacketEnabled & 0x80) { + ret = 3; + } + + return ret; } -#pragma pop /* 8024C0A8-8024C144 2469E8 009C+00 1/0 0/0 0/0 .text * query043__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ +#ifdef NONMATCHING +int dMsgFlow_c::query043(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { + u16 prm0 = flow_node->params[0]; + u8 bomb_num = dComIfGs_getBombNum(dComIfGs_getTmpReg(0xFBFF) - 1); + u8 bomb_max = dComIfGs_getBombMax(POKE_BOMB); + + return bomb_num + (u8)prm0 >= bomb_max; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query043(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query043(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query043__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } #pragma pop +#endif /* 8024C144-8024C18C 246A84 0048+00 1/0 0/0 0/0 .text * query044__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query044(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query044__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query044(mesg_flow_node_branch*, fopAc_ac_c*, int) { + return daAlink_getAlinkActorClass()->checkAcceptDungeonWarpAlink(0) == false; } -#pragma pop /* 8024C18C-8024C218 246ACC 008C+00 1/0 0/0 0/0 .text * query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query045(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query045(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -2260,94 +1471,123 @@ asm void dMsgFlow_c::query045(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ /* 8024C218-8024C248 246B58 0030+00 1/0 0/0 0/0 .text * query046__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query046(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query046__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query046(mesg_flow_node_branch*, fopAc_ac_c*, int) { + return dComIfGs_checkInsectBottle(); } -#pragma pop /* 8024C248-8024C250 246B88 0008+00 1/0 0/0 0/0 .text * query047__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -bool dMsgFlow_c::query047(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - return false; +int dMsgFlow_c::query047(mesg_flow_node_branch*, fopAc_ac_c*, int) { + return 0; } /* 8024C250-8024C2A0 246B90 0050+00 1/0 0/0 0/0 .text * query048__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query048(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query048__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query048(mesg_flow_node_branch*, fopAc_ac_c*, int) { + u8 new_num = dMeter2Info_getNewLetterNum(); + + if (new_num > 2) { + new_num = 2; + } + + if (new_num == 1) { + dMeter2Info_setNewLetterSender(); + } + + return new_num; } -#pragma pop /* 8024C2A0-8024C2FC 246BE0 005C+00 1/0 0/0 0/0 .text * query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ +// missing clrlwi +#ifdef NONMATCHING +int dMsgFlow_c::query049(mesg_flow_node_branch*, fopAc_ac_c*, int) { + u8 ret; + if (dComIfGs_getPohSpiritNum() == 0) { + ret = 0; + } else if (dComIfGs_getPohSpiritNum() <= 19) { + ret = 1; + } else if (dComIfGs_getPohSpiritNum() <= 39) { + ret = 2; + } else if (dComIfGs_getPohSpiritNum() <= 59) { + ret = 3; + } else { + ret = 4; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::query049(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query049(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } #pragma pop +#endif /* 8024C2FC-8024C340 246C3C 0044+00 1/0 0/0 0/0 .text * query050__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query050(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query050__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query050(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { + u16 prm0 = flow_node->params[0]; + int offering = dMsgObject_getOffering(); + return offering < prm0; } -#pragma pop /* 8024C340-8024C3A0 246C80 0060+00 1/0 0/0 0/0 .text * query051__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query051(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query051__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query051(mesg_flow_node_branch*, fopAc_ac_c*, int) { + u8 ret; + if (dComIfGp_getMessageCountNumber() == 0) { + ret = 0; + } else if (dComIfGp_getMessageCountNumber() < 1000) { + ret = 1; + } else if (dComIfGp_getMessageCountNumber() < 10000) { + ret = 2; + } else if (dComIfGp_getMessageCountNumber() < 0xF00E) { + ret = 3; + } else { + ret = 4; + } + + return ret; +} + +inline bool dComIfGp_checkPlayerStatus0(int param_0, u32 param_1) { + return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, param_1); } -#pragma pop /* 8024C3A0-8024C3D4 246CE0 0034+00 1/0 0/0 0/0 .text * query052__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query052(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query052__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query052(mesg_flow_node_branch*, fopAc_ac_c*, int) { + bool phi_r4 = false; + if (daPy_getPlayerActorClass()->checkWaterInMove() || dComIfGp_checkPlayerStatus0(0, 0x100000)) { + phi_r4 = true; + } + + return phi_r4; } -#pragma pop /* 8024C3D4-8024C3FC 246D14 0028+00 1/0 0/0 0/0 .text * query053__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::query053(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query053__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query053(mesg_flow_node_branch*, fopAc_ac_c*, int) { + bool phi_r4 = false; + if (daPy_getPlayerActorClass()->i_checkEquipHeavyBoots()) { + phi_r4 = true; + } + + return phi_r4; } -#pragma pop /* 8024C3FC-8024C488 246D3C 008C+00 1/0 0/0 0/0 .text * event000__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -int dMsgFlow_c::event000(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +int dMsgFlow_c::event000(mesg_flow_node_event* flow_node, fopAc_ac_c*) { u16 prm1; u16 prm0; - int tmp = getParam(&prm0, &prm1, ¶m_0->param); + int tmp = getParam(&prm0, &prm1, flow_node->params); if (prm0 != 0) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[prm0]); } @@ -2359,11 +1599,11 @@ int dMsgFlow_c::event000(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { /* 8024C488-8024C514 246DC8 008C+00 1/0 0/0 0/0 .text * event001__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -int dMsgFlow_c::event001(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +int dMsgFlow_c::event001(mesg_flow_node_event* flow_node, fopAc_ac_c*) { u16 prm1; u16 prm0; - int tmp = getParam(&prm0, &prm1, ¶m_0->param); + int tmp = getParam(&prm0, &prm1, flow_node->params); if (prm0 != 0) { dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[prm0]); } @@ -2375,8 +1615,8 @@ int dMsgFlow_c::event001(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { /* 8024C514-8024C550 246E54 003C+00 1/0 0/0 0/0 .text * event002__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -int dMsgFlow_c::event002(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - int prm0 = getParam(¶m_0->param); +int dMsgFlow_c::event002(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); dComIfGp_setItemRupeeCount(prm0); return 1; @@ -2384,24 +1624,12 @@ int dMsgFlow_c::event002(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { /* 8024C550-8024C590 246E90 0040+00 1/0 0/0 0/0 .text * event003__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -// wrong instruction -#ifdef NONMATCHING -int dMsgFlow_c::event003(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - int prm0 = getParam(¶m_0->param); +int dMsgFlow_c::event003(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); dComIfGp_setItemRupeeCount(-prm0); return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::event003(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event003__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 80454DA0-80454DA8 0033A0 0008+00 3/3 0/0 0/0 .sdata2 @6040 */ @@ -2409,9 +1637,10 @@ SECTION_SDATA2 static f64 lit_6040 = 4503601774854144.0 /* cast s32 to float */; /* 8024C590-8024C5F0 246ED0 0060+00 1/0 0/0 0/0 .text * event004__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +// matches with literals #ifdef NONMATCHING -int dMsgFlow_c::event004(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - f32 prm0 = getParam(¶m_0->param); +int dMsgFlow_c::event004(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + f32 prm0 = getParam(flow_node->params); dComIfGp_setItemLifeCount(prm0, 0); return 1; @@ -2430,8 +1659,8 @@ asm int dMsgFlow_c::event004(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) /* 8024C5F0-8024C654 246F30 0064+00 1/0 0/0 0/0 .text * event005__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ #ifdef NONMATCHING -int dMsgFlow_c::event005(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - f32 prm0 = getParam(¶m_0->param); +int dMsgFlow_c::event005(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + f32 prm0 = getParam(flow_node->params); dComIfGp_setItemLifeCount(-prm0, 0); return 1; @@ -2440,7 +1669,7 @@ int dMsgFlow_c::event005(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event005(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event005(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event005__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } @@ -2449,165 +1678,269 @@ asm void dMsgFlow_c::event005(mesg_flow_node_event* param_0, fopAc_ac_c* param_1 /* 8024C654-8024C694 246F94 0040+00 1/0 0/0 0/0 .text * event006__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event006(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event006__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event006(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); + dComIfGp_setItemMagicCount(prm0); + return 1; } -#pragma pop /* 8024C694-8024C6D8 246FD4 0044+00 1/0 0/0 0/0 .text * event007__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event007(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event007__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event007(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); + dComIfGp_setItemMagicCount(-prm0); + return 1; } -#pragma pop /* 8024C6D8-8024C744 247018 006C+00 1/0 0/0 0/0 .text * event008__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event008(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event008__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event008(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + u16 prm1; + u16 prm0; + getParam(&prm0, &prm1, flow_node->params); + + if (prm0 == 27) { + int fund_raising = dMsgObject_getFundRaising(); + int tmp = 2000 - (fund_raising & 0xFFFF); + + if (tmp >= 200) { + dMsgObject_setFundRaising(0); + } else { + dMsgObject_setFundRaising(200 - tmp); + } + } + + return 1; } -#pragma pop /* 8024C744-8024C76C 247084 0028+00 1/0 0/0 0/0 .text * event009__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event009(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event009__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event009(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + getParam(flow_node->params); + return 1; } -#pragma pop /* 8024C76C-8024C7F8 2470AC 008C+00 1/0 0/0 0/0 .text * event010__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event010(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event010__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event010(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + u16 prm1; + u16 prm0; + getParam(&prm0, &prm1, flow_node->params); + + if (prm0 != 0) { + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::tempBitLabels[prm0]); + } + + if (prm1 != 0) { + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::tempBitLabels[prm1]); + } + + return 1; } -#pragma pop /* 8024C7F8-8024C884 247138 008C+00 1/0 0/0 0/0 .text * event011__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event011(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event011__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event011(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + u16 prm1; + u16 prm0; + getParam(&prm0, &prm1, flow_node->params); + + if (prm0 != 0) { + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[prm0]); + } + + if (prm1 != 0) { + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[prm1]); + } + + return 1; } -#pragma pop /* 8024C884-8024C88C 2471C4 0008+00 1/0 0/0 0/0 .text * event012__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -bool dMsgFlow_c::event012(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - return true; +int dMsgFlow_c::event012(mesg_flow_node_event*, fopAc_ac_c*) { + return 1; } /* 8024C88C-8024C8CC 2471CC 0040+00 1/0 0/0 0/0 .text * event013__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event013(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event013__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event013(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + field_0x46 = 1; + mSelectMessage = 1; + field_0x25 = 1; + + int prm0 = getParam(flow_node->params); + dMsgObject_c::setSelectCancelPos(prm0); + + return 1; } -#pragma pop /* 8024C8CC-8024C994 24720C 00C8+00 1/0 0/0 0/0 .text * event014__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event014(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event014__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event014(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) { + u16 prm1; + u16 prm0; + getParam(&prm0, &prm1, flow_node->params); + + int roomNo = -1; + if (actor != NULL) { + roomNo = fopAcM_GetRoomNo(actor); + } + + switch (prm0) { + case 0: + dComIfGs_onSaveSwitch(prm1); + break; + case 1: + dComIfGs_onSaveDunSwitch(prm1); + break; + case 2: + dComIfGs_onZoneSwitch(prm1, roomNo); + break; + case 3: + dComIfGs_onOneZoneSwitch(prm1, roomNo); + break; + } + + return 1; } -#pragma pop /* 8024C994-8024CA5C 2472D4 00C8+00 1/0 0/0 0/0 .text * event015__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event015(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event015__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event015(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) { + u16 prm1; + u16 prm0; + getParam(&prm0, &prm1, flow_node->params); + + int roomNo = -1; + if (actor != NULL) { + roomNo = fopAcM_GetRoomNo(actor); + } + + switch (prm0) { + case 0: + dComIfGs_offSaveSwitch(prm1); + break; + case 1: + dComIfGs_offSaveDunSwitch(prm1); + break; + case 2: + dComIfGs_offZoneSwitch(prm1, roomNo); + break; + case 3: + dComIfGs_offOneZoneSwitch(prm1, roomNo); + break; + } + + return 1; } -#pragma pop /* 8024CA5C-8024CA94 24739C 0038+00 1/0 0/0 0/0 .text * event016__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event016(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event016__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event016(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) { + static_cast(actor)->setEventParam(*(u32*)flow_node->params); + + u8 prm0; + getParam(&prm0, flow_node->params); + return 1; } -#pragma pop /* 8024CA94-8024CBB0 2473D4 011C+00 1/0 0/0 0/0 .text * event017__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event017(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event017__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event017(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + u16 prm1; + u16 prm0; + getParam(&prm0, &prm1, flow_node->params); + + if (prm1 <= 1) { + switch (prm0) { + case DROP_CONTAINER: + dMeter2Info_setLightDropGetFlag(0, 1); + dComIfGs_onLightDropGetFlag(0); + break; + case DROP_CONTAINER02: + dMeter2Info_setLightDropGetFlag(1, 1); + dComIfGs_onLightDropGetFlag(1); + break; + case DROP_CONTAINER03: + dMeter2Info_setLightDropGetFlag(2, 1); + dComIfGs_onLightDropGetFlag(2); + break; + default: + execItemGet(prm0); + } + + return 1; + } + + for (int i = 0; i < prm1; i++) { + execItemGet(prm0); + } + + return 1; } -#pragma pop /* 8024CBB0-8024CCA4 2474F0 00F4+00 1/0 0/0 0/0 .text * event018__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event018(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event018__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event018(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) { + u8 prm0[4]; + getParam(prm0, flow_node->params); + + field_0x47 = 1; + field_0x42 = prm0[0]; + field_0x43 = prm0[1]; + field_0x44 = prm0[2]; + field_0x45 = prm0[3]; + + if (actor != NULL) { + int stayNo = dComIfGp_roomControl_getStayNo(); + if (stayNo != 0) { + mDoAud_messageSePlay(field_0x45, &actor->mCurrent.mPosition, dComIfGp_getReverb(stayNo)); + } else { + mDoAud_messageSePlay(field_0x45, &actor->mCurrent.mPosition, 0); + } + } else { + int stayNo = dComIfGp_roomControl_getStayNo(); + if (stayNo != 0) { + mDoAud_messageSePlay(field_0x45, NULL, dComIfGp_getReverb(stayNo)); + } else { + mDoAud_messageSePlay(field_0x45, NULL, 0); + } + } + + return 1; } -#pragma pop /* 8024CCA4-8024CCAC 2475E4 0008+00 1/0 0/0 0/0 .text * event019__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -bool dMsgFlow_c::event019(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - return true; +int dMsgFlow_c::event019(mesg_flow_node_event*, fopAc_ac_c*) { + return 1; } /* 8024CCAC-8024CD84 2475EC 00D8+00 1/0 0/0 0/0 .text * event020__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event020(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event020__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event020(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) { + int prm0 = getParam(flow_node->params); + daPy_py_c* player = daPy_getPlayerActorClass(); + dStage_roomStatus_c* room = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(actor)); + stage_actor_data_class* actor_data = room->mRoomDt.getPlayer()->mEntries; + + for (int i = 0; i < room->mRoomDt.getPlayerNum(); i++, actor_data++) { + if ((u8)actor_data->mAngle.z == prm0) { + player->setPlayerPosAndAngle(&actor_data->mSpawnPos, player->mCurrent.mAngle.y, 0); + break; + } + } + + return 1; } -#pragma pop /* 8024CD84-8024CDAC 2476C4 0028+00 1/0 0/0 0/0 .text * event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event021(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event021(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } @@ -2619,113 +1952,291 @@ SECTION_SDATA2 static f32 lit_6273 = 100.0f; /* 8024CDAC-8024CE40 2476EC 0094+00 1/0 0/0 0/0 .text * event022__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +// matches with literals +#ifdef NONMATCHING +int dMsgFlow_c::event022(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); + if (prm0 == 0) { + prm0 = 100; + } + + dComIfGp_setItemOilCount(dComIfGs_getMaxOil() * (prm0 / 100.0f)); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event022(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event022(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event022__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024CE40-8024CF2C 247780 00EC+00 2/0 0/0 0/0 .text * event023__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +// matches with literals +#ifdef NONMATCHING +int dMsgFlow_c::event023(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); + + switch (prm0) { + case 1: + dComIfGs_setEmptyBottleItemIn(RED_BOTTLE); + break; + case 2: + dComIfGs_setEmptyBottleItemIn(GREEN_BOTTLE); + break; + case 3: + dComIfGs_setEmptyBottleItemIn(BLUE_BOTTLE); + break; + case 4: + dComIfGs_setEmptyBottleItemIn(MILK_BOTTLE); + break; + case 5: + dComIfGs_setEmptyBottleItemIn(HALF_MILK_BOTTLE); + break; + case 6: + dComIfGs_setEmptyBottleItemIn(OIL_BOTTLE); + break; + case 7: + dComIfGs_setEmptyBottleItemIn(HOT_SPRING); + break; + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event023(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event023(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event023__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024CF2C-8024CF54 24786C 0028+00 1/0 0/0 0/0 .text * event024__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event024(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event024__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event024(mesg_flow_node_event*, fopAc_ac_c* actor) { + static_cast(actor)->setSoldOutFlag(); + return 1; } -#pragma pop /* 8024CF54-8024CF9C 247894 0048+00 1/0 0/0 0/0 .text * event025__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event025(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event025__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event025(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); + dComIfGs_setTmpReg(0xFBFF, prm0); + + return 1; } -#pragma pop /* 8024CF9C-8024D004 2478DC 0068+00 1/0 0/0 0/0 .text * event026__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +// todo: setup required classes +#ifdef NONMATCHING +int dMsgFlow_c::event026(mesg_flow_node_event*, fopAc_ac_c* actor) { + if (fopAcM_GetName(actor) == PROC_MYNA) { + actor = static_cast(actor)->getSpeakActorPtr(); + } + + if (actor != NULL) { + if (fopAcM_GetName(actor) == PROC_OBJ_SSITEM || fopAcM_GetName(actor) == PROC_OBJ_SSDRINK || + fopAcM_GetName(actor) == PROC_TAG_SSDRINK) { + + } + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event026(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event026(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event026__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024D004-8024D3C4 247944 03C0+00 2/0 0/0 0/0 .text * event027__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +// matches with literals +#ifdef NONMATCHING +int dMsgFlow_c::event027(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + u16 prm1; + u16 prm0; + getParam(&prm0, &prm1, flow_node->params); + + u8 aParam8[2]; + getParam(aParam8, flow_node->params); + + u8 slot; + if (aParam8[0] >= 1 && aParam8[0] < 4) { + slot = aParam8[0] - 1; + } else if (aParam8[0] == 4) { + if (dMeter2Info_getRentalBombBag() != 0xFF) { + slot = dMeter2Info_getRentalBombBag(); + } + } else { + slot = dComIfGs_getTmpReg(0xFBFF) - 1; + } + + switch (aParam8[1]) { + case 0: + if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == BOMB_BAG_LV1) { + dComIfGs_setItem((u8)(SLOT_15 + slot), NORMAL_BOMB); + } + + if (prm1 != 0) { + dComIfGp_setItemBombNumCount(slot, (u8)prm1); + } else { + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(NORMAL_BOMB)); + } + break; + case 1: + if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == BOMB_BAG_LV1) { + dComIfGs_setItem((u8)(SLOT_15 + slot), WATER_BOMB); + } + + if (prm1 != 0) { + dComIfGp_setItemBombNumCount(slot, (u8)prm1); + } else { + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(WATER_BOMB)); + } + break; + case 2: + if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == BOMB_BAG_LV1) { + dComIfGs_setItem((u8)(SLOT_15 + slot), POKE_BOMB); + } + + if (prm1 != 0) { + dComIfGp_setItemBombNumCount(slot, (u8)prm1); + } else { + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(POKE_BOMB)); + } + break; + case 3: + break; + case 4: + case 5: + dComIfGp_setItemBombNumCount(slot, (u8)prm1); + break; + case 6: + dComIfGs_setItem((u8)(SLOT_15 + slot), NORMAL_BOMB); + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(NORMAL_BOMB)); + break; + case 7: + dComIfGs_setItem((u8)(SLOT_15 + slot), WATER_BOMB); + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(WATER_BOMB)); + break; + case 8: + dComIfGs_setItem((u8)(SLOT_15 + slot), POKE_BOMB); + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(POKE_BOMB)); + break; + case 9: + case 10: + case 11: + break; + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event027(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event027(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event027__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024D3C4-8024D500 247D04 013C+00 1/0 0/0 0/0 .text * event028__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +// regalloc +#ifdef NONMATCHING +int dMsgFlow_c::event028(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + dMsgObject_c::setSelectCursorPos(dComIfGs_getTmpReg(0xFBFF) - 1); + u8 bagID = dMsgObject_c::getSelectBombBagID(); + s16 bombPrice = dMsgObject_c::getSelectBombPrice(); + + dComIfGp_setItemRupeeCount(bombPrice); + dComIfGs_setBombNum(bagID, 0); + + if (dComIfGs_getItem((u8)(SLOT_15 + bagID), true) != BOMB_ARROW) { + dComIfGs_setItem((u8)(SLOT_15 + bagID), BOMB_BAG_LV1); + } else { + for (int i = 0; i < 3; i++) { + u8 select_item = dComIfGs_getSelectItemIndex(i); + + if (SLOT_15 + bagID == select_item) { + u8 mix_item = dComIfGs_getMixItemIndex(i); + + dComIfGs_setMixItemIndex(i, NO_ITEM); + dComIfGs_setSelectItemIndex(i, mix_item); + dComIfGp_setSelectItem(i); + } + } + dComIfGs_setItem((u8)(SLOT_15 + bagID), BOMB_BAG_LV1); + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event028(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event028(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event028__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024D500-8024D544 247E40 0044+00 1/0 0/0 0/0 .text * event029__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event029(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event029__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event029(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + field_0x46 = 2; + mSelectMessage = 1; + field_0x25 = 1; + dMsgObject_c::setSelectCancelPos(getParam(flow_node->params)); + + return 1; } -#pragma pop /* 8024D544-8024D5BC 247E84 0078+00 1/0 0/0 0/0 .text * event030__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event030(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event030__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event030(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + u16 prm1; + u16 prm0; + getParam(&prm0, &prm1, flow_node->params); + + s16 arrowNum = prm1; + if (arrowNum == 0) { + arrowNum = dComIfGs_getArrowMax(); + } + + if (prm0 == 0) { + dComIfGp_setItemArrowNumCount(arrowNum); + } else { + dMsgObject_c::setArrowNum(arrowNum); + } + + return 1; } -#pragma pop /* 8024D5BC-8024D5EC 247EFC 0030+00 1/0 0/0 0/0 .text * event031__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event031(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event031__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event031(mesg_flow_node_event*, fopAc_ac_c*) { + dMeter2Info_resetMiniGameItem(false); + return 1; } -#pragma pop /* ############################################################################################## */ /* 80454DAC-80454DB0 0033AC 0004+00 2/2 0/0 0/0 .sdata2 @6613 */ @@ -2736,7 +2247,7 @@ SECTION_SDATA2 static f32 lit_6613 = 1.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event032(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event032(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event032__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } @@ -2747,7 +2258,7 @@ asm void dMsgFlow_c::event032(mesg_flow_node_event* param_0, fopAc_ac_c* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event033(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event033(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event033__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } @@ -2755,96 +2266,123 @@ asm void dMsgFlow_c::event033(mesg_flow_node_event* param_0, fopAc_ac_c* param_1 /* 8024D788-8024D7C8 2480C8 0040+00 1/0 0/0 0/0 .text * event034__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event034(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event034__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event034(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); + dComIfGs_setWarashibeItem(prm0); + return 1; } -#pragma pop /* 8024D7C8-8024D870 248108 00A8+00 1/0 0/0 0/0 .text * event035__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event035(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event035__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event035(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); + + if (prm0 == TOMATO_PUREE || prm0 == TASTE) { + dComIfGs_offItemFirstBit(prm0); + } else if (prm0 == RAFRELS_MEMO || prm0 == ASHS_SCRIBBLING) { + dComIfGs_setItem(SLOT_19, NO_ITEM); + } else if (prm0 == LETTER || prm0 == BILL || prm0 == WOOD_STATUE || prm0 == IRIAS_PENDANT) { + dComIfGs_setWarashibeItem(NO_ITEM); + } + + return 1; } -#pragma pop /* 8024D870-8024D8C4 2481B0 0054+00 1/0 0/0 0/0 .text * event036__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event036(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event036__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event036(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + u16 prm1; + u16 prm0; + getParam(&prm0, &prm1, flow_node->params); + + dComIfGs_onSaveSwitch(prm0, prm1); + return 1; } -#pragma pop /* 8024D8C4-8024D918 248204 0054+00 1/0 0/0 0/0 .text * event037__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event037(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event037__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event037(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + u16 prm1; + u16 prm0; + getParam(&prm0, &prm1, flow_node->params); + + dComIfGs_offSaveSwitch(prm0, prm1); + return 1; } -#pragma pop /* 8024D918-8024D93C 248258 0024+00 1/0 0/0 0/0 .text * event038__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event038(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event038__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event038(mesg_flow_node_event*, fopAc_ac_c*) { + dMeter2Info_recieveLetter(); + return 1; } -#pragma pop /* 8024D93C-8024D970 24827C 0034+00 1/0 0/0 0/0 .text * event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event039(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event039(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + dMeter2Info_setTableMapRegionNo(getParam(flow_node->params)); + return 1; } -#pragma pop /* 8024D970-8024DA78 2482B0 0108+00 2/0 0/0 0/0 .text * event040__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +// matches with literals +#ifdef NONMATCHING +int dMsgFlow_c::event040(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); + + switch (prm0) { + case 0: + break; + case 1: + dComIfGs_setBottleItemIn(RED_BOTTLE, EMPTY_BOTTLE); + break; + case 2: + dComIfGs_setBottleItemIn(GREEN_BOTTLE, EMPTY_BOTTLE); + break; + case 3: + dComIfGs_setBottleItemIn(BLUE_BOTTLE, EMPTY_BOTTLE); + break; + case 4: + dComIfGs_setBottleItemIn(MILK_BOTTLE, EMPTY_BOTTLE); + break; + case 5: + dComIfGs_setBottleItemIn(HALF_MILK_BOTTLE, EMPTY_BOTTLE); + break; + case 6: + dComIfGs_setBottleItemIn(OIL_BOTTLE, EMPTY_BOTTLE); + break; + case 7: + dComIfGs_setBottleItemIn(HOT_SPRING, EMPTY_BOTTLE); + break; + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgFlow_c::event040(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { +asm int dMsgFlow_c::event040(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { nofralloc #include "asm/d/msg/d_msg_flow/event040__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024DA78-8024DAA8 2483B8 0030+00 1/0 0/0 0/0 .text * event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgFlow_c::event041(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/msg/d_msg_flow/event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" +int dMsgFlow_c::event041(mesg_flow_node_event* flow_node, fopAc_ac_c*) { + int prm0 = getParam(flow_node->params); + dMsgObject_addOffering(prm0); + + return 1; } -#pragma pop /* 8024DAA8-8024DAB0 2483E8 0008+00 1/0 0/0 0/0 .text * event042__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ -bool dMsgFlow_c::event042(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { - return true; +int dMsgFlow_c::event042(mesg_flow_node_event*, fopAc_ac_c*) { + return 1; } /* 8024DAB0-8024DACC 2483F0 001C+00 3/3 0/0 0/0 .text cLib_calcTimer__FPl */ @@ -2857,19 +2395,4 @@ extern "C" asm void func_8024DAB0(void* _this, s32* param_0) { } #pragma pop -/* 8024DACC-8024E3E0 24840C 0914+00 0/0 1/0 0/0 .text __sinit_d_msg_flow_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_msg_flow_cpp() { - nofralloc -#include "asm/d/msg/d_msg_flow/__sinit_d_msg_flow_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8024DACC, __sinit_d_msg_flow_cpp); -#pragma pop - /* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index bb259748cc0..53b349a53ee 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -12,28 +12,6 @@ // Types: // -struct jmessage_tControl {}; - -struct jmessage_tReference { - /* 80228B04 */ jmessage_tReference(); - /* 80229034 */ void pageSend(); - /* 80229168 */ void selectMessage(); - /* 802294A8 */ void inputNumber(); - /* 802297E4 */ void shiftCharCountBuffer(); - /* 80229810 */ void resetCharCountBuffer(); - /* 8022994C */ void isLightEnd(); - /* 80238C78 */ void setActorPos(cXyz); -}; - -struct jmessage_tSequenceProcessor { - /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*); -}; - -struct jmessage_tRenderingProcessor { - /* 8022CCB0 */ jmessage_tRenderingProcessor(jmessage_tReference const*); - /* 8022E12C */ void resetRendering(); -}; - struct dMsgString_c { /* 80249C20 */ dMsgString_c(); /* 80249D28 */ ~dMsgString_c(); @@ -133,28 +111,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JMessage { - struct TControl { - /* 802A75D4 */ void reset(); - /* 802A7634 */ void update(); - /* 802A76BC */ void render(); - /* 802A77E8 */ void setMessageCode(u16, u16); - /* 802A78F4 */ void setMessageID(u32, u32, bool*); - }; - - struct TResourceContainer { - struct TCResource { - /* 802A8EF8 */ ~TCResource(); - }; - - /* 802A906C */ TResourceContainer(); - }; - - struct TParse { - /* 802A9130 */ TParse(JMessage::TResourceContainer*); - }; -}; - // // Forward References: // @@ -1125,7 +1081,7 @@ asm void dMsgObject_c::isHowlMessage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::isMidonaMessage() { +asm bool dMsgObject_c::isMidonaMessage() { nofralloc #include "asm/d/msg/d_msg_object/isMidonaMessage__12dMsgObject_cFv.s" } @@ -1474,7 +1430,7 @@ asm void dMsgObject_c::offCameraCancelFlag() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::isKillMessageFlag() { +asm bool dMsgObject_c::isKillMessageFlag() { nofralloc #include "asm/d/msg/d_msg_object/isKillMessageFlag__12dMsgObject_cFv.s" } @@ -1781,7 +1737,7 @@ asm void dMsgObject_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* p #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getMsgDtPtr() { +asm u8* dMsgObject_c::getMsgDtPtr() { nofralloc #include "asm/d/msg/d_msg_object/getMsgDtPtr__12dMsgObject_cFv.s" } @@ -2121,7 +2077,7 @@ asm void dMsgObject_c::isHowlHearingMode() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getSelectBombBagID() { +asm u8 dMsgObject_c::getSelectBombBagID() { nofralloc #include "asm/d/msg/d_msg_object/getSelectBombBagID__12dMsgObject_cFv.s" } @@ -2131,7 +2087,7 @@ asm void dMsgObject_c::getSelectBombBagID() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getSelectBombPrice() { +asm s16 dMsgObject_c::getSelectBombPrice() { nofralloc #include "asm/d/msg/d_msg_object/getSelectBombPrice__12dMsgObject_cFv.s" } @@ -2232,7 +2188,7 @@ static asm void dMsgObject_addTotalPayment(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_getFundRaising() { +asm u16 dMsgObject_getFundRaising() { nofralloc #include "asm/d/msg/d_msg_object/dMsgObject_getFundRaising__Fv.s" } @@ -2262,7 +2218,7 @@ static asm void dMsgObject_addFundRaising(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_getOffering() { +asm u16 dMsgObject_getOffering() { nofralloc #include "asm/d/msg/d_msg_object/dMsgObject_getOffering__Fv.s" } diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp index 34e97f46d68..f6f74ea5425 100644 --- a/src/d/shop/d_shop_system.cpp +++ b/src/d/shop/d_shop_system.cpp @@ -1940,9 +1940,9 @@ int dShopSystem_c::seq_choose(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { p_flow->doFlow(actor, NULL, 0); - u16 select_num = p_flow->getSelectNum(); + int select_num = p_flow->getSelectNum(); if (dMsgObject_c::getStatus() != 6 && dMsgObject_c::getStatus() != 8 && dMsgObject_c::getStatus() != 9 && dMsgObject_c::getStatus() != 20) { - if (select_num == 0) { + if ((u16)select_num == 0) { setSeq(SEQ_DECIDE_YES); } else { setSeq(SEQ_DECIDE_NO); diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 2450e5d4a69..f86916988cb 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -129,7 +129,7 @@ asm void fopMsgM_setStageLayer(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void fopMsgM_SearchByID(unsigned int param_0) { +asm msg_class* fopMsgM_SearchByID(unsigned int param_0) { nofralloc #include "asm/f_op/f_op_msg_mng/fopMsgM_SearchByID__FUi.s" } From 9b81bd3fc3594033d60dec2337f286a2ffab7414 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 15 Mar 2022 02:35:30 -0700 Subject: [PATCH 3/3] format / asm --- .../CheckShopItemCreateHeap__FP10fopAc_ac_c.s | 23 - .../getPosP__12daShopItem_cFv.s | 3 - .../getRotateP__12daShopItem_cFv.s | 3 - asm/d/msg/d_msg_flow/__ct__10dMsgFlow_cFv.s | 19 - asm/d/msg/d_msg_flow/__dt__10dMsgFlow_cFv.s | 20 - asm/d/msg/d_msg_flow/__sinit_d_msg_flow_cpp.s | 582 ------------------ ...10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s | 39 -- .../checkEventRender__10dMsgFlow_cFPiPiPiPi.s | 49 -- ...0dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci.s | 94 --- ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 17 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 17 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 18 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 30 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 11 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 38 -- ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 38 -- ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 17 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 58 -- ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 58 -- ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 15 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 82 --- ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 66 -- ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 59 -- ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 11 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 19 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 18 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 34 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 13 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 17 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 49 -- ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 22 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 22 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 10 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 14 - ...w_cFP20mesg_flow_node_eventP10fopAc_ac_c.s | 13 - .../d_msg_flow/getEventId__10dMsgFlow_cFPi.s | 5 - .../msg/d_msg_flow/getMsgNo__10dMsgFlow_cFv.s | 3 - asm/d/msg/d_msg_flow/getMsg__10dMsgFlow_cFv.s | 17 - .../d_msg_flow/getNowMsgNo__10dMsgFlow_cFv.s | 3 - .../getParam__10dMsgFlow_cFPUcPUc.s | 12 - ...10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s | 71 --- ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 19 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 39 -- ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 15 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 14 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 16 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 12 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 15 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 19 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 13 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 12 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 19 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 19 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 52 -- ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 19 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 13 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 23 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 18 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 30 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 16 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 12 - asm/d/msg/d_msg_flow/remove__10dMsgFlow_cFv.s | 27 - .../d_msg_flow/setInitValue__10dMsgFlow_cFi.s | 40 -- .../__ct__15dShopItemCtrl_cFv.s | 19 - .../__dt__15dShopItemCtrl_cFv.s | 20 - .../getCurrentPos__15dShopItemCtrl_cFi.s | 41 -- .../isHomePos__15dShopItemCtrl_cFi.s | 48 -- .../setRotateAnime__15dShopItemCtrl_cFi.s | 49 -- .../d_shop_system/__dt__13dShopSystem_cFv.s | 59 -- ...troller__13dShopSystem_cFUcP10dMsgFlow_c.s | 115 ---- ...LeftTrigger__13dShopSystem_cFP9STControl.s | 10 - ...ightTrigger__13dShopSystem_cFP9STControl.s | 10 - .../checkShopOpen__13dShopSystem_cFv.s | 18 - .../createShopItem__13dShopSystem_cFi.s | 72 --- .../deleteObject__13dShopSystem_cFv.s | 31 - .../drawCursor__13dShopSystem_cFv.s | 60 -- .../getFlowNodeNum__13dShopSystem_cFv.s | 8 - .../d_shop_system/isFlag__13dShopSystem_cFi.s | 9 - .../isSoldOutItemFlag__13dShopSystem_cFi.s | 9 - .../itemRotate__13dShopSystem_cFv.s | 64 -- .../moveCursor__13dShopSystem_cFiUc.s | 20 - .../offFlag__13dShopSystem_cFi.s | 8 - .../offSoldOutItemFlag__13dShopSystem_cFi.s | 8 - .../d_shop_system/onFlag__13dShopSystem_cFi.s | 8 - .../onSoldOutItemFlag__13dShopSystem_cFi.s | 8 - ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 74 --- ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 77 --- ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 33 - ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 5 - ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 44 -- ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 24 - .../setSellItemMax__13dShopSystem_cFUc.s | 3 - .../setSeq__13dShopSystem_cFUc.s | 5 - .../setSoldOutFlag__13dShopSystem_cFv.s | 5 - .../setSoldOutItemHide__13dShopSystem_cFv.s | 31 - .../setSoldOut__13dShopSystem_cFv.s | 108 ---- .../shop_init__13dShopSystem_cFb.s | 38 -- .../daTagEscape_Create__FP10fopAc_ac_c.s | 23 - .../daTagEscape_Delete__FP13daTagEscape_c.s | 14 - .../d_a_tag_telop/create__13daTag_Telop_cFv.s | 46 -- .../daTag_Telop_Create__FP10fopAc_ac_c.s | 9 - .../daTag_Telop_Delete__FP13daTag_Telop_c.s | 14 - .../daTag_Telop_Execute__FP13daTag_Telop_c.s | 10 - .../execute__13daTag_Telop_cFv.s | 29 - include/JSystem/JMessage/control.h | 22 +- include/JSystem/JMessage/data.h | 6 +- include/JSystem/JMessage/locale.h | 12 +- include/JSystem/JMessage/processor.h | 162 +++-- include/JSystem/JMessage/resource.h | 52 +- include/d/a/d_a_alink.h | 2 +- include/d/a/d_a_npc.h | 6 +- include/d/a/d_a_shop_item_static.h | 2 +- include/d/msg/d_msg_flow.h | 4 +- include/d/msg/d_msg_object.h | 6 +- include/d/shop/d_shop_item_ctrl.h | 2 +- include/d/shop/d_shop_system.h | 8 +- include/f_op/f_op_msg_mng.h | 2 +- include/m_Do/m_Do_audio.h | 2 +- .../rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h | 6 +- libs/JSystem/JMessage/resource.cpp | 4 +- rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp | 2 +- src/d/a/d_a_npc.cpp | 2 +- src/d/a/d_a_shop_item_static.cpp | 9 +- src/d/msg/d_msg_flow.cpp | 159 ++--- src/d/shop/d_shop_item_ctrl.cpp | 3 +- src/d/shop/d_shop_system.cpp | 206 ++++--- 126 files changed, 316 insertions(+), 3820 deletions(-) delete mode 100644 asm/d/a/d_a_shop_item_static/CheckShopItemCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_shop_item_static/getPosP__12daShopItem_cFv.s delete mode 100644 asm/d/a/d_a_shop_item_static/getRotateP__12daShopItem_cFv.s delete mode 100644 asm/d/msg/d_msg_flow/__ct__10dMsgFlow_cFv.s delete mode 100644 asm/d/msg/d_msg_flow/__dt__10dMsgFlow_cFv.s delete mode 100644 asm/d/msg/d_msg_flow/__sinit_d_msg_flow_cpp.s delete mode 100644 asm/d/msg/d_msg_flow/branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/checkEventRender__10dMsgFlow_cFPiPiPiPi.s delete mode 100644 asm/d/msg/d_msg_flow/doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/event003__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event006__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event007__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event008__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event009__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event010__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event011__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event013__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event014__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event015__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event016__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event017__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event018__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event020__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event024__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event025__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event029__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event030__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event031__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event034__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event035__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event036__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event037__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event038__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/getEventId__10dMsgFlow_cFPi.s delete mode 100644 asm/d/msg/d_msg_flow/getMsgNo__10dMsgFlow_cFv.s delete mode 100644 asm/d/msg/d_msg_flow/getMsg__10dMsgFlow_cFv.s delete mode 100644 asm/d/msg/d_msg_flow/getNowMsgNo__10dMsgFlow_cFv.s delete mode 100644 asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUcPUc.s delete mode 100644 asm/d/msg/d_msg_flow/nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s delete mode 100644 asm/d/msg/d_msg_flow/query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query002__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query006__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query026__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query030__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query033__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query034__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query035__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query036__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query037__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query044__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query046__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query048__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query050__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query051__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query052__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query053__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/remove__10dMsgFlow_cFv.s delete mode 100644 asm/d/msg/d_msg_flow/setInitValue__10dMsgFlow_cFi.s delete mode 100644 asm/d/shop/d_shop_item_ctrl/__ct__15dShopItemCtrl_cFv.s delete mode 100644 asm/d/shop/d_shop_item_ctrl/__dt__15dShopItemCtrl_cFv.s delete mode 100644 asm/d/shop/d_shop_item_ctrl/getCurrentPos__15dShopItemCtrl_cFi.s delete mode 100644 asm/d/shop/d_shop_item_ctrl/isHomePos__15dShopItemCtrl_cFi.s delete mode 100644 asm/d/shop/d_shop_item_ctrl/setRotateAnime__15dShopItemCtrl_cFi.s delete mode 100644 asm/d/shop/d_shop_system/__dt__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/checkController__13dShopSystem_cFUcP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/checkLeftTrigger__13dShopSystem_cFP9STControl.s delete mode 100644 asm/d/shop/d_shop_system/checkRightTrigger__13dShopSystem_cFP9STControl.s delete mode 100644 asm/d/shop/d_shop_system/checkShopOpen__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/createShopItem__13dShopSystem_cFi.s delete mode 100644 asm/d/shop/d_shop_system/deleteObject__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/drawCursor__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/getFlowNodeNum__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/isFlag__13dShopSystem_cFi.s delete mode 100644 asm/d/shop/d_shop_system/isSoldOutItemFlag__13dShopSystem_cFi.s delete mode 100644 asm/d/shop/d_shop_system/itemRotate__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/moveCursor__13dShopSystem_cFiUc.s delete mode 100644 asm/d/shop/d_shop_system/offFlag__13dShopSystem_cFi.s delete mode 100644 asm/d/shop/d_shop_system/offSoldOutItemFlag__13dShopSystem_cFi.s delete mode 100644 asm/d/shop/d_shop_system/onFlag__13dShopSystem_cFi.s delete mode 100644 asm/d/shop/d_shop_system/onSoldOutItemFlag__13dShopSystem_cFi.s delete mode 100644 asm/d/shop/d_shop_system/seq_choose__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/seq_decide__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/seq_decide_no__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/seq_event__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/seq_finish__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/seq_select_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/setSellItemMax__13dShopSystem_cFUc.s delete mode 100644 asm/d/shop/d_shop_system/setSeq__13dShopSystem_cFUc.s delete mode 100644 asm/d/shop/d_shop_system/setSoldOutFlag__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/setSoldOutItemHide__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/setSoldOut__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/shop_init__13dShopSystem_cFb.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape/daTagEscape_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape/daTagEscape_Delete__FP13daTagEscape_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/create__13daTag_Telop_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Delete__FP13daTag_Telop_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Execute__FP13daTag_Telop_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/execute__13daTag_Telop_cFv.s diff --git a/asm/d/a/d_a_shop_item_static/CheckShopItemCreateHeap__FP10fopAc_ac_c.s b/asm/d/a/d_a_shop_item_static/CheckShopItemCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index dbe54812f3b..00000000000 --- a/asm/d/a/d_a_shop_item_static/CheckShopItemCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80037C24: -/* 80037C24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80037C28 7C 08 02 A6 */ mflr r0 -/* 80037C2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80037C30 88 03 09 64 */ lbz r0, 0x964(r3) -/* 80037C34 1C A0 00 30 */ mulli r5, r0, 0x30 -/* 80037C38 3C 80 80 38 */ lis r4, mData__12daShopItem_c@ha /* 0x803792E8@ha */ -/* 80037C3C 38 84 92 E8 */ addi r4, r4, mData__12daShopItem_c@l /* 0x803792E8@l */ -/* 80037C40 7D 44 2A 14 */ add r10, r4, r5 -/* 80037C44 A8 0A 00 10 */ lha r0, 0x10(r10) -/* 80037C48 90 01 00 08 */ stw r0, 8(r1) -/* 80037C4C 7C 84 28 2E */ lwzx r4, r4, r5 -/* 80037C50 A8 AA 00 04 */ lha r5, 4(r10) -/* 80037C54 A8 CA 00 06 */ lha r6, 6(r10) -/* 80037C58 A8 EA 00 08 */ lha r7, 8(r10) -/* 80037C5C A9 0A 00 0A */ lha r8, 0xa(r10) -/* 80037C60 A9 2A 00 0C */ lha r9, 0xc(r10) -/* 80037C64 A9 4A 00 0E */ lha r10, 0xe(r10) -/* 80037C68 48 10 CA F5 */ bl CreateItemHeap__12daItemBase_cFPCcsssssss -/* 80037C6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80037C70 7C 08 03 A6 */ mtlr r0 -/* 80037C74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80037C78 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_shop_item_static/getPosP__12daShopItem_cFv.s b/asm/d/a/d_a_shop_item_static/getPosP__12daShopItem_cFv.s deleted file mode 100644 index 2e656a7a667..00000000000 --- a/asm/d/a/d_a_shop_item_static/getPosP__12daShopItem_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80037C1C: -/* 80037C1C 38 63 04 D0 */ addi r3, r3, 0x4d0 -/* 80037C20 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_shop_item_static/getRotateP__12daShopItem_cFv.s b/asm/d/a/d_a_shop_item_static/getRotateP__12daShopItem_cFv.s deleted file mode 100644 index e0b67da10e2..00000000000 --- a/asm/d/a/d_a_shop_item_static/getRotateP__12daShopItem_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80037C14: -/* 80037C14 38 63 04 DC */ addi r3, r3, 0x4dc -/* 80037C18 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/__ct__10dMsgFlow_cFv.s b/asm/d/msg/d_msg_flow/__ct__10dMsgFlow_cFv.s deleted file mode 100644 index 6785959a450..00000000000 --- a/asm/d/msg/d_msg_flow/__ct__10dMsgFlow_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80249F00: -/* 80249F00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80249F04 7C 08 02 A6 */ mflr r0 -/* 80249F08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80249F0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80249F10 7C 7F 1B 78 */ mr r31, r3 -/* 80249F14 3C 80 80 3C */ lis r4, __vt__10dMsgFlow_c@ha /* 0x803C1F40@ha */ -/* 80249F18 38 04 1F 40 */ addi r0, r4, __vt__10dMsgFlow_c@l /* 0x803C1F40@l */ -/* 80249F1C 90 03 00 00 */ stw r0, 0(r3) -/* 80249F20 38 00 00 00 */ li r0, 0 -/* 80249F24 98 03 00 48 */ stb r0, 0x48(r3) -/* 80249F28 38 80 00 01 */ li r4, 1 -/* 80249F2C 48 00 06 55 */ bl setInitValue__10dMsgFlow_cFi -/* 80249F30 7F E3 FB 78 */ mr r3, r31 -/* 80249F34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80249F38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80249F3C 7C 08 03 A6 */ mtlr r0 -/* 80249F40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80249F44 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/__dt__10dMsgFlow_cFv.s b/asm/d/msg/d_msg_flow/__dt__10dMsgFlow_cFv.s deleted file mode 100644 index fbfb09b3b38..00000000000 --- a/asm/d/msg/d_msg_flow/__dt__10dMsgFlow_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80249F48: -/* 80249F48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80249F4C 7C 08 02 A6 */ mflr r0 -/* 80249F50 90 01 00 14 */ stw r0, 0x14(r1) -/* 80249F54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80249F58 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80249F5C 41 82 00 1C */ beq lbl_80249F78 -/* 80249F60 3C A0 80 3C */ lis r5, __vt__10dMsgFlow_c@ha /* 0x803C1F40@ha */ -/* 80249F64 38 05 1F 40 */ addi r0, r5, __vt__10dMsgFlow_c@l /* 0x803C1F40@l */ -/* 80249F68 90 1F 00 00 */ stw r0, 0(r31) -/* 80249F6C 7C 80 07 35 */ extsh. r0, r4 -/* 80249F70 40 81 00 08 */ ble lbl_80249F78 -/* 80249F74 48 08 4D C9 */ bl __dl__FPv -lbl_80249F78: -/* 80249F78 7F E3 FB 78 */ mr r3, r31 -/* 80249F7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80249F80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80249F84 7C 08 03 A6 */ mtlr r0 -/* 80249F88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80249F8C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/__sinit_d_msg_flow_cpp.s b/asm/d/msg/d_msg_flow/__sinit_d_msg_flow_cpp.s deleted file mode 100644 index f15bafce46c..00000000000 --- a/asm/d/msg/d_msg_flow/__sinit_d_msg_flow_cpp.s +++ /dev/null @@ -1,582 +0,0 @@ -lbl_8024DACC: -/* 8024DACC 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803C14B8@ha */ -/* 8024DAD0 38 83 14 B8 */ addi r4, r3, cNullVec__6Z2Calc@l /* 0x803C14B8@l */ -/* 8024DAD4 80 64 01 18 */ lwz r3, 0x118(r4) -/* 8024DAD8 80 04 01 1C */ lwz r0, 0x11c(r4) -/* 8024DADC 90 64 03 94 */ stw r3, 0x394(r4) -/* 8024DAE0 90 04 03 98 */ stw r0, 0x398(r4) -/* 8024DAE4 80 04 01 20 */ lwz r0, 0x120(r4) -/* 8024DAE8 90 04 03 9C */ stw r0, 0x39c(r4) -/* 8024DAEC 38 64 03 94 */ addi r3, r4, 0x394 -/* 8024DAF0 80 A4 01 24 */ lwz r5, 0x124(r4) -/* 8024DAF4 80 04 01 28 */ lwz r0, 0x128(r4) -/* 8024DAF8 90 A3 00 0C */ stw r5, 0xc(r3) -/* 8024DAFC 90 03 00 10 */ stw r0, 0x10(r3) -/* 8024DB00 80 04 01 2C */ lwz r0, 0x12c(r4) -/* 8024DB04 90 03 00 14 */ stw r0, 0x14(r3) -/* 8024DB08 80 A4 01 30 */ lwz r5, 0x130(r4) -/* 8024DB0C 80 04 01 34 */ lwz r0, 0x134(r4) -/* 8024DB10 90 A3 00 18 */ stw r5, 0x18(r3) -/* 8024DB14 90 03 00 1C */ stw r0, 0x1c(r3) -/* 8024DB18 80 04 01 38 */ lwz r0, 0x138(r4) -/* 8024DB1C 90 03 00 20 */ stw r0, 0x20(r3) -/* 8024DB20 80 A4 01 3C */ lwz r5, 0x13c(r4) -/* 8024DB24 80 04 01 40 */ lwz r0, 0x140(r4) -/* 8024DB28 90 A3 00 24 */ stw r5, 0x24(r3) -/* 8024DB2C 90 03 00 28 */ stw r0, 0x28(r3) -/* 8024DB30 80 04 01 44 */ lwz r0, 0x144(r4) -/* 8024DB34 90 03 00 2C */ stw r0, 0x2c(r3) -/* 8024DB38 80 A4 01 48 */ lwz r5, 0x148(r4) -/* 8024DB3C 80 04 01 4C */ lwz r0, 0x14c(r4) -/* 8024DB40 90 A3 00 30 */ stw r5, 0x30(r3) -/* 8024DB44 90 03 00 34 */ stw r0, 0x34(r3) -/* 8024DB48 80 04 01 50 */ lwz r0, 0x150(r4) -/* 8024DB4C 90 03 00 38 */ stw r0, 0x38(r3) -/* 8024DB50 80 A4 01 54 */ lwz r5, 0x154(r4) -/* 8024DB54 80 04 01 58 */ lwz r0, 0x158(r4) -/* 8024DB58 90 A3 00 3C */ stw r5, 0x3c(r3) -/* 8024DB5C 90 03 00 40 */ stw r0, 0x40(r3) -/* 8024DB60 80 04 01 5C */ lwz r0, 0x15c(r4) -/* 8024DB64 90 03 00 44 */ stw r0, 0x44(r3) -/* 8024DB68 80 A4 01 60 */ lwz r5, 0x160(r4) -/* 8024DB6C 80 04 01 64 */ lwz r0, 0x164(r4) -/* 8024DB70 90 A3 00 48 */ stw r5, 0x48(r3) -/* 8024DB74 90 03 00 4C */ stw r0, 0x4c(r3) -/* 8024DB78 80 04 01 68 */ lwz r0, 0x168(r4) -/* 8024DB7C 90 03 00 50 */ stw r0, 0x50(r3) -/* 8024DB80 80 A4 01 6C */ lwz r5, 0x16c(r4) -/* 8024DB84 80 04 01 70 */ lwz r0, 0x170(r4) -/* 8024DB88 90 A3 00 54 */ stw r5, 0x54(r3) -/* 8024DB8C 90 03 00 58 */ stw r0, 0x58(r3) -/* 8024DB90 80 04 01 74 */ lwz r0, 0x174(r4) -/* 8024DB94 90 03 00 5C */ stw r0, 0x5c(r3) -/* 8024DB98 80 A4 01 78 */ lwz r5, 0x178(r4) -/* 8024DB9C 80 04 01 7C */ lwz r0, 0x17c(r4) -/* 8024DBA0 90 A3 00 60 */ stw r5, 0x60(r3) -/* 8024DBA4 90 03 00 64 */ stw r0, 0x64(r3) -/* 8024DBA8 80 04 01 80 */ lwz r0, 0x180(r4) -/* 8024DBAC 90 03 00 68 */ stw r0, 0x68(r3) -/* 8024DBB0 80 A4 01 84 */ lwz r5, 0x184(r4) -/* 8024DBB4 80 04 01 88 */ lwz r0, 0x188(r4) -/* 8024DBB8 90 A3 00 6C */ stw r5, 0x6c(r3) -/* 8024DBBC 90 03 00 70 */ stw r0, 0x70(r3) -/* 8024DBC0 80 04 01 8C */ lwz r0, 0x18c(r4) -/* 8024DBC4 90 03 00 74 */ stw r0, 0x74(r3) -/* 8024DBC8 80 A4 01 90 */ lwz r5, 0x190(r4) -/* 8024DBCC 80 04 01 94 */ lwz r0, 0x194(r4) -/* 8024DBD0 90 A3 00 78 */ stw r5, 0x78(r3) -/* 8024DBD4 90 03 00 7C */ stw r0, 0x7c(r3) -/* 8024DBD8 80 04 01 98 */ lwz r0, 0x198(r4) -/* 8024DBDC 90 03 00 80 */ stw r0, 0x80(r3) -/* 8024DBE0 80 A4 01 9C */ lwz r5, 0x19c(r4) -/* 8024DBE4 80 04 01 A0 */ lwz r0, 0x1a0(r4) -/* 8024DBE8 90 A3 00 84 */ stw r5, 0x84(r3) -/* 8024DBEC 90 03 00 88 */ stw r0, 0x88(r3) -/* 8024DBF0 80 04 01 A4 */ lwz r0, 0x1a4(r4) -/* 8024DBF4 90 03 00 8C */ stw r0, 0x8c(r3) -/* 8024DBF8 80 A4 01 A8 */ lwz r5, 0x1a8(r4) -/* 8024DBFC 80 04 01 AC */ lwz r0, 0x1ac(r4) -/* 8024DC00 90 A3 00 90 */ stw r5, 0x90(r3) -/* 8024DC04 90 03 00 94 */ stw r0, 0x94(r3) -/* 8024DC08 80 04 01 B0 */ lwz r0, 0x1b0(r4) -/* 8024DC0C 90 03 00 98 */ stw r0, 0x98(r3) -/* 8024DC10 80 A4 01 B4 */ lwz r5, 0x1b4(r4) -/* 8024DC14 80 04 01 B8 */ lwz r0, 0x1b8(r4) -/* 8024DC18 90 A3 00 9C */ stw r5, 0x9c(r3) -/* 8024DC1C 90 03 00 A0 */ stw r0, 0xa0(r3) -/* 8024DC20 80 04 01 BC */ lwz r0, 0x1bc(r4) -/* 8024DC24 90 03 00 A4 */ stw r0, 0xa4(r3) -/* 8024DC28 80 A4 01 C0 */ lwz r5, 0x1c0(r4) -/* 8024DC2C 80 04 01 C4 */ lwz r0, 0x1c4(r4) -/* 8024DC30 90 A3 00 A8 */ stw r5, 0xa8(r3) -/* 8024DC34 90 03 00 AC */ stw r0, 0xac(r3) -/* 8024DC38 80 04 01 C8 */ lwz r0, 0x1c8(r4) -/* 8024DC3C 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 8024DC40 80 A4 01 CC */ lwz r5, 0x1cc(r4) -/* 8024DC44 80 04 01 D0 */ lwz r0, 0x1d0(r4) -/* 8024DC48 90 A3 00 B4 */ stw r5, 0xb4(r3) -/* 8024DC4C 90 03 00 B8 */ stw r0, 0xb8(r3) -/* 8024DC50 80 04 01 D4 */ lwz r0, 0x1d4(r4) -/* 8024DC54 90 03 00 BC */ stw r0, 0xbc(r3) -/* 8024DC58 80 A4 01 D8 */ lwz r5, 0x1d8(r4) -/* 8024DC5C 80 04 01 DC */ lwz r0, 0x1dc(r4) -/* 8024DC60 90 A3 00 C0 */ stw r5, 0xc0(r3) -/* 8024DC64 90 03 00 C4 */ stw r0, 0xc4(r3) -/* 8024DC68 80 04 01 E0 */ lwz r0, 0x1e0(r4) -/* 8024DC6C 90 03 00 C8 */ stw r0, 0xc8(r3) -/* 8024DC70 80 A4 01 E4 */ lwz r5, 0x1e4(r4) -/* 8024DC74 80 04 01 E8 */ lwz r0, 0x1e8(r4) -/* 8024DC78 90 A3 00 CC */ stw r5, 0xcc(r3) -/* 8024DC7C 90 03 00 D0 */ stw r0, 0xd0(r3) -/* 8024DC80 80 04 01 EC */ lwz r0, 0x1ec(r4) -/* 8024DC84 90 03 00 D4 */ stw r0, 0xd4(r3) -/* 8024DC88 80 A4 01 F0 */ lwz r5, 0x1f0(r4) -/* 8024DC8C 80 04 01 F4 */ lwz r0, 0x1f4(r4) -/* 8024DC90 90 A3 00 D8 */ stw r5, 0xd8(r3) -/* 8024DC94 90 03 00 DC */ stw r0, 0xdc(r3) -/* 8024DC98 80 04 01 F8 */ lwz r0, 0x1f8(r4) -/* 8024DC9C 90 03 00 E0 */ stw r0, 0xe0(r3) -/* 8024DCA0 80 A4 01 FC */ lwz r5, 0x1fc(r4) -/* 8024DCA4 80 04 02 00 */ lwz r0, 0x200(r4) -/* 8024DCA8 90 A3 00 E4 */ stw r5, 0xe4(r3) -/* 8024DCAC 90 03 00 E8 */ stw r0, 0xe8(r3) -/* 8024DCB0 80 04 02 04 */ lwz r0, 0x204(r4) -/* 8024DCB4 90 03 00 EC */ stw r0, 0xec(r3) -/* 8024DCB8 80 A4 02 08 */ lwz r5, 0x208(r4) -/* 8024DCBC 80 04 02 0C */ lwz r0, 0x20c(r4) -/* 8024DCC0 90 A3 00 F0 */ stw r5, 0xf0(r3) -/* 8024DCC4 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8024DCC8 80 04 02 10 */ lwz r0, 0x210(r4) -/* 8024DCCC 90 03 00 F8 */ stw r0, 0xf8(r3) -/* 8024DCD0 80 A4 02 14 */ lwz r5, 0x214(r4) -/* 8024DCD4 80 04 02 18 */ lwz r0, 0x218(r4) -/* 8024DCD8 90 A3 00 FC */ stw r5, 0xfc(r3) -/* 8024DCDC 90 03 01 00 */ stw r0, 0x100(r3) -/* 8024DCE0 80 04 02 1C */ lwz r0, 0x21c(r4) -/* 8024DCE4 90 03 01 04 */ stw r0, 0x104(r3) -/* 8024DCE8 80 A4 02 20 */ lwz r5, 0x220(r4) -/* 8024DCEC 80 04 02 24 */ lwz r0, 0x224(r4) -/* 8024DCF0 90 A3 01 08 */ stw r5, 0x108(r3) -/* 8024DCF4 90 03 01 0C */ stw r0, 0x10c(r3) -/* 8024DCF8 80 04 02 28 */ lwz r0, 0x228(r4) -/* 8024DCFC 90 03 01 10 */ stw r0, 0x110(r3) -/* 8024DD00 80 A4 02 2C */ lwz r5, 0x22c(r4) -/* 8024DD04 80 04 02 30 */ lwz r0, 0x230(r4) -/* 8024DD08 90 A3 01 14 */ stw r5, 0x114(r3) -/* 8024DD0C 90 03 01 18 */ stw r0, 0x118(r3) -/* 8024DD10 80 04 02 34 */ lwz r0, 0x234(r4) -/* 8024DD14 90 03 01 1C */ stw r0, 0x11c(r3) -/* 8024DD18 80 A4 02 38 */ lwz r5, 0x238(r4) -/* 8024DD1C 80 04 02 3C */ lwz r0, 0x23c(r4) -/* 8024DD20 90 A3 01 20 */ stw r5, 0x120(r3) -/* 8024DD24 90 03 01 24 */ stw r0, 0x124(r3) -/* 8024DD28 80 04 02 40 */ lwz r0, 0x240(r4) -/* 8024DD2C 90 03 01 28 */ stw r0, 0x128(r3) -/* 8024DD30 80 A4 02 44 */ lwz r5, 0x244(r4) -/* 8024DD34 80 04 02 48 */ lwz r0, 0x248(r4) -/* 8024DD38 90 A3 01 2C */ stw r5, 0x12c(r3) -/* 8024DD3C 90 03 01 30 */ stw r0, 0x130(r3) -/* 8024DD40 80 04 02 4C */ lwz r0, 0x24c(r4) -/* 8024DD44 90 03 01 34 */ stw r0, 0x134(r3) -/* 8024DD48 80 A4 02 50 */ lwz r5, 0x250(r4) -/* 8024DD4C 80 04 02 54 */ lwz r0, 0x254(r4) -/* 8024DD50 90 A3 01 38 */ stw r5, 0x138(r3) -/* 8024DD54 90 03 01 3C */ stw r0, 0x13c(r3) -/* 8024DD58 80 04 02 58 */ lwz r0, 0x258(r4) -/* 8024DD5C 90 03 01 40 */ stw r0, 0x140(r3) -/* 8024DD60 80 A4 02 5C */ lwz r5, 0x25c(r4) -/* 8024DD64 80 04 02 60 */ lwz r0, 0x260(r4) -/* 8024DD68 90 A3 01 44 */ stw r5, 0x144(r3) -/* 8024DD6C 90 03 01 48 */ stw r0, 0x148(r3) -/* 8024DD70 80 04 02 64 */ lwz r0, 0x264(r4) -/* 8024DD74 90 03 01 4C */ stw r0, 0x14c(r3) -/* 8024DD78 80 A4 02 68 */ lwz r5, 0x268(r4) -/* 8024DD7C 80 04 02 6C */ lwz r0, 0x26c(r4) -/* 8024DD80 90 A3 01 50 */ stw r5, 0x150(r3) -/* 8024DD84 90 03 01 54 */ stw r0, 0x154(r3) -/* 8024DD88 80 04 02 70 */ lwz r0, 0x270(r4) -/* 8024DD8C 90 03 01 58 */ stw r0, 0x158(r3) -/* 8024DD90 80 A4 02 74 */ lwz r5, 0x274(r4) -/* 8024DD94 80 04 02 78 */ lwz r0, 0x278(r4) -/* 8024DD98 90 A3 01 5C */ stw r5, 0x15c(r3) -/* 8024DD9C 90 03 01 60 */ stw r0, 0x160(r3) -/* 8024DDA0 80 04 02 7C */ lwz r0, 0x27c(r4) -/* 8024DDA4 90 03 01 64 */ stw r0, 0x164(r3) -/* 8024DDA8 80 A4 02 80 */ lwz r5, 0x280(r4) -/* 8024DDAC 80 04 02 84 */ lwz r0, 0x284(r4) -/* 8024DDB0 90 A3 01 68 */ stw r5, 0x168(r3) -/* 8024DDB4 90 03 01 6C */ stw r0, 0x16c(r3) -/* 8024DDB8 80 04 02 88 */ lwz r0, 0x288(r4) -/* 8024DDBC 90 03 01 70 */ stw r0, 0x170(r3) -/* 8024DDC0 80 A4 02 8C */ lwz r5, 0x28c(r4) -/* 8024DDC4 80 04 02 90 */ lwz r0, 0x290(r4) -/* 8024DDC8 90 A3 01 74 */ stw r5, 0x174(r3) -/* 8024DDCC 90 03 01 78 */ stw r0, 0x178(r3) -/* 8024DDD0 80 04 02 94 */ lwz r0, 0x294(r4) -/* 8024DDD4 90 03 01 7C */ stw r0, 0x17c(r3) -/* 8024DDD8 80 A4 02 98 */ lwz r5, 0x298(r4) -/* 8024DDDC 80 04 02 9C */ lwz r0, 0x29c(r4) -/* 8024DDE0 90 A3 01 80 */ stw r5, 0x180(r3) -/* 8024DDE4 90 03 01 84 */ stw r0, 0x184(r3) -/* 8024DDE8 80 04 02 A0 */ lwz r0, 0x2a0(r4) -/* 8024DDEC 90 03 01 88 */ stw r0, 0x188(r3) -/* 8024DDF0 80 A4 02 A4 */ lwz r5, 0x2a4(r4) -/* 8024DDF4 80 04 02 A8 */ lwz r0, 0x2a8(r4) -/* 8024DDF8 90 A3 01 8C */ stw r5, 0x18c(r3) -/* 8024DDFC 90 03 01 90 */ stw r0, 0x190(r3) -/* 8024DE00 80 04 02 AC */ lwz r0, 0x2ac(r4) -/* 8024DE04 90 03 01 94 */ stw r0, 0x194(r3) -/* 8024DE08 80 A4 02 B0 */ lwz r5, 0x2b0(r4) -/* 8024DE0C 80 04 02 B4 */ lwz r0, 0x2b4(r4) -/* 8024DE10 90 A3 01 98 */ stw r5, 0x198(r3) -/* 8024DE14 90 03 01 9C */ stw r0, 0x19c(r3) -/* 8024DE18 80 04 02 B8 */ lwz r0, 0x2b8(r4) -/* 8024DE1C 90 03 01 A0 */ stw r0, 0x1a0(r3) -/* 8024DE20 80 A4 02 BC */ lwz r5, 0x2bc(r4) -/* 8024DE24 80 04 02 C0 */ lwz r0, 0x2c0(r4) -/* 8024DE28 90 A3 01 A4 */ stw r5, 0x1a4(r3) -/* 8024DE2C 90 03 01 A8 */ stw r0, 0x1a8(r3) -/* 8024DE30 80 04 02 C4 */ lwz r0, 0x2c4(r4) -/* 8024DE34 90 03 01 AC */ stw r0, 0x1ac(r3) -/* 8024DE38 80 A4 02 C8 */ lwz r5, 0x2c8(r4) -/* 8024DE3C 80 04 02 CC */ lwz r0, 0x2cc(r4) -/* 8024DE40 90 A3 01 B0 */ stw r5, 0x1b0(r3) -/* 8024DE44 90 03 01 B4 */ stw r0, 0x1b4(r3) -/* 8024DE48 80 04 02 D0 */ lwz r0, 0x2d0(r4) -/* 8024DE4C 90 03 01 B8 */ stw r0, 0x1b8(r3) -/* 8024DE50 80 A4 02 D4 */ lwz r5, 0x2d4(r4) -/* 8024DE54 80 04 02 D8 */ lwz r0, 0x2d8(r4) -/* 8024DE58 90 A3 01 BC */ stw r5, 0x1bc(r3) -/* 8024DE5C 90 03 01 C0 */ stw r0, 0x1c0(r3) -/* 8024DE60 80 04 02 DC */ lwz r0, 0x2dc(r4) -/* 8024DE64 90 03 01 C4 */ stw r0, 0x1c4(r3) -/* 8024DE68 80 A4 02 E0 */ lwz r5, 0x2e0(r4) -/* 8024DE6C 80 04 02 E4 */ lwz r0, 0x2e4(r4) -/* 8024DE70 90 A3 01 C8 */ stw r5, 0x1c8(r3) -/* 8024DE74 90 03 01 CC */ stw r0, 0x1cc(r3) -/* 8024DE78 80 04 02 E8 */ lwz r0, 0x2e8(r4) -/* 8024DE7C 90 03 01 D0 */ stw r0, 0x1d0(r3) -/* 8024DE80 80 A4 02 EC */ lwz r5, 0x2ec(r4) -/* 8024DE84 80 04 02 F0 */ lwz r0, 0x2f0(r4) -/* 8024DE88 90 A3 01 D4 */ stw r5, 0x1d4(r3) -/* 8024DE8C 90 03 01 D8 */ stw r0, 0x1d8(r3) -/* 8024DE90 80 04 02 F4 */ lwz r0, 0x2f4(r4) -/* 8024DE94 90 03 01 DC */ stw r0, 0x1dc(r3) -/* 8024DE98 80 A4 02 F8 */ lwz r5, 0x2f8(r4) -/* 8024DE9C 80 04 02 FC */ lwz r0, 0x2fc(r4) -/* 8024DEA0 90 A3 01 E0 */ stw r5, 0x1e0(r3) -/* 8024DEA4 90 03 01 E4 */ stw r0, 0x1e4(r3) -/* 8024DEA8 80 04 03 00 */ lwz r0, 0x300(r4) -/* 8024DEAC 90 03 01 E8 */ stw r0, 0x1e8(r3) -/* 8024DEB0 80 A4 03 04 */ lwz r5, 0x304(r4) -/* 8024DEB4 80 04 03 08 */ lwz r0, 0x308(r4) -/* 8024DEB8 90 A3 01 EC */ stw r5, 0x1ec(r3) -/* 8024DEBC 90 03 01 F0 */ stw r0, 0x1f0(r3) -/* 8024DEC0 80 04 03 0C */ lwz r0, 0x30c(r4) -/* 8024DEC4 90 03 01 F4 */ stw r0, 0x1f4(r3) -/* 8024DEC8 80 A4 03 10 */ lwz r5, 0x310(r4) -/* 8024DECC 80 04 03 14 */ lwz r0, 0x314(r4) -/* 8024DED0 90 A3 01 F8 */ stw r5, 0x1f8(r3) -/* 8024DED4 90 03 01 FC */ stw r0, 0x1fc(r3) -/* 8024DED8 80 04 03 18 */ lwz r0, 0x318(r4) -/* 8024DEDC 90 03 02 00 */ stw r0, 0x200(r3) -/* 8024DEE0 80 A4 03 1C */ lwz r5, 0x31c(r4) -/* 8024DEE4 80 04 03 20 */ lwz r0, 0x320(r4) -/* 8024DEE8 90 A3 02 04 */ stw r5, 0x204(r3) -/* 8024DEEC 90 03 02 08 */ stw r0, 0x208(r3) -/* 8024DEF0 80 04 03 24 */ lwz r0, 0x324(r4) -/* 8024DEF4 90 03 02 0C */ stw r0, 0x20c(r3) -/* 8024DEF8 80 A4 03 28 */ lwz r5, 0x328(r4) -/* 8024DEFC 80 04 03 2C */ lwz r0, 0x32c(r4) -/* 8024DF00 90 A3 02 10 */ stw r5, 0x210(r3) -/* 8024DF04 90 03 02 14 */ stw r0, 0x214(r3) -/* 8024DF08 80 04 03 30 */ lwz r0, 0x330(r4) -/* 8024DF0C 90 03 02 18 */ stw r0, 0x218(r3) -/* 8024DF10 80 A4 03 34 */ lwz r5, 0x334(r4) -/* 8024DF14 80 04 03 38 */ lwz r0, 0x338(r4) -/* 8024DF18 90 A3 02 1C */ stw r5, 0x21c(r3) -/* 8024DF1C 90 03 02 20 */ stw r0, 0x220(r3) -/* 8024DF20 80 04 03 3C */ lwz r0, 0x33c(r4) -/* 8024DF24 90 03 02 24 */ stw r0, 0x224(r3) -/* 8024DF28 80 A4 03 40 */ lwz r5, 0x340(r4) -/* 8024DF2C 80 04 03 44 */ lwz r0, 0x344(r4) -/* 8024DF30 90 A3 02 28 */ stw r5, 0x228(r3) -/* 8024DF34 90 03 02 2C */ stw r0, 0x22c(r3) -/* 8024DF38 80 04 03 48 */ lwz r0, 0x348(r4) -/* 8024DF3C 90 03 02 30 */ stw r0, 0x230(r3) -/* 8024DF40 80 A4 03 4C */ lwz r5, 0x34c(r4) -/* 8024DF44 80 04 03 50 */ lwz r0, 0x350(r4) -/* 8024DF48 90 A3 02 34 */ stw r5, 0x234(r3) -/* 8024DF4C 90 03 02 38 */ stw r0, 0x238(r3) -/* 8024DF50 80 04 03 54 */ lwz r0, 0x354(r4) -/* 8024DF54 90 03 02 3C */ stw r0, 0x23c(r3) -/* 8024DF58 80 A4 03 58 */ lwz r5, 0x358(r4) -/* 8024DF5C 80 04 03 5C */ lwz r0, 0x35c(r4) -/* 8024DF60 90 A3 02 40 */ stw r5, 0x240(r3) -/* 8024DF64 90 03 02 44 */ stw r0, 0x244(r3) -/* 8024DF68 80 04 03 60 */ lwz r0, 0x360(r4) -/* 8024DF6C 90 03 02 48 */ stw r0, 0x248(r3) -/* 8024DF70 80 A4 03 64 */ lwz r5, 0x364(r4) -/* 8024DF74 80 04 03 68 */ lwz r0, 0x368(r4) -/* 8024DF78 90 A3 02 4C */ stw r5, 0x24c(r3) -/* 8024DF7C 90 03 02 50 */ stw r0, 0x250(r3) -/* 8024DF80 80 04 03 6C */ lwz r0, 0x36c(r4) -/* 8024DF84 90 03 02 54 */ stw r0, 0x254(r3) -/* 8024DF88 80 A4 03 70 */ lwz r5, 0x370(r4) -/* 8024DF8C 80 04 03 74 */ lwz r0, 0x374(r4) -/* 8024DF90 90 A3 02 58 */ stw r5, 0x258(r3) -/* 8024DF94 90 03 02 5C */ stw r0, 0x25c(r3) -/* 8024DF98 80 04 03 78 */ lwz r0, 0x378(r4) -/* 8024DF9C 90 03 02 60 */ stw r0, 0x260(r3) -/* 8024DFA0 80 A4 03 7C */ lwz r5, 0x37c(r4) -/* 8024DFA4 80 04 03 80 */ lwz r0, 0x380(r4) -/* 8024DFA8 90 A3 02 64 */ stw r5, 0x264(r3) -/* 8024DFAC 90 03 02 68 */ stw r0, 0x268(r3) -/* 8024DFB0 80 04 03 84 */ lwz r0, 0x384(r4) -/* 8024DFB4 90 03 02 6C */ stw r0, 0x26c(r3) -/* 8024DFB8 80 A4 03 88 */ lwz r5, 0x388(r4) -/* 8024DFBC 80 04 03 8C */ lwz r0, 0x38c(r4) -/* 8024DFC0 90 A3 02 70 */ stw r5, 0x270(r3) -/* 8024DFC4 90 03 02 74 */ stw r0, 0x274(r3) -/* 8024DFC8 80 04 03 90 */ lwz r0, 0x390(r4) -/* 8024DFCC 90 03 02 78 */ stw r0, 0x278(r3) -/* 8024DFD0 80 64 06 10 */ lwz r3, 0x610(r4) -/* 8024DFD4 80 04 06 14 */ lwz r0, 0x614(r4) -/* 8024DFD8 90 64 08 14 */ stw r3, 0x814(r4) -/* 8024DFDC 90 04 08 18 */ stw r0, 0x818(r4) -/* 8024DFE0 80 04 06 18 */ lwz r0, 0x618(r4) -/* 8024DFE4 90 04 08 1C */ stw r0, 0x81c(r4) -/* 8024DFE8 38 64 08 14 */ addi r3, r4, 0x814 -/* 8024DFEC 80 A4 06 1C */ lwz r5, 0x61c(r4) -/* 8024DFF0 80 04 06 20 */ lwz r0, 0x620(r4) -/* 8024DFF4 90 A3 00 0C */ stw r5, 0xc(r3) -/* 8024DFF8 90 03 00 10 */ stw r0, 0x10(r3) -/* 8024DFFC 80 04 06 24 */ lwz r0, 0x624(r4) -/* 8024E000 90 03 00 14 */ stw r0, 0x14(r3) -/* 8024E004 80 A4 06 28 */ lwz r5, 0x628(r4) -/* 8024E008 80 04 06 2C */ lwz r0, 0x62c(r4) -/* 8024E00C 90 A3 00 18 */ stw r5, 0x18(r3) -/* 8024E010 90 03 00 1C */ stw r0, 0x1c(r3) -/* 8024E014 80 04 06 30 */ lwz r0, 0x630(r4) -/* 8024E018 90 03 00 20 */ stw r0, 0x20(r3) -/* 8024E01C 80 A4 06 34 */ lwz r5, 0x634(r4) -/* 8024E020 80 04 06 38 */ lwz r0, 0x638(r4) -/* 8024E024 90 A3 00 24 */ stw r5, 0x24(r3) -/* 8024E028 90 03 00 28 */ stw r0, 0x28(r3) -/* 8024E02C 80 04 06 3C */ lwz r0, 0x63c(r4) -/* 8024E030 90 03 00 2C */ stw r0, 0x2c(r3) -/* 8024E034 80 A4 06 40 */ lwz r5, 0x640(r4) -/* 8024E038 80 04 06 44 */ lwz r0, 0x644(r4) -/* 8024E03C 90 A3 00 30 */ stw r5, 0x30(r3) -/* 8024E040 90 03 00 34 */ stw r0, 0x34(r3) -/* 8024E044 80 04 06 48 */ lwz r0, 0x648(r4) -/* 8024E048 90 03 00 38 */ stw r0, 0x38(r3) -/* 8024E04C 80 A4 06 4C */ lwz r5, 0x64c(r4) -/* 8024E050 80 04 06 50 */ lwz r0, 0x650(r4) -/* 8024E054 90 A3 00 3C */ stw r5, 0x3c(r3) -/* 8024E058 90 03 00 40 */ stw r0, 0x40(r3) -/* 8024E05C 80 04 06 54 */ lwz r0, 0x654(r4) -/* 8024E060 90 03 00 44 */ stw r0, 0x44(r3) -/* 8024E064 80 A4 06 58 */ lwz r5, 0x658(r4) -/* 8024E068 80 04 06 5C */ lwz r0, 0x65c(r4) -/* 8024E06C 90 A3 00 48 */ stw r5, 0x48(r3) -/* 8024E070 90 03 00 4C */ stw r0, 0x4c(r3) -/* 8024E074 80 04 06 60 */ lwz r0, 0x660(r4) -/* 8024E078 90 03 00 50 */ stw r0, 0x50(r3) -/* 8024E07C 80 A4 06 64 */ lwz r5, 0x664(r4) -/* 8024E080 80 04 06 68 */ lwz r0, 0x668(r4) -/* 8024E084 90 A3 00 54 */ stw r5, 0x54(r3) -/* 8024E088 90 03 00 58 */ stw r0, 0x58(r3) -/* 8024E08C 80 04 06 6C */ lwz r0, 0x66c(r4) -/* 8024E090 90 03 00 5C */ stw r0, 0x5c(r3) -/* 8024E094 80 A4 06 70 */ lwz r5, 0x670(r4) -/* 8024E098 80 04 06 74 */ lwz r0, 0x674(r4) -/* 8024E09C 90 A3 00 60 */ stw r5, 0x60(r3) -/* 8024E0A0 90 03 00 64 */ stw r0, 0x64(r3) -/* 8024E0A4 80 04 06 78 */ lwz r0, 0x678(r4) -/* 8024E0A8 90 03 00 68 */ stw r0, 0x68(r3) -/* 8024E0AC 80 A4 06 7C */ lwz r5, 0x67c(r4) -/* 8024E0B0 80 04 06 80 */ lwz r0, 0x680(r4) -/* 8024E0B4 90 A3 00 6C */ stw r5, 0x6c(r3) -/* 8024E0B8 90 03 00 70 */ stw r0, 0x70(r3) -/* 8024E0BC 80 04 06 84 */ lwz r0, 0x684(r4) -/* 8024E0C0 90 03 00 74 */ stw r0, 0x74(r3) -/* 8024E0C4 80 A4 06 88 */ lwz r5, 0x688(r4) -/* 8024E0C8 80 04 06 8C */ lwz r0, 0x68c(r4) -/* 8024E0CC 90 A3 00 78 */ stw r5, 0x78(r3) -/* 8024E0D0 90 03 00 7C */ stw r0, 0x7c(r3) -/* 8024E0D4 80 04 06 90 */ lwz r0, 0x690(r4) -/* 8024E0D8 90 03 00 80 */ stw r0, 0x80(r3) -/* 8024E0DC 80 A4 06 94 */ lwz r5, 0x694(r4) -/* 8024E0E0 80 04 06 98 */ lwz r0, 0x698(r4) -/* 8024E0E4 90 A3 00 84 */ stw r5, 0x84(r3) -/* 8024E0E8 90 03 00 88 */ stw r0, 0x88(r3) -/* 8024E0EC 80 04 06 9C */ lwz r0, 0x69c(r4) -/* 8024E0F0 90 03 00 8C */ stw r0, 0x8c(r3) -/* 8024E0F4 80 A4 06 A0 */ lwz r5, 0x6a0(r4) -/* 8024E0F8 80 04 06 A4 */ lwz r0, 0x6a4(r4) -/* 8024E0FC 90 A3 00 90 */ stw r5, 0x90(r3) -/* 8024E100 90 03 00 94 */ stw r0, 0x94(r3) -/* 8024E104 80 04 06 A8 */ lwz r0, 0x6a8(r4) -/* 8024E108 90 03 00 98 */ stw r0, 0x98(r3) -/* 8024E10C 80 A4 06 AC */ lwz r5, 0x6ac(r4) -/* 8024E110 80 04 06 B0 */ lwz r0, 0x6b0(r4) -/* 8024E114 90 A3 00 9C */ stw r5, 0x9c(r3) -/* 8024E118 90 03 00 A0 */ stw r0, 0xa0(r3) -/* 8024E11C 80 04 06 B4 */ lwz r0, 0x6b4(r4) -/* 8024E120 90 03 00 A4 */ stw r0, 0xa4(r3) -/* 8024E124 80 A4 06 B8 */ lwz r5, 0x6b8(r4) -/* 8024E128 80 04 06 BC */ lwz r0, 0x6bc(r4) -/* 8024E12C 90 A3 00 A8 */ stw r5, 0xa8(r3) -/* 8024E130 90 03 00 AC */ stw r0, 0xac(r3) -/* 8024E134 80 04 06 C0 */ lwz r0, 0x6c0(r4) -/* 8024E138 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 8024E13C 80 A4 06 C4 */ lwz r5, 0x6c4(r4) -/* 8024E140 80 04 06 C8 */ lwz r0, 0x6c8(r4) -/* 8024E144 90 A3 00 B4 */ stw r5, 0xb4(r3) -/* 8024E148 90 03 00 B8 */ stw r0, 0xb8(r3) -/* 8024E14C 80 04 06 CC */ lwz r0, 0x6cc(r4) -/* 8024E150 90 03 00 BC */ stw r0, 0xbc(r3) -/* 8024E154 80 A4 06 D0 */ lwz r5, 0x6d0(r4) -/* 8024E158 80 04 06 D4 */ lwz r0, 0x6d4(r4) -/* 8024E15C 90 A3 00 C0 */ stw r5, 0xc0(r3) -/* 8024E160 90 03 00 C4 */ stw r0, 0xc4(r3) -/* 8024E164 80 04 06 D8 */ lwz r0, 0x6d8(r4) -/* 8024E168 90 03 00 C8 */ stw r0, 0xc8(r3) -/* 8024E16C 80 A4 06 DC */ lwz r5, 0x6dc(r4) -/* 8024E170 80 04 06 E0 */ lwz r0, 0x6e0(r4) -/* 8024E174 90 A3 00 CC */ stw r5, 0xcc(r3) -/* 8024E178 90 03 00 D0 */ stw r0, 0xd0(r3) -/* 8024E17C 80 04 06 E4 */ lwz r0, 0x6e4(r4) -/* 8024E180 90 03 00 D4 */ stw r0, 0xd4(r3) -/* 8024E184 80 A4 06 E8 */ lwz r5, 0x6e8(r4) -/* 8024E188 80 04 06 EC */ lwz r0, 0x6ec(r4) -/* 8024E18C 90 A3 00 D8 */ stw r5, 0xd8(r3) -/* 8024E190 90 03 00 DC */ stw r0, 0xdc(r3) -/* 8024E194 80 04 06 F0 */ lwz r0, 0x6f0(r4) -/* 8024E198 90 03 00 E0 */ stw r0, 0xe0(r3) -/* 8024E19C 80 A4 06 F4 */ lwz r5, 0x6f4(r4) -/* 8024E1A0 80 04 06 F8 */ lwz r0, 0x6f8(r4) -/* 8024E1A4 90 A3 00 E4 */ stw r5, 0xe4(r3) -/* 8024E1A8 90 03 00 E8 */ stw r0, 0xe8(r3) -/* 8024E1AC 80 04 06 FC */ lwz r0, 0x6fc(r4) -/* 8024E1B0 90 03 00 EC */ stw r0, 0xec(r3) -/* 8024E1B4 80 A4 07 00 */ lwz r5, 0x700(r4) -/* 8024E1B8 80 04 07 04 */ lwz r0, 0x704(r4) -/* 8024E1BC 90 A3 00 F0 */ stw r5, 0xf0(r3) -/* 8024E1C0 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8024E1C4 80 04 07 08 */ lwz r0, 0x708(r4) -/* 8024E1C8 90 03 00 F8 */ stw r0, 0xf8(r3) -/* 8024E1CC 80 A4 07 0C */ lwz r5, 0x70c(r4) -/* 8024E1D0 80 04 07 10 */ lwz r0, 0x710(r4) -/* 8024E1D4 90 A3 00 FC */ stw r5, 0xfc(r3) -/* 8024E1D8 90 03 01 00 */ stw r0, 0x100(r3) -/* 8024E1DC 80 04 07 14 */ lwz r0, 0x714(r4) -/* 8024E1E0 90 03 01 04 */ stw r0, 0x104(r3) -/* 8024E1E4 80 A4 07 18 */ lwz r5, 0x718(r4) -/* 8024E1E8 80 04 07 1C */ lwz r0, 0x71c(r4) -/* 8024E1EC 90 A3 01 08 */ stw r5, 0x108(r3) -/* 8024E1F0 90 03 01 0C */ stw r0, 0x10c(r3) -/* 8024E1F4 80 04 07 20 */ lwz r0, 0x720(r4) -/* 8024E1F8 90 03 01 10 */ stw r0, 0x110(r3) -/* 8024E1FC 80 A4 07 24 */ lwz r5, 0x724(r4) -/* 8024E200 80 04 07 28 */ lwz r0, 0x728(r4) -/* 8024E204 90 A3 01 14 */ stw r5, 0x114(r3) -/* 8024E208 90 03 01 18 */ stw r0, 0x118(r3) -/* 8024E20C 80 04 07 2C */ lwz r0, 0x72c(r4) -/* 8024E210 90 03 01 1C */ stw r0, 0x11c(r3) -/* 8024E214 80 A4 07 30 */ lwz r5, 0x730(r4) -/* 8024E218 80 04 07 34 */ lwz r0, 0x734(r4) -/* 8024E21C 90 A3 01 20 */ stw r5, 0x120(r3) -/* 8024E220 90 03 01 24 */ stw r0, 0x124(r3) -/* 8024E224 80 04 07 38 */ lwz r0, 0x738(r4) -/* 8024E228 90 03 01 28 */ stw r0, 0x128(r3) -/* 8024E22C 80 A4 07 3C */ lwz r5, 0x73c(r4) -/* 8024E230 80 04 07 40 */ lwz r0, 0x740(r4) -/* 8024E234 90 A3 01 2C */ stw r5, 0x12c(r3) -/* 8024E238 90 03 01 30 */ stw r0, 0x130(r3) -/* 8024E23C 80 04 07 44 */ lwz r0, 0x744(r4) -/* 8024E240 90 03 01 34 */ stw r0, 0x134(r3) -/* 8024E244 80 A4 07 48 */ lwz r5, 0x748(r4) -/* 8024E248 80 04 07 4C */ lwz r0, 0x74c(r4) -/* 8024E24C 90 A3 01 38 */ stw r5, 0x138(r3) -/* 8024E250 90 03 01 3C */ stw r0, 0x13c(r3) -/* 8024E254 80 04 07 50 */ lwz r0, 0x750(r4) -/* 8024E258 90 03 01 40 */ stw r0, 0x140(r3) -/* 8024E25C 80 A4 07 54 */ lwz r5, 0x754(r4) -/* 8024E260 80 04 07 58 */ lwz r0, 0x758(r4) -/* 8024E264 90 A3 01 44 */ stw r5, 0x144(r3) -/* 8024E268 90 03 01 48 */ stw r0, 0x148(r3) -/* 8024E26C 80 04 07 5C */ lwz r0, 0x75c(r4) -/* 8024E270 90 03 01 4C */ stw r0, 0x14c(r3) -/* 8024E274 80 A4 07 60 */ lwz r5, 0x760(r4) -/* 8024E278 80 04 07 64 */ lwz r0, 0x764(r4) -/* 8024E27C 90 A3 01 50 */ stw r5, 0x150(r3) -/* 8024E280 90 03 01 54 */ stw r0, 0x154(r3) -/* 8024E284 80 04 07 68 */ lwz r0, 0x768(r4) -/* 8024E288 90 03 01 58 */ stw r0, 0x158(r3) -/* 8024E28C 80 A4 07 6C */ lwz r5, 0x76c(r4) -/* 8024E290 80 04 07 70 */ lwz r0, 0x770(r4) -/* 8024E294 90 A3 01 5C */ stw r5, 0x15c(r3) -/* 8024E298 90 03 01 60 */ stw r0, 0x160(r3) -/* 8024E29C 80 04 07 74 */ lwz r0, 0x774(r4) -/* 8024E2A0 90 03 01 64 */ stw r0, 0x164(r3) -/* 8024E2A4 80 A4 07 78 */ lwz r5, 0x778(r4) -/* 8024E2A8 80 04 07 7C */ lwz r0, 0x77c(r4) -/* 8024E2AC 90 A3 01 68 */ stw r5, 0x168(r3) -/* 8024E2B0 90 03 01 6C */ stw r0, 0x16c(r3) -/* 8024E2B4 80 04 07 80 */ lwz r0, 0x780(r4) -/* 8024E2B8 90 03 01 70 */ stw r0, 0x170(r3) -/* 8024E2BC 80 A4 07 84 */ lwz r5, 0x784(r4) -/* 8024E2C0 80 04 07 88 */ lwz r0, 0x788(r4) -/* 8024E2C4 90 A3 01 74 */ stw r5, 0x174(r3) -/* 8024E2C8 90 03 01 78 */ stw r0, 0x178(r3) -/* 8024E2CC 80 04 07 8C */ lwz r0, 0x78c(r4) -/* 8024E2D0 90 03 01 7C */ stw r0, 0x17c(r3) -/* 8024E2D4 80 A4 07 90 */ lwz r5, 0x790(r4) -/* 8024E2D8 80 04 07 94 */ lwz r0, 0x794(r4) -/* 8024E2DC 90 A3 01 80 */ stw r5, 0x180(r3) -/* 8024E2E0 90 03 01 84 */ stw r0, 0x184(r3) -/* 8024E2E4 80 04 07 98 */ lwz r0, 0x798(r4) -/* 8024E2E8 90 03 01 88 */ stw r0, 0x188(r3) -/* 8024E2EC 80 A4 07 9C */ lwz r5, 0x79c(r4) -/* 8024E2F0 80 04 07 A0 */ lwz r0, 0x7a0(r4) -/* 8024E2F4 90 A3 01 8C */ stw r5, 0x18c(r3) -/* 8024E2F8 90 03 01 90 */ stw r0, 0x190(r3) -/* 8024E2FC 80 04 07 A4 */ lwz r0, 0x7a4(r4) -/* 8024E300 90 03 01 94 */ stw r0, 0x194(r3) -/* 8024E304 80 A4 07 A8 */ lwz r5, 0x7a8(r4) -/* 8024E308 80 04 07 AC */ lwz r0, 0x7ac(r4) -/* 8024E30C 90 A3 01 98 */ stw r5, 0x198(r3) -/* 8024E310 90 03 01 9C */ stw r0, 0x19c(r3) -/* 8024E314 80 04 07 B0 */ lwz r0, 0x7b0(r4) -/* 8024E318 90 03 01 A0 */ stw r0, 0x1a0(r3) -/* 8024E31C 80 A4 07 B4 */ lwz r5, 0x7b4(r4) -/* 8024E320 80 04 07 B8 */ lwz r0, 0x7b8(r4) -/* 8024E324 90 A3 01 A4 */ stw r5, 0x1a4(r3) -/* 8024E328 90 03 01 A8 */ stw r0, 0x1a8(r3) -/* 8024E32C 80 04 07 BC */ lwz r0, 0x7bc(r4) -/* 8024E330 90 03 01 AC */ stw r0, 0x1ac(r3) -/* 8024E334 80 A4 07 C0 */ lwz r5, 0x7c0(r4) -/* 8024E338 80 04 07 C4 */ lwz r0, 0x7c4(r4) -/* 8024E33C 90 A3 01 B0 */ stw r5, 0x1b0(r3) -/* 8024E340 90 03 01 B4 */ stw r0, 0x1b4(r3) -/* 8024E344 80 04 07 C8 */ lwz r0, 0x7c8(r4) -/* 8024E348 90 03 01 B8 */ stw r0, 0x1b8(r3) -/* 8024E34C 80 A4 07 CC */ lwz r5, 0x7cc(r4) -/* 8024E350 80 04 07 D0 */ lwz r0, 0x7d0(r4) -/* 8024E354 90 A3 01 BC */ stw r5, 0x1bc(r3) -/* 8024E358 90 03 01 C0 */ stw r0, 0x1c0(r3) -/* 8024E35C 80 04 07 D4 */ lwz r0, 0x7d4(r4) -/* 8024E360 90 03 01 C4 */ stw r0, 0x1c4(r3) -/* 8024E364 80 A4 07 D8 */ lwz r5, 0x7d8(r4) -/* 8024E368 80 04 07 DC */ lwz r0, 0x7dc(r4) -/* 8024E36C 90 A3 01 C8 */ stw r5, 0x1c8(r3) -/* 8024E370 90 03 01 CC */ stw r0, 0x1cc(r3) -/* 8024E374 80 04 07 E0 */ lwz r0, 0x7e0(r4) -/* 8024E378 90 03 01 D0 */ stw r0, 0x1d0(r3) -/* 8024E37C 80 A4 07 E4 */ lwz r5, 0x7e4(r4) -/* 8024E380 80 04 07 E8 */ lwz r0, 0x7e8(r4) -/* 8024E384 90 A3 01 D4 */ stw r5, 0x1d4(r3) -/* 8024E388 90 03 01 D8 */ stw r0, 0x1d8(r3) -/* 8024E38C 80 04 07 EC */ lwz r0, 0x7ec(r4) -/* 8024E390 90 03 01 DC */ stw r0, 0x1dc(r3) -/* 8024E394 80 A4 07 F0 */ lwz r5, 0x7f0(r4) -/* 8024E398 80 04 07 F4 */ lwz r0, 0x7f4(r4) -/* 8024E39C 90 A3 01 E0 */ stw r5, 0x1e0(r3) -/* 8024E3A0 90 03 01 E4 */ stw r0, 0x1e4(r3) -/* 8024E3A4 80 04 07 F8 */ lwz r0, 0x7f8(r4) -/* 8024E3A8 90 03 01 E8 */ stw r0, 0x1e8(r3) -/* 8024E3AC 80 A4 07 FC */ lwz r5, 0x7fc(r4) -/* 8024E3B0 80 04 08 00 */ lwz r0, 0x800(r4) -/* 8024E3B4 90 A3 01 EC */ stw r5, 0x1ec(r3) -/* 8024E3B8 90 03 01 F0 */ stw r0, 0x1f0(r3) -/* 8024E3BC 80 04 08 04 */ lwz r0, 0x804(r4) -/* 8024E3C0 90 03 01 F4 */ stw r0, 0x1f4(r3) -/* 8024E3C4 80 A4 08 08 */ lwz r5, 0x808(r4) -/* 8024E3C8 80 04 08 0C */ lwz r0, 0x80c(r4) -/* 8024E3CC 90 A3 01 F8 */ stw r5, 0x1f8(r3) -/* 8024E3D0 90 03 01 FC */ stw r0, 0x1fc(r3) -/* 8024E3D4 80 04 08 10 */ lwz r0, 0x810(r4) -/* 8024E3D8 90 03 02 00 */ stw r0, 0x200(r3) -/* 8024E3DC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s deleted file mode 100644 index f852c98b199..00000000000 --- a/asm/d/msg/d_msg_flow/branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8024AD54: -/* 8024AD54 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024AD58 7C 08 02 A6 */ mflr r0 -/* 8024AD5C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024AD60 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024AD64 48 11 74 79 */ bl _savegpr_29 -/* 8024AD68 7C 7D 1B 78 */ mr r29, r3 -/* 8024AD6C 7C 86 23 78 */ mr r6, r4 -/* 8024AD70 7C BE 2B 78 */ mr r30, r5 -/* 8024AD74 80 83 00 0C */ lwz r4, 0xc(r3) -/* 8024AD78 A0 03 00 10 */ lhz r0, 0x10(r3) -/* 8024AD7C 54 00 18 38 */ slwi r0, r0, 3 -/* 8024AD80 7F E4 02 14 */ add r31, r4, r0 -/* 8024AD84 7F E4 FB 78 */ mr r4, r31 -/* 8024AD88 7C C5 33 78 */ mr r5, r6 -/* 8024AD8C 38 C0 00 01 */ li r6, 1 -/* 8024AD90 A0 1F 00 02 */ lhz r0, 2(r31) -/* 8024AD94 1D 00 00 0C */ mulli r8, r0, 0xc -/* 8024AD98 3C E0 80 3C */ lis r7, mQueryList__10dMsgFlow_c@ha /* 0x803C184C@ha */ -/* 8024AD9C 38 07 18 4C */ addi r0, r7, mQueryList__10dMsgFlow_c@l /* 0x803C184C@l */ -/* 8024ADA0 7D 80 42 14 */ add r12, r0, r8 -/* 8024ADA4 48 11 72 E1 */ bl __ptmf_scall -/* 8024ADA8 60 00 00 00 */ nop -/* 8024ADAC 7C 65 1B 78 */ mr r5, r3 -/* 8024ADB0 7F A3 EB 78 */ mr r3, r29 -/* 8024ADB4 80 9D 00 14 */ lwz r4, 0x14(r29) -/* 8024ADB8 A0 1F 00 06 */ lhz r0, 6(r31) -/* 8024ADBC 7C 00 2A 14 */ add r0, r0, r5 -/* 8024ADC0 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024ADC4 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024ADC8 7F C5 F3 78 */ mr r5, r30 -/* 8024ADCC 4B FF FA 01 */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c -/* 8024ADD0 38 60 00 01 */ li r3, 1 -/* 8024ADD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024ADD8 48 11 74 51 */ bl _restgpr_29 -/* 8024ADDC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024ADE0 7C 08 03 A6 */ mtlr r0 -/* 8024ADE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024ADE8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/checkEventRender__10dMsgFlow_cFPiPiPiPi.s b/asm/d/msg/d_msg_flow/checkEventRender__10dMsgFlow_cFPiPiPiPi.s deleted file mode 100644 index 52aebb3e077..00000000000 --- a/asm/d/msg/d_msg_flow/checkEventRender__10dMsgFlow_cFPiPiPiPi.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8024A424: -/* 8024A424 88 03 00 47 */ lbz r0, 0x47(r3) -/* 8024A428 28 00 00 00 */ cmplwi r0, 0 -/* 8024A42C 41 82 00 84 */ beq lbl_8024A4B0 -/* 8024A430 28 04 00 00 */ cmplwi r4, 0 -/* 8024A434 41 82 00 1C */ beq lbl_8024A450 -/* 8024A438 89 03 00 42 */ lbz r8, 0x42(r3) -/* 8024A43C 28 08 00 FF */ cmplwi r8, 0xff -/* 8024A440 38 00 FF FF */ li r0, -1 -/* 8024A444 41 82 00 08 */ beq lbl_8024A44C -/* 8024A448 7D 00 43 78 */ mr r0, r8 -lbl_8024A44C: -/* 8024A44C 90 04 00 00 */ stw r0, 0(r4) -lbl_8024A450: -/* 8024A450 28 05 00 00 */ cmplwi r5, 0 -/* 8024A454 41 82 00 1C */ beq lbl_8024A470 -/* 8024A458 88 83 00 43 */ lbz r4, 0x43(r3) -/* 8024A45C 28 04 00 FF */ cmplwi r4, 0xff -/* 8024A460 38 00 FF FF */ li r0, -1 -/* 8024A464 41 82 00 08 */ beq lbl_8024A46C -/* 8024A468 7C 80 23 78 */ mr r0, r4 -lbl_8024A46C: -/* 8024A46C 90 05 00 00 */ stw r0, 0(r5) -lbl_8024A470: -/* 8024A470 28 06 00 00 */ cmplwi r6, 0 -/* 8024A474 41 82 00 1C */ beq lbl_8024A490 -/* 8024A478 88 83 00 44 */ lbz r4, 0x44(r3) -/* 8024A47C 28 04 00 FF */ cmplwi r4, 0xff -/* 8024A480 38 00 FF FF */ li r0, -1 -/* 8024A484 41 82 00 08 */ beq lbl_8024A48C -/* 8024A488 7C 80 23 78 */ mr r0, r4 -lbl_8024A48C: -/* 8024A48C 90 06 00 00 */ stw r0, 0(r6) -lbl_8024A490: -/* 8024A490 28 07 00 00 */ cmplwi r7, 0 -/* 8024A494 41 82 00 1C */ beq lbl_8024A4B0 -/* 8024A498 88 83 00 45 */ lbz r4, 0x45(r3) -/* 8024A49C 28 04 00 FF */ cmplwi r4, 0xff -/* 8024A4A0 38 00 FF FF */ li r0, -1 -/* 8024A4A4 41 82 00 08 */ beq lbl_8024A4AC -/* 8024A4A8 7C 80 23 78 */ mr r0, r4 -lbl_8024A4AC: -/* 8024A4AC 90 07 00 00 */ stw r0, 0(r7) -lbl_8024A4B0: -/* 8024A4B0 88 03 00 47 */ lbz r0, 0x47(r3) -/* 8024A4B4 20 00 00 01 */ subfic r0, r0, 1 -/* 8024A4B8 7C 00 00 34 */ cntlzw r0, r0 -/* 8024A4BC 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024A4C0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci.s deleted file mode 100644 index b0582cb0df3..00000000000 --- a/asm/d/msg/d_msg_flow/doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_8024A2D8: -/* 8024A2D8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024A2DC 7C 08 02 A6 */ mflr r0 -/* 8024A2E0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024A2E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024A2E8 48 11 7E ED */ bl _savegpr_27 -/* 8024A2EC 7C 7B 1B 78 */ mr r27, r3 -/* 8024A2F0 7C 9C 23 78 */ mr r28, r4 -/* 8024A2F4 7C BD 2B 78 */ mr r29, r5 -/* 8024A2F8 3B E0 00 00 */ li r31, 0 -/* 8024A2FC 54 DE 04 3E */ clrlwi r30, r6, 0x10 -/* 8024A300 A0 63 00 1C */ lhz r3, 0x1c(r3) -/* 8024A304 4B FE DD 39 */ bl changeFlowGroup__12dMsgObject_cFl -/* 8024A308 4B FE D6 79 */ bl isKillMessageFlag__12dMsgObject_cFv -/* 8024A30C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8024A310 41 82 00 14 */ beq lbl_8024A324 -/* 8024A314 38 00 00 01 */ li r0, 1 -/* 8024A318 98 1B 00 27 */ stb r0, 0x27(r27) -/* 8024A31C 98 1B 00 26 */ stb r0, 0x26(r27) -/* 8024A320 3B C0 00 00 */ li r30, 0 -lbl_8024A324: -/* 8024A324 88 1B 00 26 */ lbz r0, 0x26(r27) -/* 8024A328 28 00 00 00 */ cmplwi r0, 0 -/* 8024A32C 41 82 00 3C */ beq lbl_8024A368 -/* 8024A330 57 C0 04 3F */ clrlwi. r0, r30, 0x10 -/* 8024A334 41 82 00 34 */ beq lbl_8024A368 -/* 8024A338 7F 63 DB 78 */ mr r3, r27 -/* 8024A33C 38 80 00 00 */ li r4, 0 -/* 8024A340 48 00 02 41 */ bl setInitValue__10dMsgFlow_cFi -/* 8024A344 B3 DB 00 1C */ sth r30, 0x1c(r27) -/* 8024A348 7F 63 DB 78 */ mr r3, r27 -/* 8024A34C A0 9B 00 1C */ lhz r4, 0x1c(r27) -/* 8024A350 48 00 04 35 */ bl getInitNodeIndex__10dMsgFlow_cFUs -/* 8024A354 7C 64 1B 78 */ mr r4, r3 -/* 8024A358 7F 63 DB 78 */ mr r3, r27 -/* 8024A35C 7F A5 EB 78 */ mr r5, r29 -/* 8024A360 48 00 04 6D */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c -/* 8024A364 3B E0 00 01 */ li r31, 1 -lbl_8024A368: -/* 8024A368 88 1B 00 26 */ lbz r0, 0x26(r27) -/* 8024A36C 28 00 00 00 */ cmplwi r0, 0 -/* 8024A370 40 82 00 10 */ bne lbl_8024A380 -/* 8024A374 88 1B 00 27 */ lbz r0, 0x27(r27) -/* 8024A378 28 00 00 00 */ cmplwi r0, 0 -/* 8024A37C 41 82 00 40 */ beq lbl_8024A3BC -lbl_8024A380: -/* 8024A380 80 7B 00 20 */ lwz r3, 0x20(r27) -/* 8024A384 4B DD 56 A1 */ bl fopMsgM_SearchByID__FUi -/* 8024A388 28 03 00 00 */ cmplwi r3, 0 -/* 8024A38C 41 82 00 28 */ beq lbl_8024A3B4 -/* 8024A390 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 8024A394 28 00 00 12 */ cmplwi r0, 0x12 -/* 8024A398 41 82 00 0C */ beq lbl_8024A3A4 -/* 8024A39C 38 60 00 00 */ li r3, 0 -/* 8024A3A0 48 00 00 6C */ b lbl_8024A40C -lbl_8024A3A4: -/* 8024A3A4 38 00 00 13 */ li r0, 0x13 -/* 8024A3A8 B0 03 00 F8 */ sth r0, 0xf8(r3) -/* 8024A3AC 38 00 FF FF */ li r0, -1 -/* 8024A3B0 90 1B 00 20 */ stw r0, 0x20(r27) -lbl_8024A3B4: -/* 8024A3B4 38 00 00 00 */ li r0, 0 -/* 8024A3B8 98 1B 00 27 */ stb r0, 0x27(r27) -lbl_8024A3BC: -/* 8024A3BC 88 1B 00 26 */ lbz r0, 0x26(r27) -/* 8024A3C0 28 00 00 00 */ cmplwi r0, 0 -/* 8024A3C4 41 82 00 1C */ beq lbl_8024A3E0 -/* 8024A3C8 38 60 00 00 */ li r3, 0 -/* 8024A3CC 4B F1 55 89 */ bl setMidnaMotionNum__9daPy_py_cFi -/* 8024A3D0 38 60 00 00 */ li r3, 0 -/* 8024A3D4 4B F1 55 95 */ bl setMidnaFaceNum__9daPy_py_cFi -/* 8024A3D8 38 60 00 01 */ li r3, 1 -/* 8024A3DC 48 00 00 30 */ b lbl_8024A40C -lbl_8024A3E0: -/* 8024A3E0 7F 63 DB 78 */ mr r3, r27 -/* 8024A3E4 7F 84 E3 78 */ mr r4, r28 -/* 8024A3E8 7F A5 EB 78 */ mr r5, r29 -/* 8024A3EC 48 00 0C 0D */ bl nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c -/* 8024A3F0 38 00 00 00 */ li r0, 0 -/* 8024A3F4 2C 03 00 00 */ cmpwi r3, 0 -/* 8024A3F8 40 82 00 0C */ bne lbl_8024A404 -/* 8024A3FC 2C 1F 00 00 */ cmpwi r31, 0 -/* 8024A400 41 82 00 08 */ beq lbl_8024A408 -lbl_8024A404: -/* 8024A404 38 00 00 01 */ li r0, 1 -lbl_8024A408: -/* 8024A408 54 03 06 3E */ clrlwi r3, r0, 0x18 -lbl_8024A40C: -/* 8024A40C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024A410 48 11 7E 11 */ bl _restgpr_27 -/* 8024A414 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024A418 7C 08 03 A6 */ mtlr r0 -/* 8024A41C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024A420 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event003__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event003__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 38ab018ef92..00000000000 --- a/asm/d/msg/d_msg_flow/event003__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8024C550: -/* 8024C550 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C554 7C 08 02 A6 */ mflr r0 -/* 8024C558 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C55C 38 84 00 04 */ addi r4, r4, 4 -/* 8024C560 4B FF EB D1 */ bl getParam__10dMsgFlow_cFPUc -/* 8024C564 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C568 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C56C 80 85 5D C4 */ lwz r4, 0x5dc4(r5) -/* 8024C570 7C 03 00 D0 */ neg r0, r3 -/* 8024C574 7C 04 02 14 */ add r0, r4, r0 -/* 8024C578 90 05 5D C4 */ stw r0, 0x5dc4(r5) -/* 8024C57C 38 60 00 01 */ li r3, 1 -/* 8024C580 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C584 7C 08 03 A6 */ mtlr r0 -/* 8024C588 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C58C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event006__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event006__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 7e04e1a1805..00000000000 --- a/asm/d/msg/d_msg_flow/event006__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8024C654: -/* 8024C654 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C658 7C 08 02 A6 */ mflr r0 -/* 8024C65C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C660 38 84 00 04 */ addi r4, r4, 4 -/* 8024C664 4B FF EA CD */ bl getParam__10dMsgFlow_cFPUc -/* 8024C668 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C66C 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C670 A8 85 5D CC */ lha r4, 0x5dcc(r5) -/* 8024C674 7C 60 07 34 */ extsh r0, r3 -/* 8024C678 7C 04 02 14 */ add r0, r4, r0 -/* 8024C67C B0 05 5D CC */ sth r0, 0x5dcc(r5) -/* 8024C680 38 60 00 01 */ li r3, 1 -/* 8024C684 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C688 7C 08 03 A6 */ mtlr r0 -/* 8024C68C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C690 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event007__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event007__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 9e4a417c639..00000000000 --- a/asm/d/msg/d_msg_flow/event007__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8024C694: -/* 8024C694 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C698 7C 08 02 A6 */ mflr r0 -/* 8024C69C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C6A0 38 84 00 04 */ addi r4, r4, 4 -/* 8024C6A4 4B FF EA 8D */ bl getParam__10dMsgFlow_cFPUc -/* 8024C6A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C6AC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C6B0 A8 85 5D CC */ lha r4, 0x5dcc(r5) -/* 8024C6B4 7C 03 00 D0 */ neg r0, r3 -/* 8024C6B8 7C 00 07 34 */ extsh r0, r0 -/* 8024C6BC 7C 04 02 14 */ add r0, r4, r0 -/* 8024C6C0 B0 05 5D CC */ sth r0, 0x5dcc(r5) -/* 8024C6C4 38 60 00 01 */ li r3, 1 -/* 8024C6C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C6CC 7C 08 03 A6 */ mtlr r0 -/* 8024C6D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C6D4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event008__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event008__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 104f76e7590..00000000000 --- a/asm/d/msg/d_msg_flow/event008__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8024C6D8: -/* 8024C6D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C6DC 7C 08 02 A6 */ mflr r0 -/* 8024C6E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C6E4 7C 86 23 78 */ mr r6, r4 -/* 8024C6E8 38 81 00 08 */ addi r4, r1, 8 -/* 8024C6EC 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024C6F0 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C6F4 4B FF E9 FD */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024C6F8 A0 01 00 08 */ lhz r0, 8(r1) -/* 8024C6FC 28 00 00 1B */ cmplwi r0, 0x1b -/* 8024C700 40 82 00 30 */ bne lbl_8024C730 -/* 8024C704 4B FE C2 25 */ bl dMsgObject_getFundRaising__Fv -/* 8024C708 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8024C70C 20 00 07 D0 */ subfic r0, r0, 0x7d0 -/* 8024C710 2C 00 00 C8 */ cmpwi r0, 0xc8 -/* 8024C714 41 80 00 10 */ blt lbl_8024C724 -/* 8024C718 38 60 00 00 */ li r3, 0 -/* 8024C71C 4B FE C2 75 */ bl dMsgObject_setFundRaising__FUs -/* 8024C720 48 00 00 10 */ b lbl_8024C730 -lbl_8024C724: -/* 8024C724 20 00 00 C8 */ subfic r0, r0, 0xc8 -/* 8024C728 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 8024C72C 4B FE C2 65 */ bl dMsgObject_setFundRaising__FUs -lbl_8024C730: -/* 8024C730 38 60 00 01 */ li r3, 1 -/* 8024C734 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C738 7C 08 03 A6 */ mtlr r0 -/* 8024C73C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C740 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event009__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event009__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 82ba8d7c37b..00000000000 --- a/asm/d/msg/d_msg_flow/event009__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8024C744: -/* 8024C744 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C748 7C 08 02 A6 */ mflr r0 -/* 8024C74C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C750 38 84 00 04 */ addi r4, r4, 4 -/* 8024C754 4B FF E9 DD */ bl getParam__10dMsgFlow_cFPUc -/* 8024C758 38 60 00 01 */ li r3, 1 -/* 8024C75C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C760 7C 08 03 A6 */ mtlr r0 -/* 8024C764 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C768 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event010__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event010__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 97164630d4e..00000000000 --- a/asm/d/msg/d_msg_flow/event010__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8024C76C: -/* 8024C76C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C770 7C 08 02 A6 */ mflr r0 -/* 8024C774 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C778 7C 86 23 78 */ mr r6, r4 -/* 8024C77C 38 81 00 08 */ addi r4, r1, 8 -/* 8024C780 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024C784 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C788 4B FF E9 69 */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024C78C A0 01 00 08 */ lhz r0, 8(r1) -/* 8024C790 28 00 00 00 */ cmplwi r0, 0 -/* 8024C794 41 82 00 24 */ beq lbl_8024C7B8 -/* 8024C798 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C79C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C7A0 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024C7A4 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024C7A8 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 8024C7AC 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8024C7B0 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C7B4 4B DE 81 D9 */ bl onEventBit__11dSv_event_cFUs -lbl_8024C7B8: -/* 8024C7B8 A0 01 00 0A */ lhz r0, 0xa(r1) -/* 8024C7BC 28 00 00 00 */ cmplwi r0, 0 -/* 8024C7C0 41 82 00 24 */ beq lbl_8024C7E4 -/* 8024C7C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C7C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C7CC 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024C7D0 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024C7D4 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 8024C7D8 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8024C7DC 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C7E0 4B DE 81 AD */ bl onEventBit__11dSv_event_cFUs -lbl_8024C7E4: -/* 8024C7E4 38 60 00 01 */ li r3, 1 -/* 8024C7E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C7EC 7C 08 03 A6 */ mtlr r0 -/* 8024C7F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C7F4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event011__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event011__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 858dc5e937c..00000000000 --- a/asm/d/msg/d_msg_flow/event011__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8024C7F8: -/* 8024C7F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C7FC 7C 08 02 A6 */ mflr r0 -/* 8024C800 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C804 7C 86 23 78 */ mr r6, r4 -/* 8024C808 38 81 00 08 */ addi r4, r1, 8 -/* 8024C80C 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024C810 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C814 4B FF E8 DD */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024C818 A0 01 00 08 */ lhz r0, 8(r1) -/* 8024C81C 28 00 00 00 */ cmplwi r0, 0 -/* 8024C820 41 82 00 24 */ beq lbl_8024C844 -/* 8024C824 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C828 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C82C 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024C830 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024C834 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 8024C838 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8024C83C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C840 4B DE 81 65 */ bl offEventBit__11dSv_event_cFUs -lbl_8024C844: -/* 8024C844 A0 01 00 0A */ lhz r0, 0xa(r1) -/* 8024C848 28 00 00 00 */ cmplwi r0, 0 -/* 8024C84C 41 82 00 24 */ beq lbl_8024C870 -/* 8024C850 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C854 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C858 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024C85C 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024C860 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 8024C864 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8024C868 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C86C 4B DE 81 39 */ bl offEventBit__11dSv_event_cFUs -lbl_8024C870: -/* 8024C870 38 60 00 01 */ li r3, 1 -/* 8024C874 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C878 7C 08 03 A6 */ mtlr r0 -/* 8024C87C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C880 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event013__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event013__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 8f2b1dff44c..00000000000 --- a/asm/d/msg/d_msg_flow/event013__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8024C88C: -/* 8024C88C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C890 7C 08 02 A6 */ mflr r0 -/* 8024C894 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C898 38 00 00 01 */ li r0, 1 -/* 8024C89C 98 03 00 46 */ stb r0, 0x46(r3) -/* 8024C8A0 98 03 00 24 */ stb r0, 0x24(r3) -/* 8024C8A4 98 03 00 25 */ stb r0, 0x25(r3) -/* 8024C8A8 38 84 00 04 */ addi r4, r4, 4 -/* 8024C8AC 4B FF E8 85 */ bl getParam__10dMsgFlow_cFPUc -/* 8024C8B0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8024C8B4 4B FE BD 99 */ bl setSelectCancelPos__12dMsgObject_cFUc -/* 8024C8B8 38 60 00 01 */ li r3, 1 -/* 8024C8BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C8C0 7C 08 03 A6 */ mtlr r0 -/* 8024C8C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C8C8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event014__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event014__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 15c5d1fc8da..00000000000 --- a/asm/d/msg/d_msg_flow/event014__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8024C8CC: -/* 8024C8CC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024C8D0 7C 08 02 A6 */ mflr r0 -/* 8024C8D4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024C8D8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8024C8DC 7C 86 23 78 */ mr r6, r4 -/* 8024C8E0 7C BF 2B 78 */ mr r31, r5 -/* 8024C8E4 38 81 00 08 */ addi r4, r1, 8 -/* 8024C8E8 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024C8EC 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C8F0 4B FF E8 01 */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024C8F4 38 80 FF FF */ li r4, -1 -/* 8024C8F8 28 1F 00 00 */ cmplwi r31, 0 -/* 8024C8FC 41 82 00 10 */ beq lbl_8024C90C -/* 8024C900 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8024C904 7C 00 07 74 */ extsb r0, r0 -/* 8024C908 7C 04 03 78 */ mr r4, r0 -lbl_8024C90C: -/* 8024C90C A0 01 00 08 */ lhz r0, 8(r1) -/* 8024C910 2C 00 00 02 */ cmpwi r0, 2 -/* 8024C914 41 82 00 54 */ beq lbl_8024C968 -/* 8024C918 40 80 00 14 */ bge lbl_8024C92C -/* 8024C91C 2C 00 00 00 */ cmpwi r0, 0 -/* 8024C920 41 82 00 18 */ beq lbl_8024C938 -/* 8024C924 40 80 00 2C */ bge lbl_8024C950 -/* 8024C928 48 00 00 54 */ b lbl_8024C97C -lbl_8024C92C: -/* 8024C92C 2C 00 00 04 */ cmpwi r0, 4 -/* 8024C930 40 80 00 4C */ bge lbl_8024C97C -/* 8024C934 48 00 00 40 */ b lbl_8024C974 -lbl_8024C938: -/* 8024C938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C93C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C940 38 63 09 58 */ addi r3, r3, 0x958 -/* 8024C944 A0 81 00 0A */ lhz r4, 0xa(r1) -/* 8024C948 4B DE 7E C9 */ bl onSwitch__12dSv_memBit_cFi -/* 8024C94C 48 00 00 30 */ b lbl_8024C97C -lbl_8024C950: -/* 8024C950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C954 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C958 38 63 09 78 */ addi r3, r3, 0x978 -/* 8024C95C A0 81 00 0A */ lhz r4, 0xa(r1) -/* 8024C960 4B DE 82 39 */ bl onSwitch__12dSv_danBit_cFi -/* 8024C964 48 00 00 18 */ b lbl_8024C97C -lbl_8024C968: -/* 8024C968 A0 61 00 0A */ lhz r3, 0xa(r1) -/* 8024C96C 4B DE 0F E1 */ bl dComIfGs_onZoneSwitch__Fii -/* 8024C970 48 00 00 0C */ b lbl_8024C97C -lbl_8024C974: -/* 8024C974 A0 61 00 0A */ lhz r3, 0xa(r1) -/* 8024C978 4B DE 11 25 */ bl dComIfGs_onOneZoneSwitch__Fii -lbl_8024C97C: -/* 8024C97C 38 60 00 01 */ li r3, 1 -/* 8024C980 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8024C984 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024C988 7C 08 03 A6 */ mtlr r0 -/* 8024C98C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024C990 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event015__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event015__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 1af63b9bb52..00000000000 --- a/asm/d/msg/d_msg_flow/event015__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8024C994: -/* 8024C994 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024C998 7C 08 02 A6 */ mflr r0 -/* 8024C99C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024C9A0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8024C9A4 7C 86 23 78 */ mr r6, r4 -/* 8024C9A8 7C BF 2B 78 */ mr r31, r5 -/* 8024C9AC 38 81 00 08 */ addi r4, r1, 8 -/* 8024C9B0 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024C9B4 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C9B8 4B FF E7 39 */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024C9BC 38 80 FF FF */ li r4, -1 -/* 8024C9C0 28 1F 00 00 */ cmplwi r31, 0 -/* 8024C9C4 41 82 00 10 */ beq lbl_8024C9D4 -/* 8024C9C8 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8024C9CC 7C 00 07 74 */ extsb r0, r0 -/* 8024C9D0 7C 04 03 78 */ mr r4, r0 -lbl_8024C9D4: -/* 8024C9D4 A0 01 00 08 */ lhz r0, 8(r1) -/* 8024C9D8 2C 00 00 02 */ cmpwi r0, 2 -/* 8024C9DC 41 82 00 54 */ beq lbl_8024CA30 -/* 8024C9E0 40 80 00 14 */ bge lbl_8024C9F4 -/* 8024C9E4 2C 00 00 00 */ cmpwi r0, 0 -/* 8024C9E8 41 82 00 18 */ beq lbl_8024CA00 -/* 8024C9EC 40 80 00 2C */ bge lbl_8024CA18 -/* 8024C9F0 48 00 00 54 */ b lbl_8024CA44 -lbl_8024C9F4: -/* 8024C9F4 2C 00 00 04 */ cmpwi r0, 4 -/* 8024C9F8 40 80 00 4C */ bge lbl_8024CA44 -/* 8024C9FC 48 00 00 40 */ b lbl_8024CA3C -lbl_8024CA00: -/* 8024CA00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024CA04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024CA08 38 63 09 58 */ addi r3, r3, 0x958 -/* 8024CA0C A0 81 00 0A */ lhz r4, 0xa(r1) -/* 8024CA10 4B DE 7E 29 */ bl offSwitch__12dSv_memBit_cFi -/* 8024CA14 48 00 00 30 */ b lbl_8024CA44 -lbl_8024CA18: -/* 8024CA18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024CA1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024CA20 38 63 09 78 */ addi r3, r3, 0x978 -/* 8024CA24 A0 81 00 0A */ lhz r4, 0xa(r1) -/* 8024CA28 4B DE 81 99 */ bl offSwitch__12dSv_danBit_cFi -/* 8024CA2C 48 00 00 18 */ b lbl_8024CA44 -lbl_8024CA30: -/* 8024CA30 A0 61 00 0A */ lhz r3, 0xa(r1) -/* 8024CA34 4B DE 0F 99 */ bl dComIfGs_offZoneSwitch__Fii -/* 8024CA38 48 00 00 0C */ b lbl_8024CA44 -lbl_8024CA3C: -/* 8024CA3C A0 61 00 0A */ lhz r3, 0xa(r1) -/* 8024CA40 4B DE 10 C1 */ bl dComIfGs_offOneZoneSwitch__Fii -lbl_8024CA44: -/* 8024CA44 38 60 00 01 */ li r3, 1 -/* 8024CA48 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8024CA4C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024CA50 7C 08 03 A6 */ mtlr r0 -/* 8024CA54 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024CA58 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event016__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event016__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 2319bdaaaa1..00000000000 --- a/asm/d/msg/d_msg_flow/event016__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8024CA5C: -/* 8024CA5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024CA60 7C 08 02 A6 */ mflr r0 -/* 8024CA64 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024CA68 7C 86 23 78 */ mr r6, r4 -/* 8024CA6C 80 04 00 04 */ lwz r0, 4(r4) -/* 8024CA70 90 05 0F 54 */ stw r0, 0xf54(r5) -/* 8024CA74 38 81 00 08 */ addi r4, r1, 8 -/* 8024CA78 38 A6 00 04 */ addi r5, r6, 4 -/* 8024CA7C 4B FF E6 8D */ bl getParam__10dMsgFlow_cFPUcPUc -/* 8024CA80 38 60 00 01 */ li r3, 1 -/* 8024CA84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024CA88 7C 08 03 A6 */ mtlr r0 -/* 8024CA8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024CA90 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event017__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event017__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 067c9b25098..00000000000 --- a/asm/d/msg/d_msg_flow/event017__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_8024CA94: -/* 8024CA94 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024CA98 7C 08 02 A6 */ mflr r0 -/* 8024CA9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024CAA0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8024CAA4 7C 86 23 78 */ mr r6, r4 -/* 8024CAA8 38 81 00 08 */ addi r4, r1, 8 -/* 8024CAAC 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024CAB0 38 C6 00 04 */ addi r6, r6, 4 -/* 8024CAB4 4B FF E6 3D */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024CAB8 A0 01 00 0A */ lhz r0, 0xa(r1) -/* 8024CABC 28 00 00 01 */ cmplwi r0, 1 -/* 8024CAC0 41 81 00 B4 */ bgt lbl_8024CB74 -/* 8024CAC4 A0 01 00 08 */ lhz r0, 8(r1) -/* 8024CAC8 2C 00 00 A2 */ cmpwi r0, 0xa2 -/* 8024CACC 41 82 00 48 */ beq lbl_8024CB14 -/* 8024CAD0 40 80 00 10 */ bge lbl_8024CAE0 -/* 8024CAD4 2C 00 00 A1 */ cmpwi r0, 0xa1 -/* 8024CAD8 40 80 00 14 */ bge lbl_8024CAEC -/* 8024CADC 48 00 00 88 */ b lbl_8024CB64 -lbl_8024CAE0: -/* 8024CAE0 2C 00 00 A4 */ cmpwi r0, 0xa4 -/* 8024CAE4 40 80 00 80 */ bge lbl_8024CB64 -/* 8024CAE8 48 00 00 54 */ b lbl_8024CB3C -lbl_8024CAEC: -/* 8024CAEC 38 00 00 01 */ li r0, 1 -/* 8024CAF0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8024CAF4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8024CAF8 98 03 00 E3 */ stb r0, 0xe3(r3) -/* 8024CAFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024CB00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024CB04 38 63 01 14 */ addi r3, r3, 0x114 -/* 8024CB08 38 80 00 00 */ li r4, 0 -/* 8024CB0C 4B DE 78 5D */ bl onLightDropGetFlag__16dSv_light_drop_cFUc -/* 8024CB10 48 00 00 5C */ b lbl_8024CB6C -lbl_8024CB14: -/* 8024CB14 38 00 00 01 */ li r0, 1 -/* 8024CB18 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8024CB1C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8024CB20 98 03 00 E4 */ stb r0, 0xe4(r3) -/* 8024CB24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024CB28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024CB2C 38 63 01 14 */ addi r3, r3, 0x114 -/* 8024CB30 38 80 00 01 */ li r4, 1 -/* 8024CB34 4B DE 78 35 */ bl onLightDropGetFlag__16dSv_light_drop_cFUc -/* 8024CB38 48 00 00 34 */ b lbl_8024CB6C -lbl_8024CB3C: -/* 8024CB3C 38 00 00 01 */ li r0, 1 -/* 8024CB40 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8024CB44 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8024CB48 98 03 00 E5 */ stb r0, 0xe5(r3) -/* 8024CB4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024CB50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024CB54 38 63 01 14 */ addi r3, r3, 0x114 -/* 8024CB58 38 80 00 02 */ li r4, 2 -/* 8024CB5C 4B DE 78 0D */ bl onLightDropGetFlag__16dSv_light_drop_cFUc -/* 8024CB60 48 00 00 0C */ b lbl_8024CB6C -lbl_8024CB64: -/* 8024CB64 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024CB68 4B E4 B3 25 */ bl execItemGet__FUc -lbl_8024CB6C: -/* 8024CB6C 38 60 00 01 */ li r3, 1 -/* 8024CB70 48 00 00 2C */ b lbl_8024CB9C -lbl_8024CB74: -/* 8024CB74 3B E0 00 00 */ li r31, 0 -/* 8024CB78 48 00 00 14 */ b lbl_8024CB8C -lbl_8024CB7C: -/* 8024CB7C A0 01 00 08 */ lhz r0, 8(r1) -/* 8024CB80 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024CB84 4B E4 B3 09 */ bl execItemGet__FUc -/* 8024CB88 3B FF 00 01 */ addi r31, r31, 1 -lbl_8024CB8C: -/* 8024CB8C A0 01 00 0A */ lhz r0, 0xa(r1) -/* 8024CB90 7C 1F 00 00 */ cmpw r31, r0 -/* 8024CB94 41 80 FF E8 */ blt lbl_8024CB7C -/* 8024CB98 38 60 00 01 */ li r3, 1 -lbl_8024CB9C: -/* 8024CB9C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8024CBA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024CBA4 7C 08 03 A6 */ mtlr r0 -/* 8024CBA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024CBAC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event018__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event018__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 06ffd2b5da7..00000000000 --- a/asm/d/msg/d_msg_flow/event018__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_8024CBB0: -/* 8024CBB0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024CBB4 7C 08 02 A6 */ mflr r0 -/* 8024CBB8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024CBBC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8024CBC0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8024CBC4 7C 7E 1B 78 */ mr r30, r3 -/* 8024CBC8 7C 86 23 78 */ mr r6, r4 -/* 8024CBCC 7C BF 2B 78 */ mr r31, r5 -/* 8024CBD0 38 81 00 08 */ addi r4, r1, 8 -/* 8024CBD4 38 A6 00 04 */ addi r5, r6, 4 -/* 8024CBD8 4B FF E5 31 */ bl getParam__10dMsgFlow_cFPUcPUc -/* 8024CBDC 38 00 00 01 */ li r0, 1 -/* 8024CBE0 98 1E 00 47 */ stb r0, 0x47(r30) -/* 8024CBE4 88 01 00 08 */ lbz r0, 8(r1) -/* 8024CBE8 98 1E 00 42 */ stb r0, 0x42(r30) -/* 8024CBEC 88 01 00 09 */ lbz r0, 9(r1) -/* 8024CBF0 98 1E 00 43 */ stb r0, 0x43(r30) -/* 8024CBF4 88 01 00 0A */ lbz r0, 0xa(r1) -/* 8024CBF8 98 1E 00 44 */ stb r0, 0x44(r30) -/* 8024CBFC 88 01 00 0B */ lbz r0, 0xb(r1) -/* 8024CC00 98 1E 00 45 */ stb r0, 0x45(r30) -/* 8024CC04 28 1F 00 00 */ cmplwi r31, 0 -/* 8024CC08 41 82 00 44 */ beq lbl_8024CC4C -/* 8024CC0C 88 6D 87 E4 */ lbz r3, struct_80450D64+0x0(r13) -/* 8024CC10 7C 63 07 75 */ extsb. r3, r3 -/* 8024CC14 41 82 00 20 */ beq lbl_8024CC34 -/* 8024CC18 4B DE 04 55 */ bl dComIfGp_getReverb__Fi -/* 8024CC1C 7C 66 1B 78 */ mr r6, r3 -/* 8024CC20 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8024CC24 88 9E 00 45 */ lbz r4, 0x45(r30) -/* 8024CC28 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8024CC2C 48 06 0E E9 */ bl messageSePlay__7Z2SeMgrFUsP3VecSc -/* 8024CC30 48 00 00 58 */ b lbl_8024CC88 -lbl_8024CC34: -/* 8024CC34 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8024CC38 88 9E 00 45 */ lbz r4, 0x45(r30) -/* 8024CC3C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8024CC40 38 C0 00 00 */ li r6, 0 -/* 8024CC44 48 06 0E D1 */ bl messageSePlay__7Z2SeMgrFUsP3VecSc -/* 8024CC48 48 00 00 40 */ b lbl_8024CC88 -lbl_8024CC4C: -/* 8024CC4C 88 6D 87 E4 */ lbz r3, struct_80450D64+0x0(r13) -/* 8024CC50 7C 63 07 75 */ extsb. r3, r3 -/* 8024CC54 41 82 00 20 */ beq lbl_8024CC74 -/* 8024CC58 4B DE 04 15 */ bl dComIfGp_getReverb__Fi -/* 8024CC5C 7C 66 1B 78 */ mr r6, r3 -/* 8024CC60 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8024CC64 88 9E 00 45 */ lbz r4, 0x45(r30) -/* 8024CC68 38 A0 00 00 */ li r5, 0 -/* 8024CC6C 48 06 0E A9 */ bl messageSePlay__7Z2SeMgrFUsP3VecSc -/* 8024CC70 48 00 00 18 */ b lbl_8024CC88 -lbl_8024CC74: -/* 8024CC74 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8024CC78 88 9E 00 45 */ lbz r4, 0x45(r30) -/* 8024CC7C 38 A0 00 00 */ li r5, 0 -/* 8024CC80 38 C0 00 00 */ li r6, 0 -/* 8024CC84 48 06 0E 91 */ bl messageSePlay__7Z2SeMgrFUsP3VecSc -lbl_8024CC88: -/* 8024CC88 38 60 00 01 */ li r3, 1 -/* 8024CC8C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8024CC90 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8024CC94 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024CC98 7C 08 03 A6 */ mtlr r0 -/* 8024CC9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024CCA0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event020__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event020__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 96c372e4a81..00000000000 --- a/asm/d/msg/d_msg_flow/event020__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8024CCAC: -/* 8024CCAC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024CCB0 7C 08 02 A6 */ mflr r0 -/* 8024CCB4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024CCB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024CCBC 48 11 55 19 */ bl _savegpr_27 -/* 8024CCC0 7C BB 2B 78 */ mr r27, r5 -/* 8024CCC4 38 84 00 04 */ addi r4, r4, 4 -/* 8024CCC8 4B FF E4 69 */ bl getParam__10dMsgFlow_cFPUc -/* 8024CCCC 7C 7F 1B 78 */ mr r31, r3 -/* 8024CCD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024CCD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024CCD8 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 8024CCDC 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8024CCE0 88 1B 04 E2 */ lbz r0, 0x4e2(r27) -/* 8024CCE4 7C 04 07 74 */ extsb r4, r0 -/* 8024CCE8 4B DD 76 9D */ bl getStatusRoomDt__20dStage_roomControl_cFi -/* 8024CCEC 7C 7D 1B 78 */ mr r29, r3 -/* 8024CCF0 81 83 00 00 */ lwz r12, 0(r3) -/* 8024CCF4 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8024CCF8 7D 89 03 A6 */ mtctr r12 -/* 8024CCFC 4E 80 04 21 */ bctrl -/* 8024CD00 83 83 00 04 */ lwz r28, 4(r3) -/* 8024CD04 3B 60 00 00 */ li r27, 0 -/* 8024CD08 48 00 00 40 */ b lbl_8024CD48 -lbl_8024CD0C: -/* 8024CD0C A8 1C 00 1C */ lha r0, 0x1c(r28) -/* 8024CD10 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8024CD14 7C 00 F8 00 */ cmpw r0, r31 -/* 8024CD18 40 82 00 28 */ bne lbl_8024CD40 -/* 8024CD1C 7F C3 F3 78 */ mr r3, r30 -/* 8024CD20 38 9C 00 0C */ addi r4, r28, 0xc -/* 8024CD24 A8 BE 04 DE */ lha r5, 0x4de(r30) -/* 8024CD28 38 C0 00 00 */ li r6, 0 -/* 8024CD2C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 8024CD30 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 8024CD34 7D 89 03 A6 */ mtctr r12 -/* 8024CD38 4E 80 04 21 */ bctrl -/* 8024CD3C 48 00 00 2C */ b lbl_8024CD68 -lbl_8024CD40: -/* 8024CD40 3B 7B 00 01 */ addi r27, r27, 1 -/* 8024CD44 3B 9C 00 20 */ addi r28, r28, 0x20 -lbl_8024CD48: -/* 8024CD48 7F A3 EB 78 */ mr r3, r29 -/* 8024CD4C 81 9D 00 00 */ lwz r12, 0(r29) -/* 8024CD50 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 8024CD54 7D 89 03 A6 */ mtctr r12 -/* 8024CD58 4E 80 04 21 */ bctrl -/* 8024CD5C 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8024CD60 7C 1B 00 00 */ cmpw r27, r0 -/* 8024CD64 41 80 FF A8 */ blt lbl_8024CD0C -lbl_8024CD68: -/* 8024CD68 38 60 00 01 */ li r3, 1 -/* 8024CD6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024CD70 48 11 54 B1 */ bl _restgpr_27 -/* 8024CD74 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024CD78 7C 08 03 A6 */ mtlr r0 -/* 8024CD7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024CD80 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event024__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event024__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 1dfd01320c7..00000000000 --- a/asm/d/msg/d_msg_flow/event024__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8024CF2C: -/* 8024CF2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024CF30 7C 08 02 A6 */ mflr r0 -/* 8024CF34 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024CF38 7C A3 2B 78 */ mr r3, r5 -/* 8024CF3C 4B F4 D4 19 */ bl setSoldOutFlag__13dShopSystem_cFv -/* 8024CF40 38 60 00 01 */ li r3, 1 -/* 8024CF44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024CF48 7C 08 03 A6 */ mtlr r0 -/* 8024CF4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024CF50 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event025__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event025__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index e2c0344840c..00000000000 --- a/asm/d/msg/d_msg_flow/event025__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024CF54: -/* 8024CF54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024CF58 7C 08 02 A6 */ mflr r0 -/* 8024CF5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024CF60 38 84 00 04 */ addi r4, r4, 4 -/* 8024CF64 4B FF E1 CD */ bl getParam__10dMsgFlow_cFPUc -/* 8024CF68 7C 60 1B 78 */ mr r0, r3 -/* 8024CF6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024CF70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024CF74 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024CF78 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 8024CF7C 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 8024CF80 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024CF84 4B DE 7A 5D */ bl setEventReg__11dSv_event_cFUsUc -/* 8024CF88 38 60 00 01 */ li r3, 1 -/* 8024CF8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024CF90 7C 08 03 A6 */ mtlr r0 -/* 8024CF94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024CF98 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event029__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event029__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index dfc8449cfef..00000000000 --- a/asm/d/msg/d_msg_flow/event029__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8024D500: -/* 8024D500 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024D504 7C 08 02 A6 */ mflr r0 -/* 8024D508 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D50C 38 00 00 02 */ li r0, 2 -/* 8024D510 98 03 00 46 */ stb r0, 0x46(r3) -/* 8024D514 38 00 00 01 */ li r0, 1 -/* 8024D518 98 03 00 24 */ stb r0, 0x24(r3) -/* 8024D51C 98 03 00 25 */ stb r0, 0x25(r3) -/* 8024D520 38 84 00 04 */ addi r4, r4, 4 -/* 8024D524 4B FF DC 0D */ bl getParam__10dMsgFlow_cFPUc -/* 8024D528 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8024D52C 4B FE B1 21 */ bl setSelectCancelPos__12dMsgObject_cFUc -/* 8024D530 38 60 00 01 */ li r3, 1 -/* 8024D534 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024D538 7C 08 03 A6 */ mtlr r0 -/* 8024D53C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D540 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event030__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event030__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index d91014f584b..00000000000 --- a/asm/d/msg/d_msg_flow/event030__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8024D544: -/* 8024D544 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024D548 7C 08 02 A6 */ mflr r0 -/* 8024D54C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D550 7C 86 23 78 */ mr r6, r4 -/* 8024D554 38 81 00 08 */ addi r4, r1, 8 -/* 8024D558 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024D55C 38 C6 00 04 */ addi r6, r6, 4 -/* 8024D560 4B FF DB 91 */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024D564 A0 01 00 0A */ lhz r0, 0xa(r1) -/* 8024D568 7C 04 07 35 */ extsh. r4, r0 -/* 8024D56C 40 82 00 10 */ bne lbl_8024D57C -/* 8024D570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024D574 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024D578 88 83 00 F8 */ lbz r4, 0xf8(r3) -lbl_8024D57C: -/* 8024D57C A0 01 00 08 */ lhz r0, 8(r1) -/* 8024D580 28 00 00 00 */ cmplwi r0, 0 -/* 8024D584 40 82 00 1C */ bne lbl_8024D5A0 -/* 8024D588 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024D58C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024D590 A8 03 5D F4 */ lha r0, 0x5df4(r3) -/* 8024D594 7C 00 22 14 */ add r0, r0, r4 -/* 8024D598 B0 03 5D F4 */ sth r0, 0x5df4(r3) -/* 8024D59C 48 00 00 0C */ b lbl_8024D5A8 -lbl_8024D5A0: -/* 8024D5A0 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8024D5A4 4B FE AF 35 */ bl setArrowNum__12dMsgObject_cFUc -lbl_8024D5A8: -/* 8024D5A8 38 60 00 01 */ li r3, 1 -/* 8024D5AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024D5B0 7C 08 03 A6 */ mtlr r0 -/* 8024D5B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D5B8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event031__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event031__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 97200bd6f3f..00000000000 --- a/asm/d/msg/d_msg_flow/event031__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8024D5BC: -/* 8024D5BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024D5C0 7C 08 02 A6 */ mflr r0 -/* 8024D5C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D5C8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8024D5CC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8024D5D0 38 80 00 00 */ li r4, 0 -/* 8024D5D4 4B FD 0A F1 */ bl resetMiniGameItem__13dMeter2Info_cFb -/* 8024D5D8 38 60 00 01 */ li r3, 1 -/* 8024D5DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024D5E0 7C 08 03 A6 */ mtlr r0 -/* 8024D5E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D5E8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event034__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event034__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 4a2d7e92d6c..00000000000 --- a/asm/d/msg/d_msg_flow/event034__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8024D788: -/* 8024D788 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024D78C 7C 08 02 A6 */ mflr r0 -/* 8024D790 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D794 38 84 00 04 */ addi r4, r4, 4 -/* 8024D798 4B FF D9 99 */ bl getParam__10dMsgFlow_cFPUc -/* 8024D79C 7C 60 1B 78 */ mr r0, r3 -/* 8024D7A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024D7A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024D7A8 38 63 00 9C */ addi r3, r3, 0x9c -/* 8024D7AC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8024D7B0 4B DE 64 7D */ bl setWarashibeItem__17dSv_player_item_cFUc -/* 8024D7B4 38 60 00 01 */ li r3, 1 -/* 8024D7B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024D7BC 7C 08 03 A6 */ mtlr r0 -/* 8024D7C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D7C4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event035__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event035__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index cb7ad779ab2..00000000000 --- a/asm/d/msg/d_msg_flow/event035__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8024D7C8: -/* 8024D7C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024D7CC 7C 08 02 A6 */ mflr r0 -/* 8024D7D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D7D4 38 84 00 04 */ addi r4, r4, 4 -/* 8024D7D8 4B FF D9 59 */ bl getParam__10dMsgFlow_cFPUc -/* 8024D7DC 7C 64 1B 78 */ mr r4, r3 -/* 8024D7E0 2C 04 00 F4 */ cmpwi r4, 0xf4 -/* 8024D7E4 41 82 00 0C */ beq lbl_8024D7F0 -/* 8024D7E8 2C 04 00 F5 */ cmpwi r4, 0xf5 -/* 8024D7EC 40 82 00 1C */ bne lbl_8024D808 -lbl_8024D7F0: -/* 8024D7F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024D7F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024D7F8 38 63 00 CC */ addi r3, r3, 0xcc -/* 8024D7FC 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 8024D800 4B DE 66 95 */ bl offFirstBit__21dSv_player_get_item_cFUc -/* 8024D804 48 00 00 58 */ b lbl_8024D85C -lbl_8024D808: -/* 8024D808 2C 04 00 90 */ cmpwi r4, 0x90 -/* 8024D80C 41 82 00 0C */ beq lbl_8024D818 -/* 8024D810 2C 04 00 91 */ cmpwi r4, 0x91 -/* 8024D814 40 82 00 20 */ bne lbl_8024D834 -lbl_8024D818: -/* 8024D818 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024D81C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024D820 38 63 00 9C */ addi r3, r3, 0x9c -/* 8024D824 38 80 00 13 */ li r4, 0x13 -/* 8024D828 38 A0 00 FF */ li r5, 0xff -/* 8024D82C 4B DE 57 8D */ bl setItem__17dSv_player_item_cFiUc -/* 8024D830 48 00 00 2C */ b lbl_8024D85C -lbl_8024D834: -/* 8024D834 38 04 FF 80 */ addi r0, r4, -128 -/* 8024D838 28 00 00 02 */ cmplwi r0, 2 -/* 8024D83C 40 81 00 0C */ ble lbl_8024D848 -/* 8024D840 2C 04 00 83 */ cmpwi r4, 0x83 -/* 8024D844 40 82 00 18 */ bne lbl_8024D85C -lbl_8024D848: -/* 8024D848 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024D84C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024D850 38 63 00 9C */ addi r3, r3, 0x9c -/* 8024D854 38 80 00 FF */ li r4, 0xff -/* 8024D858 4B DE 63 D5 */ bl setWarashibeItem__17dSv_player_item_cFUc -lbl_8024D85C: -/* 8024D85C 38 60 00 01 */ li r3, 1 -/* 8024D860 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024D864 7C 08 03 A6 */ mtlr r0 -/* 8024D868 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D86C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event036__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event036__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 703c1114cc3..00000000000 --- a/asm/d/msg/d_msg_flow/event036__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8024D870: -/* 8024D870 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024D874 7C 08 02 A6 */ mflr r0 -/* 8024D878 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D87C 7C 86 23 78 */ mr r6, r4 -/* 8024D880 38 81 00 08 */ addi r4, r1, 8 -/* 8024D884 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024D888 38 C6 00 04 */ addi r6, r6, 4 -/* 8024D88C 4B FF D8 65 */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024D890 A0 01 00 08 */ lhz r0, 8(r1) -/* 8024D894 54 04 28 34 */ slwi r4, r0, 5 -/* 8024D898 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024D89C 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024D8A0 7C 60 22 14 */ add r3, r0, r4 -/* 8024D8A4 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 8024D8A8 A0 81 00 0A */ lhz r4, 0xa(r1) -/* 8024D8AC 4B DE 6F 65 */ bl onSwitch__12dSv_memBit_cFi -/* 8024D8B0 38 60 00 01 */ li r3, 1 -/* 8024D8B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024D8B8 7C 08 03 A6 */ mtlr r0 -/* 8024D8BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D8C0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event037__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event037__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 41823fd2a3a..00000000000 --- a/asm/d/msg/d_msg_flow/event037__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8024D8C4: -/* 8024D8C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024D8C8 7C 08 02 A6 */ mflr r0 -/* 8024D8CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D8D0 7C 86 23 78 */ mr r6, r4 -/* 8024D8D4 38 81 00 08 */ addi r4, r1, 8 -/* 8024D8D8 38 A1 00 0A */ addi r5, r1, 0xa -/* 8024D8DC 38 C6 00 04 */ addi r6, r6, 4 -/* 8024D8E0 4B FF D8 11 */ bl getParam__10dMsgFlow_cFPUsPUsPUc -/* 8024D8E4 A0 01 00 08 */ lhz r0, 8(r1) -/* 8024D8E8 54 04 28 34 */ slwi r4, r0, 5 -/* 8024D8EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024D8F0 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024D8F4 7C 60 22 14 */ add r3, r0, r4 -/* 8024D8F8 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 8024D8FC A0 81 00 0A */ lhz r4, 0xa(r1) -/* 8024D900 4B DE 6F 39 */ bl offSwitch__12dSv_memBit_cFi -/* 8024D904 38 60 00 01 */ li r3, 1 -/* 8024D908 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024D90C 7C 08 03 A6 */ mtlr r0 -/* 8024D910 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D914 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event038__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event038__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 695cc424417..00000000000 --- a/asm/d/msg/d_msg_flow/event038__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8024D918: -/* 8024D918 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024D91C 7C 08 02 A6 */ mflr r0 -/* 8024D920 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D924 4B FD 0F B9 */ bl dMeter2Info_recieveLetter__Fv -/* 8024D928 38 60 00 01 */ li r3, 1 -/* 8024D92C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024D930 7C 08 03 A6 */ mtlr r0 -/* 8024D934 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D938 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index 15bba5325b4..00000000000 --- a/asm/d/msg/d_msg_flow/event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8024D93C: -/* 8024D93C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024D940 7C 08 02 A6 */ mflr r0 -/* 8024D944 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D948 38 84 00 04 */ addi r4, r4, 4 -/* 8024D94C 4B FF D7 E5 */ bl getParam__10dMsgFlow_cFPUc -/* 8024D950 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 8024D954 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 8024D958 98 64 00 E1 */ stb r3, 0xe1(r4) -/* 8024D95C 38 60 00 01 */ li r3, 1 -/* 8024D960 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024D964 7C 08 03 A6 */ mtlr r0 -/* 8024D968 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D96C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s deleted file mode 100644 index b0f4cdce6cd..00000000000 --- a/asm/d/msg/d_msg_flow/event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8024DA78: -/* 8024DA78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024DA7C 7C 08 02 A6 */ mflr r0 -/* 8024DA80 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024DA84 38 84 00 04 */ addi r4, r4, 4 -/* 8024DA88 4B FF D6 A9 */ bl getParam__10dMsgFlow_cFPUc -/* 8024DA8C 7C 63 07 34 */ extsh r3, r3 -/* 8024DA90 4B FE B0 4D */ bl dMsgObject_addOffering__Fs -/* 8024DA94 38 60 00 01 */ li r3, 1 -/* 8024DA98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024DA9C 7C 08 03 A6 */ mtlr r0 -/* 8024DAA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024DAA4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/getEventId__10dMsgFlow_cFPi.s b/asm/d/msg/d_msg_flow/getEventId__10dMsgFlow_cFPi.s deleted file mode 100644 index 623a82b321a..00000000000 --- a/asm/d/msg/d_msg_flow/getEventId__10dMsgFlow_cFPi.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8024A528: -/* 8024A528 A0 03 00 30 */ lhz r0, 0x30(r3) -/* 8024A52C 90 04 00 00 */ stw r0, 0(r4) -/* 8024A530 A0 63 00 32 */ lhz r3, 0x32(r3) -/* 8024A534 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/getMsgNo__10dMsgFlow_cFv.s b/asm/d/msg/d_msg_flow/getMsgNo__10dMsgFlow_cFv.s deleted file mode 100644 index 0f28ea1ecea..00000000000 --- a/asm/d/msg/d_msg_flow/getMsgNo__10dMsgFlow_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8024A538: -/* 8024A538 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8024A53C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/getMsg__10dMsgFlow_cFv.s b/asm/d/msg/d_msg_flow/getMsg__10dMsgFlow_cFv.s deleted file mode 100644 index 0f7bc3cffa6..00000000000 --- a/asm/d/msg/d_msg_flow/getMsg__10dMsgFlow_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8024A548: -/* 8024A548 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024A54C 7C 08 02 A6 */ mflr r0 -/* 8024A550 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024A554 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024A558 3C 03 00 01 */ addis r0, r3, 1 -/* 8024A55C 28 00 FF FF */ cmplwi r0, 0xffff -/* 8024A560 41 82 00 0C */ beq lbl_8024A56C -/* 8024A564 4B DD 54 C1 */ bl fopMsgM_SearchByID__FUi -/* 8024A568 48 00 00 08 */ b lbl_8024A570 -lbl_8024A56C: -/* 8024A56C 38 60 00 00 */ li r3, 0 -lbl_8024A570: -/* 8024A570 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024A574 7C 08 03 A6 */ mtlr r0 -/* 8024A578 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024A57C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/getNowMsgNo__10dMsgFlow_cFv.s b/asm/d/msg/d_msg_flow/getNowMsgNo__10dMsgFlow_cFv.s deleted file mode 100644 index ee43a6fefd3..00000000000 --- a/asm/d/msg/d_msg_flow/getNowMsgNo__10dMsgFlow_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8024A540: -/* 8024A540 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 8024A544 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUcPUc.s b/asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUcPUc.s deleted file mode 100644 index 93f479cdb50..00000000000 --- a/asm/d/msg/d_msg_flow/getParam__10dMsgFlow_cFPUcPUc.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8024B108: -/* 8024B108 7C A3 2B 78 */ mr r3, r5 -/* 8024B10C 38 00 00 04 */ li r0, 4 -/* 8024B110 7C 09 03 A6 */ mtctr r0 -lbl_8024B114: -/* 8024B114 88 03 00 00 */ lbz r0, 0(r3) -/* 8024B118 98 04 00 00 */ stb r0, 0(r4) -/* 8024B11C 38 84 00 01 */ addi r4, r4, 1 -/* 8024B120 38 63 00 01 */ addi r3, r3, 1 -/* 8024B124 42 00 FF F0 */ bdnz lbl_8024B114 -/* 8024B128 80 65 00 00 */ lwz r3, 0(r5) -/* 8024B12C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s deleted file mode 100644 index 659209d8bba..00000000000 --- a/asm/d/msg/d_msg_flow/nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_8024AFF8: -/* 8024AFF8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024AFFC 7C 08 02 A6 */ mflr r0 -/* 8024B000 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024B004 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024B008 48 11 71 D5 */ bl _savegpr_29 -/* 8024B00C 7C 7D 1B 78 */ mr r29, r3 -/* 8024B010 7C BE 2B 78 */ mr r30, r5 -/* 8024B014 7C 9F 23 78 */ mr r31, r4 -/* 8024B018 38 60 00 01 */ li r3, 1 -/* 8024B01C 38 00 00 00 */ li r0, 0 -/* 8024B020 98 1D 00 47 */ stb r0, 0x47(r29) -/* 8024B024 38 00 00 FF */ li r0, 0xff -/* 8024B028 98 1D 00 42 */ stb r0, 0x42(r29) -/* 8024B02C 98 1D 00 43 */ stb r0, 0x43(r29) -/* 8024B030 98 1D 00 44 */ stb r0, 0x44(r29) -/* 8024B034 98 1D 00 45 */ stb r0, 0x45(r29) -/* 8024B038 48 00 00 88 */ b lbl_8024B0C0 -lbl_8024B03C: -/* 8024B03C 28 1E 00 00 */ cmplwi r30, 0 -/* 8024B040 41 82 00 10 */ beq lbl_8024B050 -/* 8024B044 A0 1D 00 38 */ lhz r0, 0x38(r29) -/* 8024B048 54 00 10 3A */ slwi r0, r0, 2 -/* 8024B04C 7F FE 00 2E */ lwzx r31, r30, r0 -lbl_8024B050: -/* 8024B050 80 9D 00 0C */ lwz r4, 0xc(r29) -/* 8024B054 A0 1D 00 10 */ lhz r0, 0x10(r29) -/* 8024B058 54 00 18 38 */ slwi r0, r0, 3 -/* 8024B05C 7C 04 00 AE */ lbzx r0, r4, r0 -/* 8024B060 2C 00 00 02 */ cmpwi r0, 2 -/* 8024B064 41 82 00 38 */ beq lbl_8024B09C -/* 8024B068 40 80 00 14 */ bge lbl_8024B07C -/* 8024B06C 2C 00 00 00 */ cmpwi r0, 0 -/* 8024B070 41 82 00 50 */ beq lbl_8024B0C0 -/* 8024B074 40 80 00 14 */ bge lbl_8024B088 -/* 8024B078 48 00 00 48 */ b lbl_8024B0C0 -lbl_8024B07C: -/* 8024B07C 2C 00 00 04 */ cmpwi r0, 4 -/* 8024B080 40 80 00 40 */ bge lbl_8024B0C0 -/* 8024B084 48 00 00 2C */ b lbl_8024B0B0 -lbl_8024B088: -/* 8024B088 7F A3 EB 78 */ mr r3, r29 -/* 8024B08C 7F E4 FB 78 */ mr r4, r31 -/* 8024B090 7F C5 F3 78 */ mr r5, r30 -/* 8024B094 4B FF FA 9D */ bl messageNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c -/* 8024B098 48 00 00 28 */ b lbl_8024B0C0 -lbl_8024B09C: -/* 8024B09C 7F A3 EB 78 */ mr r3, r29 -/* 8024B0A0 7F E4 FB 78 */ mr r4, r31 -/* 8024B0A4 7F C5 F3 78 */ mr r5, r30 -/* 8024B0A8 4B FF FC AD */ bl branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c -/* 8024B0AC 48 00 00 14 */ b lbl_8024B0C0 -lbl_8024B0B0: -/* 8024B0B0 7F A3 EB 78 */ mr r3, r29 -/* 8024B0B4 7F E4 FB 78 */ mr r4, r31 -/* 8024B0B8 7F C5 F3 78 */ mr r5, r30 -/* 8024B0BC 4B FF FD 31 */ bl eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c -lbl_8024B0C0: -/* 8024B0C0 2C 03 00 00 */ cmpwi r3, 0 -/* 8024B0C4 41 82 00 10 */ beq lbl_8024B0D4 -/* 8024B0C8 88 1D 00 26 */ lbz r0, 0x26(r29) -/* 8024B0CC 28 00 00 00 */ cmplwi r0, 0 -/* 8024B0D0 41 82 FF 6C */ beq lbl_8024B03C -lbl_8024B0D4: -/* 8024B0D4 38 60 00 00 */ li r3, 0 -/* 8024B0D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024B0DC 48 11 71 4D */ bl _restgpr_29 -/* 8024B0E0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024B0E4 7C 08 03 A6 */ mtlr r0 -/* 8024B0E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024B0EC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 018f889d4ff..00000000000 --- a/asm/d/msg/d_msg_flow/query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024B138: -/* 8024B138 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B13C 7C 08 02 A6 */ mflr r0 -/* 8024B140 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B144 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B148 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B14C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8024B150 A0 04 00 04 */ lhz r0, 4(r4) -/* 8024B154 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024B158 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8024B15C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8024B160 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024B164 4B DE 98 59 */ bl isEventBit__11dSv_event_cCFUs -/* 8024B168 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B16C 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B170 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B174 7C 08 03 A6 */ mtlr r0 -/* 8024B178 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B17C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query002__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query002__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index ad5f9ceefab..00000000000 --- a/asm/d/msg/d_msg_flow/query002__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8024B180: -/* 8024B180 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B184 7C 08 02 A6 */ mflr r0 -/* 8024B188 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B18C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024B190 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B194 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B198 80 7F 5D B4 */ lwz r3, 0x5db4(r31) -/* 8024B19C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 8024B1A0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8024B1A4 41 82 00 0C */ beq lbl_8024B1B0 -/* 8024B1A8 38 60 00 01 */ li r3, 1 -/* 8024B1AC 48 00 00 48 */ b lbl_8024B1F4 -lbl_8024B1B0: -/* 8024B1B0 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 8024B1B4 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8024B1B8 81 8C 01 88 */ lwz r12, 0x188(r12) -/* 8024B1BC 7D 89 03 A6 */ mtctr r12 -/* 8024B1C0 4E 80 04 21 */ bctrl -/* 8024B1C4 28 03 00 00 */ cmplwi r3, 0 -/* 8024B1C8 40 82 00 20 */ bne lbl_8024B1E8 -/* 8024B1CC 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 8024B1D0 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8024B1D4 81 8C 01 8C */ lwz r12, 0x18c(r12) -/* 8024B1D8 7D 89 03 A6 */ mtctr r12 -/* 8024B1DC 4E 80 04 21 */ bctrl -/* 8024B1E0 28 03 00 00 */ cmplwi r3, 0 -/* 8024B1E4 41 82 00 0C */ beq lbl_8024B1F0 -lbl_8024B1E8: -/* 8024B1E8 38 60 00 02 */ li r3, 2 -/* 8024B1EC 48 00 00 08 */ b lbl_8024B1F4 -lbl_8024B1F0: -/* 8024B1F0 38 60 00 00 */ li r3, 0 -lbl_8024B1F4: -/* 8024B1F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024B1F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B1FC 7C 08 03 A6 */ mtlr r0 -/* 8024B200 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B204 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index b2534acd900..00000000000 --- a/asm/d/msg/d_msg_flow/query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8024B2C0: -/* 8024B2C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B2C4 7C 08 02 A6 */ mflr r0 -/* 8024B2C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B2CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024B2D0 7C 7F 1B 78 */ mr r31, r3 -/* 8024B2D4 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024B2D8 4B DD 47 4D */ bl fopMsgM_SearchByID__FUi -/* 8024B2DC 88 63 00 FA */ lbz r3, 0xfa(r3) -/* 8024B2E0 B0 7F 00 3A */ sth r3, 0x3a(r31) -/* 8024B2E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024B2E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B2EC 7C 08 03 A6 */ mtlr r0 -/* 8024B2F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B2F4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query006__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query006__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index bf63e2b394c..00000000000 --- a/asm/d/msg/d_msg_flow/query006__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8024B2F8: -/* 8024B2F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B2FC 7C 08 02 A6 */ mflr r0 -/* 8024B300 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B304 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024B308 7C 7F 1B 78 */ mr r31, r3 -/* 8024B30C 38 C0 00 00 */ li r6, 0 -/* 8024B310 4B FF FF B1 */ bl query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci -/* 8024B314 B0 7F 00 3A */ sth r3, 0x3a(r31) -/* 8024B318 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024B31C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B320 7C 08 03 A6 */ mtlr r0 -/* 8024B324 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B328 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index f6ed1eff08f..00000000000 --- a/asm/d/msg/d_msg_flow/query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8024B918: -/* 8024B918 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B91C 7C 08 02 A6 */ mflr r0 -/* 8024B920 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B924 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B928 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B92C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8024B930 38 80 00 FF */ li r4, 0xff -/* 8024B934 4B DE 82 B9 */ bl checkBombBag__17dSv_player_item_cFUc -/* 8024B938 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024B93C 20 00 00 03 */ subfic r0, r0, 3 -/* 8024B940 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 8024B944 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B948 7C 08 03 A6 */ mtlr r0 -/* 8024B94C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B950 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query026__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query026__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 6257eb13338..00000000000 --- a/asm/d/msg/d_msg_flow/query026__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8024B9BC: -/* 8024B9BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B9C0 7C 08 02 A6 */ mflr r0 -/* 8024B9C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B9C8 7C A3 2B 78 */ mr r3, r5 -/* 8024B9CC 38 80 00 07 */ li r4, 7 -/* 8024B9D0 4B F4 BC 29 */ bl isFlag__13dShopSystem_cFi -/* 8024B9D4 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 8024B9D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B9DC 7C 08 03 A6 */ mtlr r0 -/* 8024B9E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B9E4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query030__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query030__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index a8ca64ec5ad..00000000000 --- a/asm/d/msg/d_msg_flow/query030__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8024BAE0: -/* 8024BAE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BAE4 7C 08 02 A6 */ mflr r0 -/* 8024BAE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BAEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BAF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BAF4 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024BAF8 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 8024BAFC 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 8024BB00 4B DE 8F 05 */ bl getEventReg__11dSv_event_cCFUs -/* 8024BB04 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8024BB08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024BB0C 7C 08 03 A6 */ mtlr r0 -/* 8024BB10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BB14 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query033__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query033__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 40ed925a514..00000000000 --- a/asm/d/msg/d_msg_flow/query033__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024BB9C: -/* 8024BB9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BBA0 7C 08 02 A6 */ mflr r0 -/* 8024BBA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BBA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BBAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BBB0 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 8024BBB4 38 80 00 01 */ li r4, 1 -/* 8024BBB8 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8024BBBC 81 8C 01 CC */ lwz r12, 0x1cc(r12) -/* 8024BBC0 7D 89 03 A6 */ mtctr r12 -/* 8024BBC4 4E 80 04 21 */ bctrl -/* 8024BBC8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024BBCC 7C 00 00 34 */ cntlzw r0, r0 -/* 8024BBD0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024BBD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024BBD8 7C 08 03 A6 */ mtlr r0 -/* 8024BBDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BBE0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query034__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query034__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 88349771a4d..00000000000 --- a/asm/d/msg/d_msg_flow/query034__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8024BBE4: -/* 8024BBE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BBE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BBEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BBF0 C0 23 00 34 */ lfs f1, 0x34(r3) -/* 8024BBF4 C0 02 B3 98 */ lfs f0, lit_5608(r2) -/* 8024BBF8 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8024BBFC FC 00 00 1E */ fctiwz f0, f0 -/* 8024BC00 D8 01 00 08 */ stfd f0, 8(r1) -/* 8024BC04 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8024BC08 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024BC0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BC10 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query035__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query035__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 9eeb8bf5f2d..00000000000 --- a/asm/d/msg/d_msg_flow/query035__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8024BC14: -/* 8024BC14 38 A0 00 00 */ li r5, 0 -/* 8024BC18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BC1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BC20 88 63 00 1B */ lbz r3, 0x1b(r3) -/* 8024BC24 A0 04 00 04 */ lhz r0, 4(r4) -/* 8024BC28 7C 03 00 00 */ cmpw r3, r0 -/* 8024BC2C 40 80 00 08 */ bge lbl_8024BC34 -/* 8024BC30 38 A0 00 01 */ li r5, 1 -lbl_8024BC34: -/* 8024BC34 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 8024BC38 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query036__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query036__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index b10b9fbb3be..00000000000 --- a/asm/d/msg/d_msg_flow/query036__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024BC3C: -/* 8024BC3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BC40 7C 08 02 A6 */ mflr r0 -/* 8024BC44 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BC48 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024BC4C 4B DD 3D D9 */ bl fopMsgM_SearchByID__FUi -/* 8024BC50 88 63 00 FA */ lbz r3, 0xfa(r3) -/* 8024BC54 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BC58 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BC5C 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 8024BC60 88 04 01 A2 */ lbz r0, 0x1a2(r4) -/* 8024BC64 28 00 00 02 */ cmplwi r0, 2 -/* 8024BC68 40 82 00 08 */ bne lbl_8024BC70 -/* 8024BC6C 38 60 00 02 */ li r3, 2 -lbl_8024BC70: -/* 8024BC70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024BC74 7C 08 03 A6 */ mtlr r0 -/* 8024BC78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BC7C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query037__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query037__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 3035ccfb83b..00000000000 --- a/asm/d/msg/d_msg_flow/query037__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024BC80: -/* 8024BC80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BC84 7C 08 02 A6 */ mflr r0 -/* 8024BC88 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BC8C 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024BC90 4B DD 3D 95 */ bl fopMsgM_SearchByID__FUi -/* 8024BC94 88 63 00 FA */ lbz r3, 0xfa(r3) -/* 8024BC98 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BC9C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BCA0 80 84 5D BC */ lwz r4, 0x5dbc(r4) -/* 8024BCA4 88 04 01 A2 */ lbz r0, 0x1a2(r4) -/* 8024BCA8 28 00 00 02 */ cmplwi r0, 2 -/* 8024BCAC 40 82 00 08 */ bne lbl_8024BCB4 -/* 8024BCB0 38 60 00 03 */ li r3, 3 -lbl_8024BCB4: -/* 8024BCB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024BCB8 7C 08 03 A6 */ mtlr r0 -/* 8024BCBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BCC0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 084b1843e56..00000000000 --- a/asm/d/msg/d_msg_flow/query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8024BFEC: -/* 8024BFEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BFF0 7C 08 02 A6 */ mflr r0 -/* 8024BFF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BFF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024BFFC 93 C1 00 08 */ stw r30, 8(r1) -/* 8024C000 83 ED 8A 98 */ lwz r31, m_midnaActor__9daPy_py_c(r13) -/* 8024C004 3B C0 00 00 */ li r30, 0 -/* 8024C008 3C 60 80 3A */ lis r3, d_msg_d_msg_flow__stringBase0@ha /* 0x80399CB0@ha */ -/* 8024C00C 38 63 9C B0 */ addi r3, r3, d_msg_d_msg_flow__stringBase0@l /* 0x80399CB0@l */ -/* 8024C010 38 63 00 10 */ addi r3, r3, 0x10 -/* 8024C014 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C018 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C01C 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8024C020 48 11 C9 75 */ bl strcmp -/* 8024C024 2C 03 00 00 */ cmpwi r3, 0 -/* 8024C028 40 82 00 28 */ bne lbl_8024C050 -/* 8024C02C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C030 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C034 38 63 09 78 */ addi r3, r3, 0x978 -/* 8024C038 38 80 00 3C */ li r4, 0x3c -/* 8024C03C 4B DE 8B AD */ bl isSwitch__12dSv_danBit_cCFi -/* 8024C040 2C 03 00 00 */ cmpwi r3, 0 -/* 8024C044 41 82 00 0C */ beq lbl_8024C050 -/* 8024C048 3B C0 00 04 */ li r30, 4 -/* 8024C04C 48 00 00 40 */ b lbl_8024C08C -lbl_8024C050: -/* 8024C050 80 7F 08 90 */ lwz r3, 0x890(r31) -/* 8024C054 54 60 02 D7 */ rlwinm. r0, r3, 0, 0xb, 0xb -/* 8024C058 41 82 00 0C */ beq lbl_8024C064 -/* 8024C05C 3B C0 00 01 */ li r30, 1 -/* 8024C060 48 00 00 2C */ b lbl_8024C08C -lbl_8024C064: -/* 8024C064 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd -/* 8024C068 41 82 00 0C */ beq lbl_8024C074 -/* 8024C06C 3B C0 00 02 */ li r30, 2 -/* 8024C070 48 00 00 1C */ b lbl_8024C08C -lbl_8024C074: -/* 8024C074 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8024C078 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8024C07C 88 03 10 50 */ lbz r0, 0x1050(r3) -/* 8024C080 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 8024C084 41 82 00 08 */ beq lbl_8024C08C -/* 8024C088 3B C0 00 03 */ li r30, 3 -lbl_8024C08C: -/* 8024C08C 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 8024C090 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024C094 83 C1 00 08 */ lwz r30, 8(r1) -/* 8024C098 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C09C 7C 08 03 A6 */ mtlr r0 -/* 8024C0A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C0A4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query044__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query044__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index c59567e01fc..00000000000 --- a/asm/d/msg/d_msg_flow/query044__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024C144: -/* 8024C144 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C148 7C 08 02 A6 */ mflr r0 -/* 8024C14C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C150 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C154 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C158 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8024C15C 38 80 00 00 */ li r4, 0 -/* 8024C160 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8024C164 81 8C 02 1C */ lwz r12, 0x21c(r12) -/* 8024C168 7D 89 03 A6 */ mtctr r12 -/* 8024C16C 4E 80 04 21 */ bctrl -/* 8024C170 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024C174 7C 00 00 34 */ cntlzw r0, r0 -/* 8024C178 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024C17C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C180 7C 08 03 A6 */ mtlr r0 -/* 8024C184 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C188 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query046__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query046__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 0634bde2ed6..00000000000 --- a/asm/d/msg/d_msg_flow/query046__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8024C218: -/* 8024C218 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C21C 7C 08 02 A6 */ mflr r0 -/* 8024C220 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C224 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C228 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C22C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8024C230 4B DE 75 25 */ bl checkInsectBottle__17dSv_player_item_cFv -/* 8024C234 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8024C238 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C23C 7C 08 03 A6 */ mtlr r0 -/* 8024C240 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C244 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query048__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query048__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 93027a98af5..00000000000 --- a/asm/d/msg/d_msg_flow/query048__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8024C250: -/* 8024C250 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C254 7C 08 02 A6 */ mflr r0 -/* 8024C258 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C25C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024C260 4B FD 24 F5 */ bl dMeter2Info_getNewLetterNum__Fv -/* 8024C264 7C 7F 1B 78 */ mr r31, r3 -/* 8024C268 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024C26C 28 00 00 02 */ cmplwi r0, 2 -/* 8024C270 40 81 00 08 */ ble lbl_8024C278 -/* 8024C274 3B E0 00 02 */ li r31, 2 -lbl_8024C278: -/* 8024C278 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8024C27C 28 00 00 01 */ cmplwi r0, 1 -/* 8024C280 40 82 00 08 */ bne lbl_8024C288 -/* 8024C284 4B FD 25 81 */ bl dMeter2Info_setNewLetterSender__Fv -lbl_8024C288: -/* 8024C288 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8024C28C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024C290 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C294 7C 08 03 A6 */ mtlr r0 -/* 8024C298 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C29C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query050__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query050__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index b8e35f8ce8c..00000000000 --- a/asm/d/msg/d_msg_flow/query050__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8024C2FC: -/* 8024C2FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C300 7C 08 02 A6 */ mflr r0 -/* 8024C304 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C308 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024C30C A3 E4 00 04 */ lhz r31, 4(r4) -/* 8024C310 4B FE C7 65 */ bl dMsgObject_getOffering__Fv -/* 8024C314 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8024C318 7F E0 02 78 */ xor r0, r31, r0 -/* 8024C31C 7C 03 0E 70 */ srawi r3, r0, 1 -/* 8024C320 7C 00 F8 38 */ and r0, r0, r31 -/* 8024C324 7C 00 18 50 */ subf r0, r0, r3 -/* 8024C328 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8024C32C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024C330 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C334 7C 08 03 A6 */ mtlr r0 -/* 8024C338 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C33C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query051__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query051__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index dd52542a9d8..00000000000 --- a/asm/d/msg/d_msg_flow/query051__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8024C340: -/* 8024C340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C348 80 83 5E 0C */ lwz r4, 0x5e0c(r3) -/* 8024C34C 2C 04 00 00 */ cmpwi r4, 0 -/* 8024C350 40 82 00 0C */ bne lbl_8024C35C -/* 8024C354 38 00 00 00 */ li r0, 0 -/* 8024C358 48 00 00 40 */ b lbl_8024C398 -lbl_8024C35C: -/* 8024C35C 2C 04 03 E8 */ cmpwi r4, 0x3e8 -/* 8024C360 40 80 00 0C */ bge lbl_8024C36C -/* 8024C364 38 00 00 01 */ li r0, 1 -/* 8024C368 48 00 00 30 */ b lbl_8024C398 -lbl_8024C36C: -/* 8024C36C 2C 04 27 10 */ cmpwi r4, 0x2710 -/* 8024C370 40 80 00 0C */ bge lbl_8024C37C -/* 8024C374 38 00 00 02 */ li r0, 2 -/* 8024C378 48 00 00 20 */ b lbl_8024C398 -lbl_8024C37C: -/* 8024C37C 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000F00E@ha */ -/* 8024C380 38 03 F0 0E */ addi r0, r3, 0xF00E /* 0x0000F00E@l */ -/* 8024C384 7C 04 00 00 */ cmpw r4, r0 -/* 8024C388 40 80 00 0C */ bge lbl_8024C394 -/* 8024C38C 38 00 00 03 */ li r0, 3 -/* 8024C390 48 00 00 08 */ b lbl_8024C398 -lbl_8024C394: -/* 8024C394 38 00 00 04 */ li r0, 4 -lbl_8024C398: -/* 8024C398 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024C39C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query052__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query052__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 3b6536d54ac..00000000000 --- a/asm/d/msg/d_msg_flow/query052__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8024C3A0: -/* 8024C3A0 38 A0 00 00 */ li r5, 0 -/* 8024C3A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C3A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C3AC 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 8024C3B0 80 04 05 70 */ lwz r0, 0x570(r4) -/* 8024C3B4 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 8024C3B8 40 82 00 10 */ bne lbl_8024C3C8 -/* 8024C3BC 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 8024C3C0 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 8024C3C4 41 82 00 08 */ beq lbl_8024C3CC -lbl_8024C3C8: -/* 8024C3C8 38 A0 00 01 */ li r5, 1 -lbl_8024C3CC: -/* 8024C3CC 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 8024C3D0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query053__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query053__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 7dfb49bd065..00000000000 --- a/asm/d/msg/d_msg_flow/query053__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8024C3D4: -/* 8024C3D4 38 80 00 00 */ li r4, 0 -/* 8024C3D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C3DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C3E0 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 8024C3E4 80 03 05 70 */ lwz r0, 0x570(r3) -/* 8024C3E8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8024C3EC 41 82 00 08 */ beq lbl_8024C3F4 -/* 8024C3F0 38 80 00 01 */ li r4, 1 -lbl_8024C3F4: -/* 8024C3F4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8024C3F8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/remove__10dMsgFlow_cFv.s b/asm/d/msg/d_msg_flow/remove__10dMsgFlow_cFv.s deleted file mode 100644 index 6f563f93e07..00000000000 --- a/asm/d/msg/d_msg_flow/remove__10dMsgFlow_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8024A4C4: -/* 8024A4C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024A4C8 7C 08 02 A6 */ mflr r0 -/* 8024A4CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024A4D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024A4D4 7C 7F 1B 78 */ mr r31, r3 -/* 8024A4D8 38 00 00 00 */ li r0, 0 -/* 8024A4DC 98 03 00 27 */ stb r0, 0x27(r3) -/* 8024A4E0 38 00 00 01 */ li r0, 1 -/* 8024A4E4 98 03 00 26 */ stb r0, 0x26(r3) -/* 8024A4E8 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024A4EC 4B DD 55 39 */ bl fopMsgM_SearchByID__FUi -/* 8024A4F0 28 03 00 00 */ cmplwi r3, 0 -/* 8024A4F4 41 82 00 10 */ beq lbl_8024A504 -/* 8024A4F8 4B FE D4 9D */ bl onKillMessageFlag__12dMsgObject_cFv -/* 8024A4FC 38 00 FF FF */ li r0, -1 -/* 8024A500 90 1F 00 20 */ stw r0, 0x20(r31) -lbl_8024A504: -/* 8024A504 38 60 00 00 */ li r3, 0 -/* 8024A508 4B F1 54 4D */ bl setMidnaMotionNum__9daPy_py_cFi -/* 8024A50C 38 60 00 00 */ li r3, 0 -/* 8024A510 4B F1 54 59 */ bl setMidnaFaceNum__9daPy_py_cFi -/* 8024A514 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024A518 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024A51C 7C 08 03 A6 */ mtlr r0 -/* 8024A520 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024A524 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/setInitValue__10dMsgFlow_cFi.s b/asm/d/msg/d_msg_flow/setInitValue__10dMsgFlow_cFi.s deleted file mode 100644 index a619af69eea..00000000000 --- a/asm/d/msg/d_msg_flow/setInitValue__10dMsgFlow_cFi.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8024A580: -/* 8024A580 2C 04 00 00 */ cmpwi r4, 0 -/* 8024A584 41 82 00 2C */ beq lbl_8024A5B0 -/* 8024A588 38 80 00 00 */ li r4, 0 -/* 8024A58C 90 83 00 04 */ stw r4, 4(r3) -/* 8024A590 90 83 00 08 */ stw r4, 8(r3) -/* 8024A594 90 83 00 0C */ stw r4, 0xc(r3) -/* 8024A598 90 83 00 14 */ stw r4, 0x14(r3) -/* 8024A59C 90 83 00 18 */ stw r4, 0x18(r3) -/* 8024A5A0 38 00 FF FF */ li r0, -1 -/* 8024A5A4 90 03 00 20 */ stw r0, 0x20(r3) -/* 8024A5A8 90 83 00 28 */ stw r4, 0x28(r3) -/* 8024A5AC 90 83 00 2C */ stw r4, 0x2c(r3) -lbl_8024A5B0: -/* 8024A5B0 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 8024A5B4 38 A4 FF FF */ addi r5, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 8024A5B8 B0 A3 00 10 */ sth r5, 0x10(r3) -/* 8024A5BC 38 80 00 00 */ li r4, 0 -/* 8024A5C0 B0 83 00 1C */ sth r4, 0x1c(r3) -/* 8024A5C4 98 83 00 46 */ stb r4, 0x46(r3) -/* 8024A5C8 98 83 00 24 */ stb r4, 0x24(r3) -/* 8024A5CC 98 83 00 25 */ stb r4, 0x25(r3) -/* 8024A5D0 98 83 00 26 */ stb r4, 0x26(r3) -/* 8024A5D4 98 83 00 27 */ stb r4, 0x27(r3) -/* 8024A5D8 B0 83 00 30 */ sth r4, 0x30(r3) -/* 8024A5DC B0 83 00 32 */ sth r4, 0x32(r3) -/* 8024A5E0 38 00 00 5B */ li r0, 0x5b -/* 8024A5E4 90 03 00 34 */ stw r0, 0x34(r3) -/* 8024A5E8 B0 83 00 38 */ sth r4, 0x38(r3) -/* 8024A5EC B0 A3 00 3A */ sth r5, 0x3a(r3) -/* 8024A5F0 90 83 00 3C */ stw r4, 0x3c(r3) -/* 8024A5F4 98 83 00 40 */ stb r4, 0x40(r3) -/* 8024A5F8 98 83 00 41 */ stb r4, 0x41(r3) -/* 8024A5FC 38 00 00 FF */ li r0, 0xff -/* 8024A600 98 03 00 42 */ stb r0, 0x42(r3) -/* 8024A604 98 03 00 43 */ stb r0, 0x43(r3) -/* 8024A608 98 03 00 44 */ stb r0, 0x44(r3) -/* 8024A60C 98 03 00 45 */ stb r0, 0x45(r3) -/* 8024A610 98 83 00 47 */ stb r4, 0x47(r3) -/* 8024A614 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_item_ctrl/__ct__15dShopItemCtrl_cFv.s b/asm/d/shop/d_shop_item_ctrl/__ct__15dShopItemCtrl_cFv.s deleted file mode 100644 index 9901e97b29c..00000000000 --- a/asm/d/shop/d_shop_item_ctrl/__ct__15dShopItemCtrl_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80196914: -/* 80196914 3C 80 80 3C */ lis r4, __vt__15dShopItemCtrl_c@ha /* 0x803BB888@ha */ -/* 80196918 38 04 B8 88 */ addi r0, r4, __vt__15dShopItemCtrl_c@l /* 0x803BB888@l */ -/* 8019691C 90 03 00 00 */ stw r0, 0(r3) -/* 80196920 38 80 00 00 */ li r4, 0 -/* 80196924 38 A0 00 00 */ li r5, 0 -/* 80196928 38 E0 FF FF */ li r7, -1 -/* 8019692C 7C A6 2B 78 */ mr r6, r5 -/* 80196930 38 00 00 07 */ li r0, 7 -/* 80196934 7C 09 03 A6 */ mtctr r0 -lbl_80196938: -/* 80196938 38 05 00 04 */ addi r0, r5, 4 -/* 8019693C 7C E3 01 2E */ stwx r7, r3, r0 -/* 80196940 38 04 00 20 */ addi r0, r4, 0x20 -/* 80196944 7C C3 03 2E */ sthx r6, r3, r0 -/* 80196948 38 84 00 02 */ addi r4, r4, 2 -/* 8019694C 38 A5 00 04 */ addi r5, r5, 4 -/* 80196950 42 00 FF E8 */ bdnz lbl_80196938 -/* 80196954 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_item_ctrl/__dt__15dShopItemCtrl_cFv.s b/asm/d/shop/d_shop_item_ctrl/__dt__15dShopItemCtrl_cFv.s deleted file mode 100644 index 48f26adbb72..00000000000 --- a/asm/d/shop/d_shop_item_ctrl/__dt__15dShopItemCtrl_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80196958: -/* 80196958 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019695C 7C 08 02 A6 */ mflr r0 -/* 80196960 90 01 00 14 */ stw r0, 0x14(r1) -/* 80196964 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80196968 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8019696C 41 82 00 1C */ beq lbl_80196988 -/* 80196970 3C A0 80 3C */ lis r5, __vt__15dShopItemCtrl_c@ha /* 0x803BB888@ha */ -/* 80196974 38 05 B8 88 */ addi r0, r5, __vt__15dShopItemCtrl_c@l /* 0x803BB888@l */ -/* 80196978 90 1F 00 00 */ stw r0, 0(r31) -/* 8019697C 7C 80 07 35 */ extsh. r0, r4 -/* 80196980 40 81 00 08 */ ble lbl_80196988 -/* 80196984 48 13 83 B9 */ bl __dl__FPv -lbl_80196988: -/* 80196988 7F E3 FB 78 */ mr r3, r31 -/* 8019698C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80196990 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80196994 7C 08 03 A6 */ mtlr r0 -/* 80196998 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019699C 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_item_ctrl/getCurrentPos__15dShopItemCtrl_cFi.s b/asm/d/shop/d_shop_item_ctrl/getCurrentPos__15dShopItemCtrl_cFi.s deleted file mode 100644 index 7144a96b47d..00000000000 --- a/asm/d/shop/d_shop_item_ctrl/getCurrentPos__15dShopItemCtrl_cFi.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_801969A0: -/* 801969A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801969A4 7C 08 02 A6 */ mflr r0 -/* 801969A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801969AC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801969B0 7C 7F 1B 78 */ mr r31, r3 -/* 801969B4 C0 02 A0 D0 */ lfs f0, lit_3659(r2) -/* 801969B8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 801969BC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 801969C0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 801969C4 54 A0 10 3A */ slwi r0, r5, 2 -/* 801969C8 7C 64 02 14 */ add r3, r4, r0 -/* 801969CC 80 63 00 04 */ lwz r3, 4(r3) -/* 801969D0 3C 03 00 01 */ addis r0, r3, 1 -/* 801969D4 28 00 FF FF */ cmplwi r0, 0xffff -/* 801969D8 41 82 00 38 */ beq lbl_80196A10 -/* 801969DC 90 61 00 08 */ stw r3, 8(r1) -/* 801969E0 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 801969E4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 801969E8 38 81 00 08 */ addi r4, r1, 8 -/* 801969EC 4B E8 2E 0D */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 801969F0 28 03 00 00 */ cmplwi r3, 0 -/* 801969F4 41 82 00 1C */ beq lbl_80196A10 -/* 801969F8 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 801969FC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80196A00 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80196A04 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80196A08 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80196A0C D0 01 00 14 */ stfs f0, 0x14(r1) -lbl_80196A10: -/* 80196A10 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80196A14 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80196A18 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80196A1C D0 1F 00 04 */ stfs f0, 4(r31) -/* 80196A20 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80196A24 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80196A28 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80196A2C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80196A30 7C 08 03 A6 */ mtlr r0 -/* 80196A34 38 21 00 20 */ addi r1, r1, 0x20 -/* 80196A38 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_item_ctrl/isHomePos__15dShopItemCtrl_cFi.s b/asm/d/shop/d_shop_item_ctrl/isHomePos__15dShopItemCtrl_cFi.s deleted file mode 100644 index 45eab0fb63f..00000000000 --- a/asm/d/shop/d_shop_item_ctrl/isHomePos__15dShopItemCtrl_cFi.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80196A3C: -/* 80196A3C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80196A40 7C 08 02 A6 */ mflr r0 -/* 80196A44 90 01 00 24 */ stw r0, 0x24(r1) -/* 80196A48 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80196A4C 2C 04 00 00 */ cmpwi r4, 0 -/* 80196A50 41 80 00 88 */ blt lbl_80196AD8 -/* 80196A54 2C 04 00 07 */ cmpwi r4, 7 -/* 80196A58 40 80 00 80 */ bge lbl_80196AD8 -/* 80196A5C 54 80 10 3A */ slwi r0, r4, 2 -/* 80196A60 7C 63 02 14 */ add r3, r3, r0 -/* 80196A64 80 63 00 04 */ lwz r3, 4(r3) -/* 80196A68 3C 03 00 01 */ addis r0, r3, 1 -/* 80196A6C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80196A70 41 82 00 68 */ beq lbl_80196AD8 -/* 80196A74 90 61 00 08 */ stw r3, 8(r1) -/* 80196A78 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80196A7C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80196A80 38 81 00 08 */ addi r4, r1, 8 -/* 80196A84 4B E8 2D 75 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80196A88 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80196A8C 41 82 00 4C */ beq lbl_80196AD8 -/* 80196A90 4B EA 11 8D */ bl getPosP__12daShopItem_cFv -/* 80196A94 C0 7F 04 A8 */ lfs f3, 0x4a8(r31) -/* 80196A98 D0 61 00 0C */ stfs f3, 0xc(r1) -/* 80196A9C C0 5F 04 AC */ lfs f2, 0x4ac(r31) -/* 80196AA0 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80196AA4 C0 3F 04 B0 */ lfs f1, 0x4b0(r31) -/* 80196AA8 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80196AAC C0 03 00 00 */ lfs f0, 0(r3) -/* 80196AB0 FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 80196AB4 40 82 00 24 */ bne lbl_80196AD8 -/* 80196AB8 C0 03 00 04 */ lfs f0, 4(r3) -/* 80196ABC FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 80196AC0 40 82 00 18 */ bne lbl_80196AD8 -/* 80196AC4 C0 03 00 08 */ lfs f0, 8(r3) -/* 80196AC8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80196ACC 40 82 00 0C */ bne lbl_80196AD8 -/* 80196AD0 38 60 00 01 */ li r3, 1 -/* 80196AD4 48 00 00 08 */ b lbl_80196ADC -lbl_80196AD8: -/* 80196AD8 38 60 00 00 */ li r3, 0 -lbl_80196ADC: -/* 80196ADC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80196AE0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80196AE4 7C 08 03 A6 */ mtlr r0 -/* 80196AE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80196AEC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_item_ctrl/setRotateAnime__15dShopItemCtrl_cFi.s b/asm/d/shop/d_shop_item_ctrl/setRotateAnime__15dShopItemCtrl_cFi.s deleted file mode 100644 index c7170bd317e..00000000000 --- a/asm/d/shop/d_shop_item_ctrl/setRotateAnime__15dShopItemCtrl_cFi.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80196AF0: -/* 80196AF0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80196AF4 7C 08 02 A6 */ mflr r0 -/* 80196AF8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80196AFC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80196B00 48 1C B6 D5 */ bl _savegpr_27 -/* 80196B04 7C 7B 1B 78 */ mr r27, r3 -/* 80196B08 7C 9C 23 78 */ mr r28, r4 -/* 80196B0C 3B A0 00 00 */ li r29, 0 -/* 80196B10 3B E0 00 00 */ li r31, 0 -lbl_80196B14: -/* 80196B14 38 1F 00 04 */ addi r0, r31, 4 -/* 80196B18 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 80196B1C 3C 03 00 01 */ addis r0, r3, 1 -/* 80196B20 28 00 FF FF */ cmplwi r0, 0xffff -/* 80196B24 41 82 00 58 */ beq lbl_80196B7C -/* 80196B28 90 61 00 08 */ stw r3, 8(r1) -/* 80196B2C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80196B30 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80196B34 38 81 00 08 */ addi r4, r1, 8 -/* 80196B38 4B E8 2C C1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80196B3C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80196B40 41 82 00 3C */ beq lbl_80196B7C -/* 80196B44 4B EA 10 D1 */ bl getRotateP__12daShopItem_cFv -/* 80196B48 38 1C FF FF */ addi r0, r28, -1 -/* 80196B4C 7C 1D 00 00 */ cmpw r29, r0 -/* 80196B50 40 82 00 14 */ bne lbl_80196B64 -/* 80196B54 A8 83 00 02 */ lha r4, 2(r3) -/* 80196B58 38 04 02 00 */ addi r0, r4, 0x200 -/* 80196B5C B0 03 00 02 */ sth r0, 2(r3) -/* 80196B60 48 00 00 1C */ b lbl_80196B7C -lbl_80196B64: -/* 80196B64 38 63 00 02 */ addi r3, r3, 2 -/* 80196B68 A8 9E 04 B6 */ lha r4, 0x4b6(r30) -/* 80196B6C 38 A0 00 04 */ li r5, 4 -/* 80196B70 38 C0 08 00 */ li r6, 0x800 -/* 80196B74 38 E0 00 80 */ li r7, 0x80 -/* 80196B78 48 0D 99 C9 */ bl cLib_addCalcAngleS__FPsssss -lbl_80196B7C: -/* 80196B7C 3B BD 00 01 */ addi r29, r29, 1 -/* 80196B80 2C 1D 00 07 */ cmpwi r29, 7 -/* 80196B84 3B FF 00 04 */ addi r31, r31, 4 -/* 80196B88 41 80 FF 8C */ blt lbl_80196B14 -/* 80196B8C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80196B90 48 1C B6 91 */ bl _restgpr_27 -/* 80196B94 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80196B98 7C 08 03 A6 */ mtlr r0 -/* 80196B9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80196BA0 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/__dt__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/__dt__13dShopSystem_cFv.s deleted file mode 100644 index b9f06aff851..00000000000 --- a/asm/d/shop/d_shop_system/__dt__13dShopSystem_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_801974E4: -/* 801974E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801974E8 7C 08 02 A6 */ mflr r0 -/* 801974EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801974F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801974F4 93 C1 00 08 */ stw r30, 8(r1) -/* 801974F8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 801974FC 7C 9F 23 78 */ mr r31, r4 -/* 80197500 41 82 00 A4 */ beq lbl_801975A4 -/* 80197504 3C 80 80 3C */ lis r4, __vt__13dShopSystem_c@ha /* 0x803BBA7C@ha */ -/* 80197508 38 04 BA 7C */ addi r0, r4, __vt__13dShopSystem_c@l /* 0x803BBA7C@l */ -/* 8019750C 90 1E 0E 3C */ stw r0, 0xe3c(r30) -/* 80197510 48 00 30 55 */ bl deleteObject__13dShopSystem_cFv -/* 80197514 38 E0 00 00 */ li r7, 0 -/* 80197518 98 ED 8A D8 */ stb r7, data_80451058(r13) -/* 8019751C 98 ED 8A E0 */ stb r7, data_80451060(r13) -/* 80197520 7C E4 3B 78 */ mr r4, r7 -/* 80197524 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 80197528 38 C3 B8 A4 */ addi r6, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019752C 38 A0 00 FF */ li r5, 0xff -/* 80197530 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80197534 38 00 00 07 */ li r0, 7 -/* 80197538 7C 09 03 A6 */ mtctr r0 -lbl_8019753C: -/* 8019753C 7C E6 21 2E */ stwx r7, r6, r4 -/* 80197540 98 A3 00 00 */ stb r5, 0(r3) -/* 80197544 38 63 00 01 */ addi r3, r3, 1 -/* 80197548 38 84 00 04 */ addi r4, r4, 4 -/* 8019754C 42 00 FF F0 */ bdnz lbl_8019753C -/* 80197550 38 A0 00 00 */ li r5, 0 -/* 80197554 90 AD 8A DC */ stw r5, dShopSystem_item_count(r13) -/* 80197558 38 60 00 00 */ li r3, 0 -/* 8019755C 38 8D 81 70 */ la r4, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 80197560 38 00 00 02 */ li r0, 2 -/* 80197564 7C 09 03 A6 */ mtctr r0 -lbl_80197568: -/* 80197568 7C A4 19 2E */ stwx r5, r4, r3 -/* 8019756C 38 63 00 04 */ addi r3, r3, 4 -/* 80197570 42 00 FF F8 */ bdnz lbl_80197568 -/* 80197574 38 00 00 00 */ li r0, 0 -/* 80197578 90 0D 8A E4 */ stw r0, dShopSystem_camera_count(r13) -/* 8019757C 38 7E 0E 48 */ addi r3, r30, 0xe48 -/* 80197580 38 80 FF FF */ li r4, -1 -/* 80197584 4B FF F3 D5 */ bl __dt__15dShopItemCtrl_cFv -/* 80197588 7F C3 F3 78 */ mr r3, r30 -/* 8019758C 38 80 00 00 */ li r4, 0 -/* 80197590 4B FB 57 91 */ bl __dt__8daNpcT_cFv -/* 80197594 7F E0 07 35 */ extsh. r0, r31 -/* 80197598 40 81 00 0C */ ble lbl_801975A4 -/* 8019759C 7F C3 F3 78 */ mr r3, r30 -/* 801975A0 48 13 77 9D */ bl __dl__FPv -lbl_801975A4: -/* 801975A4 7F C3 F3 78 */ mr r3, r30 -/* 801975A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801975AC 83 C1 00 08 */ lwz r30, 8(r1) -/* 801975B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801975B4 7C 08 03 A6 */ mtlr r0 -/* 801975B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801975BC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/checkController__13dShopSystem_cFUcP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/checkController__13dShopSystem_cFUcP10dMsgFlow_c.s deleted file mode 100644 index d5d72065c55..00000000000 --- a/asm/d/shop/d_shop_system/checkController__13dShopSystem_cFUcP10dMsgFlow_c.s +++ /dev/null @@ -1,115 +0,0 @@ -lbl_80197670: -/* 80197670 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80197674 7C 08 02 A6 */ mflr r0 -/* 80197678 90 01 00 24 */ stw r0, 0x24(r1) -/* 8019767C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80197680 48 1C AB 59 */ bl _savegpr_28 -/* 80197684 7C 7D 1B 78 */ mr r29, r3 -/* 80197688 7C 9E 23 78 */ mr r30, r4 -/* 8019768C 7C BF 2B 78 */ mr r31, r5 -/* 80197690 88 03 0F 72 */ lbz r0, 0xf72(r3) -/* 80197694 28 00 00 00 */ cmplwi r0, 0 -/* 80197698 41 82 00 28 */ beq lbl_801976C0 -/* 8019769C 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801976A0 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801976A4 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801976A8 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 801976AC 41 82 00 0C */ beq lbl_801976B8 -/* 801976B0 38 60 00 01 */ li r3, 1 -/* 801976B4 48 0A 02 05 */ bl setShopWaitTimer__12dMsgObject_cFUc -lbl_801976B8: -/* 801976B8 38 60 00 00 */ li r3, 0 -/* 801976BC 48 00 01 34 */ b lbl_801977F0 -lbl_801976C0: -/* 801976C0 48 00 34 E9 */ bl dpdMove__13dShopSystem_cFv -/* 801976C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801976C8 40 82 00 0C */ bne lbl_801976D4 -/* 801976CC 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 801976D0 4B E9 AA CD */ bl checkTrigger__9STControlFv -lbl_801976D4: -/* 801976D4 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 801976D8 28 00 00 04 */ cmplwi r0, 4 -/* 801976DC 40 82 00 14 */ bne lbl_801976F0 -/* 801976E0 7F A3 EB 78 */ mr r3, r29 -/* 801976E4 7F C4 F3 78 */ mr r4, r30 -/* 801976E8 48 00 0B 69 */ bl chooseItem4__13dShopSystem_cFUc -/* 801976EC 48 00 00 28 */ b lbl_80197714 -lbl_801976F0: -/* 801976F0 28 00 00 05 */ cmplwi r0, 5 -/* 801976F4 40 82 00 14 */ bne lbl_80197708 -/* 801976F8 7F A3 EB 78 */ mr r3, r29 -/* 801976FC 7F C4 F3 78 */ mr r4, r30 -/* 80197700 48 00 06 D1 */ bl chooseItem5__13dShopSystem_cFUc -/* 80197704 48 00 00 10 */ b lbl_80197714 -lbl_80197708: -/* 80197708 7F A3 EB 78 */ mr r3, r29 -/* 8019770C 7F C4 F3 78 */ mr r4, r30 -/* 80197710 48 00 00 F9 */ bl chooseItem3__13dShopSystem_cFUc -lbl_80197714: -/* 80197714 2C 03 00 00 */ cmpwi r3, 0 -/* 80197718 41 82 00 08 */ beq lbl_80197720 -/* 8019771C 48 00 00 D4 */ b lbl_801977F0 -lbl_80197720: -/* 80197720 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80197724 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80197728 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8019772C 88 03 01 A2 */ lbz r0, 0x1a2(r3) -/* 80197730 28 00 00 00 */ cmplwi r0, 0 -/* 80197734 41 82 00 18 */ beq lbl_8019774C -/* 80197738 20 00 00 02 */ subfic r0, r0, 2 -/* 8019773C 7C 00 00 34 */ cntlzw r0, r0 -/* 80197740 54 03 D9 7E */ srwi r3, r0, 5 -/* 80197744 38 63 00 01 */ addi r3, r3, 1 -/* 80197748 48 00 00 A8 */ b lbl_801977F0 -lbl_8019774C: -/* 8019774C 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 80197750 3B 83 D2 E8 */ addi r28, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 80197754 80 1C 00 34 */ lwz r0, 0x34(r28) -/* 80197758 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 8019775C 41 82 00 54 */ beq lbl_801977B0 -/* 80197760 48 0A 0A CD */ bl getStatus__12dMsgObject_cFv -/* 80197764 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80197768 28 00 00 06 */ cmplwi r0, 6 -/* 8019776C 41 82 00 44 */ beq lbl_801977B0 -/* 80197770 48 0A 0A BD */ bl getStatus__12dMsgObject_cFv -/* 80197774 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80197778 28 00 00 08 */ cmplwi r0, 8 -/* 8019777C 41 82 00 34 */ beq lbl_801977B0 -/* 80197780 48 0A 0A AD */ bl getStatus__12dMsgObject_cFv -/* 80197784 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80197788 28 00 00 09 */ cmplwi r0, 9 -/* 8019778C 41 82 00 24 */ beq lbl_801977B0 -/* 80197790 48 0A 0A 9D */ bl getStatus__12dMsgObject_cFv -/* 80197794 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80197798 28 00 00 14 */ cmplwi r0, 0x14 -/* 8019779C 41 82 00 14 */ beq lbl_801977B0 -/* 801977A0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 801977A4 41 82 00 0C */ beq lbl_801977B0 -/* 801977A8 38 60 00 01 */ li r3, 1 -/* 801977AC 48 00 00 44 */ b lbl_801977F0 -lbl_801977B0: -/* 801977B0 80 1C 00 34 */ lwz r0, 0x34(r28) -/* 801977B4 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 -/* 801977B8 41 82 00 34 */ beq lbl_801977EC -/* 801977BC 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801977C0 28 00 00 02 */ cmplwi r0, 2 -/* 801977C4 41 82 00 14 */ beq lbl_801977D8 -/* 801977C8 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801977CC 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 801977D0 38 00 00 00 */ li r0, 0 -/* 801977D4 98 1D 0F 6E */ stb r0, 0xf6e(r29) -lbl_801977D8: -/* 801977D8 88 1F 00 24 */ lbz r0, 0x24(r31) -/* 801977DC 28 00 00 00 */ cmplwi r0, 0 -/* 801977E0 40 82 00 0C */ bne lbl_801977EC -/* 801977E4 38 60 00 02 */ li r3, 2 -/* 801977E8 48 00 00 08 */ b lbl_801977F0 -lbl_801977EC: -/* 801977EC 38 60 00 00 */ li r3, 0 -lbl_801977F0: -/* 801977F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801977F4 48 1C AA 31 */ bl _restgpr_28 -/* 801977F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801977FC 7C 08 03 A6 */ mtlr r0 -/* 80197800 38 21 00 20 */ addi r1, r1, 0x20 -/* 80197804 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/checkLeftTrigger__13dShopSystem_cFP9STControl.s b/asm/d/shop/d_shop_system/checkLeftTrigger__13dShopSystem_cFP9STControl.s deleted file mode 100644 index 9028b789f8a..00000000000 --- a/asm/d/shop/d_shop_system/checkLeftTrigger__13dShopSystem_cFP9STControl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8019AB60: -/* 8019AB60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019AB64 7C 08 02 A6 */ mflr r0 -/* 8019AB68 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019AB6C 7C 83 23 78 */ mr r3, r4 -/* 8019AB70 4B E9 78 BD */ bl checkLeftTrigger__9STControlFv -/* 8019AB74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8019AB78 7C 08 03 A6 */ mtlr r0 -/* 8019AB7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019AB80 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/checkRightTrigger__13dShopSystem_cFP9STControl.s b/asm/d/shop/d_shop_system/checkRightTrigger__13dShopSystem_cFP9STControl.s deleted file mode 100644 index 2fa42896aa8..00000000000 --- a/asm/d/shop/d_shop_system/checkRightTrigger__13dShopSystem_cFP9STControl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8019AB84: -/* 8019AB84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019AB88 7C 08 02 A6 */ mflr r0 -/* 8019AB8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019AB90 7C 83 23 78 */ mr r3, r4 -/* 8019AB94 4B E9 79 15 */ bl checkRightTrigger__9STControlFv -/* 8019AB98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8019AB9C 7C 08 03 A6 */ mtlr r0 -/* 8019ABA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019ABA4 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/checkShopOpen__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/checkShopOpen__13dShopSystem_cFv.s deleted file mode 100644 index e3c9397e210..00000000000 --- a/asm/d/shop/d_shop_system/checkShopOpen__13dShopSystem_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8019AB24: -/* 8019AB24 38 60 00 00 */ li r3, 0 -/* 8019AB28 38 8D 81 70 */ la r4, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 8019AB2C 38 00 00 02 */ li r0, 2 -/* 8019AB30 7C 09 03 A6 */ mtctr r0 -lbl_8019AB34: -/* 8019AB34 7C 04 18 2E */ lwzx r0, r4, r3 -/* 8019AB38 28 00 00 00 */ cmplwi r0, 0 -/* 8019AB3C 41 82 00 0C */ beq lbl_8019AB48 -/* 8019AB40 38 60 00 01 */ li r3, 1 -/* 8019AB44 4E 80 00 20 */ blr -lbl_8019AB48: -/* 8019AB48 38 63 00 04 */ addi r3, r3, 4 -/* 8019AB4C 42 00 FF E8 */ bdnz lbl_8019AB34 -/* 8019AB50 80 6D 8A E4 */ lwz r3, dShopSystem_camera_count(r13) -/* 8019AB54 30 03 FF FF */ addic r0, r3, -1 -/* 8019AB58 7C 60 19 10 */ subfe r3, r0, r3 -/* 8019AB5C 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/createShopItem__13dShopSystem_cFi.s b/asm/d/shop/d_shop_system/createShopItem__13dShopSystem_cFi.s deleted file mode 100644 index f15b9eda0ed..00000000000 --- a/asm/d/shop/d_shop_system/createShopItem__13dShopSystem_cFi.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8019A238: -/* 8019A238 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8019A23C 7C 08 02 A6 */ mflr r0 -/* 8019A240 90 01 00 34 */ stw r0, 0x34(r1) -/* 8019A244 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019A248 48 1C 7F 8D */ bl _savegpr_27 -/* 8019A24C 7C 7B 1B 78 */ mr r27, r3 -/* 8019A250 2C 04 FF FF */ cmpwi r4, -1 -/* 8019A254 41 82 00 D8 */ beq lbl_8019A32C -/* 8019A258 90 9B 0F 60 */ stw r4, 0xf60(r27) -/* 8019A25C 38 00 00 FF */ li r0, 0xff -/* 8019A260 98 1B 0F 73 */ stb r0, 0xf73(r27) -/* 8019A264 3B 80 00 00 */ li r28, 0 -/* 8019A268 3B E0 00 00 */ li r31, 0 -/* 8019A26C 3B A0 00 00 */ li r29, 0 -/* 8019A270 1C 04 00 03 */ mulli r0, r4, 3 -/* 8019A274 38 62 A1 58 */ la r3, item_no(r2) /* 80453B58-_SDA2_BASE_ */ -/* 8019A278 7F C3 02 14 */ add r30, r3, r0 -lbl_8019A27C: -/* 8019A27C C0 3B 04 D0 */ lfs f1, 0x4d0(r27) -/* 8019A280 80 6D 81 78 */ lwz r3, shop_item_pos_data_tbl(r13) -/* 8019A284 7C 83 EA 14 */ add r4, r3, r29 -/* 8019A288 C0 04 00 00 */ lfs f0, 0(r4) -/* 8019A28C EC 01 00 2A */ fadds f0, f1, f0 -/* 8019A290 D0 01 00 08 */ stfs f0, 8(r1) -/* 8019A294 C0 3B 04 D4 */ lfs f1, 0x4d4(r27) -/* 8019A298 C0 04 00 04 */ lfs f0, 4(r4) -/* 8019A29C EC 01 00 2A */ fadds f0, f1, f0 -/* 8019A2A0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8019A2A4 C0 3B 04 D8 */ lfs f1, 0x4d8(r27) -/* 8019A2A8 38 1D 00 08 */ addi r0, r29, 8 -/* 8019A2AC 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8019A2B0 EC 01 00 2A */ fadds f0, f1, f0 -/* 8019A2B4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8019A2B8 88 9E 00 00 */ lbz r4, 0(r30) -/* 8019A2BC 28 04 00 FF */ cmplwi r4, 0xff -/* 8019A2C0 41 82 00 3C */ beq lbl_8019A2FC -/* 8019A2C4 38 60 02 1E */ li r3, 0x21e -/* 8019A2C8 38 A1 00 08 */ addi r5, r1, 8 -/* 8019A2CC 88 1B 04 E2 */ lbz r0, 0x4e2(r27) -/* 8019A2D0 7C 06 07 74 */ extsb r6, r0 -/* 8019A2D4 38 FB 04 DC */ addi r7, r27, 0x4dc -/* 8019A2D8 39 00 00 00 */ li r8, 0 -/* 8019A2DC 39 20 FF FF */ li r9, -1 -/* 8019A2E0 4B E7 FA B9 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc -/* 8019A2E4 38 1F 0E 4C */ addi r0, r31, 0xe4c -/* 8019A2E8 7C 7B 01 2E */ stwx r3, r27, r0 -/* 8019A2EC 7F 63 DB 78 */ mr r3, r27 -/* 8019A2F0 7F 84 E3 78 */ mr r4, r28 -/* 8019A2F4 4B FF D2 E9 */ bl offFlag__13dShopSystem_cFi -/* 8019A2F8 48 00 00 1C */ b lbl_8019A314 -lbl_8019A2FC: -/* 8019A2FC 38 60 FF FF */ li r3, -1 -/* 8019A300 38 1F 0E 4C */ addi r0, r31, 0xe4c -/* 8019A304 7C 7B 01 2E */ stwx r3, r27, r0 -/* 8019A308 7F 63 DB 78 */ mr r3, r27 -/* 8019A30C 7F 84 E3 78 */ mr r4, r28 -/* 8019A310 4B FF D2 B1 */ bl onFlag__13dShopSystem_cFi -lbl_8019A314: -/* 8019A314 3B 9C 00 01 */ addi r28, r28, 1 -/* 8019A318 2C 1C 00 03 */ cmpwi r28, 3 -/* 8019A31C 3B FF 00 04 */ addi r31, r31, 4 -/* 8019A320 3B DE 00 01 */ addi r30, r30, 1 -/* 8019A324 3B BD 00 0C */ addi r29, r29, 0xc -/* 8019A328 41 80 FF 54 */ blt lbl_8019A27C -lbl_8019A32C: -/* 8019A32C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019A330 48 1C 7E F1 */ bl _restgpr_27 -/* 8019A334 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8019A338 7C 08 03 A6 */ mtlr r0 -/* 8019A33C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8019A340 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/deleteObject__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/deleteObject__13dShopSystem_cFv.s deleted file mode 100644 index 752d4a8301a..00000000000 --- a/asm/d/shop/d_shop_system/deleteObject__13dShopSystem_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8019A564: -/* 8019A564 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019A568 7C 08 02 A6 */ mflr r0 -/* 8019A56C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019A570 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8019A574 7C 7F 1B 78 */ mr r31, r3 -/* 8019A578 80 63 0E 40 */ lwz r3, 0xe40(r3) -/* 8019A57C 28 03 00 00 */ cmplwi r3, 0 -/* 8019A580 41 82 00 10 */ beq lbl_8019A590 -/* 8019A584 48 13 47 B9 */ bl __dl__FPv -/* 8019A588 38 00 00 00 */ li r0, 0 -/* 8019A58C 90 1F 0E 40 */ stw r0, 0xe40(r31) -lbl_8019A590: -/* 8019A590 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 8019A594 28 03 00 00 */ cmplwi r3, 0 -/* 8019A598 41 82 00 24 */ beq lbl_8019A5BC -/* 8019A59C 41 82 00 18 */ beq lbl_8019A5B4 -/* 8019A5A0 38 80 00 01 */ li r4, 1 -/* 8019A5A4 81 83 00 00 */ lwz r12, 0(r3) -/* 8019A5A8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8019A5AC 7D 89 03 A6 */ mtctr r12 -/* 8019A5B0 4E 80 04 21 */ bctrl -lbl_8019A5B4: -/* 8019A5B4 38 00 00 00 */ li r0, 0 -/* 8019A5B8 90 1F 0E 44 */ stw r0, 0xe44(r31) -lbl_8019A5BC: -/* 8019A5BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8019A5C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8019A5C4 7C 08 03 A6 */ mtlr r0 -/* 8019A5C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019A5CC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/drawCursor__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/drawCursor__13dShopSystem_cFv.s deleted file mode 100644 index abf0fbfe714..00000000000 --- a/asm/d/shop/d_shop_system/drawCursor__13dShopSystem_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80198878: -/* 80198878 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019887C 7C 08 02 A6 */ mflr r0 -/* 80198880 90 01 00 14 */ stw r0, 0x14(r1) -/* 80198884 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80198888 7C 7F 1B 78 */ mr r31, r3 -/* 8019888C 88 03 0F 70 */ lbz r0, 0xf70(r3) -/* 80198890 28 00 00 04 */ cmplwi r0, 4 -/* 80198894 41 82 00 34 */ beq lbl_801988C8 -/* 80198898 28 00 00 05 */ cmplwi r0, 5 -/* 8019889C 41 82 00 2C */ beq lbl_801988C8 -/* 801988A0 28 00 00 06 */ cmplwi r0, 6 -/* 801988A4 41 82 00 0C */ beq lbl_801988B0 -/* 801988A8 28 00 00 02 */ cmplwi r0, 2 -/* 801988AC 40 82 00 48 */ bne lbl_801988F4 -lbl_801988B0: -/* 801988B0 7F E3 FB 78 */ mr r3, r31 -/* 801988B4 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 801988B8 38 84 FF FF */ addi r4, r4, -1 -/* 801988BC 4B FF ED 3D */ bl isFlag__13dShopSystem_cFi -/* 801988C0 2C 03 00 00 */ cmpwi r3, 0 -/* 801988C4 41 82 00 30 */ beq lbl_801988F4 -lbl_801988C8: -/* 801988C8 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 801988CC 28 04 00 00 */ cmplwi r4, 0 -/* 801988D0 41 82 00 24 */ beq lbl_801988F4 -/* 801988D4 38 7F 0E 48 */ addi r3, r31, 0xe48 -/* 801988D8 38 84 FF FF */ addi r4, r4, -1 -/* 801988DC 4B FF E1 61 */ bl isHomePos__15dShopItemCtrl_cFi -/* 801988E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801988E4 41 82 00 10 */ beq lbl_801988F4 -/* 801988E8 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 801988EC 4B FF CA 45 */ bl addAlpha__16dSelect_cursor_cFv -/* 801988F0 48 00 00 0C */ b lbl_801988FC -lbl_801988F4: -/* 801988F4 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 801988F8 4B FF CA D5 */ bl decAlpha__16dSelect_cursor_cFv -lbl_801988FC: -/* 801988FC 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 80198900 3C 80 80 43 */ lis r4, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198904 38 84 01 10 */ addi r4, r4, g_cursorHIO@l /* 0x80430110@l */ -/* 80198908 C0 24 00 2C */ lfs f1, 0x2c(r4) -/* 8019890C 4B FF C8 BD */ bl setScale__16dSelect_cursor_cFf -/* 80198910 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80198914 28 00 00 00 */ cmplwi r0, 0 -/* 80198918 41 82 00 20 */ beq lbl_80198938 -/* 8019891C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80198920 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80198924 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80198928 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 8019892C 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80198930 80 DF 0E 44 */ lwz r6, 0xe44(r31) -/* 80198934 4B EB DE 61 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_80198938: -/* 80198938 38 60 00 01 */ li r3, 1 -/* 8019893C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80198940 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80198944 7C 08 03 A6 */ mtlr r0 -/* 80198948 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019894C 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/getFlowNodeNum__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/getFlowNodeNum__13dShopSystem_cFv.s deleted file mode 100644 index a5be8603047..00000000000 --- a/asm/d/shop/d_shop_system/getFlowNodeNum__13dShopSystem_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8019AB00: -/* 8019AB00 A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 8019AB04 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8019AB08 28 00 FF FF */ cmplwi r0, 0xffff -/* 8019AB0C 38 60 FF FF */ li r3, -1 -/* 8019AB10 4D 82 00 20 */ beqlr -/* 8019AB14 7C 03 03 78 */ mr r3, r0 -/* 8019AB18 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/isFlag__13dShopSystem_cFi.s b/asm/d/shop/d_shop_system/isFlag__13dShopSystem_cFi.s deleted file mode 100644 index 5442b7304b9..00000000000 --- a/asm/d/shop/d_shop_system/isFlag__13dShopSystem_cFi.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801975F8: -/* 801975F8 A0 63 0F 6A */ lhz r3, 0xf6a(r3) -/* 801975FC 38 00 00 01 */ li r0, 1 -/* 80197600 7C 00 20 30 */ slw r0, r0, r4 -/* 80197604 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 80197608 7C 63 00 38 */ and r3, r3, r0 -/* 8019760C 30 03 FF FF */ addic r0, r3, -1 -/* 80197610 7C 60 19 10 */ subfe r3, r0, r3 -/* 80197614 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/isSoldOutItemFlag__13dShopSystem_cFi.s b/asm/d/shop/d_shop_system/isSoldOutItemFlag__13dShopSystem_cFi.s deleted file mode 100644 index dcf42216aeb..00000000000 --- a/asm/d/shop/d_shop_system/isSoldOutItemFlag__13dShopSystem_cFi.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80197650: -/* 80197650 88 63 0F 74 */ lbz r3, 0xf74(r3) -/* 80197654 38 00 00 01 */ li r0, 1 -/* 80197658 7C 00 20 30 */ slw r0, r0, r4 -/* 8019765C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80197660 7C 63 00 38 */ and r3, r3, r0 -/* 80197664 30 03 FF FF */ addic r0, r3, -1 -/* 80197668 7C 60 19 10 */ subfe r3, r0, r3 -/* 8019766C 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/itemRotate__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/itemRotate__13dShopSystem_cFv.s deleted file mode 100644 index e4d444f52dd..00000000000 --- a/asm/d/shop/d_shop_system/itemRotate__13dShopSystem_cFv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80198950: -/* 80198950 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80198954 7C 08 02 A6 */ mflr r0 -/* 80198958 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019895C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80198960 93 C1 00 08 */ stw r30, 8(r1) -/* 80198964 7C 7E 1B 78 */ mr r30, r3 -/* 80198968 38 80 00 00 */ li r4, 0 -/* 8019896C 88 A3 0F 6E */ lbz r5, 0xf6e(r3) -/* 80198970 28 05 00 00 */ cmplwi r5, 0 -/* 80198974 41 82 00 90 */ beq lbl_80198A04 -/* 80198978 88 1E 0F 70 */ lbz r0, 0xf70(r30) -/* 8019897C 28 00 00 00 */ cmplwi r0, 0 -/* 80198980 41 82 00 84 */ beq lbl_80198A04 -/* 80198984 38 0D 81 68 */ la r0, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198988 7C 80 2A 14 */ add r4, r0, r5 -/* 8019898C 88 04 FF FF */ lbz r0, -1(r4) -/* 80198990 28 00 00 30 */ cmplwi r0, 0x30 -/* 80198994 40 82 00 28 */ bne lbl_801989BC -/* 80198998 38 80 00 08 */ li r4, 8 -/* 8019899C 4B FF EC 5D */ bl isFlag__13dShopSystem_cFi -/* 801989A0 2C 03 00 00 */ cmpwi r3, 0 -/* 801989A4 40 82 00 0C */ bne lbl_801989B0 -/* 801989A8 38 00 00 00 */ li r0, 0 -/* 801989AC 48 00 00 08 */ b lbl_801989B4 -lbl_801989B0: -/* 801989B0 88 1E 0F 6E */ lbz r0, 0xf6e(r30) -lbl_801989B4: -/* 801989B4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801989B8 48 00 00 4C */ b lbl_80198A04 -lbl_801989BC: -/* 801989BC 3B E0 00 00 */ li r31, 0 -/* 801989C0 38 85 FF FF */ addi r4, r5, -1 -/* 801989C4 4B FF EC 35 */ bl isFlag__13dShopSystem_cFi -/* 801989C8 2C 03 00 00 */ cmpwi r3, 0 -/* 801989CC 40 82 00 1C */ bne lbl_801989E8 -/* 801989D0 7F C3 F3 78 */ mr r3, r30 -/* 801989D4 88 9E 0F 6E */ lbz r4, 0xf6e(r30) -/* 801989D8 38 84 FF FF */ addi r4, r4, -1 -/* 801989DC 4B FF EC 75 */ bl isSoldOutItemFlag__13dShopSystem_cFi -/* 801989E0 2C 03 00 00 */ cmpwi r3, 0 -/* 801989E4 41 82 00 08 */ beq lbl_801989EC -lbl_801989E8: -/* 801989E8 3B E0 00 01 */ li r31, 1 -lbl_801989EC: -/* 801989EC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 801989F0 41 82 00 0C */ beq lbl_801989FC -/* 801989F4 38 00 00 00 */ li r0, 0 -/* 801989F8 48 00 00 08 */ b lbl_80198A00 -lbl_801989FC: -/* 801989FC 88 1E 0F 6E */ lbz r0, 0xf6e(r30) -lbl_80198A00: -/* 80198A00 54 04 06 3E */ clrlwi r4, r0, 0x18 -lbl_80198A04: -/* 80198A04 38 7E 0E 48 */ addi r3, r30, 0xe48 -/* 80198A08 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80198A0C 4B FF E0 E5 */ bl setRotateAnime__15dShopItemCtrl_cFi -/* 80198A10 38 60 00 01 */ li r3, 1 -/* 80198A14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80198A18 83 C1 00 08 */ lwz r30, 8(r1) -/* 80198A1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80198A20 7C 08 03 A6 */ mtlr r0 -/* 80198A24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80198A28 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/moveCursor__13dShopSystem_cFiUc.s b/asm/d/shop/d_shop_system/moveCursor__13dShopSystem_cFiUc.s deleted file mode 100644 index 600fd2d4753..00000000000 --- a/asm/d/shop/d_shop_system/moveCursor__13dShopSystem_cFiUc.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80198444: -/* 80198444 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80198448 7C 08 02 A6 */ mflr r0 -/* 8019844C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80198450 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80198454 7C 7F 1B 78 */ mr r31, r3 -/* 80198458 80 03 0F 60 */ lwz r0, 0xf60(r3) -/* 8019845C 2C 00 00 00 */ cmpwi r0, 0 -/* 80198460 41 80 00 0C */ blt lbl_8019846C -/* 80198464 48 00 00 25 */ bl moveCursor0__13dShopSystem_cFiUc -/* 80198468 48 00 00 08 */ b lbl_80198470 -lbl_8019846C: -/* 8019846C 48 00 02 9D */ bl moveCursor1__13dShopSystem_cFiUc -lbl_80198470: -/* 80198470 B0 7F 0F 6C */ sth r3, 0xf6c(r31) -/* 80198474 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80198478 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8019847C 7C 08 03 A6 */ mtlr r0 -/* 80198480 38 21 00 10 */ addi r1, r1, 0x10 -/* 80198484 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/offFlag__13dShopSystem_cFi.s b/asm/d/shop/d_shop_system/offFlag__13dShopSystem_cFi.s deleted file mode 100644 index cd69b551b17..00000000000 --- a/asm/d/shop/d_shop_system/offFlag__13dShopSystem_cFi.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801975DC: -/* 801975DC A0 A3 0F 6A */ lhz r5, 0xf6a(r3) -/* 801975E0 38 00 00 01 */ li r0, 1 -/* 801975E4 7C 00 20 30 */ slw r0, r0, r4 -/* 801975E8 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 801975EC 7C A0 00 78 */ andc r0, r5, r0 -/* 801975F0 B0 03 0F 6A */ sth r0, 0xf6a(r3) -/* 801975F4 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/offSoldOutItemFlag__13dShopSystem_cFi.s b/asm/d/shop/d_shop_system/offSoldOutItemFlag__13dShopSystem_cFi.s deleted file mode 100644 index 537af2b867e..00000000000 --- a/asm/d/shop/d_shop_system/offSoldOutItemFlag__13dShopSystem_cFi.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80197634: -/* 80197634 88 A3 0F 74 */ lbz r5, 0xf74(r3) -/* 80197638 38 00 00 01 */ li r0, 1 -/* 8019763C 7C 00 20 30 */ slw r0, r0, r4 -/* 80197640 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80197644 7C A0 00 78 */ andc r0, r5, r0 -/* 80197648 98 03 0F 74 */ stb r0, 0xf74(r3) -/* 8019764C 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/onFlag__13dShopSystem_cFi.s b/asm/d/shop/d_shop_system/onFlag__13dShopSystem_cFi.s deleted file mode 100644 index 9dc1fb835c6..00000000000 --- a/asm/d/shop/d_shop_system/onFlag__13dShopSystem_cFi.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801975C0: -/* 801975C0 A0 A3 0F 6A */ lhz r5, 0xf6a(r3) -/* 801975C4 38 00 00 01 */ li r0, 1 -/* 801975C8 7C 00 20 30 */ slw r0, r0, r4 -/* 801975CC 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 801975D0 7C A0 03 78 */ or r0, r5, r0 -/* 801975D4 B0 03 0F 6A */ sth r0, 0xf6a(r3) -/* 801975D8 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/onSoldOutItemFlag__13dShopSystem_cFi.s b/asm/d/shop/d_shop_system/onSoldOutItemFlag__13dShopSystem_cFi.s deleted file mode 100644 index 7d9df8c5876..00000000000 --- a/asm/d/shop/d_shop_system/onSoldOutItemFlag__13dShopSystem_cFi.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80197618: -/* 80197618 88 A3 0F 74 */ lbz r5, 0xf74(r3) -/* 8019761C 38 00 00 01 */ li r0, 1 -/* 80197620 7C 00 20 30 */ slw r0, r0, r4 -/* 80197624 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80197628 7C A0 03 78 */ or r0, r5, r0 -/* 8019762C 98 03 0F 74 */ stb r0, 0xf74(r3) -/* 80197630 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_choose__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_choose__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index b5acedf101e..00000000000 --- a/asm/d/shop/d_shop_system/seq_choose__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80199D14: -/* 80199D14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80199D18 7C 08 02 A6 */ mflr r0 -/* 80199D1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80199D20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80199D24 93 C1 00 08 */ stw r30, 8(r1) -/* 80199D28 7C 7E 1B 78 */ mr r30, r3 -/* 80199D2C 7C BF 2B 78 */ mr r31, r5 -/* 80199D30 38 00 00 22 */ li r0, 0x22 -/* 80199D34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80199D38 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80199D3C 98 05 5E 3C */ stb r0, 0x5e3c(r5) -/* 80199D40 38 60 00 00 */ li r3, 0 -/* 80199D44 98 65 5E 57 */ stb r3, 0x5e57(r5) -/* 80199D48 88 1F 00 24 */ lbz r0, 0x24(r31) -/* 80199D4C 28 00 00 00 */ cmplwi r0, 0 -/* 80199D50 40 82 00 14 */ bne lbl_80199D64 -/* 80199D54 38 00 00 2A */ li r0, 0x2a -/* 80199D58 98 05 5E 35 */ stb r0, 0x5e35(r5) -/* 80199D5C 98 65 5E 50 */ stb r3, 0x5e50(r5) -/* 80199D60 48 00 00 20 */ b lbl_80199D80 -lbl_80199D64: -/* 80199D64 80 C5 5D BC */ lwz r6, 0x5dbc(r5) -/* 80199D68 88 06 01 A1 */ lbz r0, 0x1a1(r6) -/* 80199D6C 28 00 00 00 */ cmplwi r0, 0 -/* 80199D70 41 82 00 10 */ beq lbl_80199D80 -/* 80199D74 38 00 00 2A */ li r0, 0x2a -/* 80199D78 98 05 5E 35 */ stb r0, 0x5e35(r5) -/* 80199D7C 98 65 5E 50 */ stb r3, 0x5e50(r5) -lbl_80199D80: -/* 80199D80 7F E3 FB 78 */ mr r3, r31 -/* 80199D84 38 A0 00 00 */ li r5, 0 -/* 80199D88 38 C0 00 00 */ li r6, 0 -/* 80199D8C 48 0B 05 4D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199D90 7F E3 FB 78 */ mr r3, r31 -/* 80199D94 38 80 00 00 */ li r4, 0 -/* 80199D98 38 A0 00 00 */ li r5, 0 -/* 80199D9C 38 C0 00 00 */ li r6, 0 -/* 80199DA0 48 0B 15 21 */ bl query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci -/* 80199DA4 7C 7F 1B 78 */ mr r31, r3 -/* 80199DA8 48 09 E4 85 */ bl getStatus__12dMsgObject_cFv -/* 80199DAC 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80199DB0 28 00 00 06 */ cmplwi r0, 6 -/* 80199DB4 41 82 00 58 */ beq lbl_80199E0C -/* 80199DB8 48 09 E4 75 */ bl getStatus__12dMsgObject_cFv -/* 80199DBC 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80199DC0 28 00 00 08 */ cmplwi r0, 8 -/* 80199DC4 41 82 00 48 */ beq lbl_80199E0C -/* 80199DC8 48 09 E4 65 */ bl getStatus__12dMsgObject_cFv -/* 80199DCC 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80199DD0 28 00 00 09 */ cmplwi r0, 9 -/* 80199DD4 41 82 00 38 */ beq lbl_80199E0C -/* 80199DD8 48 09 E4 55 */ bl getStatus__12dMsgObject_cFv -/* 80199DDC 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80199DE0 28 00 00 14 */ cmplwi r0, 0x14 -/* 80199DE4 41 82 00 28 */ beq lbl_80199E0C -/* 80199DE8 57 E0 04 3F */ clrlwi. r0, r31, 0x10 -/* 80199DEC 40 82 00 14 */ bne lbl_80199E00 -/* 80199DF0 7F C3 F3 78 */ mr r3, r30 -/* 80199DF4 38 80 00 08 */ li r4, 8 -/* 80199DF8 48 00 05 4D */ bl setSeq__13dShopSystem_cFUc -/* 80199DFC 48 00 00 10 */ b lbl_80199E0C -lbl_80199E00: -/* 80199E00 7F C3 F3 78 */ mr r3, r30 -/* 80199E04 38 80 00 09 */ li r4, 9 -/* 80199E08 48 00 05 3D */ bl setSeq__13dShopSystem_cFUc -lbl_80199E0C: -/* 80199E0C 38 60 00 00 */ li r3, 0 -/* 80199E10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80199E14 83 C1 00 08 */ lwz r30, 8(r1) -/* 80199E18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80199E1C 7C 08 03 A6 */ mtlr r0 -/* 80199E20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80199E24 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_decide__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_decide__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index dc28e1c63f1..00000000000 --- a/asm/d/shop/d_shop_system/seq_decide__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80199BF8: -/* 80199BF8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80199BFC 7C 08 02 A6 */ mflr r0 -/* 80199C00 90 01 00 24 */ stw r0, 0x24(r1) -/* 80199C04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199C08 48 1C 85 D1 */ bl _savegpr_28 -/* 80199C0C 7C 7C 1B 78 */ mr r28, r3 -/* 80199C10 7C 9D 23 78 */ mr r29, r4 -/* 80199C14 7C BE 2B 78 */ mr r30, r5 -/* 80199C18 38 80 00 02 */ li r4, 2 -/* 80199C1C 4B FF DA 55 */ bl checkController__13dShopSystem_cFUcP10dMsgFlow_c -/* 80199C20 7C 7F 1B 78 */ mr r31, r3 -/* 80199C24 38 00 00 22 */ li r0, 0x22 -/* 80199C28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80199C2C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80199C30 98 04 5E 3C */ stb r0, 0x5e3c(r4) -/* 80199C34 38 60 00 00 */ li r3, 0 -/* 80199C38 98 64 5E 57 */ stb r3, 0x5e57(r4) -/* 80199C3C 88 1E 00 24 */ lbz r0, 0x24(r30) -/* 80199C40 28 00 00 00 */ cmplwi r0, 0 -/* 80199C44 40 82 00 14 */ bne lbl_80199C58 -/* 80199C48 38 00 00 2A */ li r0, 0x2a -/* 80199C4C 98 04 5E 35 */ stb r0, 0x5e35(r4) -/* 80199C50 98 64 5E 50 */ stb r3, 0x5e50(r4) -/* 80199C54 48 00 00 20 */ b lbl_80199C74 -lbl_80199C58: -/* 80199C58 80 A4 5D BC */ lwz r5, 0x5dbc(r4) -/* 80199C5C 88 05 01 A1 */ lbz r0, 0x1a1(r5) -/* 80199C60 28 00 00 00 */ cmplwi r0, 0 -/* 80199C64 41 82 00 10 */ beq lbl_80199C74 -/* 80199C68 38 00 00 2A */ li r0, 0x2a -/* 80199C6C 98 04 5E 35 */ stb r0, 0x5e35(r4) -/* 80199C70 98 64 5E 50 */ stb r3, 0x5e50(r4) -lbl_80199C74: -/* 80199C74 2C 1F 00 00 */ cmpwi r31, 0 -/* 80199C78 41 82 00 6C */ beq lbl_80199CE4 -/* 80199C7C 7F 83 E3 78 */ mr r3, r28 -/* 80199C80 7F E4 FB 78 */ mr r4, r31 -/* 80199C84 38 A0 00 02 */ li r5, 2 -/* 80199C88 4B FF E7 BD */ bl moveCursor__13dShopSystem_cFiUc -/* 80199C8C 7C 66 1B 78 */ mr r6, r3 -/* 80199C90 7F C3 F3 78 */ mr r3, r30 -/* 80199C94 7F A4 EB 78 */ mr r4, r29 -/* 80199C98 38 A0 00 00 */ li r5, 0 -/* 80199C9C 48 0B 06 3D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199CA0 2C 03 00 00 */ cmpwi r3, 0 -/* 80199CA4 41 82 00 20 */ beq lbl_80199CC4 -/* 80199CA8 7F 83 E3 78 */ mr r3, r28 -/* 80199CAC 38 80 00 08 */ li r4, 8 -/* 80199CB0 4B FF D9 2D */ bl offFlag__13dShopSystem_cFi -/* 80199CB4 7F 83 E3 78 */ mr r3, r28 -/* 80199CB8 38 80 00 02 */ li r4, 2 -/* 80199CBC 48 00 06 89 */ bl setSeq__13dShopSystem_cFUc -/* 80199CC0 48 00 00 38 */ b lbl_80199CF8 -lbl_80199CC4: -/* 80199CC4 88 1E 00 24 */ lbz r0, 0x24(r30) -/* 80199CC8 28 00 00 00 */ cmplwi r0, 0 -/* 80199CCC 41 82 00 2C */ beq lbl_80199CF8 -/* 80199CD0 93 FC 0F 58 */ stw r31, 0xf58(r28) -/* 80199CD4 7F 83 E3 78 */ mr r3, r28 -/* 80199CD8 38 80 00 07 */ li r4, 7 -/* 80199CDC 48 00 06 69 */ bl setSeq__13dShopSystem_cFUc -/* 80199CE0 48 00 00 18 */ b lbl_80199CF8 -lbl_80199CE4: -/* 80199CE4 7F C3 F3 78 */ mr r3, r30 -/* 80199CE8 7F A4 EB 78 */ mr r4, r29 -/* 80199CEC 38 A0 00 00 */ li r5, 0 -/* 80199CF0 38 C0 00 00 */ li r6, 0 -/* 80199CF4 48 0B 05 E5 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -lbl_80199CF8: -/* 80199CF8 38 60 00 00 */ li r3, 0 -/* 80199CFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199D00 48 1C 85 25 */ bl _restgpr_28 -/* 80199D04 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80199D08 7C 08 03 A6 */ mtlr r0 -/* 80199D0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80199D10 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_decide_no__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_decide_no__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index 56aa629c4a4..00000000000 --- a/asm/d/shop/d_shop_system/seq_decide_no__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80199FA4: -/* 80199FA4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80199FA8 7C 08 02 A6 */ mflr r0 -/* 80199FAC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80199FB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199FB4 48 1C 82 29 */ bl _savegpr_29 -/* 80199FB8 7C 7D 1B 78 */ mr r29, r3 -/* 80199FBC 7C 9E 23 78 */ mr r30, r4 -/* 80199FC0 7C BF 2B 78 */ mr r31, r5 -/* 80199FC4 80 83 0F 58 */ lwz r4, 0xf58(r3) -/* 80199FC8 38 A0 00 02 */ li r5, 2 -/* 80199FCC 4B FF E4 79 */ bl moveCursor__13dShopSystem_cFiUc -/* 80199FD0 7C 66 1B 78 */ mr r6, r3 -/* 80199FD4 7F E3 FB 78 */ mr r3, r31 -/* 80199FD8 7F C4 F3 78 */ mr r4, r30 -/* 80199FDC 38 A0 00 00 */ li r5, 0 -/* 80199FE0 48 0B 02 F9 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199FE4 2C 03 00 00 */ cmpwi r3, 0 -/* 80199FE8 41 82 00 1C */ beq lbl_8019A004 -/* 80199FEC 7F A3 EB 78 */ mr r3, r29 -/* 80199FF0 38 80 00 08 */ li r4, 8 -/* 80199FF4 4B FF D5 E9 */ bl offFlag__13dShopSystem_cFi -/* 80199FF8 7F A3 EB 78 */ mr r3, r29 -/* 80199FFC 38 80 00 02 */ li r4, 2 -/* 8019A000 48 00 03 45 */ bl setSeq__13dShopSystem_cFUc -lbl_8019A004: -/* 8019A004 38 60 00 00 */ li r3, 0 -/* 8019A008 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019A00C 48 1C 82 1D */ bl _restgpr_29 -/* 8019A010 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8019A014 7C 08 03 A6 */ mtlr r0 -/* 8019A018 38 21 00 20 */ addi r1, r1, 0x20 -/* 8019A01C 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_event__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_event__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index defb31b96d3..00000000000 --- a/asm/d/shop/d_shop_system/seq_event__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8019A0C0: -/* 8019A0C0 A0 03 0E 30 */ lhz r0, 0xe30(r3) -/* 8019A0C4 7C 00 00 34 */ cntlzw r0, r0 -/* 8019A0C8 54 03 D9 7E */ srwi r3, r0, 5 -/* 8019A0CC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_finish__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_finish__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index 180ef764f3c..00000000000 --- a/asm/d/shop/d_shop_system/seq_finish__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8019A020: -/* 8019A020 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8019A024 7C 08 02 A6 */ mflr r0 -/* 8019A028 90 01 00 24 */ stw r0, 0x24(r1) -/* 8019A02C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019A030 48 1C 81 AD */ bl _savegpr_29 -/* 8019A034 7C 7D 1B 78 */ mr r29, r3 -/* 8019A038 7C 9E 23 78 */ mr r30, r4 -/* 8019A03C 7C BF 2B 78 */ mr r31, r5 -/* 8019A040 88 03 0F 75 */ lbz r0, 0xf75(r3) -/* 8019A044 28 00 00 01 */ cmplwi r0, 1 -/* 8019A048 40 82 00 2C */ bne lbl_8019A074 -/* 8019A04C 7F E4 FB 78 */ mr r4, r31 -/* 8019A050 80 BD 0F 5C */ lwz r5, 0xf5c(r29) -/* 8019A054 81 83 0E 3C */ lwz r12, 0xe3c(r3) -/* 8019A058 81 8C 00 C8 */ lwz r12, 0xc8(r12) -/* 8019A05C 7D 89 03 A6 */ mtctr r12 -/* 8019A060 4E 80 04 21 */ bctrl -/* 8019A064 2C 03 00 00 */ cmpwi r3, 0 -/* 8019A068 40 82 00 0C */ bne lbl_8019A074 -/* 8019A06C 38 60 00 00 */ li r3, 0 -/* 8019A070 48 00 00 38 */ b lbl_8019A0A8 -lbl_8019A074: -/* 8019A074 7F E3 FB 78 */ mr r3, r31 -/* 8019A078 7F C4 F3 78 */ mr r4, r30 -/* 8019A07C 38 A0 00 00 */ li r5, 0 -/* 8019A080 38 C0 00 00 */ li r6, 0 -/* 8019A084 48 0B 02 55 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 8019A088 2C 03 00 00 */ cmpwi r3, 0 -/* 8019A08C 41 82 00 18 */ beq lbl_8019A0A4 -/* 8019A090 7F A3 EB 78 */ mr r3, r29 -/* 8019A094 38 80 00 00 */ li r4, 0 -/* 8019A098 48 00 02 AD */ bl setSeq__13dShopSystem_cFUc -/* 8019A09C 38 60 00 01 */ li r3, 1 -/* 8019A0A0 48 00 00 08 */ b lbl_8019A0A8 -lbl_8019A0A4: -/* 8019A0A4 38 60 00 00 */ li r3, 0 -lbl_8019A0A8: -/* 8019A0A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019A0AC 48 1C 81 7D */ bl _restgpr_29 -/* 8019A0B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8019A0B4 7C 08 03 A6 */ mtlr r0 -/* 8019A0B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8019A0BC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_select_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_select_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index 7be348f2e58..00000000000 --- a/asm/d/shop/d_shop_system/seq_select_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8019936C: -/* 8019936C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80199370 7C 08 02 A6 */ mflr r0 -/* 80199374 90 01 00 14 */ stw r0, 0x14(r1) -/* 80199378 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8019937C 7C 7F 1B 78 */ mr r31, r3 -/* 80199380 38 7F 0E 48 */ addi r3, r31, 0xe48 -/* 80199384 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 80199388 38 84 FF FF */ addi r4, r4, -1 -/* 8019938C 4B FF D6 B1 */ bl isHomePos__15dShopItemCtrl_cFi -/* 80199390 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80199394 41 82 00 18 */ beq lbl_801993AC -/* 80199398 7F E3 FB 78 */ mr r3, r31 -/* 8019939C 48 00 0F C9 */ bl setSoldOut__13dShopSystem_cFv -/* 801993A0 7F E3 FB 78 */ mr r3, r31 -/* 801993A4 38 80 00 04 */ li r4, 4 -/* 801993A8 48 00 0F 9D */ bl setSeq__13dShopSystem_cFUc -lbl_801993AC: -/* 801993AC 38 60 00 00 */ li r3, 0 -/* 801993B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801993B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801993B8 7C 08 03 A6 */ mtlr r0 -/* 801993BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801993C0 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/setSellItemMax__13dShopSystem_cFUc.s b/asm/d/shop/d_shop_system/setSellItemMax__13dShopSystem_cFUc.s deleted file mode 100644 index 280ec594bc0..00000000000 --- a/asm/d/shop/d_shop_system/setSellItemMax__13dShopSystem_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8019AB1C: -/* 8019AB1C 98 8D 8A D8 */ stb r4, data_80451058(r13) -/* 8019AB20 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/setSeq__13dShopSystem_cFUc.s b/asm/d/shop/d_shop_system/setSeq__13dShopSystem_cFUc.s deleted file mode 100644 index 047af7bbaf9..00000000000 --- a/asm/d/shop/d_shop_system/setSeq__13dShopSystem_cFUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8019A344: -/* 8019A344 98 83 0F 70 */ stb r4, 0xf70(r3) -/* 8019A348 38 00 00 02 */ li r0, 2 -/* 8019A34C 98 03 0F 72 */ stb r0, 0xf72(r3) -/* 8019A350 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/setSoldOutFlag__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/setSoldOutFlag__13dShopSystem_cFv.s deleted file mode 100644 index d5736355691..00000000000 --- a/asm/d/shop/d_shop_system/setSoldOutFlag__13dShopSystem_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8019A354: -/* 8019A354 88 83 0F 6E */ lbz r4, 0xf6e(r3) -/* 8019A358 38 04 FF FF */ addi r0, r4, -1 -/* 8019A35C 98 03 0F 73 */ stb r0, 0xf73(r3) -/* 8019A360 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/setSoldOutItemHide__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/setSoldOutItemHide__13dShopSystem_cFv.s deleted file mode 100644 index 4112d404fde..00000000000 --- a/asm/d/shop/d_shop_system/setSoldOutItemHide__13dShopSystem_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8019A4F4: -/* 8019A4F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019A4F8 7C 08 02 A6 */ mflr r0 -/* 8019A4FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019A500 80 03 0F 60 */ lwz r0, 0xf60(r3) -/* 8019A504 2C 00 00 00 */ cmpwi r0, 0 -/* 8019A508 40 80 00 1C */ bge lbl_8019A524 -/* 8019A50C 88 03 0F 73 */ lbz r0, 0xf73(r3) -/* 8019A510 54 00 10 3A */ slwi r0, r0, 2 -/* 8019A514 7C 63 02 14 */ add r3, r3, r0 -/* 8019A518 80 63 0E 4C */ lwz r3, 0xe4c(r3) -/* 8019A51C 4B E7 F7 9D */ bl fopAcM_delete__FUi -/* 8019A520 48 00 00 34 */ b lbl_8019A554 -lbl_8019A524: -/* 8019A524 88 03 0F 73 */ lbz r0, 0xf73(r3) -/* 8019A528 54 00 10 3A */ slwi r0, r0, 2 -/* 8019A52C 7C 63 02 14 */ add r3, r3, r0 -/* 8019A530 80 03 0E 4C */ lwz r0, 0xe4c(r3) -/* 8019A534 90 01 00 08 */ stw r0, 8(r1) -/* 8019A538 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 8019A53C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 8019A540 38 81 00 08 */ addi r4, r1, 8 -/* 8019A544 4B E7 F2 B5 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8019A548 28 03 00 00 */ cmplwi r3, 0 -/* 8019A54C 41 82 00 08 */ beq lbl_8019A554 -/* 8019A550 4B E9 D5 15 */ bl hide__12daItemBase_cFv -lbl_8019A554: -/* 8019A554 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8019A558 7C 08 03 A6 */ mtlr r0 -/* 8019A55C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019A560 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/setSoldOut__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/setSoldOut__13dShopSystem_cFv.s deleted file mode 100644 index 435261cde01..00000000000 --- a/asm/d/shop/d_shop_system/setSoldOut__13dShopSystem_cFv.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_8019A364: -/* 8019A364 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8019A368 7C 08 02 A6 */ mflr r0 -/* 8019A36C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8019A370 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019A374 48 1C 7E 69 */ bl _savegpr_29 -/* 8019A378 7C 7E 1B 78 */ mr r30, r3 -/* 8019A37C 88 63 0F 73 */ lbz r3, 0xf73(r3) -/* 8019A380 28 03 00 FF */ cmplwi r3, 0xff -/* 8019A384 41 82 01 58 */ beq lbl_8019A4DC -/* 8019A388 80 1E 0F 60 */ lwz r0, 0xf60(r30) -/* 8019A38C 2C 00 00 00 */ cmpwi r0, 0 -/* 8019A390 40 80 00 50 */ bge lbl_8019A3E0 -/* 8019A394 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 8019A398 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A39C 38 63 B8 A4 */ addi r3, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A3A0 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8019A3A4 A8 03 04 B8 */ lha r0, 0x4b8(r3) -/* 8019A3A8 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 8019A3AC 28 1F 00 FF */ cmplwi r31, 0xff -/* 8019A3B0 41 82 00 30 */ beq lbl_8019A3E0 -/* 8019A3B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8019A3B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8019A3BC 3B A3 09 58 */ addi r29, r3, 0x958 -/* 8019A3C0 7F A3 EB 78 */ mr r3, r29 -/* 8019A3C4 7F E4 FB 78 */ mr r4, r31 -/* 8019A3C8 4B E9 A4 99 */ bl isSwitch__12dSv_memBit_cCFi -/* 8019A3CC 2C 03 00 00 */ cmpwi r3, 0 -/* 8019A3D0 40 82 00 10 */ bne lbl_8019A3E0 -/* 8019A3D4 7F A3 EB 78 */ mr r3, r29 -/* 8019A3D8 7F E4 FB 78 */ mr r4, r31 -/* 8019A3DC 4B E9 A4 35 */ bl onSwitch__12dSv_memBit_cFi -lbl_8019A3E0: -/* 8019A3E0 8B FE 0F 73 */ lbz r31, 0xf73(r30) -/* 8019A3E4 38 80 00 FF */ li r4, 0xff -/* 8019A3E8 98 9E 0F 73 */ stb r4, 0xf73(r30) -/* 8019A3EC 80 1E 0F 60 */ lwz r0, 0xf60(r30) -/* 8019A3F0 2C 00 00 00 */ cmpwi r0, 0 -/* 8019A3F4 41 80 00 2C */ blt lbl_8019A420 -/* 8019A3F8 57 E0 10 3A */ slwi r0, r31, 2 -/* 8019A3FC 7F BE 02 14 */ add r29, r30, r0 -/* 8019A400 80 7D 0E 4C */ lwz r3, 0xe4c(r29) -/* 8019A404 4B E7 F8 B5 */ bl fopAcM_delete__FUi -/* 8019A408 38 00 FF FF */ li r0, -1 -/* 8019A40C 90 1D 0E 4C */ stw r0, 0xe4c(r29) -/* 8019A410 7F C3 F3 78 */ mr r3, r30 -/* 8019A414 7F E4 FB 78 */ mr r4, r31 -/* 8019A418 4B FF D1 A9 */ bl onFlag__13dShopSystem_cFi -/* 8019A41C 48 00 00 C0 */ b lbl_8019A4DC -lbl_8019A420: -/* 8019A420 2C 1F 00 00 */ cmpwi r31, 0 -/* 8019A424 40 82 00 20 */ bne lbl_8019A444 -/* 8019A428 38 00 00 00 */ li r0, 0 -/* 8019A42C 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A430 90 03 B8 A4 */ stw r0, dShopSystem_itemActor@l(r3) /* 0x803BB8A4@l */ -/* 8019A434 98 8D 81 68 */ stb r4, dShopSystem_itemNo(r13) -/* 8019A438 38 00 00 02 */ li r0, 2 -/* 8019A43C 90 0D 8A DC */ stw r0, dShopSystem_item_count(r13) -/* 8019A440 48 00 00 84 */ b lbl_8019A4C4 -lbl_8019A444: -/* 8019A444 2C 1F 00 01 */ cmpwi r31, 1 -/* 8019A448 40 82 00 28 */ bne lbl_8019A470 -/* 8019A44C 38 00 00 00 */ li r0, 0 -/* 8019A450 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A454 38 63 B8 A4 */ addi r3, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A458 90 03 00 04 */ stw r0, 4(r3) -/* 8019A45C 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 8019A460 98 83 00 01 */ stb r4, 1(r3) -/* 8019A464 38 00 00 02 */ li r0, 2 -/* 8019A468 90 0D 8A DC */ stw r0, dShopSystem_item_count(r13) -/* 8019A46C 48 00 00 58 */ b lbl_8019A4C4 -lbl_8019A470: -/* 8019A470 2C 1F 00 02 */ cmpwi r31, 2 -/* 8019A474 40 82 00 28 */ bne lbl_8019A49C -/* 8019A478 38 00 00 00 */ li r0, 0 -/* 8019A47C 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A480 38 63 B8 A4 */ addi r3, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A484 90 03 00 08 */ stw r0, 8(r3) -/* 8019A488 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 8019A48C 98 83 00 02 */ stb r4, 2(r3) -/* 8019A490 38 00 00 02 */ li r0, 2 -/* 8019A494 90 0D 8A DC */ stw r0, dShopSystem_item_count(r13) -/* 8019A498 48 00 00 2C */ b lbl_8019A4C4 -lbl_8019A49C: -/* 8019A49C 2C 1F 00 06 */ cmpwi r31, 6 -/* 8019A4A0 40 82 00 24 */ bne lbl_8019A4C4 -/* 8019A4A4 38 00 00 00 */ li r0, 0 -/* 8019A4A8 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A4AC 38 63 B8 A4 */ addi r3, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A4B0 90 03 00 18 */ stw r0, 0x18(r3) -/* 8019A4B4 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 8019A4B8 98 83 00 06 */ stb r4, 6(r3) -/* 8019A4BC 38 00 00 06 */ li r0, 6 -/* 8019A4C0 90 0D 8A DC */ stw r0, dShopSystem_item_count(r13) -lbl_8019A4C4: -/* 8019A4C4 88 1E 0F 76 */ lbz r0, 0xf76(r30) -/* 8019A4C8 28 00 00 00 */ cmplwi r0, 0 -/* 8019A4CC 41 82 00 10 */ beq lbl_8019A4DC -/* 8019A4D0 7F C3 F3 78 */ mr r3, r30 -/* 8019A4D4 7F E4 FB 78 */ mr r4, r31 -/* 8019A4D8 4B FF D0 E9 */ bl onFlag__13dShopSystem_cFi -lbl_8019A4DC: -/* 8019A4DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019A4E0 48 1C 7D 49 */ bl _restgpr_29 -/* 8019A4E4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8019A4E8 7C 08 03 A6 */ mtlr r0 -/* 8019A4EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8019A4F0 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/shop_init__13dShopSystem_cFb.s b/asm/d/shop/d_shop_system/shop_init__13dShopSystem_cFb.s deleted file mode 100644 index 0812fc1736e..00000000000 --- a/asm/d/shop/d_shop_system/shop_init__13dShopSystem_cFb.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8019A0D0: -/* 8019A0D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019A0D4 7C 08 02 A6 */ mflr r0 -/* 8019A0D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019A0DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8019A0E0 7C 7F 1B 78 */ mr r31, r3 -/* 8019A0E4 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8019A0E8 41 82 00 2C */ beq lbl_8019A114 -/* 8019A0EC 38 80 00 03 */ li r4, 3 -/* 8019A0F0 48 00 02 55 */ bl setSeq__13dShopSystem_cFUc -/* 8019A0F4 38 00 00 01 */ li r0, 1 -/* 8019A0F8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8019A0FC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8019A100 98 03 00 BD */ stb r0, 0xbd(r3) -/* 8019A104 7F E3 FB 78 */ mr r3, r31 -/* 8019A108 48 00 02 5D */ bl setSoldOut__13dShopSystem_cFv -/* 8019A10C 38 60 00 01 */ li r3, 1 -/* 8019A110 48 00 00 34 */ b lbl_8019A144 -lbl_8019A114: -/* 8019A114 88 1F 0F 70 */ lbz r0, 0xf70(r31) -/* 8019A118 28 00 00 00 */ cmplwi r0, 0 -/* 8019A11C 40 82 00 24 */ bne lbl_8019A140 -/* 8019A120 38 80 00 01 */ li r4, 1 -/* 8019A124 48 00 02 21 */ bl setSeq__13dShopSystem_cFUc -/* 8019A128 38 00 00 01 */ li r0, 1 -/* 8019A12C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8019A130 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8019A134 98 03 00 BD */ stb r0, 0xbd(r3) -/* 8019A138 38 60 00 01 */ li r3, 1 -/* 8019A13C 48 00 00 08 */ b lbl_8019A144 -lbl_8019A140: -/* 8019A140 38 60 00 00 */ li r3, 0 -lbl_8019A144: -/* 8019A144 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8019A148 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8019A14C 7C 08 03 A6 */ mtlr r0 -/* 8019A150 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019A154 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape/daTagEscape_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape/daTagEscape_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 10f849d916e..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape/daTagEscape_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80D587D8: -/* 80D587D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D587DC 7C 08 02 A6 */ mflr r0 -/* 80D587E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D587E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D587E8 7C 7F 1B 78 */ mr r31, r3 -/* 80D587EC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D587F0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D587F4 40 82 00 1C */ bne lbl_80D58810 -/* 80D587F8 28 1F 00 00 */ cmplwi r31, 0 -/* 80D587FC 41 82 00 08 */ beq lbl_80D58804 -/* 80D58800 4B 2C 03 65 */ bl __ct__10fopAc_ac_cFv -lbl_80D58804: -/* 80D58804 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D58808 60 00 00 08 */ ori r0, r0, 8 -/* 80D5880C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D58810: -/* 80D58810 38 60 00 04 */ li r3, 4 -/* 80D58814 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D58818 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5881C 7C 08 03 A6 */ mtlr r0 -/* 80D58820 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D58824 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape/daTagEscape_Delete__FP13daTagEscape_c.s b/asm/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape/daTagEscape_Delete__FP13daTagEscape_c.s deleted file mode 100644 index ffc03eab394..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape/daTagEscape_Delete__FP13daTagEscape_c.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80D58828: -/* 80D58828 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D5882C 7C 08 02 A6 */ mflr r0 -/* 80D58830 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D58834 28 03 00 00 */ cmplwi r3, 0 -/* 80D58838 41 82 00 0C */ beq lbl_80D58844 -/* 80D5883C 38 80 00 00 */ li r4, 0 -/* 80D58840 4B 2C 04 4D */ bl __dt__10fopAc_ac_cFv -lbl_80D58844: -/* 80D58844 38 60 00 01 */ li r3, 1 -/* 80D58848 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D5884C 7C 08 03 A6 */ mtlr r0 -/* 80D58850 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D58854 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/create__13daTag_Telop_cFv.s b/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/create__13daTag_Telop_cFv.s deleted file mode 100644 index 2c9f339b94e..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/create__13daTag_Telop_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80490A58: -/* 80490A58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80490A5C 7C 08 02 A6 */ mflr r0 -/* 80490A60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80490A64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80490A68 7C 7F 1B 78 */ mr r31, r3 -/* 80490A6C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80490A70 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80490A74 40 82 00 1C */ bne lbl_80490A90 -/* 80490A78 28 1F 00 00 */ cmplwi r31, 0 -/* 80490A7C 41 82 00 08 */ beq lbl_80490A84 -/* 80490A80 4B B8 80 E5 */ bl __ct__10fopAc_ac_cFv -lbl_80490A84: -/* 80490A84 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80490A88 60 00 00 08 */ ori r0, r0, 8 -/* 80490A8C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80490A90: -/* 80490A90 A8 1F 04 B8 */ lha r0, 0x4b8(r31) -/* 80490A94 B0 1F 05 68 */ sth r0, 0x568(r31) -/* 80490A98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80490A9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80490AA0 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 80490AA4 38 80 13 01 */ li r4, 0x1301 -/* 80490AA8 4B BA 3F 15 */ bl isEventBit__11dSv_event_cCFUs -/* 80490AAC 2C 03 00 00 */ cmpwi r3, 0 -/* 80490AB0 41 82 00 10 */ beq lbl_80490AC0 -/* 80490AB4 38 00 00 63 */ li r0, 0x63 -/* 80490AB8 90 1F 05 6C */ stw r0, 0x56c(r31) -/* 80490ABC 48 00 00 24 */ b lbl_80490AE0 -lbl_80490AC0: -/* 80490AC0 A0 1F 05 68 */ lhz r0, 0x568(r31) -/* 80490AC4 28 00 FF FF */ cmplwi r0, 0xffff -/* 80490AC8 41 82 00 10 */ beq lbl_80490AD8 -/* 80490ACC 38 00 00 00 */ li r0, 0 -/* 80490AD0 90 1F 05 6C */ stw r0, 0x56c(r31) -/* 80490AD4 48 00 00 0C */ b lbl_80490AE0 -lbl_80490AD8: -/* 80490AD8 38 00 00 63 */ li r0, 0x63 -/* 80490ADC 90 1F 05 6C */ stw r0, 0x56c(r31) -lbl_80490AE0: -/* 80490AE0 38 60 00 04 */ li r3, 4 -/* 80490AE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80490AE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80490AEC 7C 08 03 A6 */ mtlr r0 -/* 80490AF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80490AF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 21e37e5c05c..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80490BC0: -/* 80490BC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80490BC4 7C 08 02 A6 */ mflr r0 -/* 80490BC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80490BCC 4B FF FE 8D */ bl create__13daTag_Telop_cFv -/* 80490BD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80490BD4 7C 08 03 A6 */ mtlr r0 -/* 80490BD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80490BDC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Delete__FP13daTag_Telop_c.s b/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Delete__FP13daTag_Telop_c.s deleted file mode 100644 index ac121f0af85..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Delete__FP13daTag_Telop_c.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80490B90: -/* 80490B90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80490B94 7C 08 02 A6 */ mflr r0 -/* 80490B98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80490B9C 28 03 00 00 */ cmplwi r3, 0 -/* 80490BA0 41 82 00 0C */ beq lbl_80490BAC -/* 80490BA4 38 80 00 00 */ li r4, 0 -/* 80490BA8 4B B8 80 E5 */ bl __dt__10fopAc_ac_cFv -lbl_80490BAC: -/* 80490BAC 38 60 00 01 */ li r3, 1 -/* 80490BB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80490BB4 7C 08 03 A6 */ mtlr r0 -/* 80490BB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80490BBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Execute__FP13daTag_Telop_c.s b/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Execute__FP13daTag_Telop_c.s deleted file mode 100644 index 5e5aa4224c4..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/daTag_Telop_Execute__FP13daTag_Telop_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80490B64: -/* 80490B64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80490B68 7C 08 02 A6 */ mflr r0 -/* 80490B6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80490B70 4B FF FF 89 */ bl execute__13daTag_Telop_cFv -/* 80490B74 38 60 00 01 */ li r3, 1 -/* 80490B78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80490B7C 7C 08 03 A6 */ mtlr r0 -/* 80490B80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80490B84 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/execute__13daTag_Telop_cFv.s b/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/execute__13daTag_Telop_cFv.s deleted file mode 100644 index f280ec305cd..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop/execute__13daTag_Telop_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80490AF8: -/* 80490AF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80490AFC 7C 08 02 A6 */ mflr r0 -/* 80490B00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80490B04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80490B08 7C 7F 1B 78 */ mr r31, r3 -/* 80490B0C 80 03 05 6C */ lwz r0, 0x56c(r3) -/* 80490B10 2C 00 00 63 */ cmpwi r0, 0x63 -/* 80490B14 41 82 00 28 */ beq lbl_80490B3C -/* 80490B18 40 80 00 30 */ bge lbl_80490B48 -/* 80490B1C 2C 00 00 00 */ cmpwi r0, 0 -/* 80490B20 41 82 00 08 */ beq lbl_80490B28 -/* 80490B24 48 00 00 24 */ b lbl_80490B48 -lbl_80490B28: -/* 80490B28 A0 7F 05 68 */ lhz r3, 0x568(r31) -/* 80490B2C 4B B8 F4 99 */ bl fopMsgM_messageSetDemo__FUl -/* 80490B30 38 00 00 63 */ li r0, 0x63 -/* 80490B34 90 1F 05 6C */ stw r0, 0x56c(r31) -/* 80490B38 48 00 00 10 */ b lbl_80490B48 -lbl_80490B3C: -/* 80490B3C 4B B8 91 41 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80490B40 38 00 FF FF */ li r0, -1 -/* 80490B44 90 1F 05 6C */ stw r0, 0x56c(r31) -lbl_80490B48: -/* 80490B48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80490B4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80490B50 7C 08 03 A6 */ mtlr r0 -/* 80490B54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80490B58 4E 80 00 20 */ blr diff --git a/include/JSystem/JMessage/control.h b/include/JSystem/JMessage/control.h index e1a49e2fa43..71d29d7268a 100644 --- a/include/JSystem/JMessage/control.h +++ b/include/JSystem/JMessage/control.h @@ -4,19 +4,19 @@ #include "dolphin/types.h" namespace JMessage { - struct TProcessor; +struct TProcessor; - struct TControl { - /* 802A7548 */ TControl(); - /* 802A758C */ ~TControl(); - /* 802A75D4 */ void reset(); - /* 802A7634 */ void update(); - /* 802A76BC */ void render(); - /* 802A77E8 */ void setMessageCode(u16, u16); - /* 802A78F4 */ void setMessageID(u32, u32, bool*); - /* 802A7A20 */ void setMessageCode_inSequence_(JMessage::TProcessor const*, u16, u16); - }; +struct TControl { + /* 802A7548 */ TControl(); + /* 802A758C */ ~TControl(); + /* 802A75D4 */ void reset(); + /* 802A7634 */ void update(); + /* 802A76BC */ void render(); + /* 802A77E8 */ void setMessageCode(u16, u16); + /* 802A78F4 */ void setMessageID(u32, u32, bool*); + /* 802A7A20 */ void setMessageCode_inSequence_(JMessage::TProcessor const*, u16, u16); }; +}; // namespace JMessage struct jmessage_tControl {}; diff --git a/include/JSystem/JMessage/data.h b/include/JSystem/JMessage/data.h index 1281f2419b8..ef1791c89e4 100644 --- a/include/JSystem/JMessage/data.h +++ b/include/JSystem/JMessage/data.h @@ -4,9 +4,9 @@ #include "dolphin/types.h" namespace JMessage { - struct data { - static f32 ga4cSignature[1 + 1 /* padding */]; - }; +struct data { + static f32 ga4cSignature[1 + 1 /* padding */]; }; +}; // namespace JMessage #endif /* DATA_H */ diff --git a/include/JSystem/JMessage/locale.h b/include/JSystem/JMessage/locale.h index 321a3bda582..eebedb6fd46 100644 --- a/include/JSystem/JMessage/locale.h +++ b/include/JSystem/JMessage/locale.h @@ -4,12 +4,12 @@ #include "dolphin/types.h" namespace JMessage { - struct locale { - /* 802A9490 */ void parseCharacter_1Byte(char const**); - /* 802A94A8 */ void parseCharacter_2Byte(char const**); - /* 802A9528 */ void parseCharacter_ShiftJIS(char const**); - /* 802A958C */ void parseCharacter_UTF8(char const**); - }; +struct locale { + /* 802A9490 */ void parseCharacter_1Byte(char const**); + /* 802A94A8 */ void parseCharacter_2Byte(char const**); + /* 802A9528 */ void parseCharacter_ShiftJIS(char const**); + /* 802A958C */ void parseCharacter_UTF8(char const**); }; +}; // namespace JMessage #endif /* LOCALE_H */ diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h index 90e8aee8af4..53281106f7e 100644 --- a/include/JSystem/JMessage/processor.h +++ b/include/JSystem/JMessage/processor.h @@ -1,93 +1,91 @@ #ifndef PROCESSOR_H #define PROCESSOR_H -#include "dolphin/types.h" #include "SSystem/SComponent/c_xyz.h" +#include "dolphin/types.h" namespace JMessage { - struct TProcessor { - /* 802A7B48 */ ~TProcessor(); - /* 802A7B90 */ void reset(); - /* 802A7BF8 */ void stack_pushCurrent(char const*); - /* 802A7C30 */ void stack_popCurrent(); - /* 802A7C54 */ void getResource_groupID(u16) const; - /* 802A7CD4 */ void toMessageCode_messageID(u32, u32, bool*) const; - /* 802A7E38 */ void on_select_begin(char const* (*)(JMessage::TProcessor*), void const*, - char const*, u32); - /* 802A7EDC */ void on_select_end(); - /* 802A7F34 */ void on_select_separate(); - /* 802A7FC0 */ void do_reset(); - /* 802A7FC4 */ void do_begin(void const*, char const*); - /* 802A7FC8 */ void do_end(); - /* 802A7FCC */ void do_character(int); - /* 802A7FD0 */ bool do_tag(u32, void const*, u32); - /* 802A7FD8 */ void do_select_begin(u32); - /* 802A7FDC */ void do_select_end(); - /* 802A7FE0 */ void do_select_separate(); - /* 802A7FE4 */ void on_tag_(); - /* 802A8084 */ void do_resetStatus_(char const*); - /* 802A8088 */ bool do_setBegin_isReady_() const; - /* 802A8090 */ void do_tag_(u32, void const*, u32); - /* 802A81EC */ void process_character_(); - /* 802A828C */ void process_onCharacterEnd_normal_(JMessage::TProcessor*); - /* 802A82F4 */ void process_onCharacterEnd_select_(JMessage::TProcessor*); - /* 802A833C */ void process_onSelect_limited_(JMessage::TProcessor*); - /* 802A8358 */ void process_onSelect_(JMessage::TProcessor*); - /* 802A8C24 */ void on_message(u32) const; - /* 802A8C44 */ void getMessageText_messageCode(u32) const; - }; - - struct TReference { - /* 802A7AF8 */ ~TReference(); - /* 802A7B40 */ bool do_word(u32) const; - }; - - struct TControl; - - struct TSequenceProcessor { - /* 802A8374 */ TSequenceProcessor(JMessage::TReference const*, JMessage::TControl*); - /* 802A83B8 */ ~TSequenceProcessor(); - /* 802A8418 */ void process(char const*); - /* 802A85A4 */ void on_isReady(); - /* 802A85D0 */ void on_jump_register(void const* (*)(JMessage::TSequenceProcessor const*), - u32); - /* 802A85E4 */ void on_jump_isReady(); - /* 802A8610 */ void on_jump(void const*, char const*); - /* 802A8690 */ void on_branch_register(void const* (*)(JMessage::TSequenceProcessor const*, - u32), - void const*, u32); - /* 802A86A0 */ void on_branch_query(u32); - /* 802A86D4 */ void on_branch_queryResult(); - /* 802A8700 */ void on_branch(void const*, char const*); - /* 802A8780 */ bool do_isReady(); - /* 802A8788 */ bool do_jump_isReady(); - /* 802A8790 */ void do_jump(void const*, char const*); - /* 802A8794 */ void do_branch_query(u32); - /* 802A8798 */ s32 do_branch_queryResult(); - /* 802A87A0 */ void do_branch(void const*, char const*); - /* 802A87A4 */ void do_resetStatus_(char const*); - /* 802A87C0 */ void do_setBegin_isReady_() const; - /* 802A87D0 */ void do_begin_(void const*, char const*); - /* 802A87D4 */ void do_end_(); - /* 802A87E0 */ void do_tag_(u32, void const*, u32); - /* 802A892C */ void process_setMessageIndex_reserved_(u16); - /* 802A8944 */ void process_setMessageCode_(JMessage::TSequenceProcessor const*, u16, u16); - /* 802A89B8 */ void process_onJump_limited_(JMessage::TSequenceProcessor const*); - /* 802A89EC */ void process_onJump_(JMessage::TSequenceProcessor const*); - /* 802A8A18 */ void process_onBranch_limited_(JMessage::TSequenceProcessor const*, u32); - /* 802A8A50 */ void process_onBranch_(JMessage::TSequenceProcessor const*, u32); - }; - - struct TRenderingProcessor { - /* 802A8A84 */ TRenderingProcessor(JMessage::TReference const*); - /* 802A8AC0 */ ~TRenderingProcessor(); - /* 802A8B20 */ void process(char const*); - /* 802A8BA4 */ void do_begin_(void const*, char const*); - /* 802A8BA8 */ void do_end_(); - /* 802A8BAC */ void do_tag_(u32, void const*, u32); - }; +struct TProcessor { + /* 802A7B48 */ ~TProcessor(); + /* 802A7B90 */ void reset(); + /* 802A7BF8 */ void stack_pushCurrent(char const*); + /* 802A7C30 */ void stack_popCurrent(); + /* 802A7C54 */ void getResource_groupID(u16) const; + /* 802A7CD4 */ void toMessageCode_messageID(u32, u32, bool*) const; + /* 802A7E38 */ void on_select_begin(char const* (*)(JMessage::TProcessor*), void const*, + char const*, u32); + /* 802A7EDC */ void on_select_end(); + /* 802A7F34 */ void on_select_separate(); + /* 802A7FC0 */ void do_reset(); + /* 802A7FC4 */ void do_begin(void const*, char const*); + /* 802A7FC8 */ void do_end(); + /* 802A7FCC */ void do_character(int); + /* 802A7FD0 */ bool do_tag(u32, void const*, u32); + /* 802A7FD8 */ void do_select_begin(u32); + /* 802A7FDC */ void do_select_end(); + /* 802A7FE0 */ void do_select_separate(); + /* 802A7FE4 */ void on_tag_(); + /* 802A8084 */ void do_resetStatus_(char const*); + /* 802A8088 */ bool do_setBegin_isReady_() const; + /* 802A8090 */ void do_tag_(u32, void const*, u32); + /* 802A81EC */ void process_character_(); + /* 802A828C */ void process_onCharacterEnd_normal_(JMessage::TProcessor*); + /* 802A82F4 */ void process_onCharacterEnd_select_(JMessage::TProcessor*); + /* 802A833C */ void process_onSelect_limited_(JMessage::TProcessor*); + /* 802A8358 */ void process_onSelect_(JMessage::TProcessor*); + /* 802A8C24 */ void on_message(u32) const; + /* 802A8C44 */ void getMessageText_messageCode(u32) const; }; +struct TReference { + /* 802A7AF8 */ ~TReference(); + /* 802A7B40 */ bool do_word(u32) const; +}; + +struct TControl; + +struct TSequenceProcessor { + /* 802A8374 */ TSequenceProcessor(JMessage::TReference const*, JMessage::TControl*); + /* 802A83B8 */ ~TSequenceProcessor(); + /* 802A8418 */ void process(char const*); + /* 802A85A4 */ void on_isReady(); + /* 802A85D0 */ void on_jump_register(void const* (*)(JMessage::TSequenceProcessor const*), u32); + /* 802A85E4 */ void on_jump_isReady(); + /* 802A8610 */ void on_jump(void const*, char const*); + /* 802A8690 */ void + on_branch_register(void const* (*)(JMessage::TSequenceProcessor const*, u32), void const*, u32); + /* 802A86A0 */ void on_branch_query(u32); + /* 802A86D4 */ void on_branch_queryResult(); + /* 802A8700 */ void on_branch(void const*, char const*); + /* 802A8780 */ bool do_isReady(); + /* 802A8788 */ bool do_jump_isReady(); + /* 802A8790 */ void do_jump(void const*, char const*); + /* 802A8794 */ void do_branch_query(u32); + /* 802A8798 */ s32 do_branch_queryResult(); + /* 802A87A0 */ void do_branch(void const*, char const*); + /* 802A87A4 */ void do_resetStatus_(char const*); + /* 802A87C0 */ void do_setBegin_isReady_() const; + /* 802A87D0 */ void do_begin_(void const*, char const*); + /* 802A87D4 */ void do_end_(); + /* 802A87E0 */ void do_tag_(u32, void const*, u32); + /* 802A892C */ void process_setMessageIndex_reserved_(u16); + /* 802A8944 */ void process_setMessageCode_(JMessage::TSequenceProcessor const*, u16, u16); + /* 802A89B8 */ void process_onJump_limited_(JMessage::TSequenceProcessor const*); + /* 802A89EC */ void process_onJump_(JMessage::TSequenceProcessor const*); + /* 802A8A18 */ void process_onBranch_limited_(JMessage::TSequenceProcessor const*, u32); + /* 802A8A50 */ void process_onBranch_(JMessage::TSequenceProcessor const*, u32); +}; + +struct TRenderingProcessor { + /* 802A8A84 */ TRenderingProcessor(JMessage::TReference const*); + /* 802A8AC0 */ ~TRenderingProcessor(); + /* 802A8B20 */ void process(char const*); + /* 802A8BA4 */ void do_begin_(void const*, char const*); + /* 802A8BA8 */ void do_end_(); + /* 802A8BAC */ void do_tag_(u32, void const*, u32); +}; +}; // namespace JMessage + struct jmessage_tReference { /* 80228B04 */ jmessage_tReference(); /* 80229034 */ void pageSend(); diff --git a/include/JSystem/JMessage/resource.h b/include/JSystem/JMessage/resource.h index 820b824194c..b1fc2b3a601 100644 --- a/include/JSystem/JMessage/resource.h +++ b/include/JSystem/JMessage/resource.h @@ -4,32 +4,32 @@ #include "dolphin/types.h" namespace JMessage { - struct TResource { - /* 802A8CDC */ void toMessageIndex_messageID(u32, u32, bool*) const; - }; - - struct TResourceContainer { - struct TCResource { - /* 802A8EC0 */ TCResource(); - /* 802A8EF8 */ ~TCResource(); - /* 802A8F6C */ void Get_groupID(u16); - /* 802A8FFC */ void Do_create(); - /* 802A9048 */ void Do_destroy(JMessage::TResource*); - }; - - /* 802A906C */ TResourceContainer(); - /* 802A90B8 */ void setEncoding(u8); - /* 802A90F0 */ void setEncoding_(u8); - - static void* sapfnParseCharacter_[5]; - }; - - struct TParse { - /* 802A9130 */ TParse(JMessage::TResourceContainer*); - /* 802A9158 */ ~TParse(); - /* 802A91B8 */ void parseHeader_next(void const**, u32*, u32); - /* 802A92F4 */ void parseBlock_next(void const**, u32*, u32); - }; +struct TResource { + /* 802A8CDC */ void toMessageIndex_messageID(u32, u32, bool*) const; }; +struct TResourceContainer { + struct TCResource { + /* 802A8EC0 */ TCResource(); + /* 802A8EF8 */ ~TCResource(); + /* 802A8F6C */ void Get_groupID(u16); + /* 802A8FFC */ void Do_create(); + /* 802A9048 */ void Do_destroy(JMessage::TResource*); + }; + + /* 802A906C */ TResourceContainer(); + /* 802A90B8 */ void setEncoding(u8); + /* 802A90F0 */ void setEncoding_(u8); + + static void* sapfnParseCharacter_[5]; +}; + +struct TParse { + /* 802A9130 */ TParse(JMessage::TResourceContainer*); + /* 802A9158 */ ~TParse(); + /* 802A91B8 */ void parseHeader_next(void const**, u32*, u32); + /* 802A92F4 */ void parseBlock_next(void const**, u32*, u32); +}; +}; // namespace JMessage + #endif /* RESOURCE_H */ diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 4a7927419a7..f8921292eca 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -2338,7 +2338,7 @@ public: field_0x2844.clearData(); } s32 checkPlayerDemoMode() const { return mDemo.getDemoType(); } - u16 getMidnaMsgNum() const { return mMidnaMsgNum; } + u16 getMidnaMsgNum() const { return mMidnaMsgNum; } BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; } diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h index 2c77d4d274b..c27d2b5738b 100644 --- a/include/d/a/d_a_npc.h +++ b/include/d/a/d_a_npc.h @@ -1,8 +1,8 @@ #ifndef D_A_D_A_NPC_H #define D_A_D_A_NPC_H -#include "dolphin/types.h" #include "d/com/d_com_inf_game.h" +#include "dolphin/types.h" #include "global.h" class daNpcT_MotionSeqMngr_c { @@ -253,7 +253,7 @@ public: /* 8014BEE4 */ void getEvtAreaTagP(int, int); /* 8014BFB0 */ void getShopItemTagP(); /* 8014C030 */ void setHitodamaPrtcl(); - + /* 8014CD20 */ virtual ~daNpcT_c(); /* 801490D4 */ virtual void ctrlBtk(); /* 8014CC14 */ virtual void ctrlSubFaceMotion(int); @@ -301,7 +301,7 @@ public: /* 8014CCA8 */ virtual void changeBtp(int*, int*); /* 8014CCE8 */ virtual void changeBtk(int*, int*); /* 8014A628 */ virtual void setMotionAnm(int, f32, int); - + static u8 const mCcDObjData[48]; static u8 mCcDCyl[68]; static u8 mCcDSph[64]; diff --git a/include/d/a/d_a_shop_item_static.h b/include/d/a/d_a_shop_item_static.h index d6bc8342df3..6d17c53005d 100644 --- a/include/d/a/d_a_shop_item_static.h +++ b/include/d/a/d_a_shop_item_static.h @@ -1,8 +1,8 @@ #ifndef D_A_D_A_SHOP_ITEM_STATIC_H #define D_A_D_A_SHOP_ITEM_STATIC_H -#include "dolphin/types.h" #include "d/a/d_a_itembase.h" +#include "dolphin/types.h" struct ResourceData { char* get_arcName() const { return mArcName; } diff --git a/include/d/msg/d_msg_flow.h b/include/d/msg/d_msg_flow.h index e518446ba28..f57c11a6772 100644 --- a/include/d/msg/d_msg_flow.h +++ b/include/d/msg/d_msg_flow.h @@ -1,9 +1,9 @@ #ifndef D_MSG_D_MSG_FLOW_H #define D_MSG_D_MSG_FLOW_H +#include "d/msg/d_msg_class.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" -#include "d/msg/d_msg_class.h" // all mesg_flow_node structs members might be wrong struct mesg_flow_node { @@ -17,7 +17,7 @@ struct mesg_flow_node_branch { /* 0x00 */ u8 type; /* 0x01 */ u8 field_0x1; /* 0x02 */ u16 msg_index; - /* 0x04 */ u16 params[2]; + /* 0x04 */ u16 params[2]; }; struct mesg_flow_node_event { diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index bef45d23744..3ae2dacf007 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -2,11 +2,11 @@ #define D_MSG_D_MSG_OBJECT_H #include "JSystem/J2DGraph/J2DTextbox.h" +#include "JSystem/JMessage/control.h" +#include "JSystem/JMessage/processor.h" +#include "JSystem/JMessage/resource.h" #include "d/com/d_com_inf_game.h" #include "d/msg/d_msg_class.h" -#include "JSystem/JMessage/control.h" -#include "JSystem/JMessage/resource.h" -#include "JSystem/JMessage/processor.h" #include "dolphin/types.h" class COutFont_c; diff --git a/include/d/shop/d_shop_item_ctrl.h b/include/d/shop/d_shop_item_ctrl.h index 72f6aa01745..9a3e956c229 100644 --- a/include/d/shop/d_shop_item_ctrl.h +++ b/include/d/shop/d_shop_item_ctrl.h @@ -1,8 +1,8 @@ #ifndef D_SHOP_D_SHOP_ITEM_CTRL_H #define D_SHOP_D_SHOP_ITEM_CTRL_H -#include "dolphin/types.h" #include "d/a/d_a_shop_item_static.h" +#include "dolphin/types.h" class dShopItemCtrl_c { public: diff --git a/include/d/shop/d_shop_system.h b/include/d/shop/d_shop_system.h index 41ebb33d550..52f93f85949 100644 --- a/include/d/shop/d_shop_system.h +++ b/include/d/shop/d_shop_system.h @@ -1,9 +1,9 @@ #ifndef D_SHOP_D_SHOP_SYSTEM_H #define D_SHOP_D_SHOP_SYSTEM_H -#include "dolphin/types.h" -#include "d/shop/d_shop_item_ctrl.h" #include "d/a/d_a_npc.h" +#include "d/shop/d_shop_item_ctrl.h" +#include "dolphin/types.h" typedef int (*ShopCam_actionFunc)(void); @@ -124,7 +124,7 @@ public: /* 8019AB60 */ bool checkLeftTrigger(STControl*); /* 8019AB84 */ bool checkRightTrigger(STControl*); /* 8019ABA8 */ bool dpdMove(); - + /* 801974E4 */ virtual ~dShopSystem_c(); /* 8019ACF0 */ virtual bool getResName2(int); /* 8019ACE0 */ virtual int beforeStartSeqAction(dMsgFlow_c*, int); @@ -139,7 +139,7 @@ private: /* 0xE40 */ STControl* mpStick; /* 0xE44 */ dSelect_cursor_c* mpDrawCursor; /* 0xE48 */ dShopItemCtrl_c mItemCtrl; - /* 0xE78 */ ShopCam_action_c mShopCamAction; + /* 0xE78 */ ShopCam_action_c mShopCamAction; /* 0xF54 */ u32 mEventParam; /* 0xF58 */ int field_0xf58; /* 0xF5C */ int field_0xf5c; diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index 6818b77d6b3..3493e0f590c 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -1,9 +1,9 @@ #ifndef F_F_OP_MSG_MNG_H_ #define F_F_OP_MSG_MNG_H_ +#include "d/msg/d_msg_class.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" -#include "d/msg/d_msg_class.h" typedef int (*fopMsgCreateFunc)(void*); diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 8416fc3703f..5095b82aa42 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -66,7 +66,7 @@ inline void mDoAud_seStart(u32 sfx_id, const Vec* param_1, u32 param_2, s8 param inline void mDoAud_messageSePlay(u16 param_0, Vec* position, s8 param_2) { Z2AudioMgr::getInterface()->mSeMgr.messageSePlay(param_0, position, param_2); -} +} inline void mDoAud_sceneBgmStart() { Z2AudioMgr::getInterface()->mSceneMgr.sceneBgmStart(); diff --git a/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h b/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h index 02b8a8eaa95..cba8bd7a2b4 100644 --- a/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h +++ b/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h @@ -1,8 +1,8 @@ #ifndef D_A_TAG_TELOP_H #define D_A_TAG_TELOP_H -#include "dolphin/types.h" #include "d/com/d_com_inf_game.h" +#include "dolphin/types.h" class daTag_Telop_c : public fopAc_ac_c { public: @@ -12,9 +12,7 @@ public: int create(); void execute(); - u16 getMessageNo() { - return mOrig.mAngle.z; - } + u16 getMessageNo() { return mOrig.mAngle.z; } private: /* 0x568 */ u16 mMessageNo; diff --git a/libs/JSystem/JMessage/resource.cpp b/libs/JSystem/JMessage/resource.cpp index 7a485f0a503..8c1c85b6259 100644 --- a/libs/JSystem/JMessage/resource.cpp +++ b/libs/JSystem/JMessage/resource.cpp @@ -4,9 +4,9 @@ // #include "JSystem/JMessage/resource.h" -#include "JSystem/JMessage/locale.h" -#include "JSystem/JMessage/data.h" #include "JSystem/JGadget/binary.h" +#include "JSystem/JMessage/data.h" +#include "JSystem/JMessage/locale.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp b/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp index 27b511a5594..abe16035705 100644 --- a/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp +++ b/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp @@ -51,7 +51,7 @@ int daTag_Telop_c::create() { } else { mMessageStatus = 99; } - + return 4; } diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index c6ff59a4949..589f0076cd0 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -2684,7 +2684,7 @@ asm void daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -//asm daNpcT_c::~daNpcT_c() { +// asm daNpcT_c::~daNpcT_c() { extern "C" asm void __dt__8daNpcT_cFv() { nofralloc #include "asm/d/a/d_a_npc/__dt__8daNpcT_cFv.s" diff --git a/src/d/a/d_a_shop_item_static.cpp b/src/d/a/d_a_shop_item_static.cpp index 06e96881524..a90f05d40eb 100644 --- a/src/d/a/d_a_shop_item_static.cpp +++ b/src/d/a/d_a_shop_item_static.cpp @@ -70,10 +70,11 @@ void CheckShopItemCreateHeap(fopAc_ac_c* actor) { daShopItem_c* item = static_cast(actor); u8 item_id = item->getShopItemID(); - item->CreateItemHeap(daShopItem_c::mData[item_id].get_arcName(), daShopItem_c::mData[item_id].get_bmdName(), - daShopItem_c::mData[item_id].get_btk1Name(), daShopItem_c::mData[item_id].get_bpk1Name(), - daShopItem_c::mData[item_id].get_bck1Name(), daShopItem_c::mData[item_id].get_bxa1Name(), - daShopItem_c::mData[item_id].get_brk1Name(), daShopItem_c::mData[item_id].get_btp1Name()); + item->CreateItemHeap( + daShopItem_c::mData[item_id].get_arcName(), daShopItem_c::mData[item_id].get_bmdName(), + daShopItem_c::mData[item_id].get_btk1Name(), daShopItem_c::mData[item_id].get_bpk1Name(), + daShopItem_c::mData[item_id].get_bck1Name(), daShopItem_c::mData[item_id].get_bxa1Name(), + daShopItem_c::mData[item_id].get_brk1Name(), daShopItem_c::mData[item_id].get_btp1Name()); } /* 80379738-80379738 005D98 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index fca73dc7103..07cc66a3559 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -4,15 +4,15 @@ // #include "d/msg/d_msg_flow.h" +#include "SSystem/SComponent/c_math.h" #include "d/com/d_com_inf_game.h" +#include "d/com/d_com_static.h" +#include "d/d_item.h" +#include "d/msg/d_msg_object.h" +#include "d/shop/d_shop_system.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_msg_mng.h" -#include "d/msg/d_msg_object.h" -#include "SSystem/SComponent/c_math.h" -#include "d/com/d_com_static.h" -#include "d/shop/d_shop_system.h" -#include "d/d_item.h" #include "m_Do/m_Do_audio.h" // @@ -361,106 +361,35 @@ SECTION_DATA static void* lit_4936[19] = { /* 803C184C-803C1AC8 01E96C 027C+00 2/3 0/0 0/0 .data mQueryList__10dMsgFlow_c */ SECTION_DATA queryFunc dMsgFlow_c::mQueryList[53] = { - &dMsgFlow_c::query005, - &dMsgFlow_c::query001, - &dMsgFlow_c::query002, - &dMsgFlow_c::query003, - &dMsgFlow_c::query006, - &dMsgFlow_c::query007, - &dMsgFlow_c::query004, - &dMsgFlow_c::query008, - &dMsgFlow_c::query009, - &dMsgFlow_c::query010, - &dMsgFlow_c::query011, - &dMsgFlow_c::query012, - &dMsgFlow_c::query013, - &dMsgFlow_c::query014, - &dMsgFlow_c::query015, - &dMsgFlow_c::query016, - &dMsgFlow_c::query017, - &dMsgFlow_c::query018, - &dMsgFlow_c::query019, - &dMsgFlow_c::query020, - &dMsgFlow_c::query021, - &dMsgFlow_c::query022, - &dMsgFlow_c::query023, - &dMsgFlow_c::query024, - &dMsgFlow_c::query025, - &dMsgFlow_c::query026, - &dMsgFlow_c::query027, - &dMsgFlow_c::query028, - &dMsgFlow_c::query029, - &dMsgFlow_c::query030, - &dMsgFlow_c::query031, - &dMsgFlow_c::query032, - &dMsgFlow_c::query033, - &dMsgFlow_c::query034, - &dMsgFlow_c::query035, - &dMsgFlow_c::query036, - &dMsgFlow_c::query037, - &dMsgFlow_c::query038, - &dMsgFlow_c::query039, - &dMsgFlow_c::query040, - &dMsgFlow_c::query041, - &dMsgFlow_c::query042, - &dMsgFlow_c::query043, - &dMsgFlow_c::query044, - &dMsgFlow_c::query045, - &dMsgFlow_c::query046, - &dMsgFlow_c::query047, - &dMsgFlow_c::query048, - &dMsgFlow_c::query049, - &dMsgFlow_c::query050, - &dMsgFlow_c::query051, - &dMsgFlow_c::query052, - &dMsgFlow_c::query053, + &dMsgFlow_c::query005, &dMsgFlow_c::query001, &dMsgFlow_c::query002, &dMsgFlow_c::query003, + &dMsgFlow_c::query006, &dMsgFlow_c::query007, &dMsgFlow_c::query004, &dMsgFlow_c::query008, + &dMsgFlow_c::query009, &dMsgFlow_c::query010, &dMsgFlow_c::query011, &dMsgFlow_c::query012, + &dMsgFlow_c::query013, &dMsgFlow_c::query014, &dMsgFlow_c::query015, &dMsgFlow_c::query016, + &dMsgFlow_c::query017, &dMsgFlow_c::query018, &dMsgFlow_c::query019, &dMsgFlow_c::query020, + &dMsgFlow_c::query021, &dMsgFlow_c::query022, &dMsgFlow_c::query023, &dMsgFlow_c::query024, + &dMsgFlow_c::query025, &dMsgFlow_c::query026, &dMsgFlow_c::query027, &dMsgFlow_c::query028, + &dMsgFlow_c::query029, &dMsgFlow_c::query030, &dMsgFlow_c::query031, &dMsgFlow_c::query032, + &dMsgFlow_c::query033, &dMsgFlow_c::query034, &dMsgFlow_c::query035, &dMsgFlow_c::query036, + &dMsgFlow_c::query037, &dMsgFlow_c::query038, &dMsgFlow_c::query039, &dMsgFlow_c::query040, + &dMsgFlow_c::query041, &dMsgFlow_c::query042, &dMsgFlow_c::query043, &dMsgFlow_c::query044, + &dMsgFlow_c::query045, &dMsgFlow_c::query046, &dMsgFlow_c::query047, &dMsgFlow_c::query048, + &dMsgFlow_c::query049, &dMsgFlow_c::query050, &dMsgFlow_c::query051, &dMsgFlow_c::query052, + &dMsgFlow_c::query053, }; /* 803C1CCC-803C1ED0 01EDEC 0204+00 1/2 0/0 0/0 .data mEventList__10dMsgFlow_c */ SECTION_DATA eventFunc dMsgFlow_c::mEventList[43] = { - &dMsgFlow_c::event000, - &dMsgFlow_c::event001, - &dMsgFlow_c::event002, - &dMsgFlow_c::event003, - &dMsgFlow_c::event004, - &dMsgFlow_c::event005, - &dMsgFlow_c::event006, - &dMsgFlow_c::event007, - &dMsgFlow_c::event008, - &dMsgFlow_c::event009, - &dMsgFlow_c::event010, - &dMsgFlow_c::event011, - &dMsgFlow_c::event012, - &dMsgFlow_c::event013, - &dMsgFlow_c::event014, - &dMsgFlow_c::event015, - &dMsgFlow_c::event016, - &dMsgFlow_c::event017, - &dMsgFlow_c::event018, - &dMsgFlow_c::event019, - &dMsgFlow_c::event020, - &dMsgFlow_c::event021, - &dMsgFlow_c::event022, - &dMsgFlow_c::event023, - &dMsgFlow_c::event024, - &dMsgFlow_c::event025, - &dMsgFlow_c::event026, - &dMsgFlow_c::event027, - &dMsgFlow_c::event028, - &dMsgFlow_c::event029, - &dMsgFlow_c::event030, - &dMsgFlow_c::event031, - &dMsgFlow_c::event032, - &dMsgFlow_c::event033, - &dMsgFlow_c::event034, - &dMsgFlow_c::event035, - &dMsgFlow_c::event036, - &dMsgFlow_c::event037, - &dMsgFlow_c::event038, - &dMsgFlow_c::event039, - &dMsgFlow_c::event040, - &dMsgFlow_c::event041, - &dMsgFlow_c::event042, + &dMsgFlow_c::event000, &dMsgFlow_c::event001, &dMsgFlow_c::event002, &dMsgFlow_c::event003, + &dMsgFlow_c::event004, &dMsgFlow_c::event005, &dMsgFlow_c::event006, &dMsgFlow_c::event007, + &dMsgFlow_c::event008, &dMsgFlow_c::event009, &dMsgFlow_c::event010, &dMsgFlow_c::event011, + &dMsgFlow_c::event012, &dMsgFlow_c::event013, &dMsgFlow_c::event014, &dMsgFlow_c::event015, + &dMsgFlow_c::event016, &dMsgFlow_c::event017, &dMsgFlow_c::event018, &dMsgFlow_c::event019, + &dMsgFlow_c::event020, &dMsgFlow_c::event021, &dMsgFlow_c::event022, &dMsgFlow_c::event023, + &dMsgFlow_c::event024, &dMsgFlow_c::event025, &dMsgFlow_c::event026, &dMsgFlow_c::event027, + &dMsgFlow_c::event028, &dMsgFlow_c::event029, &dMsgFlow_c::event030, &dMsgFlow_c::event031, + &dMsgFlow_c::event032, &dMsgFlow_c::event033, &dMsgFlow_c::event034, &dMsgFlow_c::event035, + &dMsgFlow_c::event036, &dMsgFlow_c::event037, &dMsgFlow_c::event038, &dMsgFlow_c::event039, + &dMsgFlow_c::event040, &dMsgFlow_c::event041, &dMsgFlow_c::event042, }; /* 803C1ED0-803C1EF0 -00001 0020+00 1/1 0/0 0/0 .data @6324 */ @@ -597,7 +526,7 @@ int dMsgFlow_c::checkEventRender(int* param_0, int* param_1, int* param_2, int* } *param_0 = tmp0; } - + if (param_1 != NULL) { int tmp1; if (field_0x43 == 0xFF) { @@ -853,13 +782,13 @@ int dMsgFlow_c::eventNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { break; - case 9: if (getParam(node->params) == 0) { int msgNum = daAlink_getAlinkActorClass()->getMidnaMsgNum(); if (msgNum == 0xFFFF) { int stayNo = dComIfGp_roomControl_getStayNo(); - msgNum = dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo()->mMsg; + msgNum = + dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo()->mMsg; } else { daAlink_getAlinkActorClass()->setMidnaMsg(); } @@ -881,7 +810,7 @@ int dMsgFlow_c::eventNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { } return 0; - + case 21: if (field_0x3c != 0) { return 0; @@ -979,7 +908,8 @@ BOOL daPy_py_c::checkNowWolf() { int dMsgFlow_c::query002(mesg_flow_node_branch*, fopAc_ac_c*, int) { if (daPy_py_c::checkNowWolf()) { return 1; - } else if (daPy_getPlayerActorClass()->checkHorseRide() || daPy_getPlayerActorClass()->checkBoarRide()) { + } else if (daPy_getPlayerActorClass()->checkHorseRide() || + daPy_getPlayerActorClass()->checkBoarRide()) { return 2; } @@ -1352,7 +1282,7 @@ int dMsgFlow_c::query036(mesg_flow_node_branch*, fopAc_ac_c*, int) { if (dMsgObject_getMsgObjectClass()->getSelectPushFlag() == 2) { tmp = 2; } - + return tmp; } @@ -1364,7 +1294,7 @@ int dMsgFlow_c::query037(mesg_flow_node_branch*, fopAc_ac_c*, int) { if (dMsgObject_getMsgObjectClass()->getSelectPushFlag() == 2) { tmp = 3; } - + return tmp; } @@ -1563,7 +1493,8 @@ inline bool dComIfGp_checkPlayerStatus0(int param_0, u32 param_1) { * query052__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ int dMsgFlow_c::query052(mesg_flow_node_branch*, fopAc_ac_c*, int) { bool phi_r4 = false; - if (daPy_getPlayerActorClass()->checkWaterInMove() || dComIfGp_checkPlayerStatus0(0, 0x100000)) { + if (daPy_getPlayerActorClass()->checkWaterInMove() || + dComIfGp_checkPlayerStatus0(0, 0x100000)) { phi_r4 = true; } @@ -1869,14 +1800,14 @@ int dMsgFlow_c::event017(mesg_flow_node_event* flow_node, fopAc_ac_c*) { default: execItemGet(prm0); } - + return 1; } for (int i = 0; i < prm1; i++) { execItemGet(prm0); } - + return 1; } @@ -1895,7 +1826,8 @@ int dMsgFlow_c::event018(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) { if (actor != NULL) { int stayNo = dComIfGp_roomControl_getStayNo(); if (stayNo != 0) { - mDoAud_messageSePlay(field_0x45, &actor->mCurrent.mPosition, dComIfGp_getReverb(stayNo)); + mDoAud_messageSePlay(field_0x45, &actor->mCurrent.mPosition, + dComIfGp_getReverb(stayNo)); } else { mDoAud_messageSePlay(field_0x45, &actor->mCurrent.mPosition, 0); } @@ -2046,7 +1978,6 @@ int dMsgFlow_c::event026(mesg_flow_node_event*, fopAc_ac_c* actor) { if (actor != NULL) { if (fopAcM_GetName(actor) == PROC_OBJ_SSITEM || fopAcM_GetName(actor) == PROC_OBJ_SSDRINK || fopAcM_GetName(actor) == PROC_TAG_SSDRINK) { - } } @@ -2174,7 +2105,7 @@ int dMsgFlow_c::event028(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { } else { for (int i = 0; i < 3; i++) { u8 select_item = dComIfGs_getSelectItemIndex(i); - + if (SLOT_15 + bagID == select_item) { u8 mix_item = dComIfGs_getMixItemIndex(i); diff --git a/src/d/shop/d_shop_item_ctrl.cpp b/src/d/shop/d_shop_item_ctrl.cpp index b017ce27b97..379b4b53ded 100644 --- a/src/d/shop/d_shop_item_ctrl.cpp +++ b/src/d/shop/d_shop_item_ctrl.cpp @@ -82,8 +82,7 @@ bool dShopItemCtrl_c::isHomePos(int item_index) { cXyz* item_pos = item->getPosP(); cXyz item_home = item->mOrig.mPosition; - if (item_pos->x == item_home.x && - item_pos->y == item_home.y && + if (item_pos->x == item_home.x && item_pos->y == item_home.y && item_pos->z == item_home.z) { return true; } diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp index f6f74ea5425..fae456195e6 100644 --- a/src/d/shop/d_shop_system.cpp +++ b/src/d/shop/d_shop_system.cpp @@ -4,15 +4,15 @@ // #include "d/shop/d_shop_system.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_item.h" +#include "d/d_procname.h" +#include "d/meter/d_meter_HIO.h" +#include "d/msg/d_msg_object.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "d/com/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_item.h" -#include "d/msg/d_msg_object.h" #include "m_Do/m_Do_audio.h" -#include "d/meter/d_meter_HIO.h" -#include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_lib.h" // @@ -208,13 +208,7 @@ SECTION_DATA static fopAc_ac_c* dShopSystem_itemActor[7] = { /* 804506E8-804506F0 000168 0007+01 7/7 0/0 0/0 .sdata dShopSystem_itemNo */ SECTION_SDATA static u8 dShopSystem_itemNo[7] = { - NO_ITEM, - NO_ITEM, - NO_ITEM, - NO_ITEM, - NO_ITEM, - NO_ITEM, - NO_ITEM, + NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, }; /* 80451058-8045105C 000558 0004+00 9/9 0/0 0/0 .sbss None */ @@ -235,7 +229,7 @@ static int dShopSystem_searchItemActor(void* param_0, void* param_1) { if ((param & 0xF0000000) == (fopAcM_GetParam(param_1) & 0xF0000000) && dShopSystem_item_count < data_80451058) { u32 param2 = (param >> 0x18) & 0xF; - + if (dShopSystem_itemActor[0] != param_0 && dShopSystem_itemActor[1] != param_0 && dShopSystem_itemActor[2] != param_0 && dShopSystem_itemActor[3] != param_0 && dShopSystem_itemActor[4] != param_0 && dShopSystem_itemActor[5] != param_0 && @@ -244,11 +238,12 @@ static int dShopSystem_searchItemActor(void* param_0, void* param_1) { u8 sw2 = static_cast(param_0)->mOrig.mAngle.z >> 8; u8 item_no = param; - if ((sw == 0xFF || !dComIfGs_isSaveSwitch(sw)) && (sw2 == 0xFF || dComIfGs_isSaveSwitch(sw2))) { + if ((sw == 0xFF || !dComIfGs_isSaveSwitch(sw)) && + (sw2 == 0xFF || dComIfGs_isSaveSwitch(sw2))) { if (sw != 0xFF && item_no == HYLIA_SHIELD && checkItemGet(item_no, true)) { dComIfGs_onSaveSwitch(sw); } - + if (param2 == 0) { data_80451060 = 1; dShopSystem_itemActor[dShopSystem_item_count] = param_0; @@ -278,9 +273,7 @@ static asm void dShopSystem_searchItemActor(void* param_0, void* param_1) { /* ############################################################################################## */ /* 804506F0-804506F8 000170 0008+00 6/6 0/0 0/0 .sdata dShopSystem_cameraActor */ -SECTION_SDATA static fopAc_ac_c* dShopSystem_cameraActor[2] = { - NULL, NULL -}; +SECTION_SDATA static fopAc_ac_c* dShopSystem_cameraActor[2] = {NULL, NULL}; /* 80451064-80451068 000564 0004+00 5/5 0/0 0/0 .sbss dShopSystem_camera_count */ static int dShopSystem_camera_count; @@ -378,8 +371,7 @@ struct shop_item_data { /* ############################################################################################## */ /* 803BB8C0-803BB8E4 0189E0 0024+00 1/0 0/0 0/0 .data item_seira_shop */ SECTION_DATA static shop_item_data item_seira_shop = { - {{110.0f, 150.0f, -115.0f}, {160.0f, 150.0f, -115.0f}, {210.0f, 150.0f, -115.0f}} -}; + {{110.0f, 150.0f, -115.0f}, {160.0f, 150.0f, -115.0f}, {210.0f, 150.0f, -115.0f}}}; /* 803BB8E4-803BB8F0 -00001 000C+00 0/1 0/0 0/0 .data @4056 */ #pragma push @@ -851,11 +843,12 @@ int dShopSystem_c::checkController(u8 seq, dMsgFlow_c* p_flow) { } if (mDoCPd_c::getTrigA(0)) { - if (msg->getStatus() != 6 && msg->getStatus() != 8 && msg->getStatus() != 9 && msg->getStatus() != 20 && seq != SEQ_WAIT) { + if (msg->getStatus() != 6 && msg->getStatus() != 8 && msg->getStatus() != 9 && + msg->getStatus() != 20 && seq != SEQ_WAIT) { return 1; } } - + if (mDoCPd_c::getTrigB(0)) { if (seq != SEQ_SELECT_WAIT) { mLastCursorPos = mCursorPos; @@ -894,7 +887,7 @@ int dShopSystem_c::chooseItem3(u8 seq) { if (cursor_pos == 7) { mCursorPos = mLastCursorPos; mLastCursorPos = 7; - + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { mCursorPos = mLastCursorPos; mLastCursorPos = old_cursor; @@ -903,7 +896,7 @@ int dShopSystem_c::chooseItem3(u8 seq) { if (mCursorPos != 0) { mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); } - + mShopCamAction.SetSelectIdx(mCursorPos); } @@ -911,7 +904,7 @@ int dShopSystem_c::chooseItem3(u8 seq) { } else if (cursor_pos == 4) { mLastCursorPos = cursor_pos; mCursorPos = 0; - + if (seq != SEQ_START) { if (mCursorPos != 0) { mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); @@ -924,7 +917,7 @@ int dShopSystem_c::chooseItem3(u8 seq) { } else if (cursor_pos != 0) { mLastCursorPos = cursor_pos; mCursorPos--; - + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { mCursorPos = mLastCursorPos; mLastCursorPos = old_cursor; @@ -933,7 +926,7 @@ int dShopSystem_c::chooseItem3(u8 seq) { if (mCursorPos != 0) { mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); } - + mShopCamAction.SetSelectIdx(mCursorPos); } return 3; @@ -948,7 +941,7 @@ right: if (cursor_pos != 3 && cursor_pos != 6) { mLastCursorPos = cursor_pos; mCursorPos++; - + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { mCursorPos = mLastCursorPos; mLastCursorPos = old_cursor; @@ -963,7 +956,7 @@ right: if (data_80451058 == 7) { mLastCursorPos = cursor_pos; mCursorPos = 7; - + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { mCursorPos = mLastCursorPos; mLastCursorPos = old_cursor; @@ -973,8 +966,8 @@ right: mShopCamAction.SetSelectIdx(mCursorPos); } return 4; - } - } + } + } } up: @@ -982,7 +975,7 @@ up: if (mpStick->checkUpTrigger() && seq != SEQ_SELECT_WAIT && mCursorPos <= 3) { mLastCursorPos = mCursorPos; mCursorPos += 3; - + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { mCursorPos = mLastCursorPos; mLastCursorPos = old_cursor; @@ -991,7 +984,7 @@ up: if (mCursorPos != 0) { mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); } - + mShopCamAction.SetSelectIdx(mCursorPos); } @@ -1005,7 +998,7 @@ up: if (cursor_pos > 3 && cursor_pos <= 6) { mLastCursorPos = cursor_pos; mCursorPos -= 3; - + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { mCursorPos = mLastCursorPos; mLastCursorPos = old_cursor; @@ -1018,7 +1011,7 @@ up: } } } - + ret: return 0; } @@ -1057,7 +1050,7 @@ int dShopSystem_c::chooseItem5(u8 seq) { if (cursor_pos != 0) { mLastCursorPos = cursor_pos; mCursorPos--; - + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { mCursorPos = mLastCursorPos; mLastCursorPos = old_cursor; @@ -1066,7 +1059,7 @@ int dShopSystem_c::chooseItem5(u8 seq) { if (mCursorPos != 0) { mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); } - + mShopCamAction.SetSelectIdx(mCursorPos); } return 3; @@ -1080,7 +1073,7 @@ right: if (cursor_pos != 2 && cursor_pos != 5) { mLastCursorPos = cursor_pos; mCursorPos++; - + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { mCursorPos = mLastCursorPos; mLastCursorPos = old_cursor; @@ -1105,7 +1098,7 @@ up: } else if (mCursorPos == 5) { mCursorPos = 2; } - + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { mCursorPos = mLastCursorPos; mLastCursorPos = old_cursor; @@ -1133,7 +1126,7 @@ down: } else if (mCursorPos == 2) { mCursorPos = 5; } - + if (mCursorPos != 0 && isFlag(mCursorPos - 1)) { mCursorPos = mLastCursorPos; mLastCursorPos = old_cursor; @@ -1197,7 +1190,7 @@ right: mDoAud_seStart(Z2SE_SY_TALK_NEXT, NULL, 0, 0); mShopCamAction.SetSelectIdx(mCursorPos); } - + return 4; } @@ -1233,7 +1226,7 @@ int dShopSystem_c::moveCursor(int control_status, u8 param_1) { #ifdef NONMATCHING int dShopSystem_c::moveCursor0(int control_status, u8 param_1) { offFlag(7); - + switch (control_status) { case 3: if (mCursorPos == 0) { @@ -1247,7 +1240,7 @@ int dShopSystem_c::moveCursor0(int control_status, u8 param_1) { return getEventParamU8(mCursorPos) + 0x52; } - return (getEventParamU8(mCursorPos) - 1) * 2 + 0x66; + return (getEventParamU8(mCursorPos) - 1) * 2 + 0x66; case 7: if (mCursorPos == 0) { @@ -1279,7 +1272,7 @@ int dShopSystem_c::moveCursor0(int control_status, u8 param_1) { return (getEventParamU8(mCursorPos) - 1) * 2 + 0x65; } - return (getEventParamU8(mCursorPos) - 1) * 2 + 0x66; + return (getEventParamU8(mCursorPos) - 1) * 2 + 0x66; } return 0; @@ -1299,7 +1292,7 @@ asm int dShopSystem_c::moveCursor0(int param_0, u8 param_1) { #ifdef NONMATCHING int dShopSystem_c::moveCursor1(int control_status, u8 param_1) { offFlag(7); - + switch (control_status) { case 7: if (mCursorPos == 0) { @@ -1346,7 +1339,9 @@ asm int dShopSystem_c::moveCursor1(int param_0, u8 param_1) { /* 80198878-80198950 1931B8 00D8+00 0/0 0/0 9/9 .text drawCursor__13dShopSystem_cFv */ int dShopSystem_c::drawCursor() { - if ((mSeq == 4 || mSeq == 5 || ((mSeq == 6 || mSeq == SEQ_SELECT_WAIT) && isFlag(mCursorPos - 1))) && mCursorPos != 0 && mItemCtrl.isHomePos(mCursorPos - 1)) { + if ((mSeq == 4 || mSeq == 5 || + ((mSeq == 6 || mSeq == SEQ_SELECT_WAIT) && isFlag(mCursorPos - 1))) && + mCursorPos != 0 && mItemCtrl.isHomePos(mCursorPos - 1)) { mpDrawCursor->addAlpha(); } else { mpDrawCursor->decAlpha(); @@ -1379,8 +1374,8 @@ int dShopSystem_c::itemRotate() { int tmp_index; if (isFlag(cursor_pos - 1) || isSoldOutItemFlag(mCursorPos - 1)) { no_rotate = true; - } - + } + if (no_rotate) { tmp_index = 0; } else { @@ -1435,9 +1430,12 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { local_1c.set(*param_0); if (dShopSystem_itemNo[mCursorPos - 1] == OIL_BOTTLE) { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mSeraShopObjZoomAngleX + -5000, isFlag(8) ? true : false); + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, + g_cursorHIO.mSeraShopObjZoomAngleX + -5000, + isFlag(8) ? true : false); } else { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mSeraShopObjZoomAngleX, isFlag(8) ? true : false); + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mSeraShopObjZoomAngleX, + isFlag(8) ? true : false); } } else { cXyz local_28; @@ -1446,49 +1444,64 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { if (dShopSystem_itemActor[1] != NULL && dShopSystem_cameraActor[1] != NULL) { cXyz local_40; local_40.set(dShopSystem_itemActor[1]->mOrig.mPosition); - + f32 tmp_05 = 0.5f; if (data_80451058 == 4) { if (dShopSystem_itemActor[2] != NULL) { - f32 tmp = (dShopSystem_itemActor[2]->mOrig.mPosition.x + dShopSystem_itemActor[1]->mOrig.mPosition.x); + f32 tmp = (dShopSystem_itemActor[2]->mOrig.mPosition.x + + dShopSystem_itemActor[1]->mOrig.mPosition.x); local_40.x = tmp * tmp_05; - f32 tmp2 = (dShopSystem_itemActor[2]->mOrig.mPosition.y + dShopSystem_itemActor[1]->mOrig.mPosition.y); + f32 tmp2 = (dShopSystem_itemActor[2]->mOrig.mPosition.y + + dShopSystem_itemActor[1]->mOrig.mPosition.y); local_40.y = tmp2 * tmp_05; - f32 tmp3 = (dShopSystem_itemActor[2]->mOrig.mPosition.z + dShopSystem_itemActor[1]->mOrig.mPosition.z); + f32 tmp3 = (dShopSystem_itemActor[2]->mOrig.mPosition.z + + dShopSystem_itemActor[1]->mOrig.mPosition.z); local_40.z = tmp3 * tmp_05; } } else if (data_80451058 == 5) { - f32 tmp = (dShopSystem_itemActor[2]->mOrig.mPosition.x + dShopSystem_itemActor[3]->mOrig.mPosition.x); + f32 tmp = (dShopSystem_itemActor[2]->mOrig.mPosition.x + + dShopSystem_itemActor[3]->mOrig.mPosition.x); local_40.x = tmp * tmp_05; local_40.y = dShopSystem_itemActor[0]->mOrig.mPosition.y; - f32 tmp3 = (dShopSystem_itemActor[2]->mOrig.mPosition.z + dShopSystem_itemActor[3]->mOrig.mPosition.z); + f32 tmp3 = (dShopSystem_itemActor[2]->mOrig.mPosition.z + + dShopSystem_itemActor[3]->mOrig.mPosition.z); local_40.z = tmp3 * tmp_05; } cXyz local_4c = local_40 - dShopSystem_cameraActor[1]->mCurrent.mPosition; s16 atan = cM_atan2s(local_4c.x, local_4c.z); - + if (!strcmp("R_SP01", dComIfGp_getStartStageName())) { - local_34.set(g_cursorHIO.mObjZoom.x, g_cursorHIO.mObjZoom.y + -25.0f, g_cursorHIO.mObjZoom.z + 150.0f); + local_34.set(g_cursorHIO.mObjZoom.x, g_cursorHIO.mObjZoom.y + -25.0f, + g_cursorHIO.mObjZoom.z + 150.0f); } else { if (field_0xf77 == 5) { - if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_30) { - local_34.set(g_cursorHIO.mObjZoom.x, 5.0f + g_cursorHIO.mObjZoom.y + -50.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); + if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 || + dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 || + dShopSystem_itemNo[mCursorPos - 1] == ARROW_30) { + local_34.set(g_cursorHIO.mObjZoom.x, 5.0f + g_cursorHIO.mObjZoom.y + -50.0f, + (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); } else { - local_34.set(g_cursorHIO.mObjZoom.x, 20.0f + g_cursorHIO.mObjZoom.y + -50.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); + local_34.set(g_cursorHIO.mObjZoom.x, + 20.0f + g_cursorHIO.mObjZoom.y + -50.0f, + (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); } } else if (mCursorPos == 7) { - local_34.set(g_cursorHIO.mMagicArmorObjZoom.x, g_cursorHIO.mMagicArmorObjZoom.y + -130.0f, g_cursorHIO.mMagicArmorObjZoom.z + 215.0f); + local_34.set(g_cursorHIO.mMagicArmorObjZoom.x, + g_cursorHIO.mMagicArmorObjZoom.y + -130.0f, + g_cursorHIO.mMagicArmorObjZoom.z + 215.0f); } else { - local_34.set(g_cursorHIO.mObjZoom.x, g_cursorHIO.mObjZoom.y + -50.0f, g_cursorHIO.mObjZoom.z + 250.0f); + local_34.set(g_cursorHIO.mObjZoom.x, g_cursorHIO.mObjZoom.y + -50.0f, + g_cursorHIO.mObjZoom.z + 250.0f); } } - cLib_offsetPos(&local_28, &dShopSystem_cameraActor[1]->mCurrent.mPosition, atan, &local_34); + cLib_offsetPos(&local_28, &dShopSystem_cameraActor[1]->mCurrent.mPosition, atan, + &local_34); if (data_80451058 == 6 || data_80451058 == 5) { param_0->y += 15.0f; } @@ -1501,28 +1514,40 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { u8 dvar1 = field_0xf77; if (dvar1 == 1) { if (dShopSystem_itemNo[mCursorPos - 1] == OIL_BOTTLE) { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX + -7000, isFlag(8) ? true : false); + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, + g_cursorHIO.mShopObjZoomAngleX + -7000, + isFlag(8) ? true : false); } else { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX, isFlag(8) ? true : false); + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX, + isFlag(8) ? true : false); } } else if (dvar1 == 2) { if (dShopSystem_itemNo[mCursorPos - 1] == RED_BOTTLE) { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 3000, isFlag(8) ? true : false); + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 3000, + isFlag(8) ? true : false); } else { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX, isFlag(8) ? true : false); + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX, + isFlag(8) ? true : false); } } else if (dvar1 == 5) { - if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_30) { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 4000, isFlag(8) ? true : false); + if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 || + dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 || + dShopSystem_itemNo[mCursorPos - 1] == ARROW_30) { + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 4000, + isFlag(8) ? true : false); } else { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 2000, isFlag(8) ? true : false); + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 2000, + isFlag(8) ? true : false); } } else if (mCursorPos == 7) { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mMagicArmorObjZoomAngleX, isFlag(8) ? true : false); + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mMagicArmorObjZoomAngleX, + isFlag(8) ? true : false); } else if (data_80451058 == 7) { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 3000, isFlag(8) ? true : false); + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 3000, + isFlag(8) ? true : false); } else { - mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX, isFlag(8) ? true : false); + mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX, + isFlag(8) ? true : false); } } @@ -1609,7 +1634,8 @@ int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { int itemNo; if (mFlow.getEventId(&itemNo) == 1) { if (field_0xd90 == -1) { - field_0xd90 = fopAcM_createItemForPresentDemo(&mCurrent.mPosition, itemNo, 0, -1, -1, NULL, NULL); + field_0xd90 = fopAcM_createItemForPresentDemo(&mCurrent.mPosition, itemNo, + 0, -1, -1, NULL, NULL); } if (fpcEx_IsExist(field_0xd90)) { @@ -1683,7 +1709,7 @@ int dShopSystem_c::seq_select_start(fopAc_ac_c*, dMsgFlow_c*) { } } break; - + case 3: mCursorPos = 2; if (isFlag(mCursorPos - 1)) { @@ -1777,7 +1803,8 @@ int dShopSystem_c::seq_select(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { return 0; } } - } else if (control_status == 3 || control_status == 4 || control_status == 5 || control_status == 6 || control_status == 7 || control_status == 2) { + } else if (control_status == 3 || control_status == 4 || control_status == 5 || + control_status == 6 || control_status == 7 || control_status == 2) { if (mLastCursorPos == 7) { mLastCursorPos = mCursorPos; mCursorPos = 7; @@ -1853,7 +1880,7 @@ int dShopSystem_c::seq_moving(fopAc_ac_c*, dMsgFlow_c*) { cXyz pos3d; cXyz last_pos2d; cXyz pos2d; - + pos3d.set(mItemCtrl.getCurrentPos(mCursorPos - 1)); pos3Dto2D(&pos3d, &pos2d); @@ -1876,7 +1903,8 @@ int dShopSystem_c::seq_moving(fopAc_ac_c*, dMsgFlow_c*) { } f32 tmp = (f32)(field_0xf68 * field_0xf68) / 9.0f; - mpDrawCursor->setPos(last_pos2d.x + tmp * (pos2d.x - last_pos2d.x), last_pos2d.y + tmp * (pos2d.y - last_pos2d.y)); + mpDrawCursor->setPos(last_pos2d.x + tmp * (pos2d.x - last_pos2d.x), + last_pos2d.y + tmp * (pos2d.y - last_pos2d.y)); } else { mpDrawCursor->setPos(pos2d.x, pos2d.y); @@ -1903,7 +1931,7 @@ asm int dShopSystem_c::seq_moving(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { * seq_decide__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ int dShopSystem_c::seq_decide(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { int control_status = checkController(SEQ_SELECT_WAIT, p_flow); - + dComIfGp_setDoStatusForce(0x22, 0); if (!p_flow->isSelectMessage()) { dComIfGp_setAStatusForce(0x2A, 0); @@ -1941,7 +1969,8 @@ int dShopSystem_c::seq_choose(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { p_flow->doFlow(actor, NULL, 0); int select_num = p_flow->getSelectNum(); - if (dMsgObject_c::getStatus() != 6 && dMsgObject_c::getStatus() != 8 && dMsgObject_c::getStatus() != 9 && dMsgObject_c::getStatus() != 20) { + if (dMsgObject_c::getStatus() != 6 && dMsgObject_c::getStatus() != 8 && + dMsgObject_c::getStatus() != 9 && dMsgObject_c::getStatus() != 20) { if ((u16)select_num == 0) { setSeq(SEQ_DECIDE_YES); } else { @@ -1966,7 +1995,8 @@ int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { if (mFlow.getEventId(&itemNo) == 1) { if (p_flow->doFlow(actor, NULL, 0)) { if (field_0xd90 == -1) { - field_0xd90 = fopAcM_createItemForPresentDemo(&mCurrent.mPosition, itemNo, 0, -1, -1, NULL, NULL); + field_0xd90 = fopAcM_createItemForPresentDemo(&mCurrent.mPosition, itemNo, 0, -1, + -1, NULL, NULL); } if (fpcEx_IsExist(field_0xd90)) { @@ -2069,12 +2099,7 @@ SECTION_SDATA static shop_item_data* shop_item_pos_data_tbl = &item_seira_shop; /* 80453B58-80453B60 002158 0006+02 1/1 0/0 0/0 .sdata2 item_no$5460 */ SECTION_SDATA2 static u8 item_no[6] = { - MILK_BOTTLE, - BEE_CHILD, - PACHINKO, - MILK_BOTTLE, - BEE_CHILD, - NO_ITEM, + MILK_BOTTLE, BEE_CHILD, PACHINKO, MILK_BOTTLE, BEE_CHILD, NO_ITEM, }; /* 8019A238-8019A344 194B78 010C+00 0/0 0/0 1/1 .text createShopItem__13dShopSystem_cFi @@ -2093,7 +2118,8 @@ void dShopSystem_c::createShopItem(int itemType) { pos.z = shop_item_pos_data_tbl->mItemPos[i].z + mCurrent.mPosition.z; if (itemTbl[i] != NO_ITEM) { - u32 index = fopAcM_create(PROC_ShopItem, itemTbl[i], &pos, fopAcM_GetRoomNo(this), &mCurrent.mAngle, NULL, -1); + u32 index = fopAcM_create(PROC_ShopItem, itemTbl[i], &pos, fopAcM_GetRoomNo(this), + &mCurrent.mAngle, NULL, -1); mItemCtrl.setItemIndex(i, index); offFlag(i); } else {