mirror of https://github.com/zeldaret/tp.git
Work on d_a_mg_fshop (#2006)
This commit is contained in:
hatal175
GitHub
parent
6e58e660d5
commit
cce0130025
|
|
@ -1,47 +0,0 @@
|
|||
lbl_8086C08C:
|
||||
/* 8086C08C 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 8086C090 7C 08 02 A6 */ mflr r0
|
||||
/* 8086C094 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 8086C098 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 8086C09C 4B AF 61 41 */ bl _savegpr_29
|
||||
/* 8086C0A0 2C 04 00 00 */ cmpwi r4, 0
|
||||
/* 8086C0A4 40 82 00 80 */ bne lbl_8086C124
|
||||
/* 8086C0A8 A0 83 00 14 */ lhz r4, 0x14(r3)
|
||||
/* 8086C0AC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
|
||||
/* 8086C0B0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
|
||||
/* 8086C0B4 83 E3 00 38 */ lwz r31, 0x38(r3)
|
||||
/* 8086C0B8 83 BF 00 14 */ lwz r29, 0x14(r31)
|
||||
/* 8086C0BC 80 7F 00 84 */ lwz r3, 0x84(r31)
|
||||
/* 8086C0C0 80 03 00 0C */ lwz r0, 0xc(r3)
|
||||
/* 8086C0C4 1F C4 00 30 */ mulli r30, r4, 0x30
|
||||
/* 8086C0C8 7C 60 F2 14 */ add r3, r0, r30
|
||||
/* 8086C0CC 3C 80 80 45 */ lis r4, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 8086C0D0 38 84 07 68 */ addi r4, r4, calc_mtx@l /* 0x80450768@l */
|
||||
/* 8086C0D4 80 84 00 00 */ lwz r4, 0(r4)
|
||||
/* 8086C0D8 4B AD A3 D9 */ bl PSMTXCopy
|
||||
/* 8086C0DC 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 8086C0E0 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 8086C0E4 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 8086C0E8 A8 9D 00 58 */ lha r4, 0x58(r29)
|
||||
/* 8086C0EC 4B 7A 02 B1 */ bl mDoMtx_XrotM__FPA4_fs
|
||||
/* 8086C0F0 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 8086C0F4 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 8086C0F8 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 8086C0FC 80 9F 00 84 */ lwz r4, 0x84(r31)
|
||||
/* 8086C100 80 04 00 0C */ lwz r0, 0xc(r4)
|
||||
/* 8086C104 7C 80 F2 14 */ add r4, r0, r30
|
||||
/* 8086C108 4B AD A3 A9 */ bl PSMTXCopy
|
||||
/* 8086C10C 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 8086C110 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 8086C114 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 8086C118 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */
|
||||
/* 8086C11C 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */
|
||||
/* 8086C120 4B AD A3 91 */ bl PSMTXCopy
|
||||
lbl_8086C124:
|
||||
/* 8086C124 38 60 00 01 */ li r3, 1
|
||||
/* 8086C128 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 8086C12C 4B AF 60 FD */ bl _restgpr_29
|
||||
/* 8086C130 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 8086C134 7C 08 03 A6 */ mtlr r0
|
||||
/* 8086C138 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 8086C13C 4E 80 00 20 */ blr
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
lbl_8086E6CC:
|
||||
/* 8086E6CC 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 8086E6D0 7C 08 02 A6 */ mflr r0
|
||||
/* 8086E6D4 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 8086E6D8 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 8086E6DC 4B AF 3A FD */ bl _savegpr_28
|
||||
/* 8086E6E0 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 8086E6E4 88 03 6B 7C */ lbz r0, 0x6b7c(r3)
|
||||
/* 8086E6E8 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 8086E6EC 41 82 00 78 */ beq lbl_8086E764
|
||||
/* 8086E6F0 3C 60 80 87 */ lis r3, d_a_mg_fshop__stringBase0@ha /* 0x8087027C@ha */
|
||||
/* 8086E6F4 38 63 02 7C */ addi r3, r3, d_a_mg_fshop__stringBase0@l /* 0x8087027C@l */
|
||||
/* 8086E6F8 38 80 00 05 */ li r4, 5
|
||||
/* 8086E6FC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8086E700 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8086E704 3F C5 00 02 */ addis r30, r5, 2
|
||||
/* 8086E708 3B DE C2 F8 */ addi r30, r30, -15624
|
||||
/* 8086E70C 7F C5 F3 78 */ mr r5, r30
|
||||
/* 8086E710 38 C0 00 80 */ li r6, 0x80
|
||||
/* 8086E714 4B 7C DB D9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
|
||||
/* 8086E718 7C 64 1B 78 */ mr r4, r3
|
||||
/* 8086E71C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8086E720 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8086E724 3B A3 0F 38 */ addi r29, r3, 0xf38
|
||||
/* 8086E728 7F A3 EB 78 */ mr r3, r29
|
||||
/* 8086E72C 88 1F 04 E2 */ lbz r0, 0x4e2(r31)
|
||||
/* 8086E730 7C 05 07 74 */ extsb r5, r0
|
||||
/* 8086E734 4B 7B E3 FD */ bl removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai
|
||||
/* 8086E738 3C 60 80 87 */ lis r3, d_a_mg_fshop__stringBase0@ha /* 0x8087027C@ha */
|
||||
/* 8086E73C 38 63 02 7C */ addi r3, r3, d_a_mg_fshop__stringBase0@l /* 0x8087027C@l */
|
||||
/* 8086E740 38 80 00 06 */ li r4, 6
|
||||
/* 8086E744 7F C5 F3 78 */ mr r5, r30
|
||||
/* 8086E748 38 C0 00 80 */ li r6, 0x80
|
||||
/* 8086E74C 4B 7C DB A1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
|
||||
/* 8086E750 7C 64 1B 78 */ mr r4, r3
|
||||
/* 8086E754 7F A3 EB 78 */ mr r3, r29
|
||||
/* 8086E758 88 1F 04 E2 */ lbz r0, 0x4e2(r31)
|
||||
/* 8086E75C 7C 05 07 74 */ extsb r5, r0
|
||||
/* 8086E760 4B 7B E3 D1 */ bl removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai
|
||||
lbl_8086E764:
|
||||
/* 8086E764 38 7F 05 68 */ addi r3, r31, 0x568
|
||||
/* 8086E768 3C 80 80 87 */ lis r4, d_a_mg_fshop__stringBase0@ha /* 0x8087027C@ha */
|
||||
/* 8086E76C 38 84 02 7C */ addi r4, r4, d_a_mg_fshop__stringBase0@l /* 0x8087027C@l */
|
||||
/* 8086E770 4B 7B E8 99 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
|
||||
/* 8086E774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8086E778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8086E77C 3B A3 0F 38 */ addi r29, r3, 0xf38
|
||||
/* 8086E780 7F A3 EB 78 */ mr r3, r29
|
||||
/* 8086E784 80 9F 6B 68 */ lwz r4, 0x6b68(r31)
|
||||
/* 8086E788 4B 80 5A C9 */ bl Release__4cBgSFP9dBgW_Base
|
||||
/* 8086E78C 88 1F 40 0E */ lbz r0, 0x400e(r31)
|
||||
/* 8086E790 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 8086E794 41 82 00 40 */ beq lbl_8086E7D4
|
||||
/* 8086E798 7F A3 EB 78 */ mr r3, r29
|
||||
/* 8086E79C 80 9F 40 2C */ lwz r4, 0x402c(r31)
|
||||
/* 8086E7A0 4B 80 5A B1 */ bl Release__4cBgSFP9dBgW_Base
|
||||
/* 8086E7A4 3B 80 00 00 */ li r28, 0
|
||||
/* 8086E7A8 3B C0 00 00 */ li r30, 0
|
||||
lbl_8086E7AC:
|
||||
/* 8086E7AC 38 1E 42 F4 */ addi r0, r30, 0x42f4
|
||||
/* 8086E7B0 7C 9F 00 2E */ lwzx r4, r31, r0
|
||||
/* 8086E7B4 28 04 00 00 */ cmplwi r4, 0
|
||||
/* 8086E7B8 41 82 00 0C */ beq lbl_8086E7C4
|
||||
/* 8086E7BC 7F A3 EB 78 */ mr r3, r29
|
||||
/* 8086E7C0 4B 80 5A 91 */ bl Release__4cBgSFP9dBgW_Base
|
||||
lbl_8086E7C4:
|
||||
/* 8086E7C4 3B 9C 00 01 */ addi r28, r28, 1
|
||||
/* 8086E7C8 2C 1C 00 64 */ cmpwi r28, 0x64
|
||||
/* 8086E7CC 3B DE 00 68 */ addi r30, r30, 0x68
|
||||
/* 8086E7D0 41 80 FF DC */ blt lbl_8086E7AC
|
||||
lbl_8086E7D4:
|
||||
/* 8086E7D4 38 60 00 01 */ li r3, 1
|
||||
/* 8086E7D8 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 8086E7DC 4B AF 3A 49 */ bl _restgpr_28
|
||||
/* 8086E7E0 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 8086E7E4 7C 08 03 A6 */ mtlr r0
|
||||
/* 8086E7E8 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 8086E7EC 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_8086C06C:
|
||||
/* 8086C06C 88 05 05 67 */ lbz r0, 0x567(r5)
|
||||
/* 8086C070 7C 00 07 75 */ extsb. r0, r0
|
||||
/* 8086C074 4C 82 00 20 */ bnelr
|
||||
/* 8086C078 38 00 00 01 */ li r0, 1
|
||||
/* 8086C07C 98 05 05 67 */ stb r0, 0x567(r5)
|
||||
/* 8086C080 38 00 00 00 */ li r0, 0
|
||||
/* 8086C084 98 05 42 8C */ stb r0, 0x428c(r5)
|
||||
/* 8086C088 4E 80 00 20 */ blr
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
lbl_8086D500:
|
||||
/* 8086D500 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8086D504 7C 08 02 A6 */ mflr r0
|
||||
/* 8086D508 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8086D50C 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 8086D510 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 8086D514 4B 7A B7 CD */ bl fopAc_IsActor__FPv
|
||||
/* 8086D518 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 8086D51C 41 82 00 28 */ beq lbl_8086D544
|
||||
/* 8086D520 A8 1F 00 08 */ lha r0, 8(r31)
|
||||
/* 8086D524 2C 00 01 37 */ cmpwi r0, 0x137
|
||||
/* 8086D528 40 82 00 1C */ bne lbl_8086D544
|
||||
/* 8086D52C 80 1F 00 B0 */ lwz r0, 0xb0(r31)
|
||||
/* 8086D530 54 00 06 3E */ clrlwi r0, r0, 0x18
|
||||
/* 8086D534 28 00 00 23 */ cmplwi r0, 0x23
|
||||
/* 8086D538 40 82 00 0C */ bne lbl_8086D544
|
||||
/* 8086D53C 7F E3 FB 78 */ mr r3, r31
|
||||
/* 8086D540 48 00 00 08 */ b lbl_8086D548
|
||||
lbl_8086D544:
|
||||
/* 8086D544 38 60 00 00 */ li r3, 0
|
||||
lbl_8086D548:
|
||||
/* 8086D548 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 8086D54C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 8086D550 7C 08 03 A6 */ mtlr r0
|
||||
/* 8086D554 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8086D558 4E 80 00 20 */ blr
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
lbl_8086D48C:
|
||||
/* 8086D48C 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8086D490 7C 08 02 A6 */ mflr r0
|
||||
/* 8086D494 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8086D498 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 8086D49C 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 8086D4A0 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 8086D4A4 7C 9F 23 78 */ mr r31, r4
|
||||
/* 8086D4A8 4B 7A B8 39 */ bl fopAc_IsActor__FPv
|
||||
/* 8086D4AC 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 8086D4B0 41 82 00 34 */ beq lbl_8086D4E4
|
||||
/* 8086D4B4 A8 1E 00 08 */ lha r0, 8(r30)
|
||||
/* 8086D4B8 2C 00 01 37 */ cmpwi r0, 0x137
|
||||
/* 8086D4BC 40 82 00 28 */ bne lbl_8086D4E4
|
||||
/* 8086D4C0 88 9E 40 0E */ lbz r4, 0x400e(r30)
|
||||
/* 8086D4C4 88 1F 40 0C */ lbz r0, 0x400c(r31)
|
||||
/* 8086D4C8 54 03 07 7E */ clrlwi r3, r0, 0x1d
|
||||
/* 8086D4CC 38 03 00 01 */ addi r0, r3, 1
|
||||
/* 8086D4D0 54 00 06 3E */ clrlwi r0, r0, 0x18
|
||||
/* 8086D4D4 7C 04 00 40 */ cmplw r4, r0
|
||||
/* 8086D4D8 40 82 00 0C */ bne lbl_8086D4E4
|
||||
/* 8086D4DC 7F C3 F3 78 */ mr r3, r30
|
||||
/* 8086D4E0 48 00 00 08 */ b lbl_8086D4E8
|
||||
lbl_8086D4E4:
|
||||
/* 8086D4E4 38 60 00 00 */ li r3, 0
|
||||
lbl_8086D4E8:
|
||||
/* 8086D4E8 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 8086D4EC 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 8086D4F0 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 8086D4F4 7C 08 03 A6 */ mtlr r0
|
||||
/* 8086D4F8 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8086D4FC 4E 80 00 20 */ blr
|
||||
|
|
@ -18,6 +18,7 @@ public:
|
|||
void SetNowY(f32 y) { mNowY = y; }
|
||||
const cXyz& GetPointP() { return m_pos; }
|
||||
u32 GetWallPrecheck() const { return mWallPrecheck; }
|
||||
void OffWall() { mFlags &= ~2; }
|
||||
|
||||
/* 0x24 */ cXyz m_pos;
|
||||
/* 0x30 */ u32 mFlags;
|
||||
|
|
|
|||
|
|
@ -110,6 +110,7 @@ struct cXyz : Vec {
|
|||
z = other.z;
|
||||
}
|
||||
}
|
||||
void zero() { set(0.0f, 0.0f, 0.0f); }
|
||||
|
||||
float getSquareMag() const { return VECSquareMag(this); }
|
||||
f32 getSquareDistance(const Vec& other) const { return VECSquareDistance(this, &other); }
|
||||
|
|
|
|||
|
|
@ -1578,6 +1578,10 @@ inline void dComIfGs_removeZone(int i_zoneNo) {
|
|||
g_dComIfG_gameInfo.info.removeZone(i_zoneNo);
|
||||
}
|
||||
|
||||
inline void dComIfGp_removeSimpleModel(J3DModelData* i_modelData, int roomNo) {
|
||||
g_dComIfG_gameInfo.play.removeSimpleModel(i_modelData, roomNo);
|
||||
}
|
||||
|
||||
inline u32 dComIfGs_getTurnRestartParam() {
|
||||
return g_dComIfG_gameInfo.info.getTurnRestart().getParam();
|
||||
}
|
||||
|
|
@ -2840,6 +2844,11 @@ inline void dComIfGp_drawSimpleModel() {
|
|||
g_dComIfG_gameInfo.play.drawSimpleModel();
|
||||
}
|
||||
|
||||
inline void dComIfGp_entrySimpleModel(J3DModel *model,int roomNo) {
|
||||
g_dComIfG_gameInfo.play.entrySimpleModel(model, roomNo);
|
||||
}
|
||||
|
||||
|
||||
inline dStage_Multi_c* dComIfGp_getMulti() {
|
||||
return g_dComIfG_gameInfo.play.getStage().getMulti();
|
||||
}
|
||||
|
|
@ -3797,6 +3806,10 @@ inline void dComIfGd_imageDrawShadow(Mtx param_0) {
|
|||
g_dComIfG_gameInfo.drawlist.imageDrawShadow(param_0);
|
||||
}
|
||||
|
||||
inline void dComIfGd_set3DlineMat(mDoExt_3DlineMat_c *param_0) {
|
||||
g_dComIfG_gameInfo.drawlist.set3DlineMat(param_0);
|
||||
}
|
||||
|
||||
inline daPy_py_c* daPy_getLinkPlayerActorClass() {
|
||||
return dComIfGp_getLinkPlayer();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -338,6 +338,11 @@ public:
|
|||
void setOpaListMiddle() { setOpaDrawList(mDrawBuffers[DB_LIST_MIDDLE]); }
|
||||
void setOpaListZxlu() { setOpaDrawList(mDrawBuffers[DB_LIST_Z_XLU]); }
|
||||
void setXluListZxlu() { setXluDrawList(mDrawBuffers[DB_LIST_Z_XLU]); }
|
||||
void set3DlineMat(mDoExt_3DlineMat_c *param_1) {
|
||||
#ifndef NON_VIRTUAL_3DLINEMAT
|
||||
m3DLineMatSortPacket[param_1->getMaterialID()].setMat(param_1);
|
||||
#endif
|
||||
}
|
||||
|
||||
void peekZdata() { mPeekZ.peekData(); }
|
||||
void entryZSortListZxlu(J3DPacket* i_packet, cXyz& param_1) {
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ class JKRExpHeap;
|
|||
s32 dTimer_createStockTimer();
|
||||
s32 dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f32 param_4, f32 param_5,
|
||||
f32 param_6, f32 param_7);
|
||||
int dTimer_getRestTimeMs();
|
||||
|
||||
class dDlst_TimerScrnDraw_c : public dDlst_base_c {
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@ public:
|
|||
|
||||
class mDoExt_3DlineMat_c {
|
||||
public:
|
||||
#ifdef NONMATCHING
|
||||
#ifndef NON_VIRTUAL_3DLINEMAT
|
||||
virtual int getMaterialID();
|
||||
virtual void setMaterial();
|
||||
virtual void draw();
|
||||
|
|
@ -529,6 +529,8 @@ public:
|
|||
/* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*);
|
||||
/* 80014E84 */ int getMaterialID();
|
||||
|
||||
cXyz* getPos(int param_0) { return field_0x18[param_0].field_0x0; }
|
||||
|
||||
private:
|
||||
/* 0x08 */ GXColor field_0x8;
|
||||
/* 0x0C */ dKy_tevstr_c* field_0xc;
|
||||
|
|
|
|||
|
|
@ -65,6 +65,18 @@ inline void cMtx_ZrotM(Mtx mtx, s16 z) {
|
|||
mDoMtx_ZrotM(mtx, z);
|
||||
}
|
||||
|
||||
inline void cMtx_XrotS(Mtx mtx, s16 x) {
|
||||
mDoMtx_XrotS(mtx, x);
|
||||
}
|
||||
|
||||
inline void cMtx_YrotS(Mtx mtx, s16 y) {
|
||||
mDoMtx_YrotS(mtx, y);
|
||||
}
|
||||
|
||||
inline void cMtx_ZrotS(Mtx mtx, s16 z) {
|
||||
mDoMtx_ZrotS(mtx, z);
|
||||
}
|
||||
|
||||
inline void cMtx_lookAt(Mtx param_0, const Vec* param_1, const Vec* param_2, s16 param_3) {
|
||||
mDoMtx_lookAt(param_0, param_1, param_2, param_3);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,137 @@
|
|||
#ifndef D_A_MG_FSHOP_H
|
||||
#define D_A_MG_FSHOP_H
|
||||
|
||||
#include "m_Do/m_Do_ext.h"
|
||||
#include "d/bg/d_bg_s_acch.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "SSystem/SComponent/c_phase.h"
|
||||
|
||||
class J3DModel;
|
||||
class J3DModelData;
|
||||
class dBgW;
|
||||
|
||||
struct fs_weed_s {
|
||||
/* 8086FED8 */ ~fs_weed_s();
|
||||
/* 8086FF38 */ fs_weed_s();
|
||||
|
||||
/* 0x00 */ cXyz field_0x00[15];
|
||||
/* 0xB4 */ f32 field_0xb4;
|
||||
/* 0xB8 */ f32 field_0xb8;
|
||||
/* 0xBC */ s16 field_0xbc;
|
||||
};
|
||||
|
||||
struct fs_tsubo_s {
|
||||
/* 8086FE98 */ ~fs_tsubo_s();
|
||||
/* 8086FED4 */ fs_tsubo_s();
|
||||
|
||||
/* 0x00 */ cXyz field_0x00;
|
||||
/* 0x0C */ u8 field_0x0c[0x14 - 0x0c];
|
||||
/* 0x14 */ J3DModel* field_0x14;
|
||||
/* 0x18 */ u8 field_0x18[0x1C - 0x18];
|
||||
/* 0x1C */ f32 field_0x1c;
|
||||
/* 0x20 */ s16 field_0x20;
|
||||
/* 0x22 */ s16 field_0x22;
|
||||
/* 0x24 */ s16 field_0x24;
|
||||
};
|
||||
|
||||
struct fs_rod_s {
|
||||
/* 8086FF84 */ ~fs_rod_s();
|
||||
/* 8086FFC0 */ fs_rod_s();
|
||||
|
||||
/* 0x00 */ cXyz field_0x00;
|
||||
/* 0x0C */ u8 field_0x0C[0x14 - 0x0C];
|
||||
/* 0x14 */ J3DModel* field_0x14;
|
||||
/* 0x18 */ J3DModel* field_0x18[6];
|
||||
/* 0x30 */ mDoExt_3DlineMat0_c line_mat;
|
||||
/* 0x4C */ int field_0x4c;
|
||||
/* 0x50 */ u8 field_0x50[0x54 - 0x50];
|
||||
/* 0x54 */ f32 field_0x54;
|
||||
/* 0x58 */ u8 field_0x58[0x5C - 0x58];
|
||||
};
|
||||
|
||||
struct fs_lure_s {
|
||||
/* 8086FFDC */ ~fs_lure_s();
|
||||
/* 80870018 */ fs_lure_s();
|
||||
|
||||
/* 0x00 */ cXyz field_0x00;
|
||||
/* 0x0C */ s16 field_0x0c;
|
||||
/* 0x0E */ s16 field_0x0e;
|
||||
/* 0x10 */ s16 field_0x10;
|
||||
/* 0x12 */ u8 field_0x12[0x14 - 0x12];
|
||||
/* 0x14 */ J3DModel* field_0x14;
|
||||
/* 0x18 */ J3DModel* field_0x18[2];
|
||||
/* 0x20 */ u8 field_0x20[0x24 - 0x20];
|
||||
/* 0x24 */ int field_0x24;
|
||||
/* 0x28 */ f32 field_0x28;
|
||||
/* 0x2C */ f32 field_0x2c;
|
||||
/* 0x30 */ s16 field_0x30;
|
||||
/* 0x32 */ s16 field_0x32;
|
||||
/* 0x34 */ s16 field_0x34;
|
||||
/* 0x36 */ s16 field_0x36;
|
||||
/* 0x38 */ f32 field_0x38;
|
||||
/* 0x3C */ f32 field_0x3c;
|
||||
};
|
||||
|
||||
struct fs_koro2_s {
|
||||
/* 8086FD78 */ ~fs_koro2_s();
|
||||
/* 8086FDB4 */ fs_koro2_s();
|
||||
|
||||
/* 0x00 */ J3DModel* mpModel;
|
||||
/* 0x04 */ Mtx field_0x04;
|
||||
/* 0x34 */ s8 field_0x34;
|
||||
/* 0x35 */ u8 field_0x35[0x38 - 0x35];
|
||||
/* 0x38 */ cXyz field_0x38;
|
||||
/* 0x44 */ cXyz field_0x44;
|
||||
/* 0x50 */ s16 field_0x50;
|
||||
/* 0x52 */ u8 field_0x52[0x54 - 0x52];
|
||||
/* 0x54 */ cXyz field_0x54;
|
||||
/* 0x60 */ u8 field_0x60;
|
||||
/* 0x61 */ u8 field_0x61[0x64 - 0x61];
|
||||
/* 0x64 */ dBgW* mpBgW;
|
||||
};
|
||||
|
||||
class fshop_class : public fopAc_ac_c {
|
||||
public:
|
||||
/* 0x0568 */ request_of_phase_process_class mPhase;
|
||||
/* 0x0570 */ s16 field_0x0570;
|
||||
/* 0x0572 */ s16 field_0x0572;
|
||||
/* 0x0574 */ fs_lure_s mLure[48];
|
||||
/* 0x1174 */ fs_rod_s mRod[3];
|
||||
/* 0x1288 */ fs_weed_s mWeed[60];
|
||||
/* 0x3F88 */ mDoExt_3DlineMat0_c field_0x3f88;
|
||||
/* 0x3FA4 */ fs_tsubo_s mTsubo[2];
|
||||
/* 0x3FF4 */ J3DModel* field_0x3ff4;
|
||||
/* 0x3FF8 */ s16 field_0x3ff8;
|
||||
/* 0x3FFA */ s16 field_0x3ffa;
|
||||
/* 0x3FFC */ f32 field_0x3ffc;
|
||||
/* 0x4000 */ f32 field_0x4000;
|
||||
/* 0x4004 */ J3DModel* field_0x4004;
|
||||
/* 0x4008 */ fshop_class* field_0x4008;
|
||||
/* 0x400C */ u8 field_0x400c;
|
||||
/* 0x400D */ u8 field_0x400d;
|
||||
/* 0x400E */ u8 field_0x400e;
|
||||
/* 0x4010 */ s16 field_0x4010;
|
||||
/* 0x4014 */ cXyz field_0x4014;
|
||||
/* 0x4020 */ csXyz field_0x4020;
|
||||
/* 0x4028 */ J3DModel* mpA_crwaku_model;
|
||||
/* 0x402C */ dBgW* field_0x402c;
|
||||
/* 0x4030 */ Mtx field_0x4030;
|
||||
/* 0x4060 */ s16 field_0x4060;
|
||||
/* 0x4062 */ s16 field_0x4062;
|
||||
/* 0x4064 */ cXyz field_0x4064;
|
||||
/* 0x4070 */ J3DModel* field_0x4070;
|
||||
/* 0x4074 */ dBgS_AcchCir field_0x4074;
|
||||
/* 0x40B4 */ dBgS_ObjAcch field_0x40b4;
|
||||
/* 0x428C */ u8 field_0x428c;
|
||||
/* 0x428D */ u8 field_0x428d;
|
||||
/* 0x4290 */ fs_koro2_s mKoro2[100];
|
||||
/* 0x6B30 */ J3DModel* field_0x6b30;
|
||||
/* 0x6B34 */ s16 field_0x6b34;
|
||||
/* 0x6B38 */ Mtx field_0x6b38;
|
||||
/* 0x6B68 */ dBgW* field_0x6b68;
|
||||
/* 0x6B6C */ u32 field_0x6b6c[2];
|
||||
/* 0x6B74 */ u8 field_0x6B74[0x6B7C - 0x6B74];
|
||||
/* 0x6B7C */ u8 field_0x6b7c;
|
||||
};
|
||||
|
||||
#endif /* D_A_MG_FSHOP_H */
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -4598,7 +4598,7 @@ extern "C" asm void __ct__4cXyzFRC4cXyz() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void cMtx_YrotS(f32 (*param_0)[4], s16 param_1) {
|
||||
extern "C" asm void cMtx_YrotS__FPA4_fs() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/cMtx_YrotS__FPA4_fs.s"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
// Translation Unit: d_a_obj_sw
|
||||
//
|
||||
|
||||
//#define VIRTUAL_3DLINEMAT
|
||||
#include "m_Do/m_Do_ext.h"
|
||||
|
||||
#include "rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
|
|
@ -19,51 +22,14 @@ struct obj_sc_s {
|
|||
/* 80CF2FA8 */ obj_sc_s();
|
||||
};
|
||||
|
||||
struct mDoMtx_stack_c {
|
||||
/* 8000CCC8 */ void push();
|
||||
/* 8000CD14 */ void pop();
|
||||
/* 8000CD9C */ void transM(f32, f32, f32);
|
||||
|
||||
static u8 now[48];
|
||||
};
|
||||
|
||||
struct mDoExt_McaMorfCallBack2_c {};
|
||||
|
||||
struct mDoExt_McaMorfCallBack1_c {};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct J3DAnmTransform {};
|
||||
|
||||
struct J3DModelData {};
|
||||
|
||||
struct mDoExt_McaMorf {
|
||||
/* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
|
||||
mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,
|
||||
int, void*, u32, u32);
|
||||
/* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*);
|
||||
/* 800105C8 */ void play(Vec*, u32, s8);
|
||||
/* 80010680 */ void entryDL();
|
||||
/* 800106AC */ void modelCalc();
|
||||
};
|
||||
|
||||
struct mDoExt_3DlineMat_c {};
|
||||
|
||||
struct mDoExt_3DlineMatSortPacket {
|
||||
/* 80014738 */ void setMat(mDoExt_3DlineMat_c*);
|
||||
};
|
||||
|
||||
struct ResTIMG {};
|
||||
|
||||
struct _GXColor {};
|
||||
|
||||
struct dKy_tevstr_c {};
|
||||
|
||||
struct mDoExt_3DlineMat1_c {
|
||||
/* 80013360 */ void init(u16, u16, ResTIMG*, int);
|
||||
/* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*);
|
||||
};
|
||||
|
||||
struct mDoCPd_c {
|
||||
static u8 m_cpadInfo[256];
|
||||
};
|
||||
|
|
@ -76,14 +42,6 @@ struct daPy_py_c {
|
|||
/* 80CF2FDC */ void getLeftHandPos() const;
|
||||
};
|
||||
|
||||
struct cXyz {
|
||||
/* 80266AE4 */ void operator+(Vec const&) const;
|
||||
/* 80266B34 */ void operator-(Vec const&) const;
|
||||
/* 80266B84 */ void operator*(f32) const;
|
||||
/* 80266C18 */ void operator/(f32) const;
|
||||
/* 80CF1008 */ ~cXyz();
|
||||
/* 80CF2F38 */ cXyz();
|
||||
};
|
||||
|
||||
struct dVibration_c {
|
||||
/* 8006FA24 */ void StartShock(int, int, cXyz);
|
||||
|
|
@ -117,23 +75,6 @@ struct dCamera_c {
|
|||
/* 80180BA0 */ void Reset(cXyz, cXyz, f32, s16);
|
||||
};
|
||||
|
||||
struct csXyz {};
|
||||
|
||||
struct Z2SoundObjSimple {
|
||||
/* 802BE844 */ Z2SoundObjSimple();
|
||||
};
|
||||
|
||||
struct Z2SoundObjBase {
|
||||
/* 802BDF48 */ ~Z2SoundObjBase();
|
||||
/* 802BDFF8 */ void deleteObject();
|
||||
};
|
||||
|
||||
struct JMath {
|
||||
static u8 sincosTable_[65536];
|
||||
};
|
||||
|
||||
struct J3DModel {};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
|
@ -220,12 +161,6 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv();
|
|||
extern "C" void __ct__16Z2SoundObjSimpleFv();
|
||||
extern "C" void* __nw__FUl();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void PSMTXCopy();
|
||||
extern "C" void PSMTXTrans();
|
||||
extern "C" void PSMTXScale();
|
||||
extern "C" void PSMTXMultVec();
|
||||
extern "C" void PSVECAdd();
|
||||
extern "C" void PSVECSquareMag();
|
||||
extern "C" void __construct_array();
|
||||
extern "C" void _savegpr_24();
|
||||
extern "C" void _savegpr_25();
|
||||
|
|
@ -247,7 +182,6 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
|||
extern "C" extern u8 g_env_light[4880];
|
||||
extern "C" u8 sincosTable___5JMath[65536];
|
||||
extern "C" extern void* calc_mtx[1 + 1 /* padding */];
|
||||
extern "C" extern u32 __float_nan;
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
|
|
@ -419,7 +353,8 @@ static asm void sc_build(obj_sw_class* param_0) {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cXyz::~cXyz() {
|
||||
//asm cXyz::~cXyz() {
|
||||
asm void __dt__4cXyzFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw/__dt__4cXyzFv.s"
|
||||
}
|
||||
|
|
@ -874,7 +809,8 @@ static asm void daObj_Sw_Create(fopAc_ac_c* param_0) {
|
|||
#pragma pop
|
||||
|
||||
/* 80CF2F38-80CF2F3C 002978 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */
|
||||
cXyz::cXyz() {
|
||||
//cXyz::cXyz() {
|
||||
void __ct__4cXyzFv() {
|
||||
/* empty function */
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
* Model, Animation, and Heap Functions
|
||||
*/
|
||||
|
||||
// Not matching because of virtual tables
|
||||
#define NON_VIRTUAL_3DLINEMAT
|
||||
|
||||
#include "m_Do/m_Do_ext.h"
|
||||
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
|
||||
#include "JSystem/J3DGraphBase/J3DMaterial.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue