mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-06 02:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

more misc. cleanup (#2232)

Browse Source
This commit is contained in:
Caroline Madsen
2024-10-31 20:36:11 -04:00
committed by GitHub
parent 30777a85b5
commit 09423b6fa0
121 changed files with 2254 additions and 17343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+29 -29
View File
@@ -340,7 +340,7 @@ config.libs = [
Object(NonMatching, "m_Do/m_Do_printf.cpp"),
Object(Matching, "m_Do/m_Do_audio.cpp"),
Object(Matching, "m_Do/m_Do_controller_pad.cpp"),
Object(NonMatching, "m_Do/m_Do_graphic.cpp"),
Object(Equivalent, "m_Do/m_Do_graphic.cpp"),
Object(NonMatching, "m_Do/m_Do_machine.cpp"),
Object(Matching, "m_Do/m_Do_mtx.cpp"),
Object(NonMatching, "m_Do/m_Do_ext.cpp"),
@@ -349,7 +349,7 @@ config.libs = [
Object(Matching, "m_Do/m_Do_dvd_thread.cpp"),
Object(Matching, "m_Do/m_Do_DVDError.cpp"),
Object(Matching, "m_Do/m_Do_MemCard.cpp"),
Object(NonMatching, "m_Do/m_Do_MemCardRWmng.cpp"),
Object(Matching, "m_Do/m_Do_MemCardRWmng.cpp"),
Object(Matching, "m_Do/m_Do_machine_exception.cpp"),
],
},
@@ -360,7 +360,7 @@ config.libs = [
"progress_category": "game",
"host": True,
"objects": [
Object(NonMatching, "c/c_damagereaction.cpp"),
Object(Matching, "c/c_damagereaction.cpp"),
Object(Matching, "c/c_dylink.cpp"),
],
},
@@ -441,7 +441,7 @@ config.libs = [
Object(NonMatching, "d/d_stage.cpp"),
Object(Matching, "d/d_map.cpp"),
Object(Matching, "d/d_com_inf_game.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "d/d_com_static.cpp"),
Object(Matching, "d/d_com_static.cpp"),
Object(Matching, "d/d_com_inf_actor.cpp"),
Object(Matching, "d/d_bomb.cpp"),
Object(Matching, "d/d_lib.cpp"),
@@ -456,12 +456,12 @@ config.libs = [
Object(NonMatching, "d/d_demo.cpp"),
Object(Matching, "d/d_door_param2.cpp"),
Object(NonMatching, "d/d_resorce.cpp"),
Object(NonMatching, "d/d_map_path.cpp"),
Object(Matching, "d/d_map_path.cpp"),
Object(NonMatching, "d/d_map_path_fmap.cpp"),
Object(NonMatching, "d/d_map_path_dmap.cpp"),
Object(NonMatching, "d/d_event.cpp"),
Object(Matching, "d/d_event.cpp"),
Object(Matching, "d/d_event_data.cpp"),
Object(NonMatching, "d/d_event_manager.cpp"),
Object(Matching, "d/d_event_manager.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(Matching, "d/d_event_lib.cpp"),
Object(Matching, "d/d_simple_model.cpp"),
Object(NonMatching, "d/d_particle.cpp"),
@@ -494,11 +494,11 @@ config.libs = [
Object(Matching, "d/d_bg_w_base.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "d/d_bg_w_kcol.cpp"),
Object(Matching, "d/d_bg_w_sv.cpp"),
Object(NonMatching, "d/d_cc_d.cpp"),
Object(Equivalent, "d/d_cc_d.cpp"),
Object(Matching, "d/d_cc_mass_s.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "d/d_cc_s.cpp"),
Object(Matching, "d/d_cc_uty.cpp"),
Object(NonMatching, "d/d_cam_param.cpp"),
Object(NonMatching, "d/d_cam_param.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "d/d_ev_camera.cpp"),
Object(Matching, "d/d_spline_path.cpp"),
Object(Matching, "d/d_item_data.cpp"),
@@ -523,13 +523,13 @@ config.libs = [
Object(NonMatching, "d/d_file_sel_warning.cpp"),
Object(Matching, "d/d_file_sel_info.cpp"),
Object(Matching, "d/d_bright_check.cpp"),
Object(NonMatching, "d/d_scope.cpp"),
Object(NonMatching, "d/d_select_cursor.cpp"),
Object(NonMatching, "d/d_scope.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(Equivalent, "d/d_select_cursor.cpp"),
Object(Matching, "d/d_select_icon.cpp"),
Object(Matching, "d/d_shop_camera.cpp"),
Object(Matching, "d/d_shop_item_ctrl.cpp"),
Object(Matching, "d/d_shop_system.cpp"),
Object(NonMatching, "d/d_gameover.cpp"),
Object(Matching, "d/d_gameover.cpp"),
Object(NonMatching, "d/d_kankyo.cpp"),
Object(Matching, "d/d_kyeff.cpp"),
Object(Matching, "d/d_kyeff2.cpp"),
@@ -541,7 +541,7 @@ config.libs = [
Object(NonMatching, "d/d_menu_dmap_map.cpp"),
Object(Matching, "d/d_menu_map_common.cpp"),
Object(Matching, "d/d_menu_fishing.cpp"),
Object(Equivalent, "d/d_menu_fmap.cpp"),
Object(Matching, "d/d_menu_fmap.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "d/d_menu_fmap_map.cpp"),
Object(Matching, "d/d_menu_fmap2D.cpp"),
Object(Matching, "d/d_menu_insect.cpp"),
@@ -549,7 +549,7 @@ config.libs = [
Object(NonMatching, "d/d_menu_letter.cpp"),
Object(Matching, "d/d_menu_option.cpp"),
Object(Matching, "d/d_menu_ring.cpp"),
Object(NonMatching, "d/d_menu_save.cpp"),
Object(Equivalent, "d/d_menu_save.cpp"),
Object(Matching, "d/d_menu_skill.cpp"),
Object(Matching, "d/d_menu_window_HIO.cpp"),
Object(NonMatching, "d/d_menu_window.cpp"),
@@ -566,7 +566,7 @@ config.libs = [
Object(NonMatching, "d/d_msg_class.cpp"),
Object(NonMatching, "d/d_msg_object.cpp"),
Object(NonMatching, "d/d_msg_unit.cpp"),
Object(NonMatching, "d/d_msg_scrn_3select.cpp"),
Object(Matching, "d/d_msg_scrn_3select.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(Matching, "d/d_msg_scrn_arrow.cpp"),
Object(Matching, "d/d_msg_scrn_base.cpp"),
Object(Matching, "d/d_msg_scrn_boss.cpp"),
@@ -1011,12 +1011,12 @@ config.libs = [
[
Object(NonMatching, "JSystem/J3DGraphLoader/J3DMaterialFactory.cpp"),
Object(NonMatching, "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp"),
Object(NonMatching, "JSystem/J3DGraphLoader/J3DClusterLoader.cpp"),
Object(Equivalent, "JSystem/J3DGraphLoader/J3DClusterLoader.cpp"),
Object(Equivalent, "JSystem/J3DGraphLoader/J3DModelLoader.cpp"),
Object(NonMatching, "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp"),
Object(NonMatching, "JSystem/J3DGraphLoader/J3DJointFactory.cpp"),
Object(NonMatching, "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"),
Object(NonMatching, "JSystem/J3DGraphLoader/J3DAnmLoader.cpp"),
Object(Matching, "JSystem/J3DGraphLoader/J3DJointFactory.cpp"),
Object(Matching, "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"),
Object(Equivalent, "JSystem/J3DGraphLoader/J3DAnmLoader.cpp"),
],
),
JSystemLib(
@@ -1365,7 +1365,7 @@ config.libs = [
ActorRel(Matching, "d_a_door_knob00"),
ActorRel(Matching, "d_a_door_shutter"),
ActorRel(Matching, "d_a_door_spiral"),
ActorRel(NonMatching, "d_a_dshutter"),
ActorRel(Matching, "d_a_dshutter"),
ActorRel(NonMatching, "d_a_ep"),
ActorRel(Matching, "d_a_hitobj"),
ActorRel(Matching, "d_a_kytag00"),
@@ -1407,7 +1407,7 @@ config.libs = [
ActorRel(Matching, "d_a_disappear"),
ActorRel(NonMatching, "d_a_mg_rod"),
ActorRel(NonMatching, "d_a_midna"),
ActorRel(NonMatching, "d_a_nbomb"),
ActorRel(Equivalent, "d_a_nbomb"),
ActorRel(NonMatching, "d_a_obj_life_container"),
ActorRel(NonMatching, "d_a_obj_yousei"),
ActorRel(NonMatching, "d_a_spinner"),
@@ -1452,7 +1452,7 @@ config.libs = [
ActorRel(Matching, "d_a_obj_eff"),
ActorRel(NonMatching, "d_a_obj_fmobj"),
ActorRel(NonMatching, "d_a_obj_gpTaru"),
ActorRel(NonMatching, "d_a_obj_hhashi"),
ActorRel(Matching, "d_a_obj_hhashi"),
ActorRel(NonMatching, "d_a_obj_kanban2"),
ActorRel(NonMatching, "d_a_obj_kbacket"),
ActorRel(Matching, "d_a_obj_kgate"),
@@ -1520,14 +1520,14 @@ config.libs = [
ActorRel(NonMatching, "d_a_coach_fire"),
ActorRel(NonMatching, "d_a_cow"),
ActorRel(NonMatching, "d_a_cstatue"),
ActorRel(NonMatching, "d_a_do"),
ActorRel(Equivalent, "d_a_do"),
ActorRel(Matching, "d_a_door_boss"),
ActorRel(Matching, "d_a_door_bossL5"),
ActorRel(NonMatching, "d_a_door_mbossL1"),
ActorRel(Equivalent, "d_a_door_mbossL1"),
ActorRel(Matching, "d_a_door_push"),
ActorRel(NonMatching, "d_a_e_ai"),
ActorRel(Matching, "d_a_e_arrow"),
ActorRel(NonMatching, "d_a_e_ba"),
ActorRel(Equivalent, "d_a_e_ba"),
ActorRel(NonMatching, "d_a_e_bee"),
ActorRel(NonMatching, "d_a_e_bg"),
ActorRel(NonMatching, "d_a_e_bi"),
@@ -1546,7 +1546,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_e_fb"),
ActorRel(NonMatching, "d_a_e_fk"),
ActorRel(NonMatching, "d_a_e_fs"),
ActorRel(NonMatching, "d_a_e_fz"),
ActorRel(Equivalent, "d_a_e_fz"),
ActorRel(NonMatching, "d_a_e_gb"),
ActorRel(NonMatching, "d_a_e_ge"),
ActorRel(NonMatching, "d_a_e_gi"),
@@ -1607,7 +1607,7 @@ config.libs = [
ActorRel(Matching, "d_a_e_yd_leaf"),
ActorRel(NonMatching, "d_a_e_yg"),
ActorRel(NonMatching, "d_a_e_yh"),
ActorRel(NonMatching, "d_a_e_yk"),
ActorRel(Equivalent, "d_a_e_yk"),
ActorRel(NonMatching, "d_a_e_ym"),
ActorRel(Matching, "d_a_e_ym_tag"),
ActorRel(NonMatching, "d_a_e_ymb"),
@@ -1628,7 +1628,7 @@ config.libs = [
ActorRel(Matching, "d_a_kytag07"),
ActorRel(Matching, "d_a_kytag08"),
ActorRel(Matching, "d_a_kytag09"),
ActorRel(NonMatching, "d_a_kytag12"),
ActorRel(Matching, "d_a_kytag12"),
ActorRel(NonMatching, "d_a_kytag13"),
ActorRel(Matching, "d_a_kytag15"),
ActorRel(Matching, "d_a_kytag16"),
@@ -2054,7 +2054,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_zdoor"),
ActorRel(NonMatching, "d_a_obj_zrTurara"),
ActorRel(Matching, "d_a_obj_zrTuraraRock"),
ActorRel(NonMatching, "d_a_obj_zraMark"),
ActorRel(Equivalent, "d_a_obj_zraMark"),
ActorRel(Matching, "d_a_obj_zra_freeze"),
ActorRel(NonMatching, "d_a_obj_zra_rock"),
ActorRel(NonMatching, "d_a_passer_mng"),
include/JSystem/J2DGraph/J2DAnimation.h
+1 -5
View File
@@ -151,12 +151,8 @@ public:
mTranslateValues = pTranslateValues;
mKind = KIND_TRANSFORM;
}
#ifdef __dt__15J2DAnmTransformFv_DEFINED
/* 80184370 */ virtual ~J2DAnmTransform();
#else
/* 80184370 */ virtual ~J2DAnmTransform() {}
#endif
/* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const;
/* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const; // {} (should be inline)
/* 0x10 */ f32* mScaleValues;
/* 0x14 */ s16* mRotationValues;
include/JSystem/J2DGraph/J2DPane.h
+8 -2
View File
@@ -88,13 +88,19 @@ public:
/* vt 0x20 */ virtual void setCullBack(_GXCullMode cmode);
/* vt 0x24 */ virtual void setAlpha(u8);
/* vt 0x28 */ virtual bool setConnectParent(bool connected);
/* vt 0x2C */ virtual void calcMtx();
/* vt 0x2C */ virtual void calcMtx() {
if (mPaneTree.getParent() != NULL) {
makeMatrix(mTranslateX, mTranslateY);
}
}
/* vt 0x30 */ virtual void update();
/* vt 0x34 */ virtual void drawSelf(f32 arg1, f32 arg2);
/* vt 0x38 */ virtual void drawSelf(f32 arg1, f32 arg2, Mtx* mtx);
/* vt 0x3C */ virtual J2DPane* search(u64 tag);
/* vt 0x40 */ virtual J2DPane* searchUserInfo(u64 tag);
/* vt 0x44 */ virtual void makeMatrix(f32, f32);
/* vt 0x44 */ virtual void makeMatrix(f32 a, f32 b) {
makeMatrix(a, b, -mBounds.i.x, -mBounds.i.y);
}
/* vt 0x48 */ virtual void makeMatrix(f32 a, f32 b, f32 c, f32 d);
/* vt 0x4C */ virtual bool isUsed(const ResTIMG* timg);
/* vt 0x50 */ virtual bool isUsed(const ResFONT* font);
include/JSystem/J2DGraph/J2DPicture.h
+13 -3
View File
@@ -106,9 +106,19 @@ public:
/* 802FDAC8 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
/* 800539DC */ virtual JUTTexture* getTexture(u8) const;
/* 802FF634 */ virtual u8 getTextureCount() const;
/* 80053C6C */ virtual bool setBlack(JUtility::TColor);
/* 80053C44 */ virtual bool setWhite(JUtility::TColor);
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white);
/* 80053C6C */ virtual bool setBlack(JUtility::TColor i_black) {
mBlack = i_black;
return true;
}
/* 80053C44 */ virtual bool setWhite(JUtility::TColor i_white) {
mWhite = i_white;
return true;
}
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white) {
mBlack = i_black;
mWhite = i_white;
return true;
}
/* 801DFA4C */ virtual JUtility::TColor getBlack() const;
/* 801DFA40 */ virtual JUtility::TColor getWhite() const;
/* 8025603C */ virtual J2DMaterial* getMaterial() const { return NULL; }
include/JSystem/J2DGraph/J2DScreen.h
+1 -1
View File
@@ -55,7 +55,7 @@ public:
/* 802F90E0 */ virtual J2DPane* searchUserInfo(u64);
/* 802F9600 */ virtual bool isUsed(ResTIMG const*);
/* 802F9620 */ virtual bool isUsed(ResFONT const*);
/* 80053BA0 */ virtual void clearAnmTransform();
/* 80053BA0 */ virtual void clearAnmTransform() { J2DPane::clearAnmTransform(); }
/* 802F9704 */ virtual void setAnimation(J2DAnmColor*);
/* 80192414 */ virtual void setAnimation(J2DAnmTransform* i_bck) { J2DPane::setAnimation(i_bck); }
/* 802F9798 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
include/JSystem/J2DGraph/J2DTextBox.h
+1 -1
View File
@@ -75,7 +75,7 @@ public:
/* 80300278 */ virtual void setFont(JUTFont*);
/* 8021C7F4 */ virtual JUTFont* getFont() const { return mFont; }
/* 80254408 */ virtual bool setBlack(JUtility::TColor);
/* 80186C84 */ virtual bool setWhite(JUtility::TColor);
/* 80186C84 */ virtual bool setWhite(JUtility::TColor white) { mWhiteColor = white; return true; }
/* 8019230C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 801DFA34 */ virtual JUtility::TColor getBlack() const;
/* 801DFA28 */ virtual JUtility::TColor getWhite() const;
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+129 -82
View File
@@ -174,13 +174,13 @@ struct J3DAnmVtxColorFullData {
/* 0x0A */ s16 mFrameMax;
/* 0x0C */ u16 mAnmTableNum[2];
/* 0x10 */ u8 field_0x10[0x18 - 0x10];
/* 0x18 */ s32 mTableOffsets[2];
/* 0x20 */ s32 mVtxColorIndexDataOffsets[2];
/* 0x28 */ s32 mVtxColorIndexPointerOffsets[2];
/* 0x30 */ s32 mRValuesOffset;
/* 0x34 */ s32 mGValuesOffset;
/* 0x38 */ s32 mBValuesOffset;
/* 0x3C */ s32 mAValuesOffset;
/* 0x18 */ void* mTableOffsets[2];
/* 0x20 */ void* mVtxColorIndexDataOffsets[2];
/* 0x28 */ void* mVtxColorIndexPointerOffsets[2];
/* 0x30 */ void* mRValuesOffset;
/* 0x34 */ void* mGValuesOffset;
/* 0x38 */ void* mBValuesOffset;
/* 0x3C */ void* mAValuesOffset;
}; // Size = 0x40
STATIC_ASSERT(sizeof(J3DAnmVtxColorFullData) == 0x40);
@@ -196,8 +196,8 @@ struct J3DAnmVisibilityFullData {
/* 0x0A */ s16 mFrameMax;
/* 0x0C */ u16 field_0xc;
/* 0x0E */ u16 field_0xe;
/* 0x10 */ s32 mTableOffset;
/* 0x14 */ s32 mValuesOffset;
/* 0x10 */ void* mTableOffset;
/* 0x14 */ void* mValuesOffset;
}; // Size = 0x18
STATIC_ASSERT(sizeof(J3DAnmVisibilityFullData) == 0x18);
@@ -213,10 +213,10 @@ struct J3DAnmTransformFullData {
/* 0x0A */ s16 mFrameMax;
/* 0x0C */ u16 field_0xc;
/* 0x0E */ u8 field_0xe[0x14 - 0xe];
/* 0x14 */ s32 mTableOffset;
/* 0x18 */ s32 mScaleValOffset;
/* 0x1C */ s32 mRotValOffset;
/* 0x20 */ s32 mTransValOffset;
/* 0x14 */ void* mTableOffset;
/* 0x18 */ void* mScaleValOffset;
/* 0x1C */ void* mRotValOffset;
/* 0x20 */ void* mTransValOffset;
}; // Size = 0x24
STATIC_ASSERT(sizeof(J3DAnmTransformFullData) == 0x24);
@@ -235,13 +235,13 @@ struct J3DAnmColorKeyData {
/* 0x12 */ u16 field_0x12;
/* 0x14 */ u16 field_0x14;
/* 0x16 */ u16 field_0x16;
/* 0x18 */ s32 mTableOffset; /* Created by retype action */
/* 0x1C */ s32 mUpdateMaterialIDOffset;
/* 0x20 */ s32 mNameTabOffset; /* Created by retype action */
/* 0x24 */ s32 mRValOffset;
/* 0x28 */ s32 mGValOffset;
/* 0x2C */ s32 mBValOffset;
/* 0x30 */ s32 mAValOffset;
/* 0x18 */ void* mTableOffset;
/* 0x1C */ void* mUpdateMaterialIDOffset;
/* 0x20 */ void* mNameTabOffset;
/* 0x24 */ void* mRValOffset;
/* 0x28 */ void* mGValOffset;
/* 0x2C */ void* mBValOffset;
/* 0x30 */ void* mAValOffset;
}; // Size = 0x34
STATIC_ASSERT(sizeof(J3DAnmColorKeyData) == 0x34);
@@ -259,26 +259,26 @@ struct J3DAnmTextureSRTKeyData {
/* 0x0E */ u16 field_0xe;
/* 0x10 */ u16 field_0x10;
/* 0x12 */ u16 field_0x12;
/* 0x14 */ s32 mTableOffset;
/* 0x18 */ s32 mUpdateMatIDOffset;
/* 0x1C */ s32 mNameTab1Offset;
/* 0x20 */ s32 mUpdateTexMtxIDOffset;
/* 0x24 */ s32 unkOffset;
/* 0x28 */ s32 mScaleValOffset;
/* 0x2C */ s32 mRotValOffset;
/* 0x30 */ s32 mTransValOffset;
/* 0x14 */ void* mTableOffset;
/* 0x18 */ void* mUpdateMatIDOffset;
/* 0x1C */ void* mNameTab1Offset;
/* 0x20 */ void* mUpdateTexMtxIDOffset;
/* 0x24 */ void* unkOffset;
/* 0x28 */ void* mScaleValOffset;
/* 0x2C */ void* mRotValOffset;
/* 0x30 */ void* mTransValOffset;
/* 0x34 */ u16 field_0x34;
/* 0x36 */ u16 field_0x36;
/* 0x38 */ u16 field_0x38;
/* 0x3A */ u16 field_0x3a;
/* 0x3C */ s32 mInfoTable2Offset;
/* 0x40 */ s32 field_0x40;
/* 0x44 */ u32 mNameTab2Offset;
/* 0x48 */ s32 field_0x48;
/* 0x4C */ s32 field_0x4c;
/* 0x50 */ s32 field_0x50;
/* 0x54 */ s32 field_0x54;
/* 0x58 */ s32 field_0x58;
/* 0x3C */ void* mInfoTable2Offset;
/* 0x40 */ void* field_0x40;
/* 0x44 */ void* mNameTab2Offset;
/* 0x48 */ void* field_0x48;
/* 0x4C */ void* field_0x4c;
/* 0x50 */ void* field_0x50;
/* 0x54 */ void* field_0x54;
/* 0x58 */ void* field_0x58;
/* 0x5C */ s32 field_0x5c;
}; // Size = 0x60
@@ -295,13 +295,13 @@ struct J3DAnmVtxColorKeyData {
/* 0x0A */ s16 mFrameMax;
/* 0x0C */ u16 mAnmTableNum[2];
/* 0x10 */ u8 field_0x10[0x18 - 0x10];
/* 0x18 */ s32 mTableOffsets[2];
/* 0x20 */ s32 mVtxColoIndexDataOffset[2];
/* 0x28 */ s32 mVtxColoIndexPointerOffset[2];
/* 0x30 */ s32 mRValOffset;
/* 0x34 */ s32 mGValOffset;
/* 0x38 */ s32 mBValOffset;
/* 0x3C */ s32 mAValOffset;
/* 0x18 */ void* mTableOffsets[2];
/* 0x20 */ void* mVtxColoIndexDataOffset[2];
/* 0x28 */ void* mVtxColoIndexPointerOffset[2];
/* 0x30 */ void* mRValOffset;
/* 0x34 */ void* mGValOffset;
/* 0x38 */ void* mBValOffset;
/* 0x3C */ void* mAValOffset;
}; // Size = 0x40
STATIC_ASSERT(sizeof(J3DAnmVtxColorKeyData) == 0x40);
@@ -317,10 +317,10 @@ struct J3DAnmTexPatternFullData {
/* 0x0A */ s16 mFrameMax;
/* 0x0C */ u16 field_0xc;
/* 0x0E */ u16 field_0xe;
/* 0x10 */ s32 mTableOffset;
/* 0x14 */ s32 mValuesOffset;
/* 0x18 */ s32 mUpdateMaterialIDOffset;
/* 0x1C */ s32 mNameTabOffset;
/* 0x10 */ void* mTableOffset;
/* 0x14 */ void* mValuesOffset;
/* 0x18 */ void* mUpdateMaterialIDOffset;
/* 0x1C */ void* mNameTabOffset;
}; // Size = 0x20
STATIC_ASSERT(sizeof(J3DAnmTexPatternFullData) == 0x20);
@@ -344,20 +344,20 @@ struct J3DAnmTevRegKeyData {
/* 0x1A */ u16 field_0x1a;
/* 0x1C */ u16 field_0x1c;
/* 0x1E */ u16 field_0x1e;
/* 0x20 */ s32 mCRegTableOffset;
/* 0x24 */ s32 mKRegTableOffset;
/* 0x28 */ s32 mCRegUpdateMaterialIDOffset;
/* 0x2C */ s32 mKRegUpdateMaterialIDOffset;
/* 0x30 */ s32 mCRegNameTabOffset;
/* 0x34 */ s32 mKRegNameTabOffset;
/* 0x38 */ s32 mCRValuesOffset;
/* 0x3C */ s32 mCGValuesOffset;
/* 0x40 */ s32 mCBValuesOffset;
/* 0x44 */ s32 mCAValuesOffset;
/* 0x48 */ s32 mKRValuesOffset;
/* 0x4C */ s32 mKGValuesOffset;
/* 0x50 */ s32 mKBValuesOffset;
/* 0x54 */ s32 mKAValuesOffset;
/* 0x20 */ void* mCRegTableOffset;
/* 0x24 */ void* mKRegTableOffset;
/* 0x28 */ void* mCRegUpdateMaterialIDOffset;
/* 0x2C */ void* mKRegUpdateMaterialIDOffset;
/* 0x30 */ void* mCRegNameTabOffset;
/* 0x34 */ void* mKRegNameTabOffset;
/* 0x38 */ void* mCRValuesOffset;
/* 0x3C */ void* mCGValuesOffset;
/* 0x40 */ void* mCBValuesOffset;
/* 0x44 */ void* mCAValuesOffset;
/* 0x48 */ void* mKRValuesOffset;
/* 0x4C */ void* mKGValuesOffset;
/* 0x50 */ void* mKBValuesOffset;
/* 0x54 */ void* mKAValuesOffset;
}; // Size = 0x58
STATIC_ASSERT(sizeof(J3DAnmTevRegKeyData) == 0x58);
@@ -373,13 +373,13 @@ struct J3DAnmColorFullData { /* PlaceHolder Structure */
/* 0x0C */ s16 mFrameMax;
/* 0x0E */ u16 mUpdateMaterialNum;
/* 0x10 */ u8 field_0x10[0x18 - 0x10];
/* 0x18 */ s32 mTableOffset;
/* 0x1C */ s32 mUpdateMaterialIDOffset;
/* 0x20 */ s32 mNameTabOffset;
/* 0x24 */ s32 mRValuesOffset;
/* 0x28 */ s32 mGValuesOffset;
/* 0x2C */ s32 mBValuesOffset;
/* 0x30 */ s32 mAValuesOffset;
/* 0x18 */ void* mTableOffset;
/* 0x1C */ void* mUpdateMaterialIDOffset;
/* 0x20 */ void* mNameTabOffset;
/* 0x24 */ void* mRValuesOffset;
/* 0x28 */ void* mGValuesOffset;
/* 0x2C */ void* mBValuesOffset;
/* 0x30 */ void* mAValuesOffset;
}; // Size = 0x34
STATIC_ASSERT(sizeof(J3DAnmColorFullData) == 0x34);
@@ -403,10 +403,10 @@ struct J3DAnmTransformKeyData {
/* 0x0A */ s16 mFrameMax;
/* 0x0C */ u16 field_0xc;
/* 0x10 */ int field_0x10;
/* 0x14 */ s32 mTableOffset;
/* 0x18 */ s32 field_0x18;
/* 0x1c */ s32 field_0x1c;
/* 0x20 */ s32 field_0x20;
/* 0x14 */ void* mTableOffset;
/* 0x18 */ void* field_0x18;
/* 0x1c */ void* field_0x1c;
/* 0x20 */ void* field_0x20;
};
/**
@@ -418,8 +418,8 @@ struct J3DAnmClusterKeyData {
/* 0x08 */ u8 field_0x8;
/* 0x0A */ s16 mFrameMax;
/* 0x0C */ s32 field_0xc;
/* 0x10 */ s32 mTableOffset;
/* 0x14 */ s32 mWeightOffset;
/* 0x10 */ void* mTableOffset;
/* 0x14 */ void* mWeightOffset;
};
/**
@@ -431,8 +431,8 @@ struct J3DAnmClusterFullData {
/* 0x08 */ u8 field_0x8;
/* 0x0A */ s16 mFrameMax;
/* 0x0C */ s32 field_0xc;
/* 0x10 */ s32 mTableOffset;
/* 0x14 */ s32 mWeightOffset;
/* 0x10 */ void* mTableOffset;
/* 0x14 */ void* mWeightOffset;
};
/**
@@ -487,7 +487,7 @@ public:
/* 80328E40 */ J3DAnmTransform(s16, f32*, s16*, f32*);
/* 8003B93C */ virtual ~J3DAnmTransform() {}
/* 8003C77C */ virtual s32 getKind() const;
/* 8003C77C */ virtual s32 getKind() const { return 0; }
virtual void getTransform(u16, J3DTransformInfo*) const = 0;
/* 0x0C */ f32* mScaleData;
@@ -512,9 +512,11 @@ public:
/* 80329A34 */ void calcTransform(f32, u16, J3DTransformInfo*) const;
/* 8003B8D0 */ virtual ~J3DAnmTransformKey();
/* 8003C800 */ virtual s32 getKind() const;
/* 8003C808 */ virtual void getTransform(u16, J3DTransformInfo*) const;
/* 8003B8D0 */ virtual ~J3DAnmTransformKey() {}
/* 8003C800 */ virtual s32 getKind() const { return 8; }
/* 8003C808 */ virtual void getTransform(u16 param_0, J3DTransformInfo* param_1) const {
calcTransform(mFrame, param_0, param_1);
}
/* 0x20 */ int mDecShift;
/* 0x24 */ J3DAnmTransformKeyTable* mAnmTable;
@@ -860,8 +862,8 @@ public:
mVisibility = NULL;
}
/* 8033979C */ virtual ~J3DAnmVisibilityFull();
/* 803397F8 */ virtual s32 getKind() const;
/* 8033979C */ virtual ~J3DAnmVisibilityFull() {}
/* 803397F8 */ virtual s32 getKind() const { return 6; }
/* 0x0C */ u16 mUpdateMaterialNum;
/* 0x0E */ u16 field_0xe;
@@ -921,4 +923,49 @@ public:
/* 0x10 */ f32 mFrame;
}; // Size: 0x14
struct J3DMtxCalcAnmBase: public J3DMtxCalc {
J3DMtxCalcAnmBase(J3DAnmTransform* param_0) { mAnmTransform = param_0; }
/* 8000D8EC */ ~J3DMtxCalcAnmBase() {}
/* 80014FB8 */ J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
/* 80014FC0 */ void setAnmTransform(J3DAnmTransform* param_0) { mAnmTransform = param_0; }
J3DAnmTransform* mAnmTransform;
};
struct J3DMtxCalcAnimationAdaptorBase {
J3DMtxCalcAnimationAdaptorBase() {}
void change(J3DAnmTransform*) {}
};
template <typename A0>
struct J3DMtxCalcAnimationAdaptorDefault : public J3DMtxCalcAnimationAdaptorBase {
J3DMtxCalcAnimationAdaptorDefault(J3DAnmTransform* param_0) {}
void calc(J3DMtxCalcAnmBase* param_0) {
J3DTransformInfo transform;
J3DTransformInfo* transform_p;
if (param_0->getAnmTransform() != NULL) {
u16 jnt_no = J3DMtxCalc::getJoint()->getJntNo();
param_0->getAnmTransform()->getTransform(jnt_no, &transform);
transform_p = &transform;
} else {
transform_p = &J3DMtxCalc::getJoint()->getTransformInfo();
}
A0::calcTransform(*transform_p);
}
};
template <typename A0, typename B0>
struct J3DMtxCalcAnimation : public J3DMtxCalcAnmBase {
J3DMtxCalcAnimation(J3DAnmTransform* param_0) : J3DMtxCalcAnmBase(param_0), field_0x8(param_0) {}
~J3DMtxCalcAnimation() {}
void setAnmTransform(J3DAnmTransform* param_0) {
mAnmTransform = param_0;
field_0x8.change(param_0);
}
void init(const Vec& param_0, const Mtx& param_1) { B0::init(param_0, param_1); }
void calc() { field_0x8.calc(this); }
A0 field_0x8;
};
#endif /* J3DANIMATION_H */
include/JSystem/J3DGraphAnimator/J3DJoint.h
+6 -6
View File
@@ -18,12 +18,12 @@ public:
/* 80325D1C */ static void setMtxBuffer(J3DMtxBuffer*);
/* 8000D948 */ virtual ~J3DMtxCalc() {}
/* 80014E90 */ virtual void setAnmTransform(J3DAnmTransform*);
/* 80014E9C */ virtual J3DAnmTransform* getAnmTransform();
/* 80014E8C */ virtual void setAnmTransform(u8, J3DAnmTransform*);
/* 80014E94 */ virtual J3DAnmTransform* getAnmTransform(u8);
/* 80014EA4 */ virtual void setWeight(u8, f32);
/* 80014EA8 */ virtual void getWeight(u8) const;
/* 80014E90 */ virtual void setAnmTransform(J3DAnmTransform*) {}
/* 80014E9C */ virtual J3DAnmTransform* getAnmTransform() { return NULL; }
/* 80014E8C */ virtual void setAnmTransform(u8, J3DAnmTransform*) {}
/* 80014E94 */ virtual J3DAnmTransform* getAnmTransform(u8) { return NULL; }
/* 80014EA4 */ virtual void setWeight(u8, f32) {}
/* 80014EA8 */ virtual f32 getWeight(u8) const { return 0.0f; }
virtual void init(const Vec& param_0, const Mtx&) = 0;
virtual void calc() = 0;
include/JSystem/J3DGraphBase/J3DMatBlock.h
+50 -50
View File
@@ -78,12 +78,12 @@ public:
/* 803172FC */ virtual s32 countDLSize();
virtual u32 getType() = 0;
/* 8031741C */ virtual void setTexGenNum(u32 const*);
/* 8000E0D0 */ virtual void setTexGenNum(u32);
/* 8000DFE8 */ virtual u32 getTexGenNum() const;
/* 8000E0CC */ virtual void setTexCoord(u32, J3DTexCoord const*);
/* 8000DFE0 */ virtual J3DTexCoord* getTexCoord(u32);
/* 8000E0D0 */ virtual void setTexGenNum(u32) {}
/* 8000DFE8 */ virtual u32 getTexGenNum() const { return 0; }
/* 8000E0CC */ virtual void setTexCoord(u32, J3DTexCoord const*) {}
/* 8000DFE0 */ virtual J3DTexCoord* getTexCoord(u32) { return NULL; }
/* 8003AB2C */ virtual void setTexMtx(u32, J3DTexMtx*) {}
/* 8000DFD8 */ virtual J3DTexMtx* getTexMtx(u32);
/* 8000DFD8 */ virtual J3DTexMtx* getTexMtx(u32) { return NULL; }
/* 80317424 */ virtual void setNBTScale(J3DNBTScale const*);
/* 80317420 */ virtual void setNBTScale(J3DNBTScale);
/* 80317334 */ virtual J3DNBTScale* getNBTScale();
@@ -217,37 +217,37 @@ public:
virtual u32 getType() = 0;
/* 8031730C */ virtual s32 countDLSize();
/* 80323544 */ virtual void setTexNo(u32, u16 const*);
/* 8000E0AC */ virtual void setTexNo(u32, u16);
/* 8000DF94 */ virtual u16 getTexNo(u32) const;
/* 8000E0AC */ virtual void setTexNo(u32, u16) {}
/* 8000DF94 */ virtual u16 getTexNo(u32) const { return 0xffff; }
/* 80323548 */ virtual void setTevOrder(u32, J3DTevOrder const*);
/* 8000E0BC */ virtual void setTevOrder(u32, J3DTevOrder);
/* 8000DFB8 */ virtual J3DTevOrder* getTevOrder(u32);
/* 8000E0BC */ virtual void setTevOrder(u32, J3DTevOrder) {}
/* 8000DFB8 */ virtual J3DTevOrder* getTevOrder(u32) { return NULL; }
/* 80110E80 */ virtual void setTevColor(u32, J3DGXColorS10 const*);
/* 8000E0C4 */ virtual void setTevColor(u32, J3DGXColorS10);
/* 8000DFC8 */ virtual J3DGXColorS10* getTevColor(u32);
/* 800732AC */ virtual void setTevKColor(u32, J3DGXColor const*);
/* 8000E0C0 */ virtual void setTevKColor(u32, J3DGXColor);
/* 8000DFC0 */ virtual J3DGXColor* getTevKColor(u32);
/* 8000E0C4 */ virtual void setTevColor(u32, J3DGXColorS10) {}
/* 8000DFC8 */ virtual J3DGXColorS10* getTevColor(u32) { return NULL; }
/* 800732AC */ virtual void setTevKColor(u32, J3DGXColor const*) {}
/* 8000E0C0 */ virtual void setTevKColor(u32, J3DGXColor) {}
/* 8000DFC0 */ virtual J3DGXColor* getTevKColor(u32) { return NULL; }
/* 80322950 */ virtual void setTevKColorSel(u32, u8 const*);
/* 8000E0B8 */ virtual void setTevKColorSel(u32, u8);
/* 8000DFB0 */ virtual bool getTevKColorSel(u32);
/* 8000E0B8 */ virtual void setTevKColorSel(u32, u8) {}
/* 8000DFB0 */ virtual bool getTevKColorSel(u32) { return false; }
/* 80322954 */ virtual void setTevKAlphaSel(u32, u8 const*);
/* 8000E0B4 */ virtual void setTevKAlphaSel(u32, u8);
/* 8000DFA8 */ virtual bool getTevKAlphaSel(u32);
/* 8000E0B4 */ virtual void setTevKAlphaSel(u32, u8) {}
/* 8000DFA8 */ virtual bool getTevKAlphaSel(u32) { return false; }
/* 8032354C */ virtual void setTevStageNum(u8 const*);
/* 8000E0C8 */ virtual void setTevStageNum(u8);
/* 8000DFD0 */ virtual u8 getTevStageNum() const;
/* 8000E0C8 */ virtual void setTevStageNum(u8) {}
/* 8000DFD0 */ virtual u8 getTevStageNum() const { return 1; }
/* 80323550 */ virtual void setTevStage(u32, J3DTevStage const*);
/* 8000E0A8 */ virtual void setTevStage(u32, J3DTevStage);
/* 8000DF8C */ virtual J3DTevStage* getTevStage(u32);
/* 8000E0A8 */ virtual void setTevStage(u32, J3DTevStage) {}
/* 8000DF8C */ virtual J3DTevStage* getTevStage(u32) { return NULL; }
/* 8032295C */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*);
/* 80322958 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo);
/* 80322960 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*);
/* 8000E0B0 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable);
/* 8000DFA0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32);
/* 8000E0B0 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable) {}
/* 8000DFA0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32) { return NULL; }
/* 80323554 */ virtual void setIndTevStage(u32, J3DIndTevStage const*);
/* 8000E0A4 */ virtual void setIndTevStage(u32, J3DIndTevStage);
/* 8000DF84 */ virtual J3DIndTevStage* getIndTevStage(u32);
/* 8000E0A4 */ virtual void setIndTevStage(u32, J3DIndTevStage) {}
/* 8000DF84 */ virtual J3DIndTevStage* getIndTevStage(u32) { return NULL; }
/* 80323558 */ virtual u32 getTexNoOffset() const;
/* 80322964 */ virtual bool getTevRegOffset() const;
/* 80321FE0 */ virtual void setTexNoOffset(u32);
@@ -809,19 +809,19 @@ public:
virtual u32 getType() = 0;
/* 80317368 */ virtual void setFog(J3DFog);
/* 80317364 */ virtual void setFog(J3DFog*);
/* 8000DF5C */ virtual J3DFog* getFog();
/* 8000DF5C */ virtual J3DFog* getFog() { return NULL; }
/* 8031736C */ virtual void setAlphaComp(J3DAlphaComp const*);
/* 8000E01C */ virtual void setAlphaComp(J3DAlphaComp const&);
/* 8000DF54 */ virtual J3DAlphaComp* getAlphaComp();
/* 8000E01C */ virtual void setAlphaComp(J3DAlphaComp const&) {}
/* 8000DF54 */ virtual J3DAlphaComp* getAlphaComp() { return NULL; }
/* 80317370 */ virtual void setBlend(J3DBlend const*);
/* 8000E018 */ virtual void setBlend(J3DBlend const&);
/* 8000DF4C */ virtual J3DBlend* getBlend();
/* 8000E018 */ virtual void setBlend(J3DBlend const&) {}
/* 8000DF4C */ virtual J3DBlend* getBlend() { return NULL; }
/* 80317374 */ virtual void setZMode(J3DZMode const*);
/* 8000E014 */ virtual void setZMode(J3DZMode);
/* 8000DF44 */ virtual J3DZMode* getZMode();
/* 8000E014 */ virtual void setZMode(J3DZMode) {}
/* 8000DF44 */ virtual J3DZMode* getZMode() { return NULL; }
/* 80317378 */ virtual void setZCompLoc(u8 const*);
/* 8000E010 */ virtual void setZCompLoc(u8);
/* 8000DF3C */ virtual u8 getZCompLoc() const;
/* 8000E010 */ virtual void setZCompLoc(u8) {}
/* 8000DF3C */ virtual u8 getZCompLoc() const { return 0; }
/* 80317380 */ virtual void setDither(u8 const*);
/* 8031737C */ virtual void setDither(u8);
/* 80317384 */ virtual u8 getDither() const;
@@ -1054,17 +1054,17 @@ public:
virtual void load() = 0;
/* 80317314 */ virtual s32 countDLSize();
virtual u32 getType() = 0;
/* 8000E0A0 */ virtual void setIndTexStageNum(u8);
/* 8000DF7C */ virtual u8 getIndTexStageNum() const;
/* 8000E0A0 */ virtual void setIndTexStageNum(u8) {}
/* 8000DF7C */ virtual u8 getIndTexStageNum() const { return 0; }
/* 80317410 */ virtual void setIndTexOrder(u32, J3DIndTexOrder);
/* 8031740C */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*);
/* 8000DF74 */ virtual J3DIndTexOrder* getIndTexOrder(u32);
/* 8000DF74 */ virtual J3DIndTexOrder* getIndTexOrder(u32) { return NULL; }
/* 80317414 */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*);
/* 8000E060 */ virtual void setIndTexMtx(u32, J3DIndTexMtx);
/* 8000DF6C */ virtual J3DIndTexMtx* getIndTexMtx(u32);
/* 8000E020 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale);
/* 8000E060 */ virtual void setIndTexMtx(u32, J3DIndTexMtx) {}
/* 8000DF6C */ virtual J3DIndTexMtx* getIndTexMtx(u32) { return NULL; }
/* 8000E020 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {}
/* 80317418 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*);
/* 8000DF64 */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32);
/* 8000DF64 */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
/* 8031726C */ virtual ~J3DIndBlock() {}
};
@@ -1215,17 +1215,17 @@ public:
/* 80317304 */ virtual s32 countDLSize();
virtual u32 getType() = 0;
/* 80317448 */ virtual void setMatColor(u32, J3DGXColor const*);
/* 8000E0DC */ virtual void setMatColor(u32, J3DGXColor);
/* 8000E000 */ virtual J3DGXColor* getMatColor(u32);
/* 8000E0DC */ virtual void setMatColor(u32, J3DGXColor) {}
/* 8000E000 */ virtual J3DGXColor* getMatColor(u32) { return NULL; }
/* 801A4C0C */ virtual void setAmbColor(u32, J3DGXColor const*);
/* 8000E0D4 */ virtual void setAmbColor(u32, J3DGXColor);
/* 8000DFF0 */ virtual J3DGXColor* getAmbColor(u32);
/* 8000E0E0 */ virtual void setColorChanNum(u8);
/* 8000E0D4 */ virtual void setAmbColor(u32, J3DGXColor) {}
/* 8000DFF0 */ virtual J3DGXColor* getAmbColor(u32) { return NULL; }
/* 8000E0E0 */ virtual void setColorChanNum(u8) {}
/* 8031744C */ virtual void setColorChanNum(u8 const*);
/* 8000E008 */ virtual u8 getColorChanNum() const;
/* 8000E0D8 */ virtual void setColorChan(u32, J3DColorChan const&);
/* 8000E008 */ virtual u8 getColorChanNum() const { return 0; }
/* 8000E0D8 */ virtual void setColorChan(u32, J3DColorChan const&) {}
/* 80317450 */ virtual void setColorChan(u32, J3DColorChan const*);
/* 8000DFF8 */ virtual J3DColorChan* getColorChan(u32);
/* 8000DFF8 */ virtual J3DColorChan* getColorChan(u32) { return NULL; }
/* 801A4C08 */ virtual void setLight(u32, J3DLightObj*);
/* 80317454 */ virtual bool getLight(u32);
/* 80317460 */ virtual void setCullMode(u8 const*);
include/JSystem/J3DGraphBase/J3DTevs.h
+6 -2
View File
@@ -65,7 +65,10 @@ extern J3DTevSwapModeInfo const j3dDefaultTevSwapMode;
*
*/
struct J3DTevStage {
/* 8000E230 */ J3DTevStage();
/* 8000E230 */ J3DTevStage() {
setTevStageInfo(j3dDefaultTevStageInfo);
setTevSwapModeInfo(j3dDefaultTevSwapMode);
}
void setTevColorOp(u8 param_1, u8 param_2, u8 param_3, u8 param_4, u8 param_5) {
mTevColorOp = mTevColorOp & ~(0x01 << 2) | param_1 << 2;
if (param_1 <= 1) {
@@ -237,13 +240,14 @@ struct J3DTevOrder : public J3DTevOrderInfo {
};
extern u8 j3dTevSwapTableTable[1024];
extern u8 const data_804563F8;
/**
* @ingroup jsystem-j3d
*
*/
struct J3DTevSwapModeTable {
/* 8000E134 */ J3DTevSwapModeTable();
/* 8000E134 */ J3DTevSwapModeTable() { mIdx = data_804563F8; }
J3DTevSwapModeTable(J3DTevSwapModeTableInfo const& info) {
mIdx = calcTevSwapTableID(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
}
include/JSystem/J3DGraphLoader/J3DAnmLoader.h
+54
View File
@@ -1,6 +1,7 @@
#ifndef J3DANMLOADER_H
#define J3DANMLOADER_H
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
enum J3DAnmLoaderDataBaseFlag {
J3DLOADER_UNK_FLAG0,
@@ -20,4 +21,57 @@ struct J3DAnmLoaderDataBase {
static J3DAnmBase* load(void const* param_0) { return load(param_0, J3DLOADER_UNK_FLAG0); }
};
class J3DAnmLoader {
public:
virtual J3DAnmBase* load(const void*) = 0;
virtual void setResource(J3DAnmBase*, const void*) = 0;
/* 80339800 */ virtual ~J3DAnmLoader() {}
};
class J3DAnmKeyLoader_v15 : public J3DAnmLoader {
public:
/* 803384E0 */ J3DAnmKeyLoader_v15();
/* 80338FEC */ void readAnmTransform(J3DAnmTransformKeyData const*);
/* 80339014 */ void setAnmTransform(J3DAnmTransformKey*, J3DAnmTransformKeyData const*);
/* 803390B0 */ void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
/* 803390D8 */ void setAnmTextureSRT(J3DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
/* 803392B0 */ void readAnmColor(J3DAnmColorKeyData const*);
/* 803392D8 */ void setAnmColor(J3DAnmColorKey*, J3DAnmColorKeyData const*);
/* 803393C4 */ void readAnmCluster(J3DAnmClusterKeyData const*);
/* 803393EC */ void setAnmCluster(J3DAnmClusterKey*, J3DAnmClusterKeyData const*);
/* 80339458 */ void readAnmTevReg(J3DAnmTevRegKeyData const*);
/* 80339480 */ void setAnmTevReg(J3DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
/* 8033960C */ void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
/* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
/* 80338D44 */ virtual J3DAnmBase* load(void const*);
/* 80338E8C */ virtual void setResource(J3DAnmBase*, void const*);
/* 803384FC */ virtual ~J3DAnmKeyLoader_v15();
/* 0x4 */ J3DAnmBase* mAnm;
};
class J3DAnmFullLoader_v15 : public J3DAnmLoader {
public:
/* 80338468 */ J3DAnmFullLoader_v15();
/* 80338800 */ void readAnmTransform(J3DAnmTransformFullData const*);
/* 80338828 */ void setAnmTransform(J3DAnmTransformFull*, J3DAnmTransformFullData const*);
/* 803388BC */ void readAnmColor(J3DAnmColorFullData const*);
/* 803388E4 */ void setAnmColor(J3DAnmColorFull*, J3DAnmColorFullData const*);
/* 803389B0 */ void readAnmTexPattern(J3DAnmTexPatternFullData const*);
/* 803389D8 */ void setAnmTexPattern(J3DAnmTexPattern*, J3DAnmTexPatternFullData const*);
/* 80338A7C */ void readAnmVisibility(J3DAnmVisibilityFullData const*);
/* 80338AA4 */ void setAnmVisibility(J3DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
/* 80338B20 */ void readAnmCluster(J3DAnmClusterFullData const*);
/* 80338B48 */ void setAnmCluster(J3DAnmClusterFull*, J3DAnmClusterFullData const*);
/* 80338BB4 */ void readAnmVtxColor(J3DAnmVtxColorFullData const*);
/* 80338BDC */ void setAnmVtxColor(J3DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
/* 80338558 */ virtual J3DAnmBase* load(void const*);
/* 803386A0 */ virtual void setResource(J3DAnmBase*, void const*);
/* 80338484 */ virtual ~J3DAnmFullLoader_v15();
/* 0x4 */ J3DAnmBase* mAnm;
};
#endif /* J3DANMLOADER_H */
include/JSystem/JGeometry.h
+3 -1
View File
@@ -171,7 +171,9 @@ struct TVec3<f32> : public Vec {
}
inline TVec3<f32> operator+(const TVec3<f32>& b) {
return *this += b;
TVec3<f32> a = *this;
a += b;
return a;
}
// inline TVec3<f32> operator+(const TVec3<f32>& b) {
include/JSystem/JParticle/JPAParticle.h
+3 -3
View File
@@ -81,9 +81,9 @@ public:
class JPAParticleCallBack {
public:
JPAParticleCallBack() {}
virtual ~JPAParticleCallBack();
virtual void execute(JPABaseEmitter*, JPABaseParticle*);
virtual void draw(JPABaseEmitter*, JPABaseParticle*);
virtual ~JPAParticleCallBack() = 0;
virtual void execute(JPABaseEmitter*, JPABaseParticle*) {}
virtual void draw(JPABaseEmitter*, JPABaseParticle*) {}
};
// not sure where this belongs
include/JSystem/JUtility/JUTFont.h
+3 -3
View File
@@ -77,7 +77,7 @@ public:
};
/* 0x0C */ virtual void setGX() = 0;
/* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2);
/* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2) { setGX(); }
/* 0x14 */ virtual f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6) = 0;
/* 0x18 */ virtual int getLeading() const = 0;
/* 0x1C */ virtual s32 getAscent() const = 0;
@@ -85,8 +85,8 @@ public:
/* 0x24 */ virtual s32 getHeight() const = 0;
/* 0x28 */ virtual s32 getWidth() const = 0;
/* 0x2C */ virtual void getWidthEntry(int i_no, TWidth* width) const = 0;
/* 0x30 */ virtual int getCellWidth() const;
/* 0x34 */ virtual s32 getCellHeight() const;
/* 0x30 */ virtual s32 getCellWidth() const { return getWidth(); }
/* 0x34 */ virtual s32 getCellHeight() const { return getHeight(); }
/* 0x38 */ virtual int getFontType() const = 0;
/* 0x3C */ virtual ResFONT* getResFont() const = 0;
/* 0x40 */ virtual bool isLeadByte(int a1) const = 0;
include/JSystem/JUtility/JUTResFont.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
/* 802DE01C */ virtual s32 getHeight() const;
/* 802DDFF8 */ virtual s32 getWidth() const;
/* 802DFC64 */ virtual void getWidthEntry(int, JUTFont::TWidth*) const;
/* 802DFD0C */ virtual int getCellWidth() const;
/* 802DFD0C */ virtual s32 getCellWidth() const;
/* 802DFD58 */ virtual s32 getCellHeight() const;
/* 802DDFE0 */ virtual int getFontType() const;
/* 802DDFD8 */ virtual ResFONT* getResFont() const;
include/c/c_damagereaction.h
+3 -2
View File
@@ -3,15 +3,16 @@
#include "JSystem/JParticle/JPAParticle.h"
class JPTraceParticleCallBack4 /* : JPAParticleCallBack */ {
class JPTraceParticleCallBack4 : JPAParticleCallBack {
public:
/* 8001817C */ void execute(JPABaseEmitter*, JPABaseParticle*);
/* 800182A4 */ void draw(JPABaseEmitter*, JPABaseParticle*);
/* 80018328 */ ~JPTraceParticleCallBack4();
/* 80018328 */ ~JPTraceParticleCallBack4() {}
};
BOOL cDmrNowMidnaTalk();
extern u8 cDmr_SkipInfo;
extern JPTraceParticleCallBack4 JPTracePCB4;
#endif /* C_C_DAMAGEREACTION_H */
include/d/actor/d_a_do.h
+1 -1
View File
@@ -63,7 +63,7 @@ struct daDo_HIO_tmp {
class daDo_HIO_c {
public:
/* 80667D4C */ daDo_HIO_c();
/* 8066ED40 */ virtual ~daDo_HIO_c(); // should be inlined
/* 8066ED40 */ virtual ~daDo_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mBaseSize;
include/d/actor/d_a_dshutter.h
+11 -11
View File
@@ -18,10 +18,10 @@ public:
public:
typedef int (daDsh_c::*actionFunc)();
/* action_c(actionFunc i_initFunc, actionFunc i_execFunc) {
action_c(actionFunc i_initFunc, actionFunc i_execFunc) {
mInitFunc = i_initFunc;
mExecuteFunc = i_execFunc;
} */
}
actionFunc& getInit() { return mInitFunc; }
actionFunc& getExecute() { return mExecuteFunc; }
@@ -65,15 +65,15 @@ public:
f32 getCloseBoundSpeed() { return CLOSE_BOUND_SPEED; }
f32 getCloseBoundRatio() { return CLOSE_BOUND_RATIO; }
static f32 OPEN_SIZE;
static f32 OPEN_ACCEL;
static f32 OPEN_SPEED;
static f32 OPEN_BOUND_SPEED;
static f32 OPEN_BOUND_RATIO;
static f32 CLOSE_ACCEL;
static f32 CLOSE_SPEED;
static f32 CLOSE_BOUND_SPEED;
static f32 CLOSE_BOUND_RATIO;
static f32 const OPEN_SIZE;
static f32 const OPEN_ACCEL;
static f32 const OPEN_SPEED;
static f32 const OPEN_BOUND_SPEED;
static f32 const OPEN_BOUND_RATIO;
static f32 const CLOSE_ACCEL;
static f32 const CLOSE_SPEED;
static f32 const CLOSE_BOUND_SPEED;
static f32 const CLOSE_BOUND_RATIO;
/* 0x5A0 */ dComIfG_resLoader_c mResLoader;
/* 0x5B0 */ J3DModel* mpModel;
include/d/actor/d_a_e_ba.h
+1 -1
View File
@@ -79,7 +79,7 @@ public:
/* 0x698 */ f32 mKnockbackSpeed;
/* 0x69C */ s16 mKnockbackAngle;
/* 0x69E */ csXyz mChanceAngle;
/* 0x6A4 */ bool mIsDying;
/* 0x6A4 */ s8 mIsDying;
/* 0x6A6 */ s16 mTimer[4];
/* 0x6AE */ s16 mIFrames;
/* 0x6B0 */ cXyz field_0x6b0;
include/d/actor/d_a_nbomb.h
+6 -3
View File
@@ -76,9 +76,12 @@ public:
/* 804CAEE8 */ int execute();
/* 804CBC60 */ int draw();
virtual BOOL checkExplodeNow();
virtual void deleteBombAndEffect();
virtual void setCargoBombExplode();
virtual BOOL checkExplodeNow() { return field_0xb51 != 0; }
virtual void deleteBombAndEffect() {
fopAcM_delete(this);
onStateFlg0(FLG0_UNK_40);
}
virtual void setCargoBombExplode() { onStateFlg0(FLG0_BOMB_HIT); }
void onStateFlg0(daNbomb_FLG0 i_flag) { mStateFlg0 |= i_flag; }
void offStateFlg0(daNbomb_FLG0 i_flag) { mStateFlg0 &= ~i_flag; }
include/d/actor/d_a_obj_carry.h
+1 -1
View File
@@ -208,7 +208,7 @@ public:
}
static u8 const mData[2072];
static Vec mPos[5];
static cXyz mPos[5];
static u8 mSttsFlag[5];
static s8 mRoomNo[5];
static bool mSaveFlag;
include/d/actor/d_a_obj_movebox.h
+1 -1
View File
@@ -191,7 +191,7 @@ namespace daObjMovebox {
void off_switch1() const { fopAcM_offSwitch(this, prm_get_swSave1()); }
void off_switch2() const { fopAcM_offSwitch(this, prmZ_get_swSave2()); }
static s16 M_dir_base[4];
static const s16 M_dir_base[4];
static const char* const M_arcname[8];
static const dCcD_SrcCyl M_cyl_src;
static const daObjMovebox::Hio_c::Attr_c M_attr[8];
include/d/actor/d_a_player.h
+1 -1
View File
@@ -945,7 +945,7 @@ public:
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline static BOOL checkNowWolf();
inline static u32 i_checkNowWolf() { return dComIfGp_getLinkPlayer()->checkWolf(); }
inline static u32 i_checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
inline bool checkZoraWearFlg() const;
inline bool checkMagicArmorWearFlg() const;
inline static BOOL i_checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
include/d/actor/d_a_suspend.h
+5 -5
View File
@@ -21,8 +21,8 @@ public:
/* 800310C8 */ u8 check(fopAc_ac_c*);
/* 80031038 */ bool check(cXyz const&);
/* 80031150 */ void execute();
/* 80031F28 */ ~data_c();
/* 80031F64 */ data_c();
/* 80031F28 */ ~data_c() {}
/* 80031F64 */ data_c() { reset(); }
void setNext(data_c* i_next) { mpNext = i_next; }
data_c* getNext() { return mpNext; }
@@ -44,7 +44,7 @@ public:
public:
/* 80031190 */ void add(daSus_c::data_c*);
/* 800311FC */ void reset();
/* 80031EE4 */ room_c();
/* 80031EE4 */ room_c() { init(); }
void init() { mpData = NULL; }
/* 0x0 */ data_c* mpData;
@@ -68,8 +68,8 @@ public:
u8 getSw() { return fopAcM_GetParam(this) & 0xFF; }
u8 getRoom() { return fopAcM_GetParam(this) >> 10; }
static u8 mData[1152];
static u8 mRoom[256];
static data_c mData[0x20];
static room_c mRoom[0x40];
static s16 mSetTop;
};
include/d/actor/d_a_ykgr.h
+20 -18
View File
@@ -8,21 +8,27 @@
#include "d/d_com_inf_game.h"
#include "d/d_particle.h"
struct daYkgr_HIO_c {
/* 805A8D98 */ ~daYkgr_HIO_c();
struct daYkgr_HIO_c : mDoHIO_entry_c {
daYkgr_HIO_c();
/* 805A8D98 */ virtual ~daYkgr_HIO_c();
u32 vtable;
u8 field_0x4[0x20 - 0x4];
f32 field_0x20;
f32 field_0x24;
/* 0x04 */ u8 field_0x4;
/* 0x08 */ s32 field_0x8;
/* 0x0C */ s32 field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
};
struct dPa_YkgrPcallBack /*: public JPAParticleCallBack */ {
/* 805A8E3C */ ~dPa_YkgrPcallBack();
struct dPa_YkgrPcallBack : public JPAParticleCallBack {
dPa_YkgrPcallBack();
/* 805A8E3C */ ~dPa_YkgrPcallBack() {}
/* 805A848C */ void draw(JPABaseEmitter*, JPABaseParticle*);
/* 805A84D4 */ void setParam(f32);
u32 vtable;
/* 0x04 */ f32 field_0x4;
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
@@ -32,10 +38,6 @@ struct dPa_YkgrPcallBack /*: public JPAParticleCallBack */ {
/* 0x1C */ s8 field_0x1c;
};
extern "C" u8 m_flag__8daYkgr_c;
extern "C" u8 m_alpha_flag__8daYkgr_c;
extern "C" u8 m_alpha__8daYkgr_c;
/**
* @ingroup actors-unsorted
* @class daYkgr_c
@@ -94,11 +96,11 @@ public:
static f32 m_aim_rate;
static dPath* m_path;
u8 field_0x568[0x570 - 0x568];
Mtx field_0x570;
u32 field_0x5a0;
f32 field_0x5a4;
f32 field_0x5a8;
/* 0x568 */ u8 field_0x568[0x570 - 0x568];
/* 0x570 */ Mtx field_0x570;
/* 0x5A0 */ u32 field_0x5a0;
/* 0x5A4 */ f32 field_0x5a4;
/* 0x5A8 */ f32 field_0x5a8;
};
STATIC_ASSERT(sizeof(daYkgr_c) == 0x5AC);
include/d/d_bg_w_kcol.h
+1 -1
View File
@@ -45,7 +45,7 @@ struct KCol_Header {
class dBgWKCol : public dBgW_Base {
public:
/* 8007E6F4 */ dBgWKCol();
/* 8007E7D0 */ static void initKCollision(void*);
/* 8007E7D0 */ static void* initKCollision(void*);
/* 8007E804 */ void create(void* pprism, void* plc);
/* 8007E850 */ void getTriNrm(KC_PrismData*, Vec**) const;
/* 8007E8C0 */ cM3dGPla GetTriPla(int) const;
include/d/d_bomb.h
+3 -3
View File
@@ -32,9 +32,9 @@ public:
static bool checkWaterBomb(fopAc_ac_c*);
static bool checkInsectBombMove(fopAc_ac_c*);
virtual BOOL checkExplodeNow();
virtual void deleteBombAndEffect();
virtual void setCargoBombExplode();
virtual BOOL checkExplodeNow() { return FALSE; }
virtual void deleteBombAndEffect() {}
virtual void setCargoBombExplode() {}
bool checkStateExplode() { return fopAcM_GetParam(this) == 0; }
include/d/d_cam_param.h
+28 -25
View File
@@ -21,7 +21,7 @@ public:
/* 0x8 */ int mInputSpeed;
/* 0xC */ u8 field_0xc[4];
/* 800889B0 */ virtual ~dCstick_c();
/* 800889B0 */ virtual ~dCstick_c() {}
f32 SwTHH() { return mThresholdHigh; }
};
@@ -64,7 +64,7 @@ struct dCamStyleData {
/* 0x0 */ u32 field_0x0;
/* 0x4 */ u16 field_0x4;
/* 0x6 */ u16 field_0x6;
/* 0x8 */ u8 field_0x8[0x78 - 0x8];
/* 0x8 */ f32 field_0x8[28];
}; // Size: 0x78
/* 0x0 */ u8 field_0x0[4];
@@ -77,16 +77,19 @@ public:
/* 800884F0 */ dCamParam_c(s32);
/* 800885D4 */ int Change(s32);
/* 80088620 */ int SearchStyle(u32);
/* 80182C60 */ void Arg2(s16);
/* 80182C3C */ void Arg2();
/* 80182C48 */ void Arg1();
/* 80182C6C */ void Arg1(u8);
/* 80182C50 */ void Arg0();
/* 80182C74 */ void Arg0(u8);
/* 80182C7C */ void Fovy(u8);
/* 80182C58 */ void Fovy();
/* 80182C60 */ void Arg2(s16 val) { mMapToolArg2 = val; }
/* 80182C3C */ int Arg2() { return mMapToolArg2; }
/* 80182C48 */ u8 Arg1() { return mMapToolArg1; }
/* 80182C6C */ void Arg1(u8 val) { mMapToolArg1 = val; }
/* 80182C50 */ u8 Arg0() { return mMapToolArg0; }
/* 80182C74 */ void Arg0(u8 val) { mMapToolArg0 = val; }
/* 80182C7C */ void Fovy(u8 val) { mMapToolFovy = val; }
/* 80182C58 */ u8 Fovy() { return mMapToolFovy; }
/* 80182CB4 */ bool CheckFlag(u16 flag) { return mCurrentStyle->field_0x6 & flag; }
/* 80182CD0 */ void Val(s32, int);
/* 80182CD0 */ f32 Val(s32 param_0, int param_1) {
return mCamStyleData[param_0].field_0x8[param_1];
}
/* 0x00 */ u8 mMapToolFovy;
/* 0x01 */ u8 mMapToolArg0;
@@ -103,7 +106,7 @@ public:
int Algorythmn() { return mCurrentStyle->field_0x4; }
bool Flag(s32 param_0, u16 param_1) { return mCamStyleData[param_0].field_0x6 & param_1; }
/* 8008858C */ virtual ~dCamParam_c();
/* 8008858C */ virtual ~dCamParam_c() {}
};
class dCamSetup_c {
@@ -111,16 +114,17 @@ public:
/* 80088668 */ dCamSetup_c();
/* 80088918 */ bool CheckLatitudeRange(s16*);
/* 80088988 */ f32 PlayerHideDist();
/* 80182BB8 */ void CheckFlag2(u16);
/* 80182BE8 */ void WaitRollSpeed();
/* 80182BF0 */ void WaitRollTimer();
/* 80182C1C */ // void ThrowTimer();
/* 80182C24 */ void ThrowCushion();
/* 80182C2C */ void ThrowVAngle();
/* 80182C34 */ void ThrowCtrAdjust();
/* 80182CEC */ void ChargeBRatio();
/* 80182CF4 */ void ChargeTimer();
/* 80182CFC */ void ChargeLatitude();
/* 80182BB8 */ bool CheckFlag2(u16 i_flag) { return mFlags2 & i_flag; }
/* 80182BE8 */ f32 WaitRollSpeed() { return mWaitRollSpeed; }
/* 80182BF0 */ int WaitRollTimer() { return mWaitRollTimer; }
/* 80182C1C */ int ThrowTimer() { return mThrowTimer; }
/* 80182C24 */ f32 ThrowCushion() { return mThrowCushion; }
/* 80182C2C */ f32 ThrowVAngle() { return mThrowVAngle; }
/* 80182C34 */ f32 ThrowCtrAdjust() { return mThrowCtrOffset; }
/* 80182CEC */ f32 ChargeBRatio() { return mChargeBRatio; }
/* 80182CF4 */ int ChargeTimer() { return mChargeTimer; }
/* 80182CFC */ f32 ChargeLatitude() { return mChargeLatitude; }
bool CheckFlag(u16 i_flag) { return mDebugFlags & i_flag; }
f32 ManualEndVal() { return mManualEndVal; }
@@ -128,14 +132,13 @@ public:
f32 VistaTrimHeight() { return mTrimVistaHeight; }
f32 ForceLockOffTimer() { return mForceLockOffTimer; }
f32 ForceLockOffDist() { return mForceLockOffDist; }
int ThrowTimer() { return mThrowTimer; }
f32 USOValue() { return mFalseValue; }
f32 USOAngle() { return mFalseAngle; }
/* 0x000 */ f32 mDrawNear;
/* 0x004 */ f32 mDrawFar;
/* 0x008 */ u16 mDebugFlags;
/* 0x00A */ u16 field_0xa;
/* 0x00A */ u16 mFlags2;
/* 0x00C */ int field_0xc;
/* 0x010 */ int mModeSwitchType;
/* 0x014 */ void* mTypeTable;
@@ -199,7 +202,7 @@ public:
/* 0x0F8 */ f32 field_0xf8;
/* 0x0FC vtable */
/* 800888B8 */ virtual ~dCamSetup_c();
/* 800888B8 */ virtual ~dCamSetup_c() {}
/* 0x100 */ dCstick_c mCStick;
/* 0x114 */ dCamBGChk_c mBGChk;
include/d/d_drawlist.h
+1 -5
View File
@@ -345,16 +345,12 @@ public:
void setXluListZxlu() { setXluDrawList(mDrawBuffers[DB_LIST_Z_XLU]); }
void setOpaListFilter() { setOpaDrawList(mDrawBuffers[DB_LIST_FILTER]); }
void setXluListFilter() { setXluDrawList(mDrawBuffers[DB_LIST_FILTER]); }
void set3DlineMat(mDoExt_3DlineMat_c *param_1) {
#ifndef NON_VIRTUAL_3DLINEMAT
void set3DlineMat(mDoExt_3DlineMat_c *param_1) {
m3DLineMatSortPacket[param_1->getMaterialID()].setMat(param_1);
#endif
}
void set3DlineMatDark(mDoExt_3DlineMat_c *param_1) {
#ifndef NON_VIRTUAL_3DLINEMAT
m3DLineMatSortPacket[param_1->getMaterialID()].setMatDark(param_1);
#endif
}
void peekZdata() { mPeekZ.peekData(); }
include/d/d_file_select.h
+43 -66
View File
@@ -3,25 +3,36 @@
#include "d/d_com_inf_game.h"
#include "d/d_file_sel_warning.h"
#include "d/d_msg_string.h"
#include "d/d_name.h"
#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
class dFile_info_c;
class dDlst_FileSel_c {
class dDlst_FileSel_c : public dDlst_base_c {
public:
/* 8018DEBC */ void draw();
/* 8019135C */ ~dDlst_FileSel_c();
/* 8019135C */ ~dDlst_FileSel_c() {
delete Scr;
delete mpMessageString;
}
dDlst_FileSel_c() {
mpMessageFont[0] = mDoExt_getMesgFont();
mpMessageFont[1] = mDoExt_getSubFont();
mpMessageString = new dMsgString_c();
}
/* 0x00 */ void* vtable;
/* 0x04 */ J2DScreen* Scr;
/* 0x08 */ JUTFont* mpMessageFont[2];
/* 0x0C */ dMsgString_c* mpMessageString;
};
class dFile_select3D_c {
public:
/* 801902F0 */ dFile_select3D_c();
/* 80190380 */ /* virtual */ ~dFile_select3D_c();
/* 80190380 */ virtual ~dFile_select3D_c();
/* 801903DC */ void _create(u8, u8);
/* 8019049C */ void _delete();
/* 801904A0 */ void freeHeap();
@@ -40,7 +51,6 @@ public:
void setBasePane(CPaneMgr* paneMgr) { mPaneMgr = paneMgr; }
void setBase2Pane(J2DPane* pane) { mPane = pane; }
/* 0x0000 */ void* vtable;
/* 0x0004 */ JKRSolidHeap* mpHeap;
/* 0x0008 */ J3DModel* mpModel;
/* 0x000C */ mDoExt_bckAnm* mBckAnm;
@@ -59,78 +69,48 @@ public:
/* 0x03CF */ u8 mMaskIdx;
};
class dDlst_FileSelYn_c {
class dDlst_FileSelYn_c : public dDlst_base_c {
public:
/* 8018E0C0 */ void draw();
/* 801911F4 */ ~dDlst_FileSelYn_c();
/* 801911F4 */ virtual ~dDlst_FileSelYn_c() { delete ScrYn; }
/* 0x00 */ void* vtable;
/* 0x04 */ J2DScreen* ScrYn;
/* 0x08 */ u8 field_0x08[4];
};
class dDlst_FileSelDt_c {
class dDlst_FileSelDt_c : public dDlst_base_c {
public:
/* 8018DEF4 */ void draw();
/* 801912E4 */ ~dDlst_FileSelDt_c();
/* 801912E4 */ virtual ~dDlst_FileSelDt_c() { delete ScrDt; }
/* 0x00 */ void* vtable;
/* 0x04 */ J2DScreen* ScrDt;
/* 0x08 */ J2DPane* mpPane;
/* 0x0C */ J2DPane* mpPane2;
};
class dDlst_FileSelCp_c {
class dDlst_FileSelCp_c : public dDlst_base_c {
public:
/* 8018DFFC */ void draw();
/* 8019126C */ ~dDlst_FileSelCp_c();
/* 8019126C */ virtual ~dDlst_FileSelCp_c() { delete Scr; }
/* 0x00 */ void* vtable;
/* 0x04 */ J2DScreen* Scr;
/* 0x08 */ bool field_0x08;
/* 0x0C */ J2DPane* mpPane1;
/* 0x10 */ J2DPane* mpPane2;
};
class dDlst_FileSel3m_c {
class dDlst_FileSel3m_c : public dDlst_base_c {
public:
/* 8018E0F8 */ void draw();
/* 8019117C */ ~dDlst_FileSel3m_c();
/* 8019117C */ virtual ~dDlst_FileSel3m_c() { delete Scr3m; }
/* 0x00 */ void* vtable;
/* 0x04 */ J2DScreen* Scr3m;
};
// temp struct in order to get matches
class dFs_HIO_c_tmp {
public:
/* 0x0000 */ void* vtable;
/* 0x0004 */ s8 field_0x0004;
/* 0x0005 */ u8 field_0x0005;
/* 0x0006 */ u8 field_0x0006;
/* 0x0007 */ u8 field_0x0007;
/* 0x0008 */ u8 field_0x0008;
/* 0x0009 */ u8 field_0x0009;
/* 0x000A */ u8 field_0x000a;
/* 0x000B */ u8 field_0x000b;
/* 0x000C */ u8 field_0x000c;
/* 0x000D */ u8 field_0x000d;
/* 0x000E */ u8 field_0x000e[2];
/* 0x0010 */ float field_0x0010[3];
/* 0x001C */ u8 field_0x001c;
/* 0x001D */ u8 field_0x001d;
/* 0x001E */ u8 field_0x001e;
/* 0x001F */ u8 field_0x001f;
/* 0x0020 */ u8 field_0x0020;
/* 0x0021 */ u8 field_0x0021;
/* 0x0022 */ u8 field_0x0022;
/* 0x0023 */ u8 field_0x0023;
};
class dFs_HIO_c {
public:
/* 801835F8 */ dFs_HIO_c();
/* 801913E0 */ virtual ~dFs_HIO_c();
/* 801913E0 */ virtual ~dFs_HIO_c() {}
/* 0x0000 */ // void* vtable;
/* 0x0004 */ s8 field_0x0004;
@@ -163,7 +143,7 @@ public:
typedef void (dFile_select_c::*DispFunc)();
/* 8018366C */ dFile_select_c(JKRArchive*);
/* 8018375C */ ~dFile_select_c();
/* 8018375C */ virtual ~dFile_select_c();
/* 801843CC */ void _create();
/* 801844FC */ void _move();
/* 80184664 */ void selFileWakuAnm();
@@ -326,24 +306,21 @@ public:
u8 getSelectNum() { return mSelectNum; }
void setUseType(u8 type) { mUseType = type; }
/* 0x0000 */ void* vtable;
/* 0x0004 */ u8 field_0x04[4];
/* 0x0008 */ JKRArchive* mpArchive;
/* 0x000C */ dFile_select3D_c* mpFileSelect3d;
/* 0x0010 */ dDlst_FileSel_c fileSel;
/* 0x0018 */ JUTFont* mpMessageFont[2];
/* 0x0020 */ dMsgString_c* mpMessageString;
/* 0x0024 */ dDlst_FileSelDt_c mSelDt;
/* 0x0034 */ dDlst_FileSelCp_c mCpSel;
/* 0x0048 */ dDlst_FileSelYn_c mYnSel;
/* 0x0054 */ dDlst_FileSel3m_c m3mSel;
/* 0x0004 */ u8 field_0x04[4];
/* 0x0008 */ JKRArchive* mpArchive;
/* 0x000C */ dFile_select3D_c* mpFileSelect3d;
/* 0x0010 */ dDlst_FileSel_c fileSel;
/* 0x0024 */ dDlst_FileSelDt_c mSelDt;
/* 0x0034 */ dDlst_FileSelCp_c mCpSel;
/* 0x0048 */ dDlst_FileSelYn_c mYnSel;
/* 0x0054 */ dDlst_FileSel3m_c m3mSel;
/* 0x005C */ u8 field_0x005c[4];
/* 0x0060 */ dSelect_cursor_c* mSelIcon;
/* 0x0064 */ dSelect_cursor_c* mSelIcon2;
/* 0x0060 */ dSelect_cursor_c* mSelIcon;
/* 0x0064 */ dSelect_cursor_c* mSelIcon2;
/* 0x0068 */ dName_c* mpName;
/* 0x006C */ dFile_warning_c* mpFileWarning;
/* 0x006C */ dFile_warning_c* mpFileWarning;
/* 0x0070 */ dFile_info_c* field_0x0070[3];
/* 0x007C */ dFile_info_c* mpFileInfo[2];
/* 0x007C */ dFile_info_c* mpFileInfo[2];
/* 0x0084 */ J2DAnmTransform* field_0x0084;
/* 0x0088 */ J2DAnmTransform* field_0x0088;
/* 0x008C */ J2DAnmTransform* field_0x008c;
@@ -352,8 +329,8 @@ public:
/* 0x0098 */ J2DAnmTransform* field_0x0098;
/* 0x009C */ J2DAnmTransform* field_0x009c;
/* 0x00A0 */ s32 field_0x00a0;
/* 0x00A4 */ CPaneMgr* field_0x00a4;
/* 0x00A8 */ u8 field_0x00a8[0xb0-0xa8];
/* 0x00A4 */ CPaneMgr* field_0x00a4;
/* 0x00A8 */ u8 field_0x00a8[0xb0-0xa8];
/* 0x00B0 */ s32 field_0x00b0;
/* 0x00B4 */ s32 field_0x00b4;
/* 0x00B8 */ u8 field_0x00b8;
@@ -369,10 +346,10 @@ public:
/* 0x00F8 */ s32 field_0x00f8[2];
/* 0x0100 */ s32 field_0x0100;
/* 0x0104 */ s32 field_0x0104;
/* 0x0108 */ bool field_0x0108;
/* 0x0109 */ bool field_0x0109;
/* 0x010A */ u8 field_0x10a[2];
/* 0x010C */ J2DPane* mpPane;
/* 0x0108 */ bool field_0x0108;
/* 0x0109 */ bool field_0x0109;
/* 0x010A */ u8 field_0x10a[2];
/* 0x010C */ J2DPane* mpPane;
/* 0x0110 */ int field_0x0110;
/* 0x0114 */ int field_0x0114;
/* 0x0118 */ J2DPane* field_0x0118;
include/d/d_gameover.h
+1 -1
View File
@@ -10,7 +10,7 @@
class dDlst_Gameover_CAPTURE_c : public dDlst_base_c {
public:
/* 8019ACF8 */ virtual void draw();
/* 8019C2CC */ virtual ~dDlst_Gameover_CAPTURE_c(); // supposed to be inlined
/* 8019C2CC */ virtual ~dDlst_Gameover_CAPTURE_c() {}
};
class dMsgScrnLight_c;
include/d/d_menu_collect.h
+2 -2
View File
@@ -21,7 +21,7 @@ class dMenu_Collect2DTop_c : public dDlst_base_c {
public:
dMenu_Collect2DTop_c(dMenu_Collect2D_c* param_0) { mpCollect2D = param_0; }
/* 801B77A4 */ virtual void draw();
/* 801B7EB8 */ virtual ~dMenu_Collect2DTop_c();
/* 801B7EB8 */ virtual ~dMenu_Collect2DTop_c() {}
/* 0x4 */ dMenu_Collect2D_c* mpCollect2D;
};
@@ -102,7 +102,7 @@ public:
/* 801B61BC */ void setItemNameString(u8, u8);
/* 801B6344 */ void setItemNameStringNull();
/* 801B7F00 */ virtual void draw();
/* 801B7F00 */ virtual void draw() { _draw(); }
/* 801AFE34 */ virtual ~dMenu_Collect2D_c();
u8 getCursorX() { return mCursorX; }
include/d/d_menu_save.h
+1 -1
View File
@@ -265,7 +265,7 @@ public:
/* 801F69B8 */ void _draw();
/* 801F69FC */ void _draw2();
/* 802844D0 */ virtual ~dMenu_save_c();
/* 802844D0 */ virtual ~dMenu_save_c() {}
u8 getSaveStatus() { return mSaveStatus; }
u8 getEndStatus() { return mEndStatus; }
include/d/d_meter2.h
+5 -13
View File
@@ -19,20 +19,12 @@ class dMeterHaihai_c;
class dMeterSub_c : public dDlst_base_c {
public:
// these seem to be inlined, but generates in the wrong order in d_scope.cpp
/* 8019412C */ //virtual void draw() {}
/* 801940D4 */ //virtual ~dMeterSub_c() {}
/* 8019411C */ //virtual int _create() { return 0; }
/* 80194130 */ //virtual int _execute(u32) { return 0; }
/* 80194124 */ //virtual int _delete() { return 0; }
/* 80194138 */ //virtual int isDead() { return 0; }
/* 8019412C */ virtual void draw();
/* 8019412C */ virtual void draw() {}
/* 801940D4 */ virtual ~dMeterSub_c() {}
/* 8019411C */ virtual int _create();
/* 80194130 */ virtual int _execute(u32);
/* 80194124 */ virtual int _delete();
/* 80194138 */ virtual bool isDead();
/* 8019411C */ virtual int _create() { return 0; }
/* 80194130 */ virtual int _execute(u32) { return 0; }
/* 80194124 */ virtual int _delete() { return 0; }
/* 80194138 */ virtual bool isDead() { return false; }
};
class dMeter2_c : public msg_class {
include/d/d_meter2_draw.h
+2 -2
View File
@@ -354,8 +354,8 @@ private:
/* 0x518 */ J2DPicture* mpItemXYPane[3];
/* 0x524 */ int field_0x524[2][2];
/* 0x534 */ J2DAnmTransformKey* mPikariBck;
/* 0x538 */ J2DAnmColorKey* mPikariBpk;
/* 0x53C */ J2DAnmColorKey* mpOxygenBpk[3];
/* 0x538 */ J2DAnmColor* mPikariBpk;
/* 0x53C */ J2DAnmColor* mpOxygenBpk[3];
/* 0x548 */ JUtility::TColor mPikariBlack;
/* 0x54C */ JUtility::TColor mPikariWhite;
/* 0x550 */ f32 field_0x550;
include/d/d_msg_scrn_3select.h
+2 -2
View File
@@ -5,7 +5,7 @@
class J2DScreen;
class J2DAnmTransform;
class J2DAnmColor;
class J2DAnmColorKey;
class J2DAnmTextureSRTKey;
class dSelect_cursor_c;
class CPaneMgr;
@@ -58,7 +58,7 @@ public:
private:
/* 0x004 */ J2DScreen* mpScreen;
/* 0x008 */ J2DAnmTransform* mpAnmBck;
/* 0x00C */ J2DAnmColor* mpAnmBpk;
/* 0x00C */ J2DAnmColorKey* mpAnmBpk;
/* 0x010 */ J2DAnmTextureSRTKey* mpAnmBtk;
/* 0x014 */ dSelect_cursor_c* mpSelectCursor;
/* 0x018 */ CPaneMgr* mpParent;
include/d/d_msg_string.h
+8 -1
View File
@@ -12,7 +12,14 @@ public:
/* 80249CA0 */ dMsgString_c(u8);
/* 80249D28 */ ~dMsgString_c();
/* 80191B6C */ virtual f32 getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
/* 80191B6C */ virtual f32 getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2,
JUTFont* param_3, COutFont_c* param_4, u8 param_5) {
if (param_4 == NULL && mpOutFont != NULL) {
return getStringLocal(param_0, param_1, param_2, param_3, mpOutFont, param_5);
} else {
return getStringLocal(param_0, param_1, param_2, param_3, param_4, param_5);
}
}
/* 801E1D10 */ virtual void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
u8);
/* 80249DB4 */ virtual void resetStringLocal(J2DTextBox*);
include/d/d_particle.h
+14 -14
View File
@@ -193,10 +193,10 @@ public:
setModel(param_0, param_1, param_2, param_3, param_4, param_5);
}
static dPa_modelEcallBack& getEcallback() { return (dPa_modelEcallBack&)mEcallback; }
static dPa_modelEcallBack* mEcallback; // Should be dPa_modelEcallBack
static dPa_modelEcallBack& getEcallback() { return mEcallback; }
static dPa_modelEcallBack mEcallback;
static u8 mPcallback[4];
static dPa_modelPcallBack mPcallback;
static model_c* mModel;
};
@@ -415,15 +415,15 @@ public:
static JPAEmitterManager* getEmitterManager() { return mEmitterMng; }
static JPAParticleCallBack* getLight8PcallBack() {
static dPa_light8PcallBack* getLight8PcallBack() {
return &mLight8PcallBack;
}
static JPAParticleCallBack* getGen_b_Light8PcallBack() {
static dPa_gen_b_light8PcallBack* getGen_b_Light8PcallBack() {
return &m_b_Light8PcallBack;
}
static JPAParticleCallBack* getGen_d_Light8PcallBack() {
static dPa_gen_d_light8PcallBack* getGen_d_Light8PcallBack() {
return &m_d_Light8PcallBack;
}
@@ -439,11 +439,11 @@ public:
return &mLight8EcallBack;
}
static JPAParticleCallBack* getParticleTracePCB() {
static dPa_particleTracePcallBack_c* getParticleTracePCB() {
return &mParticleTracePCB;
}
static JPAParticleCallBack* getFsenthPcallBack() {
static dPa_fsenthPcallBack* getFsenthPcallBack() {
return &mFsenthPcallBack;
}
@@ -455,15 +455,15 @@ public:
static u8 mLifeBall[24];
static Mtx mWindViewMatrix;
static JPAEmitterManager* mEmitterMng;
static JPAParticleCallBack mWaterBubblePcallBack;
static JPAParticleCallBack mFsenthPcallBack;
static dPa_wbPcallBack_c mWaterBubblePcallBack;
static dPa_fsenthPcallBack mFsenthPcallBack;
static dPa_light8EcallBack mLight8EcallBack;
static JPAParticleCallBack mLight8PcallBack;
static dPa_light8PcallBack mLight8PcallBack;
static dPa_gen_b_light8EcallBack m_b_Light8EcallBack;
static JPAParticleCallBack m_b_Light8PcallBack;
static dPa_gen_b_light8PcallBack m_b_Light8PcallBack;
static dPa_gen_d_light8EcallBack m_d_Light8EcallBack;
static JPAParticleCallBack m_d_Light8PcallBack;
static JPAParticleCallBack mParticleTracePCB;
static dPa_gen_d_light8PcallBack m_d_Light8PcallBack;
static dPa_particleTracePcallBack_c mParticleTracePCB;
static u8 mStatus;
private:
include/d/d_select_cursor.h
+1 -1
View File
@@ -10,7 +10,7 @@ class dSelect_cursorHIO_c {
public:
/* 801941E4 */ dSelect_cursorHIO_c();
/* 80195978 */ virtual ~dSelect_cursorHIO_c();
/* 80195978 */ virtual ~dSelect_cursorHIO_c() {}
/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 field_0x8;
include/d/d_select_icon.h
+4 -3
View File
@@ -2,11 +2,12 @@
#define D_D_SELECT_ICON_H
#include "JSystem/J2DGraph/J2DScreen.h"
#include "d/d_drawlist.h"
#include "d/d_pane_class.h"
class dSi_HIO_c {
public:
virtual ~dSi_HIO_c();
virtual ~dSi_HIO_c() {}
dSi_HIO_c();
u8 field_0x4[4];
@@ -20,10 +21,10 @@ public:
virtual ~dSelect_icon_c() {}
void drawSelf() {
// Not sure what field_0x4 is
field_0x4.draw();
}
/* 0x04 */ u8 field_0x4[4];
/* 0x04 */ dDlst_base_c field_0x4; // type is a guess
/* 0x08 */ J2DScreen* field_0x8;
/* 0x0C */ CPaneMgrAlpha* field_0xc;
/* 0x10 */ CPaneMgr* field_0x10;
include/f_op/f_op_actor_enemy.h
+4 -6
View File
@@ -48,18 +48,16 @@ static int setMidnaBindEffect(fopEn_enemy_c* i_actorP, Z2CreatureEnemy* i_creatu
sp68.x = -cM_atan2s(sp60.y, JMAFastSqrt(sp60.x * sp60.x + sp60.z * sp60.z));
sp68.z = 0;
s32 room_no = fopAcM_GetRoomNo(a_this);
JPABaseEmitter* emitter = dComIfGp_particle_set(
0x29B, i_effPos, &a_this->tevStr, &sp68, i_effSize, 0xFF, NULL, room_no,
&e_prim[darkworld_check], &e_env[darkworld_check], NULL);
0x29B, i_effPos, &a_this->tevStr, &sp68, i_effSize, 0xFF, NULL,
fopAcM_GetRoomNo(a_this), &e_prim[darkworld_check], &e_env[darkworld_check], NULL);
if (emitter != NULL) {
emitter->setGlobalParticleHeightScale((JREG_F(7) + 0.01f) * sp60.abs());
}
room_no = fopAcM_GetRoomNo(a_this);
dComIfGp_particle_set(0x29C, i_effPos, &a_this->tevStr, &a_this->shape_angle, i_effSize,
0xFF, NULL, room_no, &e_prim[darkworld_check],
0xFF, NULL, fopAcM_GetRoomNo(a_this), &e_prim[darkworld_check],
&e_env[darkworld_check], NULL);
i_creatureP->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_ON, 0, -1);
@@ -75,7 +73,7 @@ static int setMidnaBindEffect(fopEn_enemy_c* i_actorP, Z2CreatureEnemy* i_creatu
&e_env[darkworld_check], NULL);
}
i_creatureP->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_SUS, 0, -1);
i_creatureP->startCreatureSoundLevel(Z2SE_MIDNA_BIND_LOCK_SUS, 0, -1);
return 1;
}
include/f_op/f_op_actor_mng.h
+6 -10
View File
@@ -171,8 +171,8 @@ enum fopAcM_STATUS {
/* 0x100000 */ fopAcM_STATUS_HOOK_CARRY_NOW = 1 << 20,
};
inline s32 fopAcM_GetRoomNo(const fopAc_ac_c* pActor) {
return (s8)pActor->current.roomNo;
inline s8 fopAcM_GetRoomNo(const fopAc_ac_c* pActor) {
return pActor->current.roomNo;
}
inline fpc_ProcID fopAcM_GetID(const void* pActor) {
@@ -691,23 +691,19 @@ inline s32 fopAcM_seenPlayerAngleY(const fopAc_ac_c* i_actor) {
s8 dComIfGp_getReverb(int roomNo);
inline void fopAcM_seStartCurrent(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
s8 roomNo = fopAcM_GetRoomNo(actor);
mDoAud_seStart(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo));
mDoAud_seStart(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
s8 roomNo = fopAcM_GetRoomNo(actor);
mDoAud_seStart(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo));
mDoAud_seStart(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
s8 roomNo = fopAcM_GetRoomNo(actor);
mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo));
mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
inline void fopAcM_seStartCurrentLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
s8 roomNo = fopAcM_GetRoomNo(actor);
mDoAud_seStartLevel(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo));
mDoAud_seStartLevel(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
}
inline void fopAcM_offActor(fopAc_ac_c* pActor, u32 flag) {
include/m_Do/m_Do_MemCard.h
+26 -1
View File
@@ -1,6 +1,7 @@
#ifndef M_DO_M_DO_MEMCARD_H
#define M_DO_M_DO_MEMCARD_H
#include "card.h"
#include "dolphin/os/OSMutex.h"
#include "global.h"
@@ -42,6 +43,14 @@ public:
void clearProbeStat() { mProbeStat = 2; }
void setCopyToPos(u8 param_0) { mCopyToPos = param_0; }
u32 getDataVersion() { return mDataVersion; }
void setDataVersion(u32 version) { mDataVersion = version; }
void getCardStatus(s32 fileNo, CARDStat* stat) { CARDGetStatus(mChannel, fileNo, stat); }
void setCardStatus(s32 fileNo, CARDStat* stat) { CARDSetStatus(mChannel, fileNo, stat); }
void setSerialNo() {
u64 serial_no;
CARDGetSerialNo(mChannel, &serial_no);
mSerialNo = serial_no;
}
/* 0x0000 */ u8 mData[0x1FBC];
/* 0x1FBC */ u8 mChannel;
@@ -111,8 +120,24 @@ inline u32 mDoMemCd_LoadSync(void* buffer, u32 size, u32 index) {
return g_mDoMemCd_control.LoadSync(buffer, size, index);
}
inline s32 mDoMemCd_getDataVersion() {
inline u32 mDoMemCd_getDataVersion() {
return g_mDoMemCd_control.getDataVersion();
}
inline void mDoMemCd_setDataVersion(u32 version) {
g_mDoMemCd_control.setDataVersion(version);
}
inline void mDoMemCd_setSerialNo() {
g_mDoMemCd_control.setSerialNo();
}
inline void mDoMemCd_getCardStatus(s32 fileNo, CARDStat* stat) {
g_mDoMemCd_control.getCardStatus(fileNo, stat);
}
inline void mDoMemCd_setCardStatus(s32 fileNo, CARDStat* stat) {
g_mDoMemCd_control.setCardStatus(fileNo, stat);
}
#endif /* M_DO_M_DO_MEMCARD_H */
include/m_Do/m_Do_ext.h
+5 -5
View File
@@ -43,7 +43,7 @@ private:
class mDoExt_transAnmBas : public J3DAnmTransformKey {
public:
mDoExt_transAnmBas(void* bas) { mBas = bas; }
virtual ~mDoExt_transAnmBas();
virtual ~mDoExt_transAnmBas() {}
void* getBas() { return mBas; }
@@ -224,10 +224,10 @@ private:
class mDoExt_invJntPacket : public J3DPacket {
public:
/* 8000E654 */ mDoExt_invJntPacket();
/* 8000E654 */ mDoExt_invJntPacket() {}
/* 80012220 */ virtual void draw();
/* 8000E5F8 */ virtual ~mDoExt_invJntPacket();
/* 8000E5F8 */ virtual ~mDoExt_invJntPacket() {}
void setJoint(J3DModel* i_model, u16 param_1, u8 param_2) {
field_0x10 = i_model;
@@ -450,7 +450,7 @@ struct mDoExt_MtxCalcAnmBlendTbl
/* 800D00BC */ J3DAnmTransform* getAnm(int);
/* 80014F3C */ virtual ~mDoExt_MtxCalcAnmBlendTbl();
/* 80014F3C */ virtual ~mDoExt_MtxCalcAnmBlendTbl() {}
/* 8000F26C */ virtual void calc();
/* 0x4 */ int mNum;
@@ -465,7 +465,7 @@ struct mDoExt_MtxCalcAnmBlendTblOld : public mDoExt_MtxCalcAnmBlendTbl {
: mDoExt_MtxCalcAnmBlendTbl(num, anmRatio) {
mOldFrame = oldFrame;
}
/* 80014EB0 */ virtual ~mDoExt_MtxCalcAnmBlendTblOld();
/* 80014EB0 */ virtual ~mDoExt_MtxCalcAnmBlendTblOld() {}
/* 8000F4B0 */ virtual void calc();
/* 0xC */ mDoExt_MtxCalcOldFrame* mOldFrame;
include/m_Do/m_Do_graphic.h
+1 -3
View File
@@ -8,8 +8,6 @@ class JUTFader;
int mDoGph_Create();
extern u8 mBlureFlag__13mDoGph_gInf_c; // Blure
extern u8 mFade__13mDoGph_gInf_c; // Fade
extern bool data_80450BE7; // AutoForcus
struct ResTIMG;
@@ -17,7 +15,7 @@ class mDoGph_gInf_c {
public:
class bloom_c {
public:
// bloom_c() { m_buffer = NULL; } matches sinit
bloom_c() { m_buffer = NULL; }
/* 80009544 */ void create();
/* 800095F8 */ void remove();
/* 80009650 */ void draw();
src/JSystem/J3DGraphBase/J3DTevs.cpp
+2 -2
View File
@@ -556,10 +556,10 @@ extern const J3DColorChanInfo j3dDefaultColorChanInfo = {
};
/* 804563F8-804563FA 0049F8 0002+00 0/0 1/1 0/0 .sdata2 None */
extern const u16 data_804563F8 = 0x1B00;
extern const u8 data_804563F8 = 0x1B;
/* 804563FA-804563FC 0049FA 0002+00 0/0 1/1 0/0 .sdata2 j3dDefaultAlphaCmpID */
const u16 j3dDefaultAlphaCmpID = 0x00E7;
/* 804563FC-80456400 0049FC 0002+02 0/0 3/3 0/0 .sdata2 j3dDefaultZModeID */
const u16 j3dDefaultZModeID = 0x0017;
const u16 j3dDefaultZModeID = 0x0017;
src/JSystem/J3DGraphBase/J3DTransform.cpp
+4 -71
View File
@@ -6,40 +6,8 @@
#include "JSystem/J3DGraphBase/J3DTransform.h"
#include "JSystem/JMath/JMATrigonometric.h"
#include "JSystem/J3DGraphBase/J3DStruct.h"
#include "dol2asm.h"
#include "dolphin/base/PPCArch.h"
//
// Forward References:
//
extern "C" void __MTGQR7__FUl();
extern "C" void J3DGQRSetup7__FUlUlUlUl();
extern "C" void J3DCalcBBoardMtx__FPA4_f();
extern "C" void J3DCalcYBBoardMtx__FPA4_f();
extern "C" void J3DPSCalcInverseTranspose__FPA4_fPA3_f();
extern "C" void J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f();
extern "C" void J3DGetTranslateRotateMtx__FsssfffPA4_f();
extern "C" void J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f();
extern "C" void J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f();
extern "C" void J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f();
extern "C" void J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f();
extern "C" void J3DScaleNrmMtx__FPA4_fRC3Vec();
extern "C" void J3DScaleNrmMtx33__FPA3_fRC3Vec();
extern "C" void J3DMtxProjConcat__FPA4_fPA4_fPA4_f();
extern "C" void J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl();
extern "C" extern f32 PSMulUnit01[2];
//
// External References:
//
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
//
/* 80311630-80311638 -00001 0008+00 0/0 0/0 0/0 .text __MTGQR7__FUl */
void __MTGQR7(register u32 v) {
// clang-format off
@@ -55,18 +23,8 @@ void J3DGQRSetup7(u32 r0, u32 r1, u32 r2, u32 r3) {
__MTGQR7(v);
}
/* ############################################################################################## */
/* 80456378-8045637C 004978 0004+00 6/6 0/0 0/0 .sdata2 @435 */
SECTION_SDATA2 static u8 lit_435[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 80311670-80311760 30BFB0 00F0+00 0/0 2/2 0/0 .text J3DCalcBBoardMtx__FPA4_f */
// this uses a non-standard sqrtf, not sure why or how its supposed to be setup
#ifdef NONMATCHING
static inline f32 sqrtf2(f32 x) {
if (x > 0.0f) {
f32 guess = (f32)__frsqrte(x);
@@ -102,13 +60,7 @@ void J3DCalcBBoardMtx(Mtx mtx) {
mtx[2][1] = 0.0f;
mtx[2][2] = z;
}
#else
void J3DCalcBBoardMtx(f32 (*param_0)[4]) {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 803A1E30-803A1E50 02E490 0020+00 0/0 1/1 0/0 .rodata j3dDefaultTransformInfo */
extern J3DTransformInfo const j3dDefaultTransformInfo = {
{1.0f, 1.0f, 1.0f}, {0, 0, 0}, {0.0f, 0.0f, 0.0f}};
@@ -120,12 +72,6 @@ extern Vec const j3dDefaultScale = {1.0f, 1.0f, 1.0f};
extern Mtx const j3dDefaultMtx = {
{1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}};
/* 803A1E8C-803A1E98 02E4EC 000C+00 1/1 0/0 0/0 .rodata @443 */
SECTION_RODATA static u8 const lit_443[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x803A1E8C, &lit_443);
/* 80311760-8031189C 30C0A0 013C+00 0/0 2/2 0/0 .text J3DCalcYBBoardMtx__FPA4_f */
void J3DCalcYBBoardMtx(f32 (*param_0)[4]) {
// NONMATCHING
@@ -191,10 +137,6 @@ void J3DGetTranslateRotateMtx(s16 rx, s16 ry, s16 rz, f32 tx, f32 ty, f32 tz, Mt
dst[2][3] = tz;
}
/* ############################################################################################## */
/* 8045637C-80456380 00497C 0004+00 4/4 0/0 0/0 .sdata2 @526 */
SECTION_SDATA2 static f32 lit_526 = 1.0f;
/* 80311ACC-80311B80 30C40C 00B4+00 0/0 3/3 0/0 .text
* J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f */
void J3DGetTextureMtx(const J3DTextureSRTInfo& srt, const Vec& center, Mtx dst) {
@@ -248,15 +190,6 @@ void J3DGetTextureMtxOld(const J3DTextureSRTInfo& srt, const Vec& center, Mtx ds
dst[2][2] = 1.0f;
}
/* ############################################################################################## */
/* 80456380-80456388 004980 0004+04 2/2 0/0 0/0 .sdata2 @557 */
SECTION_SDATA2 static f32 lit_557[1 + 1 /* padding */] = {
0.5f,
/* padding */
0.0f,
};
/* 80311C34-80311CE4 30C574 00B0+00 0/0 3/3 0/0 .text
* J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f */
void J3DGetTextureMtxMaya(const J3DTextureSRTInfo& srt, Mtx dst) {
@@ -361,8 +294,8 @@ void J3DMtxProjConcat(f32 (*param_0)[4], f32 (*param_1)[4], f32 (*param_2)[4]) {
/* ############################################################################################## */
/* 80450958-80450960 0003D8 0008+00 1/1 0/0 0/0 .sdata Unit01 */
SECTION_SDATA static u8 Unit01[8] = {
0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
static f32 Unit01[2] = {
0.0f, 1.0f
};
/* 80311F70-8031204C 30C8B0 00DC+00 0/0 1/1 0/0 .text J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl */
@@ -372,7 +305,7 @@ void J3DPSMtxArrayConcat(f32 (*param_0)[4], f32 (*param_1)[4], f32 (*param_2)[4]
/* ############################################################################################## */
/* 803CD8F8-803CD900 02AA18 0008+00 0/0 2/2 0/0 .data PSMulUnit01 */
SECTION_DATA extern f32 PSMulUnit01[2] = {
extern f32 PSMulUnit01[2] = {
0.0f,
-1.0f,
};
};
src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+71 -333
View File
@@ -4,217 +4,9 @@
//
#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "JSystem/JSupport/JSupport.h"
#include "dol2asm.h"
#include "dolphin/os.h"
//
// Types:
//
class J3DAnmLoader {
public:
virtual J3DAnmBase* load(const void*) = 0;
virtual void setResource(J3DAnmBase*, const void*) = 0;
/* 80339800 */ virtual ~J3DAnmLoader() {}
};
class J3DAnmKeyLoader_v15 : public J3DAnmLoader {
public:
/* 803384E0 */ J3DAnmKeyLoader_v15();
/* 80338FEC */ void readAnmTransform(J3DAnmTransformKeyData const*);
/* 80339014 */ void setAnmTransform(J3DAnmTransformKey*, J3DAnmTransformKeyData const*);
/* 803390B0 */ void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
/* 803390D8 */ void setAnmTextureSRT(J3DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
/* 803392B0 */ void readAnmColor(J3DAnmColorKeyData const*);
/* 803392D8 */ void setAnmColor(J3DAnmColorKey*, J3DAnmColorKeyData const*);
/* 803393C4 */ void readAnmCluster(J3DAnmClusterKeyData const*);
/* 803393EC */ void setAnmCluster(J3DAnmClusterKey*, J3DAnmClusterKeyData const*);
/* 80339458 */ void readAnmTevReg(J3DAnmTevRegKeyData const*);
/* 80339480 */ void setAnmTevReg(J3DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
/* 8033960C */ void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
/* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
/* 80338D44 */ virtual J3DAnmBase* load(void const*);
/* 80338E8C */ virtual void setResource(J3DAnmBase*, void const*);
/* 803384FC */ virtual ~J3DAnmKeyLoader_v15();
/* 0x4 */ J3DAnmBase* mAnm;
};
class J3DAnmFullLoader_v15 : public J3DAnmLoader {
public:
/* 80338468 */ J3DAnmFullLoader_v15();
/* 80338800 */ void readAnmTransform(J3DAnmTransformFullData const*);
/* 80338828 */ void setAnmTransform(J3DAnmTransformFull*, J3DAnmTransformFullData const*);
/* 803388BC */ void readAnmColor(J3DAnmColorFullData const*);
/* 803388E4 */ void setAnmColor(J3DAnmColorFull*, J3DAnmColorFullData const*);
/* 803389B0 */ void readAnmTexPattern(J3DAnmTexPatternFullData const*);
/* 803389D8 */ void setAnmTexPattern(J3DAnmTexPattern*, J3DAnmTexPatternFullData const*);
/* 80338A7C */ void readAnmVisibility(J3DAnmVisibilityFullData const*);
/* 80338AA4 */ void setAnmVisibility(J3DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
/* 80338B20 */ void readAnmCluster(J3DAnmClusterFullData const*);
/* 80338B48 */ void setAnmCluster(J3DAnmClusterFull*, J3DAnmClusterFullData const*);
/* 80338BB4 */ void readAnmVtxColor(J3DAnmVtxColorFullData const*);
/* 80338BDC */ void setAnmVtxColor(J3DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
/* 80338558 */ virtual J3DAnmBase* load(void const*);
/* 803386A0 */ virtual void setResource(J3DAnmBase*, void const*);
/* 80338484 */ virtual ~J3DAnmFullLoader_v15();
/* 0x4 */ J3DAnmBase* mAnm;
};
//
// Forward References:
//
extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag();
extern "C" void setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv();
extern "C" void __ct__20J3DAnmFullLoader_v15Fv();
extern "C" void __dt__20J3DAnmFullLoader_v15Fv();
extern "C" void __ct__19J3DAnmKeyLoader_v15Fv();
extern "C" void __dt__19J3DAnmKeyLoader_v15Fv();
extern "C" void load__20J3DAnmFullLoader_v15FPCv();
extern "C" void setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv();
extern "C" void readAnmTransform__20J3DAnmFullLoader_v15FPC23J3DAnmTransformFullData();
extern "C" void
setAnmTransform__20J3DAnmFullLoader_v15FP19J3DAnmTransformFullPC23J3DAnmTransformFullData();
extern "C" void readAnmColor__20J3DAnmFullLoader_v15FPC19J3DAnmColorFullData();
extern "C" void setAnmColor__20J3DAnmFullLoader_v15FP15J3DAnmColorFullPC19J3DAnmColorFullData();
extern "C" void readAnmTexPattern__20J3DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData();
extern "C" void
setAnmTexPattern__20J3DAnmFullLoader_v15FP16J3DAnmTexPatternPC24J3DAnmTexPatternFullData();
extern "C" void readAnmVisibility__20J3DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData();
extern "C" void
setAnmVisibility__20J3DAnmFullLoader_v15FP20J3DAnmVisibilityFullPC24J3DAnmVisibilityFullData();
extern "C" void readAnmCluster__20J3DAnmFullLoader_v15FPC21J3DAnmClusterFullData();
extern "C" void
setAnmCluster__20J3DAnmFullLoader_v15FP17J3DAnmClusterFullPC21J3DAnmClusterFullData();
extern "C" void readAnmVtxColor__20J3DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData();
extern "C" void
setAnmVtxColor__20J3DAnmFullLoader_v15FP18J3DAnmVtxColorFullPC22J3DAnmVtxColorFullData();
extern "C" void load__19J3DAnmKeyLoader_v15FPCv();
extern "C" void setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv();
extern "C" void readAnmTransform__19J3DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData();
extern "C" void
setAnmTransform__19J3DAnmKeyLoader_v15FP18J3DAnmTransformKeyPC22J3DAnmTransformKeyData();
extern "C" void readAnmTextureSRT__19J3DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData();
extern "C" void
setAnmTextureSRT__19J3DAnmKeyLoader_v15FP19J3DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData();
extern "C" void readAnmColor__19J3DAnmKeyLoader_v15FPC18J3DAnmColorKeyData();
extern "C" void setAnmColor__19J3DAnmKeyLoader_v15FP14J3DAnmColorKeyPC18J3DAnmColorKeyData();
extern "C" void readAnmCluster__19J3DAnmKeyLoader_v15FPC20J3DAnmClusterKeyData();
extern "C" void setAnmCluster__19J3DAnmKeyLoader_v15FP16J3DAnmClusterKeyPC20J3DAnmClusterKeyData();
extern "C" void readAnmTevReg__19J3DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData();
extern "C" void setAnmTevReg__19J3DAnmKeyLoader_v15FP15J3DAnmTevRegKeyPC19J3DAnmTevRegKeyData();
extern "C" void readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData();
extern "C" void
setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData();
extern "C" void __dt__20J3DAnmVisibilityFullFv();
extern "C" s32 getKind__20J3DAnmVisibilityFullCFv();
extern "C" void __dt__12J3DAnmLoaderFv();
extern "C" void func_80339848(void* _this, void const*, void const*);
extern "C" void func_80339860(void* _this, void const*, void const*);
extern "C" extern char const* const J3DAnmLoader__stringBase0;
//
// External References:
//
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void setResource__10JUTNameTabFPC7ResNTAB();
extern "C" void func_802F4260(void* _this, void const*, void const*);
extern "C" void func_802F42C0(void* _this, void const*, void const*);
extern "C" void func_8030A458(void* _this, void const*, void const*);
extern "C" void func_8030A470(void* _this, void const*, void const*);
extern "C" void func_8030A488(void* _this, void const*, void const*);
extern "C" void func_8030A4A0(void* _this, void const*, void const*);
extern "C" void func_8030A4B8(void* _this, void const*, void const*);
extern "C" void func_8030A4D0(void* _this, void const*, void const*);
extern "C" void func_8030A4E8(void* _this, void const*, void const*);
extern "C" void func_8030A500(void* _this, void const*, void const*);
extern "C" void func_8030A518(void* _this, void const*, void const*);
extern "C" void func_8030A530(void* _this, void const*, void const*);
extern "C" void func_8030A548(void* _this, void const*, void const*);
extern "C" void func_8030A560(void* _this, void const*, void const*);
extern "C" void func_8030A578(void* _this, void const*, void const*);
extern "C" void __ct__15J3DAnmTransformFsPfPsPf();
extern "C" void __ct__19J3DAnmTextureSRTKeyFv();
extern "C" void __ct__18J3DAnmVtxColorFullFv();
extern "C" void __ct__17J3DAnmVtxColorKeyFv();
extern "C" void __ct__15J3DAnmColorFullFv();
extern "C" void __ct__14J3DAnmColorKeyFv();
extern "C" void __ct__15J3DAnmTevRegKeyFv();
extern "C" void __ct__16J3DAnmTexPatternFv();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_29();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__10J3DAnmBase[4];
extern "C" extern void* __vt__18J3DAnmTransformKey[5];
extern "C" extern void* __vt__16J3DAnmClusterKey[5];
extern "C" extern void* __vt__13J3DAnmCluster[5];
extern "C" extern void* __vt__17J3DAnmClusterFull[5];
extern "C" extern void* __vt__27J3DAnmTransformFullWithLerp[5];
extern "C" extern void* __vt__19J3DAnmTransformFull[5 + 1 /* padding */];
//
// Declarations:
//
/* ############################################################################################## */
/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A2130 =
"J3DAnmLoader: this is not a J3D Binary.\n";
#pragma pop
/* 803CF238-803CF24C 02C358 0014+00 2/2 0/0 0/0 .data __vt__19J3DAnmKeyLoader_v15 */
SECTION_DATA extern void* __vt__19J3DAnmKeyLoader_v15[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)load__19J3DAnmKeyLoader_v15FPCv,
(void*)setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv,
(void*)__dt__19J3DAnmKeyLoader_v15Fv,
};
/* 803CF24C-803CF260 02C36C 0014+00 2/2 0/0 0/0 .data __vt__20J3DAnmFullLoader_v15 */
SECTION_DATA extern void* __vt__20J3DAnmFullLoader_v15[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)load__20J3DAnmFullLoader_v15FPCv,
(void*)setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv,
(void*)__dt__20J3DAnmFullLoader_v15Fv,
};
/* 803CF260-803CF274 02C380 0014+00 5/5 0/0 0/0 .data __vt__12J3DAnmLoader */
SECTION_DATA extern void* __vt__12J3DAnmLoader[5] = {
(void*)NULL /* RTTI */, (void*)NULL, (void*)NULL, (void*)NULL, (void*)__dt__12J3DAnmLoaderFv,
};
/* 803CF274-803CF288 02C394 0010+04 2/2 0/0 0/0 .data __vt__20J3DAnmVisibilityFull */
SECTION_DATA extern void* __vt__20J3DAnmVisibilityFull[4 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__20J3DAnmVisibilityFullFv,
(void*)getKind__20J3DAnmVisibilityFullCFv,
/* padding */
NULL,
};
/* 804564C0-804564C8 004AC0 0004+04 13/13 0/0 0/0 .sdata2 @889 */
SECTION_SDATA2 static f32 lit_889[1 + 1 /* padding */] = {
0.0f,
/* padding */
0.0f,
};
/* 80337B40-80338134 332480 05F4+00 0/0 7/7 1/1 .text
* load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag */
J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseFlag flag) {
@@ -298,7 +90,6 @@ J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseF
return NULL;
}
/* 80338134-80338468 332A74 0334+00 0/0 1/1 0/0 .text
* setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv */
void J3DAnmLoaderDataBase::setResource(J3DAnmBase* param_1, const void* param_2) {
@@ -382,28 +173,15 @@ void J3DAnmLoaderDataBase::setResource(J3DAnmBase* param_1, const void* param_2)
/* 80338468-80338484 332DA8 001C+00 2/2 0/0 0/0 .text __ct__20J3DAnmFullLoader_v15Fv */
J3DAnmFullLoader_v15::J3DAnmFullLoader_v15() {}
/* 80338484-803384E0 332DC4 005C+00 3/2 0/0 0/0 .text __dt__20J3DAnmFullLoader_v15Fv */
J3DAnmFullLoader_v15::~J3DAnmFullLoader_v15() {}
/* 803384E0-803384FC 332E20 001C+00 2/2 0/0 0/0 .text __ct__19J3DAnmKeyLoader_v15Fv */
J3DAnmKeyLoader_v15::J3DAnmKeyLoader_v15() {}
/* 803384FC-80338558 332E3C 005C+00 3/2 0/0 0/0 .text __dt__19J3DAnmKeyLoader_v15Fv */
J3DAnmKeyLoader_v15::~J3DAnmKeyLoader_v15() {}
/* ############################################################################################## */
/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A2159 = "Unknown data block\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A216D = "\0\0";
#pragma pop
/* 80338558-803386A0 332E98 0148+00 2/1 0/0 0/0 .text load__20J3DAnmFullLoader_v15FPCv */
J3DAnmBase* J3DAnmFullLoader_v15::load(const void* param_1) {
const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_1;
@@ -437,7 +215,6 @@ J3DAnmBase* J3DAnmFullLoader_v15::load(const void* param_1) {
return mAnm;
}
/* 803386A0-80338800 332FE0 0160+00 2/1 0/0 0/0 .text
* setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv */
void J3DAnmFullLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2) {
@@ -487,10 +264,10 @@ void J3DAnmFullLoader_v15::setAnmTransform(J3DAnmTransformFull* param_1,
param_1->mAttribute = param_2->field_0x8;
param_1->mFrame = 0.0f;
param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmTransformFullTable>(param_2, (void*)param_2->mTableOffset);
param_1->mScaleData = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->mScaleValOffset);
param_1->mRotData = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mRotValOffset);
param_1->mTransData = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->mTransValOffset);
JSUConvertOffsetToPtr<J3DAnmTransformFullTable>(param_2, param_2->mTableOffset);
param_1->mScaleData = JSUConvertOffsetToPtr<f32>(param_2, param_2->mScaleValOffset);
param_1->mRotData = JSUConvertOffsetToPtr<s16>(param_2, param_2->mRotValOffset);
param_1->mTransData = JSUConvertOffsetToPtr<f32>(param_2, param_2->mTransValOffset);
}
@@ -509,18 +286,17 @@ void J3DAnmFullLoader_v15::setAnmColor(J3DAnmColorFull* param_1,
param_1->mFrame = 0.0f;
param_1->mUpdateMaterialNum = param_2->mUpdateMaterialNum;
param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmColorFullTable>(param_2, (void*)param_2->mTableOffset);
JSUConvertOffsetToPtr<J3DAnmColorFullTable>(param_2, param_2->mTableOffset);
param_1->mColorR = JSUConvertOffsetToPtr<u8>(param_2, param_2->mRValuesOffset);
param_1->mColorG = JSUConvertOffsetToPtr<u8>(param_2, param_2->mGValuesOffset);
param_1->mColorB = JSUConvertOffsetToPtr<u8>(param_2, param_2->mBValuesOffset);
param_1->mColorA = JSUConvertOffsetToPtr<u8>(param_2, param_2->mAValuesOffset);
param_1->mUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(param_2, (void*)param_2->mUpdateMaterialIDOffset);
JSUConvertOffsetToPtr<u16>(param_2, param_2->mUpdateMaterialIDOffset);
param_1->mUpdateMaterialName.setResource(
JSUConvertOffsetToPtr<ResNTAB>(param_2, (void*)param_2->mNameTabOffset));
JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mNameTabOffset));
}
/* 803389B0-803389D8 3332F0 0028+00 1/1 0/0 0/0 .text
* readAnmTexPattern__20J3DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData */
void J3DAnmFullLoader_v15::readAnmTexPattern(const J3DAnmTexPatternFullData* param_1) {
@@ -537,15 +313,14 @@ void J3DAnmFullLoader_v15::setAnmTexPattern(J3DAnmTexPattern* param_1,
param_1->mUpdateMaterialNum = param_2->field_0xc;
param_1->field_0x14 = param_2->field_0xe;
param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmTexPatternFullTable>(param_2, (void*)param_2->mTableOffset);
param_1->mTextureIndex = JSUConvertOffsetToPtr<u16>(param_2, (void*)param_2->mValuesOffset);
JSUConvertOffsetToPtr<J3DAnmTexPatternFullTable>(param_2, param_2->mTableOffset);
param_1->mTextureIndex = JSUConvertOffsetToPtr<u16>(param_2, param_2->mValuesOffset);
param_1->mUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(param_2, (void*)param_2->mUpdateMaterialIDOffset);
JSUConvertOffsetToPtr<u16>(param_2, param_2->mUpdateMaterialIDOffset);
param_1->mUpdateMaterialName.setResource(
JSUConvertOffsetToPtr<ResNTAB>(param_2, (void*)param_2->mNameTabOffset));
JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mNameTabOffset));
}
/* 80338A7C-80338AA4 3333BC 0028+00 1/1 0/0 0/0 .text
* readAnmVisibility__20J3DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData */
void J3DAnmFullLoader_v15::readAnmVisibility(const J3DAnmVisibilityFullData* param_1) {
@@ -562,11 +337,10 @@ void J3DAnmFullLoader_v15::setAnmVisibility(J3DAnmVisibilityFull* param_1,
param_1->mUpdateMaterialNum = param_2->field_0xc;
param_1->field_0xe = param_2->field_0xe;
param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmVisibilityFullTable>(param_2, (void*)param_2->mTableOffset);
JSUConvertOffsetToPtr<J3DAnmVisibilityFullTable>(param_2, param_2->mTableOffset);
param_1->mVisibility = JSUConvertOffsetToPtr<u8>(param_2, param_2->mValuesOffset);
}
/* 80338B20-80338B48 333460 0028+00 1/1 0/0 0/0 .text
* readAnmCluster__20J3DAnmFullLoader_v15FPC21J3DAnmClusterFullData */
void J3DAnmFullLoader_v15::readAnmCluster(const J3DAnmClusterFullData* param_1) {
@@ -581,11 +355,10 @@ void J3DAnmFullLoader_v15::setAnmCluster(J3DAnmClusterFull* param_1,
param_1->mAttribute = param_2->field_0x8;
param_1->mFrame = 0.0f;
param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmClusterFullTable>(param_2, (void*)param_2->mTableOffset);
param_1->mWeight = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->mWeightOffset);
JSUConvertOffsetToPtr<J3DAnmClusterFullTable>(param_2, param_2->mTableOffset);
param_1->mWeight = JSUConvertOffsetToPtr<f32>(param_2, param_2->mWeightOffset);
}
/* 80338BB4-80338BDC 3334F4 0028+00 1/1 0/0 0/0 .text
* readAnmVtxColor__20J3DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData */
void J3DAnmFullLoader_v15::readAnmVtxColor(const J3DAnmVtxColorFullData* param_1) {
@@ -602,17 +375,17 @@ void J3DAnmFullLoader_v15::setAnmVtxColor(J3DAnmVtxColorFull* dst,
dst->mAnmTableNum[0] = data->mAnmTableNum[0];
dst->mAnmTableNum[1] = data->mAnmTableNum[1];
dst->mpTable[0] =
JSUConvertOffsetToPtr<J3DAnmColorFullTable>(data, (void*)data->mTableOffsets[0]);
JSUConvertOffsetToPtr<J3DAnmColorFullTable>(data, data->mTableOffsets[0]);
dst->mpTable[1] =
JSUConvertOffsetToPtr<J3DAnmColorFullTable>(data, (void*)data->mTableOffsets[1]);
JSUConvertOffsetToPtr<J3DAnmColorFullTable>(data, data->mTableOffsets[1]);
dst->mAnmVtxColorIndexData[0] = JSUConvertOffsetToPtr<J3DAnmVtxColorIndexData>(
data, (void*)data->mVtxColorIndexDataOffsets[0]);
data, data->mVtxColorIndexDataOffsets[0]);
dst->mAnmVtxColorIndexData[1] = JSUConvertOffsetToPtr<J3DAnmVtxColorIndexData>(
data, (void*)data->mVtxColorIndexDataOffsets[1]);
data, data->mVtxColorIndexDataOffsets[1]);
void* indexPtr0 =
JSUConvertOffsetToPtr<u16>(data, (void*)data->mVtxColorIndexPointerOffsets[0]);
JSUConvertOffsetToPtr<u16>(data, data->mVtxColorIndexPointerOffsets[0]);
void* indexPtr1 =
JSUConvertOffsetToPtr<u16>(data, (void*)data->mVtxColorIndexPointerOffsets[1]);
JSUConvertOffsetToPtr<u16>(data, data->mVtxColorIndexPointerOffsets[1]);
for (s32 i = 0; i < dst->mAnmTableNum[0]; i++)
dst->mAnmVtxColorIndexData[0][i].mpData =
@@ -627,7 +400,6 @@ void J3DAnmFullLoader_v15::setAnmVtxColor(J3DAnmVtxColorFull* dst,
dst->mColorA = JSUConvertOffsetToPtr<u8>(data, data->mAValuesOffset);
}
/* 80338D44-80338E8C 333684 0148+00 2/1 0/0 0/0 .text load__19J3DAnmKeyLoader_v15FPCv */
J3DAnmBase* J3DAnmKeyLoader_v15::load(const void* param_1) {
const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_1;
@@ -661,7 +433,6 @@ J3DAnmBase* J3DAnmKeyLoader_v15::load(const void* param_1) {
return mAnm;
}
/* 80338E8C-80338FEC 3337CC 0160+00 2/1 0/0 0/0 .text
* setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv */
void J3DAnmKeyLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2) {
@@ -711,10 +482,10 @@ void J3DAnmKeyLoader_v15::setAnmTransform(J3DAnmTransformKey* param_1,
param_1->mDecShift = param_2->field_0x9;
param_1->mFrame = 0.0f;
param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(param_2, (void*)param_2->mTableOffset);
param_1->mScaleData = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->field_0x18);
param_1->mRotData = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->field_0x1c);
param_1->mTransData = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->field_0x20);
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(param_2, param_2->mTableOffset);
param_1->mScaleData = JSUConvertOffsetToPtr<f32>(param_2, param_2->field_0x18);
param_1->mRotData = JSUConvertOffsetToPtr<s16>(param_2, param_2->field_0x1c);
param_1->mTransData = JSUConvertOffsetToPtr<f32>(param_2, param_2->field_0x20);
}
@@ -738,34 +509,33 @@ void J3DAnmKeyLoader_v15::setAnmTextureSRT(J3DAnmTextureSRTKey* param_1,
param_1->mRotNum = param_2->field_0x10;
param_1->mTransNum = param_2->field_0x12;
param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(param_2, (void*)param_2->mTableOffset);
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(param_2, param_2->mTableOffset);
param_1->mUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(param_2, (void*)param_2->mUpdateMatIDOffset);
JSUConvertOffsetToPtr<u16>(param_2, param_2->mUpdateMatIDOffset);
param_1->mUpdateMaterialName.setResource(
JSUConvertOffsetToPtr<ResNTAB>(param_2, (void*)param_2->mNameTab1Offset));
JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mNameTab1Offset));
param_1->mUpdateTexMtxID =
JSUConvertOffsetToPtr<u8>(param_2, param_2->mUpdateTexMtxIDOffset);
param_1->mSRTCenter = JSUConvertOffsetToPtr<Vec>(param_2, (void*)param_2->unkOffset);
param_1->mScaleData = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->mScaleValOffset);
param_1->mRotData = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mRotValOffset);
param_1->mTransData = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->mTransValOffset);
param_1->mSRTCenter = JSUConvertOffsetToPtr<Vec>(param_2, param_2->unkOffset);
param_1->mScaleData = JSUConvertOffsetToPtr<f32>(param_2, param_2->mScaleValOffset);
param_1->mRotData = JSUConvertOffsetToPtr<s16>(param_2, param_2->mRotValOffset);
param_1->mTransData = JSUConvertOffsetToPtr<f32>(param_2, param_2->mTransValOffset);
if (param_2->mNameTab2Offset) {
param_1->mPostUpdateMaterialName.setResource(
JSUConvertOffsetToPtr<ResNTAB>(param_2, (void*)param_2->mNameTab2Offset));
JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mNameTab2Offset));
}
param_1->field_0x4a = param_2->field_0x34;
param_1->field_0x44 = param_2->field_0x36;
param_1->field_0x46 = param_2->field_0x38;
param_1->field_0x48 = param_2->field_0x3a;
param_1->field_0x58 =
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(param_2, (void*)param_2->mInfoTable2Offset);
param_1->mPostUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(param_2, (void*)param_2->field_0x40);
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(param_2, param_2->mInfoTable2Offset);
param_1->mPostUpdateMaterialID = JSUConvertOffsetToPtr<u16>(param_2, param_2->field_0x40);
param_1->mPostUpdateTexMtxID = JSUConvertOffsetToPtr<u8>(param_2, param_2->field_0x48);
param_1->mPostSRTCenter = JSUConvertOffsetToPtr<Vec>(param_2, (void*)param_2->field_0x4c);
param_1->field_0x4c = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->field_0x50);
param_1->field_0x50 = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->field_0x54);
param_1->field_0x54 = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->field_0x58);
param_1->mPostSRTCenter = JSUConvertOffsetToPtr<Vec>(param_2, param_2->field_0x4c);
param_1->field_0x4c = JSUConvertOffsetToPtr<f32>(param_2, param_2->field_0x50);
param_1->field_0x50 = JSUConvertOffsetToPtr<s16>(param_2, param_2->field_0x54);
param_1->field_0x54 = JSUConvertOffsetToPtr<f32>(param_2, param_2->field_0x58);
switch (param_2->field_0x5c) {
case 0:
case 1:
@@ -796,15 +566,15 @@ void J3DAnmKeyLoader_v15::setAnmColor(J3DAnmColorKey* param_1, const J3DAnmColor
param_1->field_0x10 = param_2->field_0x14;
param_1->field_0x12 = param_2->field_0x16;
param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmColorKeyTable>(param_2, (void*)param_2->mTableOffset);
param_1->mColorR = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mRValOffset);
param_1->mColorG = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mGValOffset);
param_1->mColorB = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mBValOffset);
param_1->mColorA = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mAValOffset);
JSUConvertOffsetToPtr<J3DAnmColorKeyTable>(param_2, param_2->mTableOffset);
param_1->mColorR = JSUConvertOffsetToPtr<s16>(param_2, param_2->mRValOffset);
param_1->mColorG = JSUConvertOffsetToPtr<s16>(param_2, param_2->mGValOffset);
param_1->mColorB = JSUConvertOffsetToPtr<s16>(param_2, param_2->mBValOffset);
param_1->mColorA = JSUConvertOffsetToPtr<s16>(param_2, param_2->mAValOffset);
param_1->mUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(param_2, (void*)param_2->mUpdateMaterialIDOffset);
JSUConvertOffsetToPtr<u16>(param_2, param_2->mUpdateMaterialIDOffset);
param_1->mUpdateMaterialName.setResource(
JSUConvertOffsetToPtr<ResNTAB>(param_2, (void*)param_2->mNameTabOffset));
JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mNameTabOffset));
}
@@ -822,8 +592,8 @@ void J3DAnmKeyLoader_v15::setAnmCluster(J3DAnmClusterKey* param_1,
param_1->mAttribute = param_2->field_0x8;
param_1->mFrame = 0.0f;
param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmClusterKeyTable>(param_2, (void*)param_2->mTableOffset);
param_1->mWeight = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->mWeightOffset);
JSUConvertOffsetToPtr<J3DAnmClusterKeyTable>(param_2, param_2->mTableOffset);
param_1->mWeight = JSUConvertOffsetToPtr<f32>(param_2, param_2->mWeightOffset);
}
@@ -842,34 +612,34 @@ void J3DAnmKeyLoader_v15::setAnmTevReg(J3DAnmTevRegKey* param_1,
param_1->mFrame = 0.0f;
param_1->mCRegUpdateMaterialNum = param_2->mCRegUpdateMaterialNum;
param_1->mAnmCRegKeyTable =
JSUConvertOffsetToPtr<J3DAnmCRegKeyTable>(param_2, (void*)param_2->mCRegTableOffset);
JSUConvertOffsetToPtr<J3DAnmCRegKeyTable>(param_2, param_2->mCRegTableOffset);
param_1->mCRegUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(param_2, (void*)param_2->mCRegUpdateMaterialIDOffset);
JSUConvertOffsetToPtr<u16>(param_2, param_2->mCRegUpdateMaterialIDOffset);
param_1->mCRegUpdateMaterialName.setResource(
JSUConvertOffsetToPtr<ResNTAB>(param_2, (void*)param_2->mCRegNameTabOffset));
JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mCRegNameTabOffset));
param_1->mKRegUpdateMaterialNum = param_2->mKRegUpdateMaterialNum;
param_1->mAnmKRegKeyTable =
JSUConvertOffsetToPtr<J3DAnmKRegKeyTable>(param_2, (void*)param_2->mKRegTableOffset);
JSUConvertOffsetToPtr<J3DAnmKRegKeyTable>(param_2, param_2->mKRegTableOffset);
param_1->mKRegUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(param_2, (void*)param_2->mKRegUpdateMaterialIDOffset);
JSUConvertOffsetToPtr<u16>(param_2, param_2->mKRegUpdateMaterialIDOffset);
param_1->mKRegUpdateMaterialName.setResource(
JSUConvertOffsetToPtr<ResNTAB>(param_2, (void*)param_2->mKRegNameTabOffset));
JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mKRegNameTabOffset));
param_1->mCRegDataCountR = param_2->field_0x10;
param_1->mCRegDataCountG = param_2->field_0x12;
param_1->mCRegDataCountB = param_2->field_0x14;
param_1->mCRegDataCountA = param_2->field_0x16;
param_1->mAnmCRegDataR = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCRValuesOffset);
param_1->mAnmCRegDataG = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCGValuesOffset);
param_1->mAnmCRegDataB = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCBValuesOffset);
param_1->mAnmCRegDataA = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCAValuesOffset);
param_1->mAnmCRegDataR = JSUConvertOffsetToPtr<s16>(param_2, param_2->mCRValuesOffset);
param_1->mAnmCRegDataG = JSUConvertOffsetToPtr<s16>(param_2, param_2->mCGValuesOffset);
param_1->mAnmCRegDataB = JSUConvertOffsetToPtr<s16>(param_2, param_2->mCBValuesOffset);
param_1->mAnmCRegDataA = JSUConvertOffsetToPtr<s16>(param_2, param_2->mCAValuesOffset);
param_1->mKRegDataCountR = param_2->field_0x18;
param_1->mKRegDataCountG = param_2->field_0x1a;
param_1->mKRegDataCountB = param_2->field_0x1c;
param_1->mKRegDataCountA = param_2->field_0x1e;
param_1->mAnmKRegDataR = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKRValuesOffset);
param_1->mAnmKRegDataG = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKGValuesOffset);
param_1->mAnmKRegDataB = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKBValuesOffset);
param_1->mAnmKRegDataA = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKAValuesOffset);
param_1->mAnmKRegDataR = JSUConvertOffsetToPtr<s16>(param_2, param_2->mKRValuesOffset);
param_1->mAnmKRegDataG = JSUConvertOffsetToPtr<s16>(param_2, param_2->mKGValuesOffset);
param_1->mAnmKRegDataB = JSUConvertOffsetToPtr<s16>(param_2, param_2->mKBValuesOffset);
param_1->mAnmKRegDataA = JSUConvertOffsetToPtr<s16>(param_2, param_2->mKAValuesOffset);
}
@@ -889,15 +659,15 @@ void J3DAnmKeyLoader_v15::setAnmVtxColor(J3DAnmVtxColorKey* dst,
dst->mAnmTableNum[0] = data->mAnmTableNum[0];
dst->mAnmTableNum[1] = data->mAnmTableNum[1];
dst->mpTable[0] =
JSUConvertOffsetToPtr<J3DAnmColorKeyTable>(data, (void*)data->mTableOffsets[0]);
JSUConvertOffsetToPtr<J3DAnmColorKeyTable>(data, data->mTableOffsets[0]);
dst->mpTable[1] =
JSUConvertOffsetToPtr<J3DAnmColorKeyTable>(data, (void*)data->mTableOffsets[1]);
JSUConvertOffsetToPtr<J3DAnmColorKeyTable>(data, data->mTableOffsets[1]);
dst->mAnmVtxColorIndexData[0] = JSUConvertOffsetToPtr<J3DAnmVtxColorIndexData>(
data, (void*)data->mVtxColoIndexDataOffset[0]);
data, data->mVtxColoIndexDataOffset[0]);
dst->mAnmVtxColorIndexData[1] = JSUConvertOffsetToPtr<J3DAnmVtxColorIndexData>(
data, (void*)data->mVtxColoIndexDataOffset[1]);
void* indexPtr0 = JSUConvertOffsetToPtr<u16>(data, (void*)data->mVtxColoIndexPointerOffset[0]);
void* indexPtr1 = JSUConvertOffsetToPtr<u16>(data, (void*)data->mVtxColoIndexPointerOffset[1]);
data, data->mVtxColoIndexDataOffset[1]);
void* indexPtr0 = JSUConvertOffsetToPtr<u16>(data, data->mVtxColoIndexPointerOffset[0]);
void* indexPtr1 = JSUConvertOffsetToPtr<u16>(data, data->mVtxColoIndexPointerOffset[1]);
for (s32 i = 0; i < dst->mAnmTableNum[0]; i++)
dst->mAnmVtxColorIndexData[0][i].mpData =
@@ -906,40 +676,8 @@ void J3DAnmKeyLoader_v15::setAnmVtxColor(J3DAnmVtxColorKey* dst,
dst->mAnmVtxColorIndexData[1][i].mpData =
(void*)((s32)indexPtr1 + (s32)dst->mAnmVtxColorIndexData[1][i].mpData * 2);
dst->mColorR = JSUConvertOffsetToPtr<s16>(data, (void*)data->mRValOffset);
dst->mColorG = JSUConvertOffsetToPtr<s16>(data, (void*)data->mGValOffset);
dst->mColorB = JSUConvertOffsetToPtr<s16>(data, (void*)data->mBValOffset);
dst->mColorA = JSUConvertOffsetToPtr<s16>(data, (void*)data->mAValOffset);
dst->mColorR = JSUConvertOffsetToPtr<s16>(data, data->mRValOffset);
dst->mColorG = JSUConvertOffsetToPtr<s16>(data, data->mGValOffset);
dst->mColorB = JSUConvertOffsetToPtr<s16>(data, data->mBValOffset);
dst->mColorA = JSUConvertOffsetToPtr<s16>(data, data->mAValOffset);
}
/* 8033979C-803397F8 3340DC 005C+00 1/0 0/0 0/0 .text __dt__20J3DAnmVisibilityFullFv */
J3DAnmVisibilityFull::~J3DAnmVisibilityFull() {
// NONMATCHING
}
/* 803397F8-80339800 334138 0008+00 1/0 0/0 0/0 .text getKind__20J3DAnmVisibilityFullCFv
*/
s32 J3DAnmVisibilityFull::getKind() const {
return 6;
}
/* 80339800-80339848 334140 0048+00 1/0 0/0 0/0 .text __dt__12J3DAnmLoaderFv */
// J3DAnmLoader::~J3DAnmLoader() {
extern "C" void __dt__12J3DAnmLoaderFv() {
// NONMATCHING
}
/* 80339848-80339860 334188 0018+00 1/1 0/0 0/0 .text
* JSUConvertOffsetToPtr<21J3DAnmClusterKeyTable>__FPCvPCv */
extern "C" void func_80339848(void* _this, void const* param_0, void const* param_1) {
// NONMATCHING
}
/* 80339860-80339878 3341A0 0018+00 1/1 0/0 0/0 .text
* JSUConvertOffsetToPtr<22J3DAnmClusterFullTable>__FPCvPCv */
extern "C" void func_80339860(void* _this, void const* param_0, void const* param_1) {
// NONMATCHING
}
/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
+1 -57
View File
@@ -7,48 +7,9 @@
#include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
#include "JSystem/JSupport/JSupport.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "dol2asm.h"
#include "dolphin/os.h"
#include "string.h"
//
// Forward References:
//
extern "C" void load__24J3DClusterLoaderDataBaseFPCv();
extern "C" void __ct__20J3DClusterLoader_v15Fv();
extern "C" void __dt__20J3DClusterLoader_v15Fv();
extern "C" void load__20J3DClusterLoader_v15FPCv();
extern "C" void readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock();
extern "C" void __dt__16J3DClusterLoaderFv();
extern "C" void func_80334644(void* _this, void const*, void const*);
extern "C" void func_8033465C(void* _this, void const*, void const*);
extern "C" void func_80334674(void* _this, void const*, void const*);
extern "C" extern char const* const J3DClusterLoader__stringBase0;
//
// External References:
//
extern "C" void* __nw__FUl();
extern "C" void* __nwa__FUl();
extern "C" void* __nwa__FUli();
extern "C" void __dl__FPv();
extern "C" void __ct__10JUTNameTabFPC7ResNTAB();
extern "C" void func_802F42C0(void* _this, void const*, void const*);
extern "C" void func_8030A530(void* _this, void const*, void const*);
extern "C" void func_8030A560(void* _this, void const*, void const*);
extern "C" void __ct__13J3DDeformDataFv();
extern "C" void __ct__11J3DDeformerFP13J3DDeformData();
extern "C" void _savegpr_23();
extern "C" void _savegpr_26();
extern "C" void _restgpr_23();
extern "C" void _restgpr_26();
//
// Declarations:
//
/* 80334130-803341CC 32EA70 009C+00 0/0 1/1 0/0 .text load__24J3DClusterLoaderDataBaseFPCv */
void* J3DClusterLoaderDataBase::load(const void* i_data) {
const JUTDataFileHeader* fileHeader = (JUTDataFileHeader*)i_data;
@@ -61,23 +22,6 @@ void* J3DClusterLoaderDataBase::load(const void* i_data) {
return NULL;
}
/* ############################################################################################## */
/* 803CF0E8-803CF0F8 02C208 0010+00 2/2 0/0 0/0 .data __vt__20J3DClusterLoader_v15 */
SECTION_DATA extern void* __vt__20J3DClusterLoader_v15[4] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)load__20J3DClusterLoader_v15FPCv,
(void*)__dt__20J3DClusterLoader_v15Fv,
};
/* 803CF0F8-803CF108 02C218 0010+00 3/3 0/0 0/0 .data __vt__16J3DClusterLoader */
SECTION_DATA extern void* __vt__16J3DClusterLoader[4] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)NULL,
(void*)__dt__16J3DClusterLoaderFv,
};
/* 803341CC-803341E8 32EB0C 001C+00 1/1 0/0 0/0 .text __ct__20J3DClusterLoader_v15Fv */
J3DClusterLoader_v15::J3DClusterLoader_v15() {}
@@ -198,4 +142,4 @@ extern "C" void func_80334674(void* _this, void const* param_0, void const* para
// NONMATCHING
}
/* 803A2098-803A2098 02E6F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 803A2098-803A2098 02E6F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
+4 -19
View File
@@ -8,29 +8,14 @@
#include "JSystem/J3DGraphAnimator/J3DJoint.h"
#include "JSystem/JSupport/JSupport.h"
//
// Types:
//
extern "C" u16* func_8033677C(const void*, const void*); // JSUConvertOffsetToPtr<u16>
extern "C" void* __nw__FUl();
extern "C" void __ct__8J3DJointFv();
/* 80337178-803371D0 331AB8 0058+00 0/0 1/1 0/0 .text __ct__15J3DJointFactoryFRC13J3DJointBlock */
J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) {
mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&block, block.mpJointInitData);
// Fix when we have our ODR working.
// mIndexTable = JSUConvertOffsetToPtr<u16>(&block, block.mpIndexTable);
mIndexTable = func_8033677C(&block, block.mpIndexTable);
mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&block, (u32)block.mpJointInitData);
mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpIndexTable);
}
/* 803371D0-80337338 331B10 0168+00 0/0 1/1 0/0 .text create__15J3DJointFactoryFi */
J3DJoint* J3DJointFactory::create(int param_0) {
// NONMATCHING
}
/* J3DJoint* J3DJointFactory::create(int no) {
J3DJoint* J3DJointFactory::create(int no) {
J3DJoint* joint = new J3DJoint();
joint->mJntNo = no;
joint->mKind = getKind(no);
@@ -45,4 +30,4 @@ J3DJoint* J3DJointFactory::create(int param_0) {
joint->mScaleCompensate = 0;
return joint;
} */
}
src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+5 -72
View File
@@ -11,54 +11,7 @@
#include "JSystem/J3DGraphAnimator/J3DModelData.h"
#include "JSystem/JSupport/JSupport.h"
#include "dolphin/os.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void countMaterialNum__14J3DModelLoaderFPCv();
extern "C" void calcLoadSize__14J3DModelLoaderFPCvUl();
extern "C" void calcLoadMaterialTableSize__14J3DModelLoaderFPCv();
extern "C" void calcLoadBinaryDisplayListSize__14J3DModelLoaderFPCvUl();
extern "C" void calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl();
extern "C" void calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock();
extern "C" void calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock();
extern "C" void calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock();
extern "C" void calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl();
extern "C" void calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl();
extern "C" void calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock();
extern "C" void calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl();
extern "C" void calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock();
extern "C" void calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl();
extern "C" void calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl();
extern "C" extern char const* const J3DModelLoaderCalcSize__stringBase0;
//
// External References:
//
extern "C" void __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock();
extern "C" void __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock();
extern "C" void countUniqueMaterials__18J3DMaterialFactoryFv();
extern "C" void
calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl();
extern "C" void func_8033674C(void* _this, void const*, void const*);
extern "C" void __ct__15J3DShapeFactoryFRC13J3DShapeBlock();
extern "C" void calcSize__15J3DShapeFactoryFiUl();
extern "C" void calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl();
extern "C" void _savegpr_22();
extern "C" void _savegpr_25();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _restgpr_22();
extern "C" void _restgpr_25();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
//
// Declarations:
//
/* 80336794-803367D4 3310D4 0040+00 0/0 3/0 0/0 .text countMaterialNum__14J3DModelLoaderFPCv */
u16 J3DModelLoader::countMaterialNum(const void* stream) {
@@ -73,18 +26,8 @@ u16 J3DModelLoader::countMaterialNum(const void* stream) {
return 0;
}
/* ############################################################################################## */
/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803A20E8 = "Unknown data block\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803A20FC = "\0\0\0";
#pragma pop
/* 803367D4-803369A0 331114 01CC+00 0/0 3/0 0/0 .text calcLoadSize__14J3DModelLoaderFPCvUl */
// size load issue.
#ifdef NONMATCHING
// NONMATCHING size load issue
u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) {
int flags = flags_;
const J3DModelFileData* header = static_cast<const J3DModelFileData*>(stream);
@@ -128,11 +71,6 @@ u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) {
}
return size;
}
#else
u32 J3DModelLoader::calcLoadSize(void const* param_0, u32 param_1) {
// NONMATCHING
}
#endif
/* 803369A0-80336A98 3312E0 00F8+00 0/0 3/0 0/0 .text
* calcLoadMaterialTableSize__14J3DModelLoaderFPCv */
@@ -176,13 +114,13 @@ u32 J3DModelLoader::calcLoadMaterialTableSize(const void* stream) {
/* 80336A98-80336CD8 3313D8 0240+00 0/0 3/0 0/0 .text
* calcLoadBinaryDisplayListSize__14J3DModelLoaderFPCvUl */
// flags issue
#ifdef NONMATCHING
// NONMATCHING flags issue
u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags) {
const J3DModelFileData* header = (const J3DModelFileData*)stream;
const J3DModelBlock* nextBlock = header->mBlocks;
u32 i = 0;
u32 matFlags = flags & (J3DMLF_Material_UseIndirect | J3DMLF_26);
u32 flags2;
int size = sizeof(J3DModelData);
for (; i < header->mBlockNum; i++) {
switch (nextBlock->mBlockType) {
@@ -204,7 +142,7 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags)
case 'MAT2':
break;
case 'MAT3':
u32 flags2 = (J3DMLF_21 | J3DMLF_Material_PE_Full | J3DMLF_Material_Color_LightOn);
flags2 = (J3DMLF_21 | J3DMLF_Material_PE_Full | J3DMLF_Material_Color_LightOn);
flags2 |= matFlags;
mpMaterialBlock = (const J3DMaterialBlock*)nextBlock;
if ((flags & (J3DMLF_13 | J3DMLF_DoBdlMaterialCalc)) == 0) {
@@ -231,11 +169,6 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags)
}
return size;
}
#else
u32 J3DModelLoader::calcLoadBinaryDisplayListSize(void const* param_0, u32 param_1) {
// NONMATCHING
}
#endif
/* 80336CD8-80336D64 331618 008C+00 2/2 0/0 0/0 .text
* calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl */
@@ -404,4 +337,4 @@ u32 J3DModelLoader::calcSizeMaterialDL(const J3DMaterialDLBlock* block, u32 flag
return size;
}
/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
+4 -23
View File
@@ -9,31 +9,12 @@
#include "JSystem/JSupport/JSupport.h"
#include "dolphin/os.h"
//
// Forward References:
//
//
// External References:
//
extern "C" J3DShapeInitData* func_80336764(const void*,
const void*); // JSUConvertOffsetToPtr<J3DShapeInitData>
extern "C" u16* func_8033677C(const void*, const void*); // JSUConvertOffsetToPtr<u16>
//
// Declarations:
//
/* 80337350-80337400 331C90 00B0+00 0/0 2/2 0/0 .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock */
J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) {
//mShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, (u32)block.mpShapeInitData);
mShapeInitData = func_80336764(&block, block.mpShapeInitData),
//mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpIndexTable);
mIndexTable = func_8033677C(&block, block.mpIndexTable),
mShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, (u32)block.mpShapeInitData);
mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpIndexTable);
mVtxDescList = JSUConvertOffsetToPtr<GXVtxDescList>(&block, (u32)block.mpVtxDescList),
//mMtxTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpMtxTable);
mMtxTable = func_8033677C(&block, block.mpMtxTable),
mMtxTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpMtxTable);
mDisplayListData = JSUConvertOffsetToPtr<u8>(&block, (u32)block.mpDisplayListData),
mMtxInitData = JSUConvertOffsetToPtr<J3DShapeMtxInitData>(&block, (u32)block.mpMtxInitData),
mDrawInitData = JSUConvertOffsetToPtr<J3DShapeDrawInitData>(&block, (u32)block.mpDrawInitData),
@@ -213,4 +194,4 @@ s32 J3DShapeFactory::calcSizeShapeMtx(u32 flag, int shapeNo, int mtxGroupNo) con
}
return ret;
}
}
src/JSystem/JUtility/JUTResFont.cpp
+2 -2
View File
@@ -325,7 +325,7 @@ void JUTResFont::getWidthEntry(int code, JUTFont::TWidth* i_width) const {
}
/* 802DFD0C-802DFD58 2DA64C 004C+00 1/0 1/0 0/0 .text getCellWidth__10JUTResFontCFv */
int JUTResFont::getCellWidth() const {
s32 JUTResFont::getCellWidth() const {
if (mpGlyphBlocks) {
ResFONT::GLY1* glyphBlock = *mpGlyphBlocks;
if (glyphBlock) {
@@ -469,4 +469,4 @@ int JUTResFont::convertSjis(int inChr, u16* inLead) const {
return tmp2 + (tmp - 0x88) * 0xbc + -0x5e + lead;
}
/* 8039D45C-8039D45C 029ABC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8039D45C-8039D45C 029ABC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h
+1 -1
View File
@@ -87,4 +87,4 @@ inline float i_tanf(float x) { return tan(x); }
};
#endif
#endif
#endif
src/c/c_damagereaction.cpp
+7 -111
View File
@@ -4,68 +4,20 @@
//
#include "c/c_damagereaction.h"
#include "dol2asm.h"
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
//
// Forward References:
//
extern "C" void execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle();
extern "C" void draw__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle();
extern "C" void cDmrNowMidnaTalk__Fv();
extern "C" void __dt__24JPTraceParticleCallBack4Fv();
extern "C" void __sinit_c_damagereaction_cpp();
extern "C" void execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle();
extern "C" void draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle();
//
// External References:
//
extern "C" void fopAcM_getTalkEventPartner__FPC10fopAc_ac_c();
extern "C" void __dt__19JPAParticleCallBackFv();
extern "C" void __dl__FPv();
extern "C" void __register_global_object();
// extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
/* ############################################################################################## */
/* 80450C98-80450C9C -00001 0004+00 0/0 0/0 50/50 .sbss None */
extern u8 struct_80450C98[4];
u8 struct_80450C98[4];
/* 80450C9C-80450CA0 -00001 0004+00 0/0 0/0 6/6 .sbss None */
#pragma push
#pragma force_active on
u8 cDmr_SkipInfo;
#pragma pop
/* ############################################################################################## */
/* 80451BA8-80451BAC 0001A8 0004+00 1/1 0/0 0/0 .sdata2 @3731 */
SECTION_SDATA2 static f32 lit_3731 = 25.0f;
/* 80451BAC-80451BB0 0001AC 0004+00 1/1 0/0 0/0 .sdata2 @3732 */
SECTION_SDATA2 static u8 lit_3732[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 80451BB0-80451BB4 0001B0 0004+00 1/1 0/0 0/0 .sdata2 @3733 */
SECTION_SDATA2 static f32 lit_3733 = 3.0f / 10.0f;
/* 80451BB4-80451BB8 0001B4 0004+00 1/1 0/0 0/0 .sdata2 @3734 */
SECTION_SDATA2 static f32 lit_3734 = 0.5f;
/* 80451BB8-80451BC0 0001B8 0008+00 1/1 0/0 0/0 .sdata2 @3736 */
SECTION_SDATA2 static f64 lit_3736 = 4503599627370496.0 /* cast u32 to float */;
u8 data_80450C9D;
u8 data_80450C9E;
u8 data_80450C9F;
/* 8001817C-800182A4 012ABC 0128+00 1/0 0/0 0/0 .text
* execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle */
@@ -73,15 +25,15 @@ void JPTraceParticleCallBack4::execute(JPABaseEmitter* param_0, JPABaseParticle*
u32 age = param_1->getAge();
if (age != 0) {
Vec* user_work = (Vec*)param_0->getUserWork();
JGeometry::TVec3<f32> vec1, vec2, vec3;
f32 fVar1 = (25.0f - age) / 25.0f;
if (fVar1 < 0.0f) {
fVar1 = 0.0f;
}
JGeometry::TVec3<f32> vec1(user_work[age]);
vec1 = user_work[age];
vec1.scale(0.3f * fVar1);
JGeometry::TVec3<f32> vec2(user_work[0]);
vec2 = user_work[0];
vec2.scale(0.5f * fVar1);
JGeometry::TVec3<f32> vec3;
param_1->getOffsetPosition(vec3);
vec3.add(vec1 + vec2);
@@ -112,65 +64,9 @@ BOOL cDmrNowMidnaTalk() {
return 0;
}
/* ############################################################################################## */
/* 803A3568-803A357C 000688 0014+00 2/2 0/0 0/0 .data __vt__24JPTraceParticleCallBack4 */
SECTION_DATA extern void* __vt__24JPTraceParticleCallBack4[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__24JPTraceParticleCallBack4Fv,
(void*)execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle,
(void*)draw__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle,
};
/* 80018328-80018388 012C68 0060+00 2/1 0/0 0/0 .text __dt__24JPTraceParticleCallBack4Fv
*/
// Needs JPAParticleCallBack inheritance and function order issues in the file
#ifdef NONMATCHING
JPTraceParticleCallBack4::~JPTraceParticleCallBack4() {}
#else
JPTraceParticleCallBack4::~JPTraceParticleCallBack4() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 803A357C-803A3590 00069C 0014+00 1/1 3/3 0/0 .data __vt__19JPAParticleCallBack */
SECTION_DATA extern void* __vt__19JPAParticleCallBack[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)NULL,
(void*)execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle,
(void*)draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle,
};
/* 803F0F40-803F0F50 01DC60 000C+04 1/1 0/0 0/0 .bss @3741 */
static u8 lit_3741[12 + 4 /* padding */];
/* 80450CA0-80450CA4 0001A0 0004+00 0/0 0/0 2/2 .sbss None */
extern u8 data_80450CA0[4];
u8 data_80450CA0[4];
/* 80450CA4-80450CA8 0001A4 0004+00 1/1 1/1 1/1 .sbss JPTracePCB4 */
extern u8 JPTracePCB4[4];
u8 JPTracePCB4[4];
/* 80018388-800183D4 012CC8 004C+00 0/0 1/0 0/0 .text __sinit_c_damagereaction_cpp */
void __sinit_c_damagereaction_cpp() {
// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80018388, __sinit_c_damagereaction_cpp);
#pragma pop
/* 800183D4-800183D8 012D14 0004+00 1/0 1/0 0/0 .text
* execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle */
extern "C" void execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle() {
/* empty function */
}
/* 800183D8-800183DC 012D18 0004+00 1/0 4/0 0/0 .text
* draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle */
void JPAParticleCallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
/* empty function */
}
JPTraceParticleCallBack4 JPTracePCB4;
src/d/actor/d_a_alldie.cpp
+4 -8
View File
@@ -24,9 +24,7 @@ int daAlldie_c::actionWait() {
/* 804D5838-804D5888 000098 0050+00 1/1 0/0 0/0 .text actionCheck__10daAlldie_cFv */
int daAlldie_c::actionCheck() {
s8 roomNo = fopAcM_GetRoomNo(this);
if (fopAcM_myRoomSearchEnemy(roomNo) == NULL) {
if (fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this)) == NULL) {
mAction = ACT_TIMER;
mTimer = 65;
}
@@ -36,9 +34,7 @@ int daAlldie_c::actionCheck() {
/* 804D5888-804D5938 0000E8 00B0+00 1/1 0/0 0/0 .text actionTimer__10daAlldie_cFv */
int daAlldie_c::actionTimer() {
s8 roomNo = fopAcM_GetRoomNo(this);
if (fopAcM_myRoomSearchEnemy(roomNo) != NULL) {
if (fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this)) != NULL) {
mAction = ACT_CHECK;
} else {
if (mTimer > 0) {
@@ -165,7 +161,7 @@ int daAlldie_c::create() {
s8 roomNo = fopAcM_GetRoomNo(this);
if (!dComIfGs_isSwitch(getSwbit(), roomNo)) {
if (!dComIfGs_isSwitch(getSwbit(), fopAcM_GetRoomNo(this))) {
mAction = ACT_CHECK;
} else {
mAction = ACT_WAIT;
@@ -222,4 +218,4 @@ extern actor_process_profile_definition g_profile_ALLDIE = {
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
};
};
src/d/actor/d_a_arrow.cpp
+65 -1194
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_b_oh2.cpp
+2 -3
View File
@@ -161,8 +161,7 @@ static void action(b_oh2_class* i_this) {
mDoMtx_stack_c::XrotM(i_this->shape_angle.x);
i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
int roomNo = fopAcM_GetRoomNo(i_this);
i_this->mpMorf->play(0, dComIfGp_getReverb(roomNo));
i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
if (boss->speedF <= 1.0f) {
i_this->mpBrk->setFrame(0.0f);
@@ -326,4 +325,4 @@ extern actor_process_profile_definition g_profile_B_OH2 = {
0x44000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_do.cpp
+2 -2
View File
@@ -2572,7 +2572,7 @@ static cPhs__Step daDo_Create(fopAc_ac_c* i_this) {
fopAcM_OnStatus(i_this, fopAcStts_CULL_e);
fopAcM_OnCarryType(i_this, fopAcM_CARRY_TYPE_8);
i_this->attention_info.flags = 0;
i_this->attention_info.distances[fopAc_attn_SPEAK_e] = 7;
i_this->attention_info.distances[fopAc_attn_CARRY_e] = 7;
fopAcM_SetMtx(i_this, _this->mpMorf->getModel()->getBaseTRMtx());
_this->mBgS_Acch.Set(fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this), i_this,
1, &_this->mBgS_AcchCir, fopAcM_GetSpeed_p(i_this), NULL, NULL);
@@ -2824,4 +2824,4 @@ extern actor_process_profile_definition g_profile_DO = {
0x8044000,
fopAc_NPC_e,
fopAc_CULLBOX_0_e,
};
};
src/d/actor/d_a_door_boss.cpp
+3 -5
View File
@@ -266,9 +266,8 @@ void daBdoor_c::calcGoal(cXyz* i_goalP, int param_1) {
void daBdoor_c::smokeInit() {
mParticlePos = current.pos;
mParticleAngle = shape_angle;
s32 room = fopAcM_GetRoomNo(this);
dComIfGp_particle_setPolyColor(0x8156, mAcch.m_gnd, &mParticlePos, &tevStr, &mParticleAngle,
NULL, 0, NULL, room, NULL);
NULL, 0, NULL, fopAcM_GetRoomNo(this), NULL);
}
/* 806700C4-806701F4 000D24 0130+00 1/1 0/0 0/0 .text checkArea__9daBdoor_cFv */
@@ -297,8 +296,7 @@ BOOL daBdoor_c::checkFront() {
/* 80670294-80670320 000EF4 008C+00 1/1 0/0 0/0 .text checkOpen__9daBdoor_cFv */
BOOL daBdoor_c::checkOpen() {
// Fake Match - should be daPy_py_c::i_checkNowWolf
if (dComIfGp_getLinkPlayer()->mNoResetFlg1 & daPy_py_c::FLG1_IS_WOLF) {
if (daPy_py_c::i_checkNowWolf()) {
return false;
}
if (!dComIfGs_isDungeonItemBossKey()) {
@@ -479,4 +477,4 @@ extern actor_process_profile_definition g_profile_BOSS_DOOR = {
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
};
};
src/d/actor/d_a_door_bossL1.cpp
+15 -46
View File
@@ -379,9 +379,8 @@ int daBdoorL1_c::create() {
shape_angle.x = 0;
current.angle.z = 0;
current.angle.x = 0;
s32 roomNo = fopAcM_GetRoomNo(this);
u32 swBit = door_param2_c::getSwbit(this);
if (dComIfGs_isSwitch(swBit, roomNo) == 0 && dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) {
if (!dComIfGs_isSwitch(door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this))
&& dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) {
createKey();
} else {
mKeyHoleId = -1;
@@ -407,7 +406,7 @@ void daBdoorL1_c::demoProc() {
cXyz cStack_38;
if (dComIfGp_evmng_getIsAddvance(field_0x5a0)) {
switch (demoAction) {
case 0:
case 0: {
int* puVar3 = dComIfGp_evmng_getMyIntegerP(field_0x5a0, "Timer");
if (puVar3 == NULL) {
field_0x5a4 = 1;
@@ -415,6 +414,7 @@ void daBdoorL1_c::demoProc() {
field_0x5a4 = *puVar3;
}
break;
}
case 1:
field_0x59a = 5;
break;
@@ -483,12 +483,13 @@ void daBdoorL1_c::demoProc() {
dComIfGp_evmng_cutEnd(field_0x5a0);
}
break;
case 2:
case 2: {
obj_keyhole_class* keyhole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId);
if ((keyhole != NULL && keyhole->checkOpenEnd()) || mKeyHoleId == -1) {
dComIfGp_evmng_cutEnd(field_0x5a0);
}
break;
}
case 3:
if (openProc() != 0) {
openEnd();
@@ -561,46 +562,15 @@ void daBdoorL1_c::demoProc() {
}
}
/* 804E4A6C-804E4A74 000058 0006+02 0/1 0/0 0/0 .rodata l_lv1_eff$4252 */
static u16 const l_lv1_eff[3] = {
0x8C42,
0x8C43,
0x8C44,
};
/* 804E4A74-804E4A7C 000060 0006+02 0/1 0/0 0/0 .rodata l_lv2_eff$4253 */
static u16 const l_lv2_eff[3] = {
0x8C45,
0x8C46,
0x8C47,
};
/* 804E4A7C-804E4A80 000068 0004+00 0/1 0/0 0/0 .rodata l_lv4_eff_a$4254 */
static u16 const l_lv4_eff_a[2] = {
0x8C48,
0x8C49,
};
/* 804E4A80-804E4A84 00006C 0004+00 0/1 0/0 0/0 .rodata l_lv4_eff_b$4255 */
static u16 const l_lv4_eff_b[2] = {
0x8C4A,
0x8C4B,
};
/* 804E4A84-804E4A88 000070 0004+00 0/1 0/0 0/0 .rodata l_lv6_eff_a$4256 */
static u16 const l_lv6_eff_a[2] = {
0x8C4C,
0x8C4D,
};
/* 804E4A88-804E4A8C 000074 0004+00 0/1 0/0 0/0 .rodata l_lv6_eff_b$4257 */
static u16 const l_lv6_eff_b[2] = {
0x8C4E,
0x8C4F,
};
/* 804E3180-804E357C 001460 03FC+00 1/1 0/0 0/0 .text openInit__11daBdoorL1_cFv */
int daBdoorL1_c::openInit() {
static u16 const l_lv1_eff[3] = {0x8C42, 0x8C43, 0x8C44};
static u16 const l_lv2_eff[3] = {0x8C45, 0x8C46, 0x8C47};
static u16 const l_lv4_eff_a[2] = {0x8C48, 0x8C49};
static u16 const l_lv4_eff_b[2] = {0x8C4A, 0x8C4B};
static u16 const l_lv6_eff_a[2] = {0x8C4C, 0x8C4D};
static u16 const l_lv6_eff_b[2] = {0x8C4E, 0x8C4F};
u32 i;
if (field_0x590->ChkUsed()) {
dComIfG_Bgsp().Release(field_0x590);
@@ -764,9 +734,8 @@ int daBdoorL1_c::closeProc() {
field_0x7d0.y += 10.0f;
field_0x5ac.CrrPos(dComIfG_Bgsp());
cXyz cStack_34(1.65f, 1.65f, 1.65f);
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_setPolyColor(0x8c50, field_0x5ac.m_gnd, &current.pos, &tevStr,
&shape_angle, &cStack_34, 0, 0, roomNo,
&shape_angle, &cStack_34, 0, 0, fopAcM_GetRoomNo(this),
0);
break;
}
@@ -1096,4 +1065,4 @@ extern actor_process_profile_definition g_profile_L1BOSS_DOOR = {
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
};
};
src/d/actor/d_a_door_bossL5.cpp
+5 -8
View File
@@ -171,9 +171,8 @@ int daBdoorL5_c::create() {
if (rv != cPhs_COMPLEATE_e) {
return rv;
}
s32 roomNo = fopAcM_GetRoomNo(this);
u32 swBit = door_param2_c::getSwbit(this);
if (dComIfGs_isSwitch(swBit, roomNo) == 0 && dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) {
if (!dComIfGs_isSwitch(door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this))
&& dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) {
createKey();
} else {
mKeyHoleId = -1;
@@ -361,9 +360,8 @@ void daBdoorL5_c::calcGoal(cXyz* param_1, int param_2) {
void daBdoorL5_c::smokeInit() {
field_0x5a4 = current.pos;
field_0x5b0 = shape_angle;
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_setPolyColor(0x8156, field_0x5b8.m_gnd, &field_0x5a4, &tevStr, &field_0x5b0,
0, 0, 0, roomNo, 0);
0, 0, 0, fopAcM_GetRoomNo(this), 0);
}
/* 80671B14-80671C14 000F54 0100+00 1/1 0/0 0/0 .text createKey__11daBdoorL5_cFv */
@@ -414,8 +412,7 @@ int daBdoorL5_c::checkFront() {
/* 80671DE4-80671E70 001224 008C+00 1/1 0/0 0/0 .text checkOpen__11daBdoorL5_cFv */
int daBdoorL5_c::checkOpen() {
// Fake Match - should be daPy_py_c::i_checkNowWolf
if (dComIfGp_getLinkPlayer()->mNoResetFlg1 & daPy_py_c::FLG1_IS_WOLF) {
if (daPy_py_c::i_checkNowWolf()) {
return 0;
}
@@ -583,4 +580,4 @@ extern actor_process_profile_definition g_profile_L5BOSS_DOOR = {
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
};
};
src/d/actor/d_a_door_mbossL1.cpp
+6 -11
View File
@@ -981,27 +981,24 @@ int daMBdoorL1_c::openInit() {
}
if (getDoorType() == 0) {
for (int i = 0; i < 2; i++) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(
l_eff_id[i],
&current.pos, &acStack_3c, 0, 0xff, 0, roomNo, NULL, NULL, NULL);
&current.pos, &acStack_3c, 0, 0xff, 0, fopAcM_GetRoomNo(this), NULL, NULL, NULL);
}
} else {
if (getDoorType() == 1) {
for (u32 k = 0; k < 5; k++) {
switch (level) {
case 4: {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(
l_eff_id_lv4[k],
&current.pos, &acStack_3c, 0, 0xff, 0, roomNo, NULL, NULL, NULL);
&current.pos, &acStack_3c, 0, 0xff, 0, fopAcM_GetRoomNo(this), NULL, NULL, NULL);
break;
}
default: {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(
l_eff_id_lv3[k],
&current.pos, &acStack_3c, 0, 0xff, 0, roomNo, NULL, NULL, NULL);
&current.pos, &acStack_3c, 0, 0xff, 0, fopAcM_GetRoomNo(this), NULL, NULL, NULL);
break;
}
}
@@ -1357,9 +1354,8 @@ void daMBdoorL1_c::smokeInit2() {
field_0x81c.y -= 10.0f;
field_0x828.y += 10.0f;
field_0x604.CrrPos(dComIfG_Bgsp());
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_setPolyColor(0x8c50, field_0x604.m_gnd, &current.pos, &tevStr,
&shape_angle, NULL, 0, NULL, roomNo, 0);
&shape_angle, NULL, 0, NULL, fopAcM_GetRoomNo(this), 0);
}
}
@@ -1541,8 +1537,7 @@ int daMBdoorL1_c::startDemoEnd() {
f32 fVar1 = dVar12 < 0.0f ? 180.0f : -180.0f;
cXyz cStack_88(current.pos.x - fVar1 * local_70.x, current.pos.y,
current.pos.z - fVar1 * local_70.z);
s32 roomNo = fopAcM_GetRoomNo(player);
dComIfGs_setRestartRoom(cStack_88, dVar12 > 0.0f ? current.angle.y : (s16)(current.angle.y + 0x8000), roomNo);
dComIfGs_setRestartRoom(cStack_88, dVar12 > 0.0f ? current.angle.y : (s16)(current.angle.y + 0x8000), fopAcM_GetRoomNo(player));
return 1;
}
@@ -1560,7 +1555,7 @@ int daMBdoorL1_c::checkMBossRoom() {
int daMBdoorL1_c::checkStopClose() {
u8 FRoomNo = door_param2_c::getFRoomNo(this);
door_param2_c::getFRoomNo(this);
s32 roomNo = fopAcM_GetRoomNo(this);
s8 roomNo = fopAcM_GetRoomNo(this);
if (mDoorStop.mModel == NULL) {
return 0;
}
src/d/actor/d_a_door_shutter.cpp
+8 -17
View File
@@ -279,8 +279,7 @@ void daDoor20_c::setEventPrm() {
}
if (chkMakeKey()) {
if (field_0x5f0) {
// FAKE MATCH: should be daPy_py_c::i_checkNowWolf
if (((daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR))->checkWolf()) {
if (daPy_py_c::i_checkNowWolf()) {
if (dComIfGs_getKeyNum() == 0) {
return;
}
@@ -446,13 +445,11 @@ void daDoor20_c::openInit_0() {
csXyz acStack_2c(0, field_0x670, 0);
for (u32 i = 0; i < 5; i++) {
if (strcmp(dComIfGp_getStartStageName(), "D_MN10") == 0) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(l_eff_id_lv4[i],
&current.pos, &acStack_2c, NULL, 0xff, NULL, roomNo, NULL, NULL, NULL);
dComIfGp_particle_set(l_eff_id_lv4[i], &current.pos, &acStack_2c, NULL, 0xff, NULL,
fopAcM_GetRoomNo(this), NULL, NULL, NULL);
} else {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(l_eff_id_lv3[i],
&current.pos, &acStack_2c, NULL, 0xff, NULL, roomNo, NULL, NULL, NULL);
dComIfGp_particle_set(l_eff_id_lv3[i], &current.pos, &acStack_2c, NULL, 0xff, NULL,
fopAcM_GetRoomNo(this), NULL, NULL, NULL);
}
}
fopAcM_onSwitch(this, bVar5);
@@ -462,12 +459,6 @@ void daDoor20_c::openInit_0() {
}
}
/* 80466864-80466868 000044 0004+00 1/1 0/0 0/0 .rodata l_eff_id$4449 */
static u16 const l_eff_id[2] = {
0x8295,
0x8296,
};
/* 80461D24-80461EC4 001264 01A0+00 1/1 0/0 0/0 .text openInit_1__10daDoor20_cFv */
void daDoor20_c::openInit_1() {
J3DAnmTransform* anm;
@@ -481,10 +472,10 @@ void daDoor20_c::openInit_1() {
JUT_ASSERT(918, rt == 0);
u8 bVar5 = door_param2_c::getSwbit3(this);
if (bVar5 != 0xff && !fopAcM_isSwitch(this, bVar5)) {
static u16 const l_eff_id[2] = {0x8295, 0x8296};
for (int i = 0; i < 2; i++) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(l_eff_id[i], &current.pos, &shape_angle, NULL, 0xff, NULL,
roomNo, NULL, NULL, NULL);
fopAcM_GetRoomNo(this), NULL, NULL, NULL);
}
fopAcM_onSwitch(this, bVar5);
field_0x672 = true;
@@ -2289,4 +2280,4 @@ extern actor_process_profile_definition g_profile_DOOR20 = {
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/actor/d_a_dshutter.cpp
+29 -421
View File
@@ -5,150 +5,27 @@
#include "d/actor/d_a_dshutter.h"
#include "SSystem/SComponent/c_math.h"
#include "Z2AudioLib/Z2Instances.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void callInit__7daDsh_cFv();
extern "C" void callExecute__7daDsh_cFv();
extern "C" void initOpenWait__7daDsh_cFv();
extern "C" void executeOpenWait__7daDsh_cFv();
extern "C" void initOpen__7daDsh_cFv();
extern "C" void executeOpen__7daDsh_cFv();
extern "C" void initCloseWait__7daDsh_cFv();
extern "C" void executeCloseWait__7daDsh_cFv();
extern "C" void initClose__7daDsh_cFv();
extern "C" void executeClose__7daDsh_cFv();
extern "C" s16 func_80467DF8(s16*);
//
// External References:
//
//
// Declarations:
//
/* ############################################################################################## */
/* 80467F5C-80467F68 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80467F68-80467F7C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
#pragma pop
UNK_REL_DATA
/* 80467F7C-80467F88 -00001 000C+00 2/2 0/0 0/0 .data l_arcName */
SECTION_DATA static char* l_arcName[] = {
static char* l_arcName[] = {
"K_tetd",
"S_bsaku00",
"S_lv7saku",
};
/* 80467F88-80467F94 -00001 000C+00 0/1 0/0 0/0 .data @3631 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3631[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)initOpenWait__7daDsh_cFv,
};
#pragma pop
/* 80467F94-80467FA0 -00001 000C+00 0/1 0/0 0/0 .data @3632 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3632[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)executeOpenWait__7daDsh_cFv,
};
#pragma pop
/* 80467FA0-80467FAC -00001 000C+00 0/1 0/0 0/0 .data @3635 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3635[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)initOpen__7daDsh_cFv,
};
#pragma pop
/* 80467FAC-80467FB8 -00001 000C+00 0/1 0/0 0/0 .data @3636 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3636[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)executeOpen__7daDsh_cFv,
};
#pragma pop
/* 80467FB8-80467FC4 -00001 000C+00 0/1 0/0 0/0 .data @3639 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3639[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)initCloseWait__7daDsh_cFv,
};
#pragma pop
/* 80467FC4-80467FD0 -00001 000C+00 0/1 0/0 0/0 .data @3640 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3640[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)executeCloseWait__7daDsh_cFv,
};
#pragma pop
/* 80467FD0-80467FDC -00001 000C+00 0/1 0/0 0/0 .data @3643 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3643[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)initClose__7daDsh_cFv,
};
#pragma pop
/* 80467FDC-80467FE8 -00001 000C+00 0/1 0/0 0/0 .data @3644 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3644[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)executeClose__7daDsh_cFv,
};
#pragma pop
/* 80467498-8046751C 000078 0084+00 1/1 0/0 0/0 .text __dt__7daDsh_cFv */
daDsh_c::~daDsh_c() {}
/* ############################################################################################## */
/* 80467F04-80467F10 000000 000C+00 2/2 0/0 0/0 .rodata l_bmd */
SECTION_RODATA static int const l_bmd[] = {
static int const l_bmd[] = {
4,
4,
4,
};
COMPILER_STRIP_GATE(0x80467F04, &l_bmd);
/* 8046751C-8046759C 0000FC 0080+00 1/0 0/0 0/0 .text CreateHeap__7daDsh_cFv */
int daDsh_c::CreateHeap() {
@@ -178,7 +55,7 @@ int daDsh_c::Execute(f32 (**param_0)[3][4]) {
callExecute();
setMtx();
*param_0 = &mBgMtx;
func_80467DF8(&mTiltTime);
cLib_calcTimer(&mTiltTime);
return 1;
}
@@ -221,105 +98,28 @@ int daDsh_c::initOpenWait() {
return 1;
}
/* ############################################################################################## */
/* 80468070-80468074 000000 0001+03 1/1 0/0 0/0 .bss @1109 */
static u8 lit_1109[1 + 3 /* padding */];
/* 80468074-80468078 000004 0001+03 0/0 0/0 0/0 .bss @1107 */
#pragma push
#pragma force_active on
static u8 lit_1107[1 + 3 /* padding */];
#pragma pop
/* 80468078-8046807C 000008 0001+03 0/0 0/0 0/0 .bss @1105 */
#pragma push
#pragma force_active on
static u8 lit_1105[1 + 3 /* padding */];
#pragma pop
/* 8046807C-80468080 00000C 0001+03 0/0 0/0 0/0 .bss @1104 */
#pragma push
#pragma force_active on
static u8 lit_1104[1 + 3 /* padding */];
#pragma pop
/* 80468080-80468084 000010 0001+03 0/0 0/0 0/0 .bss @1099 */
#pragma push
#pragma force_active on
static u8 lit_1099[1 + 3 /* padding */];
#pragma pop
/* 80468084-80468088 000014 0001+03 0/0 0/0 0/0 .bss @1097 */
#pragma push
#pragma force_active on
static u8 lit_1097[1 + 3 /* padding */];
#pragma pop
/* 80468088-8046808C 000018 0001+03 0/0 0/0 0/0 .bss @1095 */
#pragma push
#pragma force_active on
static u8 lit_1095[1 + 3 /* padding */];
#pragma pop
/* 8046808C-80468090 00001C 0001+03 0/0 0/0 0/0 .bss @1094 */
#pragma push
#pragma force_active on
static u8 lit_1094[1 + 3 /* padding */];
#pragma pop
/* 80468090-80468094 000020 0001+03 0/0 0/0 0/0 .bss @1057 */
#pragma push
#pragma force_active on
static u8 lit_1057[1 + 3 /* padding */];
#pragma pop
/* 80468094-80468098 000024 0001+03 0/0 0/0 0/0 .bss @1055 */
#pragma push
#pragma force_active on
static u8 lit_1055[1 + 3 /* padding */];
#pragma pop
/* 80468098-8046809C 000028 0001+03 0/0 0/0 0/0 .bss @1053 */
#pragma push
#pragma force_active on
static u8 lit_1053[1 + 3 /* padding */];
#pragma pop
/* 8046809C-804680A0 00002C 0001+03 0/0 0/0 0/0 .bss @1052 */
#pragma push
#pragma force_active on
static u8 lit_1052[1 + 3 /* padding */];
#pragma pop
/* 804680A0-804680A4 000030 0001+03 0/0 0/0 0/0 .bss @1014 */
#pragma push
#pragma force_active on
static u8 lit_1014[1 + 3 /* padding */];
#pragma pop
/* 804680A4-804680A8 000034 0001+03 0/0 0/0 0/0 .bss @1012 */
#pragma push
#pragma force_active on
static u8 lit_1012[1 + 3 /* padding */];
#pragma pop
/* 804680A8-804680AC 000038 0001+03 0/0 0/0 0/0 .bss @1010 */
#pragma push
#pragma force_active on
static u8 lit_1010[1 + 3 /* padding */];
#pragma pop
/* 804680AC-804680B0 00003C 0001+03 0/0 0/0 0/0 .bss @1009 */
#pragma push
#pragma force_active on
static u8 lit_1009[1 + 3 /* padding */];
#pragma pop
UNK_BSS(1109)
UNK_BSS(1107)
UNK_BSS(1105)
UNK_BSS(1104)
UNK_BSS(1099)
UNK_BSS(1097)
UNK_BSS(1095)
UNK_BSS(1094)
UNK_BSS(1057)
UNK_BSS(1055)
UNK_BSS(1053)
UNK_BSS(1052)
UNK_BSS(1014)
UNK_BSS(1012)
UNK_BSS(1010)
UNK_BSS(1009)
/* 804680B0-804680C8 000040 0018+00 2/3 0/0 0/0 .bss l_openWaitAction */
static daDsh_c::action_c l_openWaitAction /* (&daDsh_c::initOpenWait, &daDsh_c::executeOpenWait) */;
static daDsh_c::action_c l_openWaitAction(&daDsh_c::initOpenWait, &daDsh_c::executeOpenWait);
/* 804680C8-804680E0 000058 0018+00 1/2 0/0 0/0 .bss l_openAction */
static daDsh_c::action_c l_openAction /* (&daDsh_c::initOpen, &daDsh_c::executeOpen) */;
static daDsh_c::action_c l_openAction(&daDsh_c::initOpen, &daDsh_c::executeOpen);
/* 804677E4-80467840 0003C4 005C+00 1/0 0/0 0/0 .text executeOpenWait__7daDsh_cFv */
int daDsh_c::executeOpenWait() {
@@ -330,14 +130,11 @@ int daDsh_c::executeOpenWait() {
return 1;
}
/* ############################################################################################## */
/* 80467F10-80467F1C 00000C 000C+00 1/1 0/0 0/0 .rodata l_dzb */
SECTION_RODATA static int const l_dzb[] = {7, 7, 7};
COMPILER_STRIP_GATE(0x80467F10, &l_dzb);
static int const l_dzb[] = {7, 7, 7};
/* 80467F1C-80467F28 000018 000C+00 1/1 0/0 0/0 .rodata l_heap_size */
SECTION_RODATA static u32 const l_heap_size[] = {0xC10, 0xC10, 0x3D60};
COMPILER_STRIP_GATE(0x80467F1C, &l_heap_size);
static u32 const l_heap_size[] = {0xC10, 0xC10, 0x3D60};
/* 80467840-80467988 000420 0148+00 1/0 0/0 0/0 .text initOpen__7daDsh_cFv */
int daDsh_c::initOpen() {
@@ -359,8 +156,7 @@ int daDsh_c::initOpen() {
}
/* 804680E0-804680F8 000070 0018+00 2/3 0/0 0/0 .bss l_closeWaitAction */
static daDsh_c::action_c
l_closeWaitAction /* (&daDsh_c::initCloseWait, &daDsh_c::executeCloseWait) */;
static daDsh_c::action_c l_closeWaitAction(&daDsh_c::initCloseWait, &daDsh_c::executeCloseWait);
/* 80467988-80467A64 000568 00DC+00 1/0 0/0 0/0 .text executeOpen__7daDsh_cFv */
int daDsh_c::executeOpen() {
@@ -392,9 +188,8 @@ int daDsh_c::initCloseWait() {
return 1;
}
/* ############################################################################################## */
/* 804680F8-80468110 000088 0018+00 1/2 0/0 0/0 .bss l_closeAction */
static daDsh_c::action_c l_closeAction /* (&daDsh_c::initClose, &daDsh_c::executeClose) */;
static daDsh_c::action_c l_closeAction(&daDsh_c::initClose, &daDsh_c::executeClose);
/* 80467A80-80467ADC 000660 005C+00 1/0 0/0 0/0 .text executeCloseWait__7daDsh_cFv */
int daDsh_c::executeCloseWait() {
@@ -459,180 +254,7 @@ static int daDsh_Delete(daDsh_c* i_this) {
return ret;
}
/* ############################################################################################## */
/* 80468110-80468114 0000A0 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */
#pragma push
#pragma force_active on
static u8 data_80468110[4];
#pragma pop
/* 80468114-80468118 0000A4 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14JASAudioThread> */
#pragma push
#pragma force_active on
static u8 data_80468114[4];
#pragma pop
/* 80468118-8046811C 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
#pragma push
#pragma force_active on
static u8 data_80468118[4];
#pragma pop
/* 8046811C-80468120 0000AC 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
#pragma push
#pragma force_active on
static u8 data_8046811C[4];
#pragma pop
/* 80468120-80468124 0000B0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80468120[4];
#pragma pop
/* 80468124-80468128 0000B4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80468124[4];
#pragma pop
/* 80468128-8046812C 0000B8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
*/
#pragma push
#pragma force_active on
static u8 data_80468128[4];
#pragma pop
/* 8046812C-80468130 0000BC 0004+00 0/0 0/0 0/0 .bss
* sInstance__36JASGlobalInstance<15JAISoundStarter> */
#pragma push
#pragma force_active on
static u8 data_8046812C[4];
#pragma pop
/* 80468130-80468134 0000C0 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14Z2SoundStarter> */
#pragma push
#pragma force_active on
static u8 data_80468130[4];
#pragma pop
/* 80468134-80468138 0000C4 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */
#pragma push
#pragma force_active on
static u8 data_80468134[4];
#pragma pop
/* 80468138-8046813C 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
#pragma push
#pragma force_active on
static u8 data_80468138[4];
#pragma pop
/* 8046813C-80468140 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
#pragma push
#pragma force_active on
static u8 data_8046813C[4];
#pragma pop
/* 80468140-80468144 0000D0 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAIStreamMgr> */
#pragma push
#pragma force_active on
static u8 data_80468140[4];
#pragma pop
/* 80468144-80468148 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80468144[4];
#pragma pop
/* 80468148-8046814C 0000D8 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAISoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80468148[4];
#pragma pop
/* 8046814C-80468150 0000DC 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13JAUSoundTable> */
#pragma push
#pragma force_active on
static u8 data_8046814C[4];
#pragma pop
/* 80468150-80468154 0000E0 0004+00 0/0 0/0 0/0 .bss
* sInstance__38JASGlobalInstance<17JAUSoundNameTable> */
#pragma push
#pragma force_active on
static u8 data_80468150[4];
#pragma pop
/* 80468154-80468158 0000E4 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAUSoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80468154[4];
#pragma pop
/* 80468158-8046815C 0000E8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
*/
#pragma push
#pragma force_active on
static u8 data_80468158[4];
#pragma pop
/* 8046815C-80468160 0000EC 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */
#pragma push
#pragma force_active on
static u8 data_8046815C[4];
#pragma pop
/* 80468160-80468164 0000F0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
*/
#pragma push
#pragma force_active on
static u8 data_80468160[4];
#pragma pop
/* 80468164-80468168 0000F4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80468164[4];
#pragma pop
/* 80468168-8046816C 0000F8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80468168[4];
#pragma pop
/* 8046816C-80468170 0000FC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
*/
#pragma push
#pragma force_active on
static u8 data_8046816C[4];
#pragma pop
/* 80468170-80468174 000100 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */
#pragma push
#pragma force_active on
static u8 data_80468170[4];
#pragma pop
/* 80468174-80468178 000104 0004+00 1/1 0/0 0/0 .bss None */
static s8 data_80468174[4];
AUDIO_INSTANCES;
/* 80467C7C-80467DF8 00085C 017C+00 1/0 0/0 0/0 .text daDsh_Create__FP10fopAc_ac_c */
int daDsh_c::create() {
@@ -664,20 +286,6 @@ static int daDsh_Create(fopAc_ac_c* i_this) {
return static_cast<daDsh_c*>(i_this)->create();
}
/* 80467DF8-80467E14 0009D8 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<s>__FPs */
extern "C" s16 func_80467DF8(s16* param_0) {
// NONMATCHING
}
/* 80467E14-80467EF8 0009F4 00E4+00 0/0 1/0 0/0 .text __sinit_d_a_dshutter_cpp */
void __sinit_d_a_dshutter_cpp(){// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80467E14, __sinit_d_a_dshutter_cpp);
#pragma pop
/* 80467FF0-80468010 -00001 0020+00 1/0 0/0 0/0 .data l_daDsh_Method */
static actor_method_class l_daDsh_Method = {
(process_method_func)daDsh_Create, (process_method_func)daDsh_Delete,
@@ -704,4 +312,4 @@ extern actor_process_profile_definition2 g_profile_DSHUTTER = {
fopAc_CULLBOX_0_e, // cullType
},
0,
};
};
src/d/actor/d_a_e_ba.cpp
+40 -817
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_e_fz.cpp
+2 -95
View File
@@ -6,108 +6,15 @@
*/
#include "d/actor/d_a_e_fz.h"
UNK_REL_DATA
#include "f_op/f_op_actor_enemy.h"
#include "d/actor/d_a_mirror.h"
#include "d/actor/d_a_b_yo.h"
#include "d/d_com_inf_game.h"
#include "d/d_item.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_midna.h"
#include "SSystem/SComponent/c_math.h"
#include "SSystem/SComponent/c_xyz.h"
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
/* 806C14D4-806C18E8 002C74 0414+00 1/1 0/0 0/0 .text
* setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz */
// NONMATCHING
// gave up on this one, it's a mess.
// it appears to be actually defined in f_op_actor header and is in ~60 enemy actor TUs
// so needs to be solved eventually
// bind_id issue + regalloc (could be related)
static int setMidnaBindEffect(fopEn_enemy_c* i_actorP, Z2CreatureEnemy* i_creatureP, cXyz* i_pos,
cXyz* i_scale) {
static GXColor e_prim[2] = {
{0xFF, 0x78, 0x00, 0x00},
{0xFF, 0x64, 0x78, 0x00},
};
static GXColor e_env[2] = {
{0x5A, 0x2D, 0x2D, 0x00},
{0x3C, 0x1E, 0x1E, 0x00},
};
int darkworld_check;
daPy_py_c* player_actor = daPy_getPlayerActorClass();
if (player_actor->getMidnaActor() && player_actor->checkWolfLock(i_actorP)) {
cXyz pos3;
if (dKy_darkworld_check()) {
darkworld_check = 1;
} else {
darkworld_check = 0;
}
if (i_actorP->getMidnaBindMode() == 0) {
i_actorP->setMidnaBindMode(1);
csXyz angle;
PSMTXCopy(player_actor->getMidnaActor()->getMtxHairTop(), mDoMtx_stack_c::get());
cXyz cStack_54(100.0f, 0.0f, 0.0f);
mDoMtx_stack_c::multVec(&cStack_54, &pos3);
cXyz pos = pos3 - *i_pos;
angle.y = cM_atan2s(pos.x, pos.z);
angle.x = -cM_atan2s(pos.y, JMAFastSqrt(pos.x * pos.x + pos.z * pos.z));
angle.z = 0;
s32 room_no = fopAcM_GetRoomNo(i_actorP);
JPABaseEmitter* emitter = dComIfGp_particle_set(
0x29b, i_pos, &i_actorP->tevStr, &angle, i_scale, 0xff, 0, room_no,
&e_prim[darkworld_check], &e_env[darkworld_check], 0);
if (emitter) {
emitter->setGlobalParticleHeightScale(0.01f * pos.abs());
}
room_no = fopAcM_GetRoomNo(i_actorP);
dComIfGp_particle_set(0x29c, i_pos, &i_actorP->tevStr, &i_actorP->shape_angle,
i_scale, 0xff, 0, room_no, &e_prim[darkworld_check],
&e_env[darkworld_check], 0);
i_creatureP->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_ON, 0, -1);
}
static u16 eff_id[3] = {0x029D, 0x029E, 0x029F};
for (int i = 0; i < 3; i++) {
u32* bind_id = i_actorP->getMidnaBindID(i);
s32 room_no = fopAcM_GetRoomNo(i_actorP);
*bind_id = dComIfGp_particle_set(*bind_id, eff_id[i], i_pos, &i_actorP->tevStr,
&i_actorP->shape_angle, i_scale, 0xff, 0, room_no,
&e_prim[darkworld_check], &e_env[darkworld_check], 0);
}
i_creatureP->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_SUS, 0, -1);
return 1;
}
i_actorP->setMidnaBindMode(0);
return 0;
}
namespace {
/* 806C1A38-806C1A78 000038 0040+00 1/1 0/0 0/0 .data cc_fz_src__22@unnamed@d_a_e_fz_cpp@
src/d/actor/d_a_e_vt.cpp
+1 -65
View File
@@ -8,75 +8,11 @@
#include "SSystem/SComponent/c_math.h"
#include "c/c_damagereaction.h"
#include "cmath.h"
#include "d/actor/d_a_midna.h"
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "d/d_camera.h"
// NONMATCHING load order and regalloc
static int setMidnaBindEffect(fopEn_enemy_c* i_enemy, Z2CreatureEnemy* i_sound,
cXyz* i_pos, cXyz* i_scale) {
static GXColor e_prim[2] = {
{0xFF, 0x78, 0x00, 0x00},
{0xFF, 0x64, 0x78, 0x00},
};
static GXColor e_env[2] = {
{0x5A, 0x2D, 0x2D, 0x00},
{0x3C, 0x1E, 0x1E, 0x00},
};
daPy_py_c* player = daPy_getPlayerActorClass();
if (player->getMidnaActor() != NULL && player->checkWolfLock(i_enemy)) {
cXyz local_48;
int world = dKy_darkworld_check() ? 1 : 0;
if (i_enemy->getMidnaBindMode() == 0) {
i_enemy->setMidnaBindMode(1);
csXyz angle;
MTXCopy(daPy_py_c::getMidnaActor()->getMtxHairTop(), mDoMtx_stack_c::get());
cXyz local_54(100.0f, 0.0f, 0.0f);
mDoMtx_stack_c::multVec(&local_54, &local_48);
cXyz local_60 = local_48 - *i_pos;
angle.y = cM_atan2s(local_60.x, local_60.z);
angle.x = -cM_atan2s(local_60.y,
JMAFastSqrt(local_60.x * local_60.x + local_60.z * local_60.z));
angle.z = 0;
JPABaseEmitter* emitter =
dComIfGp_particle_set(0x29B, i_pos, &i_enemy->tevStr, &angle, i_scale,
0xff, NULL, fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
if (emitter != NULL) {
emitter->setGlobalParticleHeightScale(0.01f * local_60.abs());
}
dComIfGp_particle_set(0x29C, i_pos, &i_enemy->tevStr, &i_enemy->shape_angle,
i_scale, 0xff, NULL, fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
i_sound->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_ON, 0, -1);
}
static u16 eff_id[3] = {0x029D, 0x029E, 0x029F};
for (int i = 0; i < 3; i++) {
u32* bind_id = i_enemy->getMidnaBindID(i);
*bind_id = dComIfGp_particle_set(*bind_id, eff_id[i], i_pos, &i_enemy->tevStr,
&i_enemy->shape_angle, i_scale, 0xff, NULL,
fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
}
i_sound->startCreatureSoundLevel(Z2SE_MIDNA_BIND_LOCK_SUS, 0, -1);
return 1;
} else {
i_enemy->setMidnaBindMode(0);
return 0;
}
}
#include "f_op/f_op_actor_enemy.h"
#define WL_CUT_TYPE_SMALL 1
#define WL_CUT_TYPE_JUMP 2
src/d/actor/d_a_e_yk.cpp
+2 -81
View File
@@ -8,90 +8,11 @@
#include "d/actor/d_a_e_yk.h"
#include "c/c_damagereaction.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_midna.h"
#include "d/actor/d_a_player.h"
#include "d/d_s_play.h"
#include "dol2asm.h"
#include "SSystem/SComponent/c_math.h"
/* 80807D70-80807D7C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80807D7C-80807D90 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
// NONMATCHING load order and regalloc
static int setMidnaBindEffect(fopEn_enemy_c* i_enemy, Z2CreatureEnemy* i_sound,
cXyz* i_pos, cXyz* i_scale) {
static GXColor e_prim[2] = {
{0xFF, 0x78, 0x00, 0x00},
{0xFF, 0x64, 0x78, 0x00},
};
static GXColor e_env[2] = {
{0x5A, 0x2D, 0x2D, 0x00},
{0x3C, 0x1E, 0x1E, 0x00},
};
daPy_py_c* player = daPy_getPlayerActorClass();
if (player->getMidnaActor() != NULL && player->checkWolfLock(i_enemy)) {
cXyz local_48;
int world = dKy_darkworld_check() ? 1 : 0;
if (i_enemy->getMidnaBindMode() == 0) {
i_enemy->setMidnaBindMode(1);
csXyz angle;
MTXCopy(daPy_py_c::getMidnaActor()->getMtxHairTop(), mDoMtx_stack_c::get());
cXyz local_54(100.0f, 0.0f, 0.0f);
mDoMtx_stack_c::multVec(&local_54, &local_48);
cXyz local_60 = local_48 - *i_pos;
angle.y = cM_atan2s(local_60.x, local_60.z);
angle.x = -cM_atan2s(local_60.y,
JMAFastSqrt(local_60.x * local_60.x + local_60.z * local_60.z));
angle.z = 0;
JPABaseEmitter* emitter =
dComIfGp_particle_set(0x29B, i_pos, &i_enemy->tevStr, &angle, i_scale,
0xff, NULL, fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
if (emitter != NULL) {
emitter->setGlobalParticleHeightScale(0.01f * local_60.abs());
}
dComIfGp_particle_set(0x29C, i_pos, &i_enemy->tevStr, &i_enemy->shape_angle,
i_scale, 0xff, NULL, fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
i_sound->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_ON, 0, -1);
}
static u16 eff_id[3] = {0x029D, 0x029E, 0x029F};
for (int i = 0; i < 3; i++) {
u32* bind_id = i_enemy->getMidnaBindID(i);
*bind_id = dComIfGp_particle_set(*bind_id, eff_id[i], i_pos, &i_enemy->tevStr,
&i_enemy->shape_angle, i_scale, 0xff, NULL,
fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
}
i_sound->startCreatureSoundLevel(Z2SE_MIDNA_BIND_LOCK_SUS, 0, -1);
return 1;
} else {
i_enemy->setMidnaBindMode(0);
return 0;
}
}
UNK_REL_DATA
#include "f_op/f_op_actor_enemy.h"
/* 80807EF8-80807EFC 000008 0004+00 2/2 0/0 0/0 .bss None */
static u8 data_80807EF8;
src/d/actor/d_a_horse.cpp
+1 -33
View File
@@ -2460,38 +2460,6 @@ extern "C" void __dt__10cCcD_GSttsFv() {
// NONMATCHING
}
/* 80844B8C-80844B90 00CD4C 0004+00 3/0 0/0 0/0 .text
* setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform */
void J3DMtxCalc::setAnmTransform(u8 param_0, J3DAnmTransform* param_1) {
/* empty function */
}
/* 80844B90-80844B94 00CD50 0004+00 3/0 0/0 0/0 .text
* setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform */
void J3DMtxCalc::setAnmTransform(J3DAnmTransform* param_0) {
/* empty function */
}
/* 80844B94-80844B9C 00CD54 0008+00 3/0 0/0 0/0 .text getAnmTransform__10J3DMtxCalcFUc */
J3DAnmTransform* J3DMtxCalc::getAnmTransform(u8 param_0) {
return NULL;
}
/* 80844B9C-80844BA4 00CD5C 0008+00 3/0 0/0 0/0 .text getAnmTransform__10J3DMtxCalcFv */
J3DAnmTransform* J3DMtxCalc::getAnmTransform() {
return NULL;
}
/* 80844BA4-80844BA8 00CD64 0004+00 3/0 0/0 0/0 .text setWeight__10J3DMtxCalcFUcf */
void J3DMtxCalc::setWeight(u8 param_0, f32 param_1) {
/* empty function */
}
/* 80844BA8-80844BB4 00CD68 000C+00 3/0 0/0 0/0 .text getWeight__10J3DMtxCalcCFUc */
void J3DMtxCalc::getWeight(u8 param_0) const {
// NONMATCHING
}
/* 80844BB4-80844BDC 00CD74 0028+00 1/0 0/0 0/0 .text
* init__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya>FRC3VecRA3_A4_Cf
*/
@@ -2827,4 +2795,4 @@ static u8 data_80845E10[4];
static u8 data_80845E14[4];
#pragma pop
/* 8084585C-8084585C 0003B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8084585C-8084585C 0003B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_kytag12.cpp
+18 -932
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_myna.cpp
-2
View File
@@ -583,7 +583,6 @@ void daMyna_c::attack_fly_init() {
}
/* 80946BF4-80946D20 001074 012C+00 1/0 0/0 0/0 .text attack_fly_move__8daMyna_cFv */
// NONMATCHING regswap
void daMyna_c::attack_fly_move() {
if (daMyna_evtTagActor0 != NULL) {
cXyz var1(1.0f, 1.0f, 1.0f);
@@ -727,7 +726,6 @@ void daMyna_c::shopping_wait_init() {
}
/* 809471E8-809475B4 001668 03CC+00 1/0 0/0 0/0 .text shopping_wait_move__8daMyna_cFv */
// NONMATCHING regswap
void daMyna_c::shopping_wait_move() {
if (!daPy_py_c::i_checkNowWolf()) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
src/d/actor/d_a_nbomb.cpp
+58 -1338
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_eff.cpp
+2 -3
View File
@@ -13,9 +13,8 @@ int daObjEff::Act_c::_create() {
fopAcM_SetupActor(this, Act_c);
if (daObj::PrmAbstract<Act_c::Prm_e>(this, PRM_8, PRM_0) == 3) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_setColor(0x00E7, &current.pos, NULL, NULL, NULL, 0.0f, 55, NULL, &scale,
NULL, roomNo, &scale);
NULL, fopAcM_GetRoomNo(this), &scale);
}
return cPhs_ERROR_e;
@@ -84,4 +83,4 @@ extern actor_process_profile_definition g_profile_Obj_Eff = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
};
src/d/actor/d_a_obj_enemy_create.cpp
+3 -3
View File
@@ -36,11 +36,11 @@ void daObjE_CREATE_c::NormalAction() {
// this was probably supposed to be:
// "cLib_offsetPos(&current.pos, &current.pos, angle, &offsetPos)"
cLib_offsetPos(&offsetPos, &current.pos, angle, &offsetPos);
s8 roomNo = fopAcM_GetRoomNo(this);
mActorList[i] =
fopAcM_createChild(mEnemyProcName, fopAcM_GetID(this), mEnemyParams,
&current.pos, roomNo, &mEnemyAngle, NULL, -1, NULL);
&current.pos, fopAcM_GetRoomNo(this), &mEnemyAngle,
NULL, -1, NULL);
}
mActionMode++;
mKillCheckDelayTimer = 50;
@@ -285,4 +285,4 @@ extern actor_process_profile_definition g_profile_Obj_E_CREATE = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_obj_firepillar2.cpp
+7 -11
View File
@@ -121,12 +121,10 @@ int daObjFPillar2_c::Create() {
fopAcM_SetMtx(this, mMtx);
mSoundObj.init(&mSoundPos, 1);
if (getKind() == KIND_PIPE_FIRE) {
s32 roomNo = fopAcM_GetRoomNo(this);
field_0x980 = dComIfGp_particle_set(0x84df, &current.pos, &current.angle, 0, 0xff, 0,
roomNo, 0, 0, 0);
roomNo = fopAcM_GetRoomNo(this);
fopAcM_GetRoomNo(this), 0, 0, 0);
field_0x984 = dComIfGp_particle_set(0x84e0, &current.pos, &current.angle, 0, 0xff, 0,
roomNo, 0, 0, 0);
fopAcM_GetRoomNo(this), 0, 0, 0);
}
actionOffInit();
return 1;
@@ -322,16 +320,15 @@ void daObjFPillar2_c::actionOff() {
void daObjFPillar2_c::actionOnWaitInit() {
if (getKind() == KIND_PIPE_FIRE) {
for (int i = 0; i < 3; i++) {
s32 roomNo = fopAcM_GetRoomNo(this);
mPipeFireEmitters[i] = dComIfGp_particle_set(
l_pipe_fire_id[i], &current.pos, &current.angle, 0, 0xff, 0, roomNo, 0, 0, 0);
mPipeFireEmitters[i] = dComIfGp_particle_set(l_pipe_fire_id[i], &current.pos,
&current.angle, 0, 0xff, 0,
fopAcM_GetRoomNo(this), 0, 0, 0);
}
} else {
if (getKind() == KIND_MAGMA_POLE) {
for (int i = 0; i < 3; i++) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(l_yogan_foot_id[i], &current.pos, &current.angle,
&mYoganScale, 0xff, 0, roomNo, 0, 0, 0);
&mYoganScale, 0xff, 0, fopAcM_GetRoomNo(this), 0, 0, 0);
}
}
}
@@ -373,10 +370,9 @@ void daObjFPillar2_c::actionOnWait() {
void daObjFPillar2_c::actionOnInit() {
if (getKind() == KIND_MAGMA_POLE) {
for (int i = 0; i < 3; i++) {
s32 roomNo = fopAcM_GetRoomNo((fopAc_ac_c*)this);
mMagmaPoleEmitters[i] = dComIfGp_particle_set(
l_yogan_head_id[getSize()][i],
&current.pos, &current.angle, 0, 0xff, 0, roomNo, 0, 0, 0);
&current.pos, &current.angle, 0, 0xff, 0, fopAcM_GetRoomNo(this), 0, 0, 0);
if (mMagmaPoleEmitters[i] != NULL) {
mMagmaPoleEmitters[i]->becomeImmortalEmitter();
mMagmaPoleEmitters[i]->setGlobalRTMatrix(mModel->getAnmMtx(0));
src/d/actor/d_a_obj_graWall.cpp
+2 -3
View File
@@ -12,8 +12,7 @@ int daObjGraWall_c::Create() {
field_0x6e0 = fopAcM_GetParam(this);
if (field_0x6e0 != 0xff) {
int roomNo = fopAcM_GetRoomNo(this);
if (dComIfGs_isSwitch(field_0x6e0, roomNo) != 0) {
if (dComIfGs_isSwitch(field_0x6e0, fopAcM_GetRoomNo(this)) != 0) {
return cPhs_ERROR_e;
}
} else {
@@ -129,4 +128,4 @@ extern actor_process_profile_definition g_profile_GRA_WALL = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_obj_hhashi.cpp
+15 -17
View File
@@ -13,25 +13,23 @@
#include "m_Do/m_Do_lib.h"
#include "SSystem/SComponent/c_math.h"
/* ############################################################################################## */
/* 805814AC-805814F0 000000 0044+00 10/10 0/0 0/0 .rodata ccCylSrc$3773 */
const static dCcD_SrcCyl ccCylSrc = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x100000, 0x1f}, 0x11}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
110.0f, // mRadius
158.0f // mHeight
} // mCyl
};
/* 8057F9B8-8057FA18 000078 0060+00 1/1 0/0 0/0 .text initCcCylinder__13daObjHHASHI_cFv
*/
void daObjHHASHI_c::initCcCylinder() {
const static dCcD_SrcCyl ccCylSrc = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x100000, 0x1f}, 0x11}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
110.0f, // mRadius
158.0f // mHeight
} // mCyl
};
mStts.Init(0xff, 0xff, this);
mCyl.Set(ccCylSrc);
mCyl.SetStts(&mStts);
@@ -429,4 +427,4 @@ extern actor_process_profile_definition g_profile_Obj_HHASHI = {
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_obj_movebox.cpp
+67 -548
View File
@@ -5,237 +5,14 @@
#include "d/actor/d_a_obj_movebox.h"
#include "SSystem/SComponent/c_math.h"
#include "Z2AudioLib/Z2Instances.h"
#include "d/actor/d_a_player.h"
#include "d/d_path.h"
#include "dol2asm.h"
#include "d/actor/d_a_obj_burnbox.h"
#include "d/actor/d_a_obj_eff.h"
//
// Forward References:
//
UNK_REL_DATA
extern "C" void __ct__Q212daObjMovebox5Bgc_cFv();
extern "C" void __dt__4cXyzFv();
extern "C" void __ct__4cXyzFv();
extern "C" void
gnd_pos__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cif();
extern "C" void wrt_pos__Q212daObjMovebox5Bgc_cFRC4cXyz();
extern "C" void
wall_pos__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cisf();
extern "C" void proc_vertical__Q212daObjMovebox5Bgc_cFPQ212daObjMovebox5Act_c();
extern "C" void
chk_wall_pre__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cis();
extern "C" void
chk_wall_touch__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cs();
extern "C" void
chk_wall_touch2__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cis();
extern "C" void prm_get_swSave1__Q212daObjMovebox5Act_cCFv();
extern "C" void prmZ_init__Q212daObjMovebox5Act_cFv();
extern "C" void prmX_init__Q212daObjMovebox5Act_cFv();
extern "C" void attr__Q212daObjMovebox5Act_cCFv();
extern "C" void set_mtx__Q212daObjMovebox5Act_cFv();
extern "C" void init_mtx__Q212daObjMovebox5Act_cFv();
extern "C" void path_init__Q212daObjMovebox5Act_cFv();
extern "C" void path_save__Q212daObjMovebox5Act_cFv();
extern "C" void CreateHeap__Q212daObjMovebox5Act_cFv();
extern "C" void RideCallBack__Q212daObjMovebox5Act_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c();
extern "C" void
PPCallBack__Q212daObjMovebox5Act_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel();
extern "C" void Create__Q212daObjMovebox5Act_cFv();
extern "C" void afl_sway__Q212daObjMovebox5Act_cFv();
extern "C" void check_to_walk__Q212daObjMovebox5Act_cFv();
extern "C" void clr_moment_cnt__Q212daObjMovebox5Act_cFv();
extern "C" void chk_appear__Q212daObjMovebox5Act_cCFv();
extern "C" void eff_smoke_slip_start__Q212daObjMovebox5Act_cFv();
extern "C" void mode_wait_init__Q212daObjMovebox5Act_cFv();
extern "C" void mode_wait__Q212daObjMovebox5Act_cFv();
extern "C" void mode_walk_init__Q212daObjMovebox5Act_cFv();
extern "C" void mode_walk__Q212daObjMovebox5Act_cFv();
extern "C" void mode_afl_init__Q212daObjMovebox5Act_cFv();
extern "C" void mode_afl__Q212daObjMovebox5Act_cFv();
extern "C" void __dt__14dBgS_ObjGndChkFv();
extern "C" void sound_slip__Q212daObjMovebox5Act_cFv();
extern "C" void sound_limit__Q212daObjMovebox5Act_cFv();
extern "C" void sound_land__Q212daObjMovebox5Act_cFv();
extern "C" void vib_land__Q212daObjMovebox5Act_cFv();
extern "C" void eff_land_smoke__Q212daObjMovebox5Act_cFv();
extern "C" void Execute__Q212daObjMovebox5Act_cFPPA3_A4_f();
extern "C" void Draw__Q212daObjMovebox5Act_cFv();
extern "C" void __dt__8cM3dGPlaFv();
extern "C" void Delete__Q212daObjMovebox5Act_cFv();
extern "C" static void func_80480920();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" static void func_80480BC0();
extern "C" static void func_80480C18();
extern "C" static void func_80480C38();
extern "C" static void func_80480C64();
extern "C" void __dt__10cCcD_GSttsFv();
extern "C" void func_80480CD8(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e,
daObjMovebox::Act_c::Prm_e);
extern "C" void __sinit_d_a_obj_movebox_cpp();
extern "C" void func_80480DA0();
extern "C" void __dt__11dBgS_WtrChkFv();
extern "C" void func_80480E50();
extern "C" void __ct__14dBgS_ObjGndChkFv();
extern "C" static void func_80480EE4();
extern "C" static void func_80480EEC();
extern "C" static void func_80480EF4();
extern "C" static void func_80480EFC();
extern "C" static void func_80480F04();
extern "C" static void func_80480F0C();
extern "C" u8 const M_lin5__Q212daObjMovebox5Bgc_c[80];
extern "C" u8 const M_lin20__Q212daObjMovebox5Bgc_c[368];
extern "C" void* const M_arcname__Q212daObjMovebox5Act_c[8];
extern "C" u8 const M_cyl_src__Q212daObjMovebox5Act_c[68];
extern "C" u8 const M_attr__Q212daObjMovebox5Act_c[1280];
extern "C" extern char const* const d_a_obj_movebox__stringBase0;
extern "C" u8 M_gnd_work__Q212daObjMovebox5Bgc_c[1932];
extern "C" u8 M_wrt_work__Q212daObjMovebox5Bgc_c[84];
extern "C" u8 M_wall_work__Q212daObjMovebox5Bgc_c[2576];
//
// External References:
//
extern "C" void mDoMtx_XrotS__FPA4_fs();
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void transM__14mDoMtx_stack_cFfff();
extern "C" void transM__14mDoMtx_stack_cFRC4cXyz();
extern "C" void scaleM__14mDoMtx_stack_cFfff();
extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
extern "C" void quatM__14mDoMtx_stack_cFPC10Quaternion();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc();
extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void onSwitch__10dSv_info_cFii();
extern "C" void offSwitch__10dSv_info_cFii();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff();
extern "C" void quat_rotBaseY__5daObjFP10QuaternionRC4cXyz();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci();
extern "C" void
setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void dPath_GetPnt__FPC5dPathi();
extern "C" void dPath_GetRoomPath__Fii();
extern "C" void setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj();
extern "C" void StartShock__12dVibration_cFii4cXyz();
extern "C" void LineCross__4cBgSFP11cBgS_LinChk();
extern "C" void GroundCross__4cBgSFP11cBgS_GndChk();
extern "C" void GetActorPointer__4cBgSCFi();
extern "C" void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla();
extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo();
extern "C" void SplGrpChk__4dBgSFP14dBgS_SplGrpChk();
extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz();
extern "C" void dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz();
extern "C" void RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c();
extern "C" void __ct__11dBgS_GndChkFv();
extern "C" void __dt__11dBgS_GndChkFv();
extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c();
extern "C" void __ct__14dBgS_ObjLinChkFv();
extern "C" void __dt__14dBgS_ObjLinChkFv();
extern "C" void __ct__16dBgS_MoveBgActorFv();
extern "C" bool IsDelete__16dBgS_MoveBgActorFv();
extern "C" bool ToFore__16dBgS_MoveBgActorFv();
extern "C" bool ToBack__16dBgS_MoveBgActorFv();
extern "C" void
MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f();
extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv();
extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv();
extern "C" void Set__14dBgS_SplGrpChkFR4cXyzf();
extern "C" void __dt__14dBgS_SplGrpChkFv();
extern "C" void SetObj__16dBgS_PolyPassChkFv();
extern "C" void __ct__11dBgS_WtrChkFv();
extern "C" void Move__4dBgWFv();
extern "C" void GetAc__22dCcD_GAtTgCoCommonBaseFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void ChkTgHit__12dCcD_GObjInfFv();
extern "C" void GetTgHitGObj__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
extern "C" void MoveCTg__8dCcD_CylFR4cXyz();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void dKy_pol_sound_get__FPC13cBgS_PolyInfo();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void cM_rnd__Fv();
extern "C" void SetPos__11cBgS_GndChkFPC4cXyz();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __dl__FPv();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_15();
extern "C" void _savegpr_20();
extern "C" void _savegpr_24();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_15();
extern "C" void _restgpr_20();
extern "C" void _restgpr_24();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" f32 Zero__4cXyz[3];
extern "C" u8 BaseY__4cXyz[12];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mEcallback__18dPa_modelEcallBack[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void* M_dir_base__Q212daObjMovebox5Act_c[2];
extern "C" void __register_global_object();
//
// Declarations:
//
/* 80481704-80481710 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80481710-80481724 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
#pragma pop
/* ############################################################################################## */
/* 80480F28-80480F78 000000 0050+00 14/14 0/0 0/0 .rodata M_lin5__Q212daObjMovebox5Bgc_c */
const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin5[] = {
{0.0f, 0.0f, 0.0f, 0.0f}, {-0.5f, -0.5f, 1.0f, 1.0f}, {0.5f, -0.5f, -1.0f, 1.0f},
@@ -243,7 +20,7 @@ const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin5[] = {
};
/* 80480F78-804810E8 000050 0170+00 0/4 0/0 0/0 .rodata M_lin20__Q212daObjMovebox5Bgc_c */
SECTION_RODATA const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin20[] = {
const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin20[] = {
{0.0f, 0.0f, 0.0f, 0.0f}, {-0.25f, -0.25f, 0.0f, 0.0f}, {-0.5f, -0.5f, 1.0f, 1.0f},
{0.0f, -0.5f, -1.0f, 1.0f}, {0.0f, 0.0f, -1.0f, -1.0f}, {-0.5f, 0.0f, 1.0f, -1.0f},
{0.25f, -0.25f, 0.0f, 0.0f}, {0.0f, -0.5f, 1.0f, 1.0f}, {0.5f, -0.5f, -1.0f, 1.0f},
@@ -268,98 +45,22 @@ daObjMovebox::Bgc_c::Bgc_c() {
mState = STATE_0_e;
}
/* 80481888-8048188C 000008 0001+03 4/4 0/0 0/0 .bss @1109 */
static u8 lit_1109[1 + 3 /* padding */];
/* 8048188C-80481890 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */
#pragma push
#pragma force_active on
static u8 lit_1107[1 + 3 /* padding */];
#pragma pop
/* 80481890-80481894 000010 0001+03 0/0 0/0 0/0 .bss @1105 */
#pragma push
#pragma force_active on
static u8 lit_1105[1 + 3 /* padding */];
#pragma pop
/* 80481894-80481898 000014 0001+03 0/0 0/0 0/0 .bss @1104 */
#pragma push
#pragma force_active on
static u8 lit_1104[1 + 3 /* padding */];
#pragma pop
/* 80481898-8048189C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */
#pragma push
#pragma force_active on
static u8 lit_1099[1 + 3 /* padding */];
#pragma pop
/* 8048189C-804818A0 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */
#pragma push
#pragma force_active on
static u8 lit_1097[1 + 3 /* padding */];
#pragma pop
/* 804818A0-804818A4 000020 0001+03 0/0 0/0 0/0 .bss @1095 */
#pragma push
#pragma force_active on
static u8 lit_1095[1 + 3 /* padding */];
#pragma pop
/* 804818A4-804818A8 000024 0001+03 0/0 0/0 0/0 .bss @1094 */
#pragma push
#pragma force_active on
static u8 lit_1094[1 + 3 /* padding */];
#pragma pop
/* 804818A8-804818AC 000028 0001+03 0/0 0/0 0/0 .bss @1057 */
#pragma push
#pragma force_active on
static u8 lit_1057[1 + 3 /* padding */];
#pragma pop
/* 804818AC-804818B0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */
#pragma push
#pragma force_active on
static u8 lit_1055[1 + 3 /* padding */];
#pragma pop
/* 804818B0-804818B4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */
#pragma push
#pragma force_active on
static u8 lit_1053[1 + 3 /* padding */];
#pragma pop
/* 804818B4-804818B8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */
#pragma push
#pragma force_active on
static u8 lit_1052[1 + 3 /* padding */];
#pragma pop
/* 804818B8-804818BC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */
#pragma push
#pragma force_active on
static u8 lit_1014[1 + 3 /* padding */];
#pragma pop
/* 804818BC-804818C0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */
#pragma push
#pragma force_active on
static u8 lit_1012[1 + 3 /* padding */];
#pragma pop
/* 804818C0-804818C4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */
#pragma push
#pragma force_active on
static u8 lit_1010[1 + 3 /* padding */];
#pragma pop
/* 804818C4-804818C8 000044 0001+03 0/0 0/0 0/0 .bss @1009 */
#pragma push
#pragma force_active on
static u8 lit_1009[1 + 3 /* padding */];
#pragma pop
UNK_BSS(1109)
UNK_BSS(1107)
UNK_BSS(1105)
UNK_BSS(1104)
UNK_BSS(1099)
UNK_BSS(1097)
UNK_BSS(1095)
UNK_BSS(1094)
UNK_BSS(1057)
UNK_BSS(1055)
UNK_BSS(1053)
UNK_BSS(1052)
UNK_BSS(1014)
UNK_BSS(1012)
UNK_BSS(1010)
UNK_BSS(1009)
/* 804818D4-80482060 000054 078C+00 7/8 0/0 0/0 .bss M_gnd_work__Q212daObjMovebox5Bgc_c
*/
@@ -628,7 +329,7 @@ void daObjMovebox::Act_c::prmX_init() {
/* 80481104-80481124 -00001 0020+00 3/3 0/0 0/0 .rodata M_arcname__Q212daObjMovebox5Act_c
*/
SECTION_RODATA const char* const daObjMovebox::Act_c::M_arcname[8] = {
const char* const daObjMovebox::Act_c::M_arcname[8] = {
"Kkiba_00", "Osiblk", "H_Box20", "A_SMBlock", "P_Lv4blk", "P_Lv4blk2", "H_OsiHaka", "dummy4",
};
@@ -866,7 +567,6 @@ int daObjMovebox::Act_c::CreateHeap() {
/* 8047EBEC-8047ED10 0011EC 0124+00 1/1 0/0 0/0 .text
* RideCallBack__Q212daObjMovebox5Act_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
void daObjMovebox::Act_c::RideCallBack(dBgW* i_bgw, fopAc_ac_c* i_actor, fopAc_ac_c* i_rideActor) {
i_bgw; // affects stack
Act_c* a_this = (Act_c*)i_actor;
if (a_this->field_0x5ac == 2) {
@@ -1039,6 +739,7 @@ int daObjMovebox::Act_c::Create() {
/* 8047F11C-8047F38C 00171C 0270+00 1/1 0/0 0/0 .text afl_sway__Q212daObjMovebox5Act_cFv
*/
// NONMATCHING regalloc
void daObjMovebox::Act_c::afl_sway() {
f32 var_f31 = field_0x8c0 * field_0x8c0 + field_0x8c4 * field_0x8c4;
f32 var_f29 = i_attr().mMaxTiltPower * i_attr().mMaxTiltPower;
@@ -1046,19 +747,11 @@ void daObjMovebox::Act_c::afl_sway() {
const BgcSrc_c* pbgc = i_attr().field_0x9e ? mBgc.M_lin20 : mBgc.M_lin5;
int check_num = i_attr().field_0x9e ? 21 : 5;
bool var_r22 = true;
if (!mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[0]) &&
!mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[2]))
{
var_r22 = false;
}
bool var_r22 = mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[0]) ||
mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[2]);
bool var_r21 = true;
if (!mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[1]) &&
!mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[3]))
{
var_r21 = false;
}
bool var_r21 = mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[1]) ||
mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[3]);
if (var_f31 > var_f29) {
f32 var_f30 = i_attr().mMaxTiltPower / JMAFastSqrt(var_f31);
@@ -1066,16 +759,13 @@ void daObjMovebox::Act_c::afl_sway() {
field_0x8c4 *= var_f30;
}
f32 var_f24 = field_0x8c8 - field_0x8c0;
f32 var_f23 = field_0x8cc - field_0x8c4;
f32 var_f28 = i_attr().mTiltSpringFactor * -(field_0x8c8 - field_0x8c0);
f32 var_f27 = i_attr().mTiltSpringFactor * -(field_0x8cc - field_0x8c4);
f32 var_f26 = -field_0x8d0 * i_attr().mTiltViscoscityResistance;
f32 var_f25 = -field_0x8d4 * i_attr().mTiltViscoscityResistance;
f32 var_f28 = i_attr().mTiltSpringFactor * -var_f24;
f32 var_f27 = i_attr().mTiltSpringFactor * -var_f23;
f32 var_f26 = field_0x8d0 * -i_attr().mTiltViscoscityResistance;
f32 var_f25 = field_0x8d4 * -i_attr().mTiltViscoscityResistance;
field_0x8d0 += var_f28 * var_f26;
field_0x8d4 += var_f27 * var_f25;
field_0x8d0 += var_f28 + var_f26;
field_0x8d4 += var_f27 + var_f25;
field_0x8c8 += field_0x8d0;
field_0x8cc += field_0x8d4;
@@ -1295,7 +985,7 @@ void daObjMovebox::Act_c::mode_walk() {
/* 8047FCBC-8047FCE4 0022BC 0028+00 1/1 0/0 0/0 .text mode_afl_init__Q212daObjMovebox5Act_cFv */
void daObjMovebox::Act_c::mode_afl_init() {
fopAcM_SetSpeedF(this, 0.0f);
mpBgW->SetCrrFunc(dBgS_MoveBGProc_Trans);
mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical);
field_0x5ac = 2;
}
@@ -1304,22 +994,37 @@ void daObjMovebox::Act_c::mode_afl_init() {
void daObjMovebox::Act_c::mode_afl() {
f32 var_f31;
f32 var_f30 = current.pos.y - mBgc.field_0x60;
if (var_f30 > 0.0f) {
if (var_f30 >= 0.0f) {
var_f31 = 0.0f;
} else if (var_f30 > -i_attr().field_0x68) {
} else if (var_f30 <= -i_attr().field_0x68) {
var_f31 = 1.0f;
} else {
var_f31 = -var_f30 * i_attr().field_0x6c;
}
field_0x8b8 += i_attr().mWaterOscillationAngleSpeed * (cM_rnd() + 1.0f);
fopAcM_SetGravity(this, field_0x8bc + var_f31 * i_attr().mBuoyancy +
i_attr().mGravity * cM_ssin(field_0x8b8));
field_0x8b8 += (s16)(i_attr().mWaterOscillationAngleSpeed * (cM_rnd() + 1.0f));
fopAcM_SetGravity(this, var_f31 * i_attr().mBuoyancy + i_attr().mGravity +
i_attr().mWaterOscillationAccel * cM_ssin(field_0x8b8) + field_0x8bc);
field_0x8bc = 0.0f;
if (cLib_checkBit<daObjMovebox::Bgc_c::State_e>(mBgc.mState, daObjMovebox::Bgc_c::STATE_1_e)) {
if (!cLib_checkBit<daObjMovebox::Bgc_c::State_e>(mBgc.mState, daObjMovebox::Bgc_c::STATE_1_e)) {
afl_sway();
}
f32 tmp = 1.0f - var_f31;
f32 viscosity_resistance = var_f31 * i_attr().mWaterViscoscityResistance
+ tmp * i_attr().mViscosityResistance;
f32 inertia_resistance = var_f31 * i_attr().mWaterInertiaResistance
+ tmp * i_attr().mInertiaResistance;
field_0x8d8 = mBgc.field_0x60 - current.pos.y;
if (field_0x8d8 < 0.0f) {
field_0x8d8 = 0.0f;
} else if (field_0x8d8 > i_attr().field_0x68) {
field_0x8d8 = i_attr().field_0x68;
}
daObj::posMoveF_stream(this, NULL, &cXyz::Zero, viscosity_resistance, inertia_resistance);
}
void daObjMovebox::Act_c::mode_proc_call() {
@@ -1358,7 +1063,7 @@ void daObjMovebox::Act_c::sound_limit() {
}
}
mDoAud_seStartLevel(i_attr().field_0x80, &eyePos, var_r29, mReverb);
mDoAud_seStart(i_attr().field_0x80, &eyePos, var_r29, mReverb);
}
/* 804800E4-804801A8 0026E4 00C4+00 1/1 0/0 0/0 .text sound_land__Q212daObjMovebox5Act_cFv */
@@ -1372,7 +1077,7 @@ void daObjMovebox::Act_c::sound_land() {
}
}
mDoAud_seStartLevel(i_attr().field_0x84, &eyePos, var_r29, mReverb);
mDoAud_seStart(i_attr().field_0x84, &eyePos, var_r29, mReverb);
}
/* 804801A8-804801FC 0027A8 0054+00 1/1 0/0 0/0 .text vib_land__Q212daObjMovebox5Act_cFv
@@ -1381,207 +1086,20 @@ void daObjMovebox::Act_c::vib_land() {
dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f));
}
/* 8048168C-80481690 000764 0004+00 0/0 0/0 0/0 .rodata @4774 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4774 = 2.0f;
COMPILER_STRIP_GATE(0x8048168C, &lit_4774);
#pragma pop
/* 80481690-80481694 000768 0004+00 0/0 0/0 0/0 .rodata @4775 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4775 = 75.0f;
COMPILER_STRIP_GATE(0x80481690, &lit_4775);
#pragma pop
f32 dummy_literal(f32 x) {
return x + 75.0f + 2.0f;
}
/* 804801FC-8048027C 0027FC 0080+00 1/1 0/0 0/0 .text eff_land_smoke__Q212daObjMovebox5Act_cFv */
void daObjMovebox::Act_c::eff_land_smoke() {
daObjEff::Act_c::make_land_smoke(&current.pos, i_attr().mLandSmokeScale);
}
/* 80482BDC-80482BEC 00135C 000C+04 0/0 0/0 0/0 .bss @4762 */
#pragma push
#pragma force_active on
static u8 lit_4762[12 + 4 /* padding */];
#pragma pop
void dummy_static() {
static cXyz particle_scale;
}
/* 80482BEC-80482BF8 00136C 000C+00 0/0 0/0 0/0 .bss particle_scale$4761 */
#pragma push
#pragma force_active on
static u8 particle_scale[12];
#pragma pop
/* 80482BF8-80482BFC 001378 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */
#pragma push
#pragma force_active on
static u8 data_80482BF8[4];
#pragma pop
/* 80482BFC-80482C00 00137C 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14JASAudioThread> */
#pragma push
#pragma force_active on
static u8 data_80482BFC[4];
#pragma pop
/* 80482C00-80482C04 001380 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C00[4];
#pragma pop
/* 80482C04-80482C08 001384 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C04[4];
#pragma pop
/* 80482C08-80482C0C 001388 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C08[4];
#pragma pop
/* 80482C0C-80482C10 00138C 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C0C[4];
#pragma pop
/* 80482C10-80482C14 001390 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
*/
#pragma push
#pragma force_active on
static u8 data_80482C10[4];
#pragma pop
/* 80482C14-80482C18 001394 0004+00 0/0 0/0 0/0 .bss
* sInstance__36JASGlobalInstance<15JAISoundStarter> */
#pragma push
#pragma force_active on
static u8 data_80482C14[4];
#pragma pop
/* 80482C18-80482C1C 001398 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14Z2SoundStarter> */
#pragma push
#pragma force_active on
static u8 data_80482C18[4];
#pragma pop
/* 80482C1C-80482C20 00139C 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */
#pragma push
#pragma force_active on
static u8 data_80482C1C[4];
#pragma pop
/* 80482C20-80482C24 0013A0 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C20[4];
#pragma pop
/* 80482C24-80482C28 0013A4 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C24[4];
#pragma pop
/* 80482C28-80482C2C 0013A8 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAIStreamMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C28[4];
#pragma pop
/* 80482C2C-80482C30 0013AC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C2C[4];
#pragma pop
/* 80482C30-80482C34 0013B0 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAISoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80482C30[4];
#pragma pop
/* 80482C34-80482C38 0013B4 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13JAUSoundTable> */
#pragma push
#pragma force_active on
static u8 data_80482C34[4];
#pragma pop
/* 80482C38-80482C3C 0013B8 0004+00 0/0 0/0 0/0 .bss
* sInstance__38JASGlobalInstance<17JAUSoundNameTable> */
#pragma push
#pragma force_active on
static u8 data_80482C38[4];
#pragma pop
/* 80482C3C-80482C40 0013BC 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAUSoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80482C3C[4];
#pragma pop
/* 80482C40-80482C44 0013C0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
*/
#pragma push
#pragma force_active on
static u8 data_80482C40[4];
#pragma pop
/* 80482C44-80482C48 0013C4 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C44[4];
#pragma pop
/* 80482C48-80482C4C 0013C8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
*/
#pragma push
#pragma force_active on
static u8 data_80482C48[4];
#pragma pop
/* 80482C4C-80482C50 0013CC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C4C[4];
#pragma pop
/* 80482C50-80482C54 0013D0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C50[4];
#pragma pop
/* 80482C54-80482C58 0013D4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C54[4];
#pragma pop
/* 80482C58-80482C5C 0013D8 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C58[4];
#pragma pop
AUDIO_INSTANCES;
/* 8048027C-80480728 00287C 04AC+00 1/0 0/0 0/0 .text Execute__Q212daObjMovebox5Act_cFPPA3_A4_f */
int daObjMovebox::Act_c::Execute(Mtx** param_0) {
@@ -1612,10 +1130,9 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) {
(J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd");
JUT_ASSERT(kibako_bmd != 0);
s32 room_no = fopAcM_GetRoomNo(this);
JPABaseEmitter* emitter = dComIfGp_particle_set(
0x82AF, &sp48, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(),
room_no, NULL, NULL, &scale);
fopAcM_GetRoomNo(this), NULL, NULL, &scale);
dPa_modelEcallBack::setModel(emitter, kibako_bmd, tevStr, 3, NULL, 0, 0);
for (int i = 0; i < 3; i++) {
@@ -1634,7 +1151,7 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) {
if (cLib_checkBit<daObjMovebox::Bgc_c::State_e>(mBgc.mState,
daObjMovebox::Bgc_c::STATE_20_e))
{
mDoAud_seStartLevel(i_attr().field_0x88, &eyePos, 0, mReverb);
mDoAud_seStart(i_attr().field_0x88, &eyePos, 0, mReverb);
}
if (field_0x5ac == 0) {
@@ -1750,6 +1267,8 @@ int daObjMovebox::Act_c::Mthd_Create() {
heap_size, NULL);
JUT_ASSERT((phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
}
return phase_state;
}
int daObjMovebox::Act_c::Mthd_Delete() {
@@ -1814,4 +1333,4 @@ extern actor_process_profile_definition g_profile_Obj_Movebox = {
0x00040504, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/actor/d_a_obj_onsenTaru.cpp
+2 -3
View File
@@ -379,10 +379,9 @@ void daOnsTaru_c::breakEffSet() {
J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd");
JUT_ASSERT(0x310, kibako_bmd != 0);
s32 room_no = fopAcM_GetRoomNo(this);
JPABaseEmitter* emitter =
dComIfGp_particle_set(0x8A99, &pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(),
room_no, NULL, NULL, &scale);
fopAcM_GetRoomNo(this), NULL, NULL, &scale);
if (emitter != NULL) {
dPa_modelEcallBack::setModel(emitter, kibako_bmd, tevStr, 3, NULL, 0, 0);
}
@@ -450,4 +449,4 @@ extern actor_process_profile_definition g_profile_Obj_OnsenTaru = {
0x00040020, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/actor/d_a_obj_web1.cpp
+2 -3
View File
@@ -136,8 +136,7 @@ static int daObj_Web1_Execute(obj_web1_class* i_this) {
i_this->mHitTimer--;
}
int roomNo = fopAcM_GetRoomNo(i_this);
i_this->mZ2SoundObj.framework(0, dComIfGp_getReverb(roomNo));
i_this->mZ2SoundObj.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
if (i_this->mDeleteTimer != 0) {
if (i_this->mDeleteTimer == 1) {
@@ -343,4 +342,4 @@ extern actor_process_profile_definition g_profile_OBJ_WEB1 = {
0x40100,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_obj_zraMark.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ int daObjZraMark_c::CreateHeap() {
break;
}
s32 room_no = fopAcM_GetRoomNo(this);
s8 room_no = fopAcM_GetRoomNo(this);
if (!mHahenMngr.create(pos, room_no, color, var_r29, 0)) {
// "------------------Fragment Generation Error\n"
OS_REPORT("------------------破片生成ミス\n");
src/d/actor/d_a_tag_chgrestart.cpp
+2 -3
View File
@@ -77,8 +77,7 @@ s32 daTagChgRestart_c::execute() {
restart_angle = entry_p->mAngle.y;
}
s32 l_roomNo = fopAcM_GetRoomNo(player);
dComIfGs_setRestartRoom(restart_pos, restart_angle, l_roomNo);
dComIfGs_setRestartRoom(restart_pos, restart_angle, fopAcM_GetRoomNo(player));
fopAcM_onSwitch(this, daTagChgRestart_prm::getSwNo(this));
}
@@ -131,4 +130,4 @@ extern actor_process_profile_definition g_profile_Tag_ChgRestart = {
0x40000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/actor/d_a_tag_kmsg.cpp
+23 -183
View File
@@ -8,86 +8,6 @@
#include "d/actor/d_a_player.h"
#include "SSystem/SComponent/c_counter.h"
#include "string.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void create__12daTag_KMsg_cFv();
extern "C" void Delete__12daTag_KMsg_cFv();
extern "C" void Execute__12daTag_KMsg_cFv();
extern "C" bool Draw__12daTag_KMsg_cFv();
extern "C" void isDelete__12daTag_KMsg_cFv();
extern "C" static void daTag_KMsg_Create__FPv();
extern "C" static void daTag_KMsg_Delete__FPv();
extern "C" static void daTag_KMsg_Execute__FPv();
extern "C" static void daTag_KMsg_Draw__FPv();
extern "C" static bool daTag_KMsg_IsDelete__FPv();
extern "C" void __dt__12daTag_KMsg_cFv();
extern "C" extern char const* const d_a_tag_kmsg__stringBase0;
//
// 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 fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs();
extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs();
extern "C" void fopAcM_cancelCarryNow__FP10fopAc_ac_c();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void reset__14dEvt_control_cFv();
extern "C" void reset__14dEvt_control_cFPv();
extern "C" void setObjectArchive__16dEvent_manager_cFPc();
extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc();
extern "C" void endCheck__16dEvent_manager_cFs();
extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci();
extern "C" void cutEnd__16dEvent_manager_cFi();
extern "C" void LineCross__4cBgSFP11cBgS_LinChk();
extern "C" void __ct__11dBgS_LinChkFv();
extern "C" void __dt__11dBgS_LinChkFv();
extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c();
extern "C" void daNpcT_chkDoBtnIsSpeak__FP10fopAc_ac_c();
extern "C" void daNpcT_getDistTableIdx__Fii();
extern "C" void daNpcT_chkEvtBit__FUl();
extern "C" void __ct__10dMsgFlow_cFv();
extern "C" void __dt__10dMsgFlow_cFv();
extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c();
extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void __ml__4cXyzCFf();
extern "C" void norm__4cXyzCFv();
extern "C" void __ct__7cSAngleFs();
extern "C" void Sin__7cSAngleCFv();
extern "C" void Cos__7cSAngleCFv();
extern "C" void __dl__FPv();
extern "C" void _savegpr_25();
extern "C" void _restgpr_25();
//
// Declarations:
//
/* ############################################################################################## */
/* 8048EADC-8048EAE0 000000 0004+00 2/2 0/0 0/0 .rodata @3884 */
SECTION_RODATA static f32 const lit_3884 = 10.0f;
COMPILER_STRIP_GATE(0x8048EADC, &lit_3884);
/* 8048EAFC-8048EAFC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8048EAFC = "";
SECTION_DEAD static char const* const stringBase_8048EAFD = "EXTINCTION";
SECTION_DEAD static char const* const stringBase_8048EB08 = "PURCHASE";
SECTION_DEAD static char const* const stringBase_8048EB11 = "Bans1";
SECTION_DEAD static char const* const stringBase_8048EB17 = "sekizoA";
SECTION_DEAD static char const* const stringBase_8048EB1F = "Lv6Gate";
#pragma pop
struct EventListItem {
char* mEventName;
@@ -95,48 +15,19 @@ struct EventListItem {
};
/* 8048EB2C-8048EB44 -00001 0018+00 1/1 0/0 0/0 .data l_evtList */
SECTION_DATA static EventListItem l_evtList[3] = {
static EventListItem l_evtList[3] = {
{"", 0},
{"EXTINCTION", 2},
{"PURCHASE", 1},
};
/* 8048EB44-8048EB50 -00001 000C+00 1/1 0/0 0/0 .data l_resNameList */
SECTION_DATA static char* l_resNameList[3] = {
static char* l_resNameList[3] = {
"",
"Bans1",
"sekizoA",
};
/* 8048EB50-8048EB70 -00001 0020+00 1/0 0/0 0/0 .data daTag_KMsg_MethodTable */
SECTION_DATA static void* daTag_KMsg_MethodTable[8] = {
(void*)daTag_KMsg_Create__FPv,
(void*)daTag_KMsg_Delete__FPv,
(void*)daTag_KMsg_Execute__FPv,
(void*)daTag_KMsg_IsDelete__FPv,
(void*)daTag_KMsg_Draw__FPv,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 8048EB70-8048EBA0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_KMSG */
SECTION_DATA extern void* g_profile_TAG_KMSG[12] = {
(void*)0xFFFFFFFD, (void*)0x0008FFFD,
(void*)0x02EB0000, (void*)&g_fpcLf_Method,
(void*)0x000005CC, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01220000, (void*)&daTag_KMsg_MethodTable,
(void*)0x00044000, (void*)0x000E0000,
};
/* 8048EBA0-8048EBAC 000074 000C+00 2/2 0/0 0/0 .data __vt__12daTag_KMsg_c */
SECTION_DATA extern void* __vt__12daTag_KMsg_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12daTag_KMsg_cFv,
};
/* 8048DE78-8048DFDC 000078 0164+00 1/1 0/0 0/0 .text create__12daTag_KMsg_cFv */
int daTag_KMsg_c::create() {
attention_info.position = current.pos;
@@ -162,7 +53,6 @@ int daTag_KMsg_c::create() {
}
}
/* 8048DFDC-8048E010 0001DC 0034+00 1/1 0/0 0/0 .text Delete__12daTag_KMsg_cFv */
int daTag_KMsg_c::Delete() {
OS_REPORT("|%06d:%x|daTag_KMsg_c -> Delete\n", g_Counter, this);
@@ -171,57 +61,8 @@ int daTag_KMsg_c::Delete() {
return 1;
}
/* ############################################################################################## */
/* 8048EAE0-8048EAE4 000004 0004+00 0/1 0/0 0/0 .rodata @4206 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4206 = 1000000000.0f;
COMPILER_STRIP_GATE(0x8048EAE0, &lit_4206);
#pragma pop
/* 8048EAE4-8048EAE8 000008 0004+00 0/1 0/0 0/0 .rodata @4207 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4207 = -0.5f;
COMPILER_STRIP_GATE(0x8048EAE4, &lit_4207);
#pragma pop
/* 8048EAE8-8048EAEC 00000C 0004+00 0/1 0/0 0/0 .rodata @4208 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4208 = -20.0f;
COMPILER_STRIP_GATE(0x8048EAE8, &lit_4208);
#pragma pop
/* 8048EAEC-8048EAF4 000010 0004+04 0/1 0/0 0/0 .rodata @4209 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4209[1 + 1 /* padding */] = {
80.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x8048EAEC, &lit_4209);
#pragma pop
/* 8048EAF4-8048EAFC 000018 0008+00 0/1 0/0 0/0 .rodata @4211 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4211[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x8048EAF4, &lit_4211);
#pragma pop
/* 8048EAFC-8048EAFC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8048EB27 = "KMsg";
#pragma pop
/* 8048E010-8048E8B8 000210 08A8+00 1/1 0/0 0/0 .text Execute__12daTag_KMsg_cFv */
// Various issues: stack, getTalkAngle
#ifdef NONMATCHING
// NONMATCHING Various issues: stack, getTalkAngle
int daTag_KMsg_c::Execute() {
bool r28 = false;
if (home.roomNo == dComIfGp_roomControl_getStayNo()) {
@@ -346,19 +187,18 @@ int daTag_KMsg_c::Execute() {
cXyz vec60 = attention_info.position;
vec60.y += f31;
cXyz vec54;
cXyz vec9c;
vec54.x = vec60.x + 80.0f * angle.Sin();
vec54.y = vec60.y;
vec54.z = vec60.x + 80.0f * angle.Cos();
vec54.z = vec60.z + 80.0f * angle.Cos();
dBgS_LinChk lin_chk;
lin_chk.ClrSttsWallOff();
lin_chk.onBackFlag();
lin_chk.onFrontFlag();
lin_chk.Set(&vec54, &vec60, NULL);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
cXyz vec48;
cXyz vec30 = vec54 - vec60;
// !@bug If decompiled correctly, vec9c is uninitialized
cXyz vec48 = vec9c + vec30.norm() * 10.0f;
vec48 = lin_chk.i_GetCross() + vec30.norm() * 10.0f;
attention_info.position.x = vec48.x;
attention_info.position.z = vec48.z;
}
@@ -368,11 +208,6 @@ int daTag_KMsg_c::Execute() {
}
return 0;
}
#else
int daTag_KMsg_c::Execute() {
// NONMATCHING
}
#endif
/* 8048E8B8-8048E8C0 000AB8 0008+00 1/1 0/0 0/0 .text Draw__12daTag_KMsg_cFv */
int daTag_KMsg_c::Draw() {
@@ -380,7 +215,6 @@ int daTag_KMsg_c::Draw() {
}
/* 8048E8C0-8048E9A8 000AC0 00E8+00 2/2 0/0 0/0 .text isDelete__12daTag_KMsg_cFv */
#ifndef NONMATCHING
int daTag_KMsg_c::isDelete() {
switch(getType()) {
case KMSG_TYPE_0:
@@ -403,11 +237,6 @@ int daTag_KMsg_c::isDelete() {
return 0;
}
}
#else
int daTag_KMsg_c::isDelete() {
// NONMATCHING
}
#endif
/* 8048E9A8-8048E9C8 000BA8 0020+00 1/0 0/0 0/0 .text daTag_KMsg_Create__FPv */
static int daTag_KMsg_Create(void* i_this) {
@@ -434,10 +263,21 @@ static int daTag_KMsg_IsDelete(void* param_0) {
return 1;
}
/* 8048EA30-8048EAD4 000C30 00A4+00 1/0 0/0 0/0 .text __dt__12daTag_KMsg_cFv */
void __dt__12daTag_KMsg_cFv() {
//asm daTag_KMsg_c::~daTag_KMsg_c() {
// NONMATCHING
}
/* 8048EB50-8048EB70 -00001 0020+00 1/0 0/0 0/0 .data daTag_KMsg_MethodTable */
static void* daTag_KMsg_MethodTable[8] = {
(void*)daTag_KMsg_Create,
(void*)daTag_KMsg_Delete,
(void*)daTag_KMsg_Execute,
(void*)daTag_KMsg_IsDelete,
(void*)daTag_KMsg_Draw,
};
/* 8048EAFC-8048EAFC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8048EB70-8048EBA0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_KMSG */
extern void* g_profile_TAG_KMSG[12] = {
(void*)0xFFFFFFFD, (void*)0x0008FFFD,
(void*)0x02EB0000, (void*)&g_fpcLf_Method,
(void*)0x000005CC, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01220000, (void*)&daTag_KMsg_MethodTable,
(void*)0x00044000, (void*)0x000E0000,
};
src/d/actor/d_a_tag_setrestart.cpp
+2 -3
View File
@@ -75,8 +75,7 @@ int daTagRestart_c::execute() {
restart_pos.y = fopAcM_gc_c::getGroundY();
}
s32 player_roomNo = fopAcM_GetRoomNo(player);
dComIfGs_setRestartRoom(restart_pos, restart_angle, player_roomNo);
dComIfGs_setRestartRoom(restart_pos, restart_angle, fopAcM_GetRoomNo(player));
}
}
@@ -131,4 +130,4 @@ extern actor_process_profile_definition g_profile_Tag_Restart = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_tbox.cpp
+4 -4
View File
@@ -719,9 +719,8 @@ void daTbox_c::dropProc() {
mDoMtx_identity(field_0x988);
speedF = 0.0f;
cXyz vec1(2.0f, 2.0f, 2.0f);
s32 room_no = fopAcM_GetRoomNo(this);
dComIfGp_particle_setPolyColor(0xe7, mAcch.m_gnd, &current.pos, &tevStr, &home.angle,
&vec1, 0, NULL, room_no, NULL);
&vec1, 0, NULL, fopAcM_GetRoomNo(this), NULL);
dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
u32 sound_id = 0;
cXyz vec2 = current.pos;
@@ -1247,7 +1246,8 @@ int daTbox_c::setGetDemoItem() {
}
/* 804946A4-804948CC 003A64 0228+00 11/0 0/0 0/0 .text actionOpenWait__8daTbox_cFv */
// nonmatching (regalloc)
// nonmatching -- matches if checkTreasureRupeeReturn has return type bool,
// but that breaks daAlink_c::procCoGetItem
int daTbox_c::actionOpenWait() {
daMidna_c* midna = daPy_py_c::getMidnaActor();
daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1720,4 +1720,4 @@ extern actor_process_profile_definition g_profile_TBOX = {
0x44100,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_ykgr.cpp
+63 -591
View File
@@ -6,125 +6,37 @@
#include "d/actor/d_a_ykgr.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "dol2asm.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "Z2AudioLib/Z2Instances.h"
//
// Forward References:
//
inline daYkgr_HIO_c::daYkgr_HIO_c() {
field_0x4 = 0;
field_0x8 = 0xff;
field_0xc = 3;
field_0x10 = -16.0f;
field_0x14 = -5.0f;
field_0x18 = -3.0f;
field_0x1c = 0.0f;
field_0x20 = 1500.0f;
field_0x24 = 500.0f;
}
extern "C" void draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle();
extern "C" void setParam__17dPa_YkgrPcallBackFf();
extern "C" void getPosRate__8daYkgr_cFv();
extern "C" static void daYkgrCreate__FPv();
extern "C" static bool daYkgrDelete__FPv();
extern "C" static void daYkgrExecute__FPv();
extern "C" static void daYkgrDraw__FPv();
extern "C" static bool daYkgrIsDelete__FPv();
extern "C" void __dt__12daYkgr_HIO_cFv();
extern "C" void __dt__14mDoHIO_entry_cFv();
extern "C" void __dt__17dPa_YkgrPcallBackFv();
extern "C" void execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle();
extern "C" void __sinit_d_a_ykgr_cpp();
extern "C" void draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle();
extern "C" extern char const* const d_a_ykgr__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_setStageLayer__FPv();
extern "C" void dComIfGs_BossLife_public_Get__Fv();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void dPath_GetRoomPath__Fii();
extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz();
extern "C" void cM_atan2s__Fff();
extern "C" void cLib_addCalc2__FPffff();
extern "C" void __dt__19JPAParticleCallBackFv();
extern "C" void func_802807E0();
extern "C" void __dl__FPv();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 m_aim_rate__8daYkgr_c[4];
extern "C" u8 m_path__8daYkgr_c[4];
extern "C" u8 m_emitter__8daYkgr_c[4];
extern "C" void __register_global_object();
//
// Declarations:
//
inline dPa_YkgrPcallBack::dPa_YkgrPcallBack() {
field_0x4 = 0.5f;
field_0x8 = 0.0f;
field_0xc = 0.0f;
field_0x10 = 0.0f;
field_0x14 = 0.5f;
field_0x18 = 0.0f;
field_0x1c = 1;
}
/* 805A848C-805A84D4 0000EC 0048+00 1/0 0/0 0/0 .text
* draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle */
// Needs inheritance
#ifdef NONMATCHING
void dPa_YkgrPcallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
GXSetIndTexMtx(GX_ITM_0, &field_0x4, field_0x1c);
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0);
}
#else
void dPa_YkgrPcallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 805A8FBC-805A8FC0 000000 0004+00 6/6 0/0 0/0 .rodata @3759 */
SECTION_RODATA static f32 const lit_3759 = -17.0f;
COMPILER_STRIP_GATE(0x805A8FBC, &lit_3759);
/* 805A8FC0-805A8FC4 000004 0004+00 0/1 0/0 0/0 .rodata @3760 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3760 = 47.0f;
COMPILER_STRIP_GATE(0x805A8FC0, &lit_3760);
#pragma pop
/* 805A8FC4-805A8FC8 000008 0004+00 0/5 0/0 0/0 .rodata @3761 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3761[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x805A8FC4, &lit_3761);
#pragma pop
/* 805A8FC8-805A8FCC 00000C 0004+00 0/4 0/0 0/0 .rodata @3762 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3762 = 0.5f;
COMPILER_STRIP_GATE(0x805A8FC8, &lit_3762);
#pragma pop
/* 805A8FCC-805A8FD4 000010 0004+04 0/4 0/0 0/0 .rodata @3763 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3763[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x805A8FCC, &lit_3763);
#pragma pop
/* 805A8FD4-805A8FDC 000018 0008+00 0/2 0/0 0/0 .rodata @3766 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3766[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x805A8FD4, &lit_3766);
#pragma pop
/* 805A84D4-805A85D4 000134 0100+00 2/2 0/0 0/0 .text setParam__17dPa_YkgrPcallBackFf */
void dPa_YkgrPcallBack::setParam(f32 param_1) {
@@ -148,136 +60,25 @@ void dPa_YkgrPcallBack::setParam(f32 param_1) {
}
}
/* ############################################################################################## */
/* 805A8FDC-805A8FE4 000020 0008+00 0/1 0/0 0/0 .rodata @3846 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3846[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x805A8FDC, &lit_3846);
#pragma pop
/* 805A8FE4-805A8FEC 000028 0008+00 0/1 0/0 0/0 .rodata @3847 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3847[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x805A8FE4, &lit_3847);
#pragma pop
/* 805A8FEC-805A8FF4 000030 0008+00 0/1 0/0 0/0 .rodata @3848 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3848[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x805A8FEC, &lit_3848);
#pragma pop
/* 805A90B8-805A90BC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */
static u8 lit_1109[1 + 3 /* padding */];
/* 805A90BC-805A90C0 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */
#pragma push
#pragma force_active on
static u8 lit_1107[1 + 3 /* padding */];
#pragma pop
/* 805A90C0-805A90C4 000010 0001+03 0/0 0/0 0/0 .bss @1105 */
#pragma push
#pragma force_active on
static u8 lit_1105[1 + 3 /* padding */];
#pragma pop
/* 805A90C4-805A90C8 000014 0001+03 0/0 0/0 0/0 .bss @1104 */
#pragma push
#pragma force_active on
static u8 lit_1104[1 + 3 /* padding */];
#pragma pop
/* 805A90C8-805A90CC 000018 0001+03 0/0 0/0 0/0 .bss @1099 */
#pragma push
#pragma force_active on
static u8 lit_1099[1 + 3 /* padding */];
#pragma pop
/* 805A90CC-805A90D0 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */
#pragma push
#pragma force_active on
static u8 lit_1097[1 + 3 /* padding */];
#pragma pop
/* 805A90D0-805A90D4 000020 0001+03 0/0 0/0 0/0 .bss @1095 */
#pragma push
#pragma force_active on
static u8 lit_1095[1 + 3 /* padding */];
#pragma pop
/* 805A90D4-805A90D8 000024 0001+03 0/0 0/0 0/0 .bss @1094 */
#pragma push
#pragma force_active on
static u8 lit_1094[1 + 3 /* padding */];
#pragma pop
/* 805A90D8-805A90DC 000028 0001+03 0/0 0/0 0/0 .bss @1057 */
#pragma push
#pragma force_active on
static u8 lit_1057[1 + 3 /* padding */];
#pragma pop
/* 805A90DC-805A90E0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */
#pragma push
#pragma force_active on
static u8 lit_1055[1 + 3 /* padding */];
#pragma pop
/* 805A90E0-805A90E4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */
#pragma push
#pragma force_active on
static u8 lit_1053[1 + 3 /* padding */];
#pragma pop
/* 805A90E4-805A90E8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */
#pragma push
#pragma force_active on
static u8 lit_1052[1 + 3 /* padding */];
#pragma pop
/* 805A90E8-805A90EC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */
#pragma push
#pragma force_active on
static u8 lit_1014[1 + 3 /* padding */];
#pragma pop
/* 805A90EC-805A90F0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */
#pragma push
#pragma force_active on
static u8 lit_1012[1 + 3 /* padding */];
#pragma pop
/* 805A90F0-805A90F4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */
#pragma push
#pragma force_active on
static u8 lit_1010[1 + 3 /* padding */];
#pragma pop
/* 805A90F4-805A90F8 000044 0001+03 0/0 0/0 0/0 .bss @1009 */
#pragma push
#pragma force_active on
static u8 lit_1009[1 + 3 /* padding */];
#pragma pop
/* 805A90F8-805A9104 000048 000C+00 0/1 0/0 0/0 .bss @3744 */
#pragma push
#pragma force_active on
static u8 lit_3744[12];
#pragma pop
UNK_BSS(1109)
UNK_BSS(1107)
UNK_BSS(1105)
UNK_BSS(1104)
UNK_BSS(1099)
UNK_BSS(1097)
UNK_BSS(1095)
UNK_BSS(1094)
UNK_BSS(1057)
UNK_BSS(1055)
UNK_BSS(1053)
UNK_BSS(1052)
UNK_BSS(1014)
UNK_BSS(1012)
UNK_BSS(1010)
UNK_BSS(1009)
/* 805A9104-805A912C 000054 0028+00 2/3 0/0 0/0 .bss l_HIO */
static u8 l_HIO[40];
static daYkgr_HIO_c l_HIO;
/* 805A85D4-805A882C 000234 0258+00 1/1 0/0 0/0 .text getPosRate__8daYkgr_cFv */
f32 daYkgr_c::getPosRate() {
@@ -295,37 +96,21 @@ f32 daYkgr_c::getPosRate() {
dVar11 = dVar10;
}
}
if (dVar11 > ((daYkgr_HIO_c*)&l_HIO)->field_0x20) {
dVar11 = ((daYkgr_HIO_c*)&l_HIO)->field_0x20;
} else if (dVar11 < ((daYkgr_HIO_c*)&l_HIO)->field_0x24) {
dVar11 = ((daYkgr_HIO_c*)&l_HIO)->field_0x24;
if (dVar11 > l_HIO.field_0x20) {
dVar11 = l_HIO.field_0x20;
} else if (dVar11 < l_HIO.field_0x24) {
dVar11 = l_HIO.field_0x24;
}
f32 y = (((daYkgr_HIO_c*)&l_HIO)->field_0x20);
y = (dVar11 - ((daYkgr_HIO_c*)&l_HIO)->field_0x24) / (y -((daYkgr_HIO_c*)&l_HIO)->field_0x24);
f32 y = (l_HIO.field_0x20);
y = (dVar11 - l_HIO.field_0x24) / (y -l_HIO.field_0x24);
return 1.0f - y;
}
/* ############################################################################################## */
/* 805A8FF4-805A8FF8 000038 0004+00 0/2 0/0 0/0 .rodata @3951 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3951 = -3.0f;
COMPILER_STRIP_GATE(0x805A8FF4, &lit_3951);
#pragma pop
/* 805A912C-805A9138 00007C 000C+00 0/1 0/0 0/0 .bss @3851 */
#pragma push
#pragma force_active on
static u8 lit_3851[12];
#pragma pop
/* 805A9138-805A9158 000088 0020+00 2/3 0/0 0/0 .bss YkgrCB */
static u8 YkgrCB[32];
static dPa_YkgrPcallBack YkgrCB;
/* 805A882C-805A8A48 00048C 021C+00 1/0 0/0 0/0 .text daYkgrCreate__FPv */
// regalloc
#ifdef NONMATCHING
// NONMATCHING regalloc
inline int daYkgr_c::_create() {
dPath* path;
s32 uVar1 = fopAcM_GetParam(this) ;
@@ -344,8 +129,8 @@ inline int daYkgr_c::_create() {
this->current.pos = player->current.pos;
m_emitter = dComIfGp_particle_set(0x80e2, &this->current.pos, NULL, NULL);
if (m_emitter != NULL) {
m_emitter->setParticleCallBackPtr((JPAParticleCallBack*)YkgrCB);
((dPa_YkgrPcallBack*)YkgrCB)->setParam(-3.0f);
m_emitter->setParticleCallBackPtr(&YkgrCB);
YkgrCB.setParam(-3.0f);
} else {
return cPhs_ERROR_e;
}
@@ -377,50 +162,31 @@ inline int daYkgr_c::_create() {
static int daYkgrCreate(void* i_this) {
return static_cast<daYkgr_c*>(i_this)->_create();
}
#else
static int daYkgrCreate(void* param_0) {
// NONMATCHING
}
#endif
/* 805A8A48-805A8A50 0006A8 0008+00 1/0 0/0 0/0 .text daYkgrDelete__FPv */
static int daYkgrDelete(void* param_0) {
return 1;
}
/* ############################################################################################## */
/* 805A8FF8-805A8FFC 00003C 0004+00 0/1 0/0 0/0 .rodata @3976 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3976 = 0.25f;
COMPILER_STRIP_GATE(0x805A8FF8, &lit_3976);
#pragma pop
/* 805A8FFC-805A9000 000040 0004+00 0/1 0/0 0/0 .rodata @3977 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3977 = 1.0f / 20.0f;
COMPILER_STRIP_GATE(0x805A8FFC, &lit_3977);
#pragma pop
/* 805A8A50-805A8BBC 0006B0 016C+00 1/0 0/0 0/0 .text daYkgrExecute__FPv */
// NONMATCHING regalloc
inline int daYkgr_c::_execute() {
cLib_addCalc2(&field_0x5a4, m_aim_rate, 0.25f, 0.05f);
cLib_addCalc2(&m_aim_rate, ((f32*)l_HIO)[7], 0.25f, 0.05f);
cLib_addCalc2(&m_aim_rate, l_HIO.field_0x1c, 0.25f, 0.05f);
cLib_addCalc2(&field_0x5a8, getPosRate(), 0.25f, 0.05f);
f32 fVar4 = field_0x5a8 * 0.5f + field_0x5a4 * 0.5f;
((dPa_YkgrPcallBack*)YkgrCB)->setParam(fVar4 * ((f32*)l_HIO)[6] + (1.0f - fVar4) * ((f32*)l_HIO)[5]);
YkgrCB.setParam(fVar4 * l_HIO.field_0x18 + (1.0f - fVar4) * l_HIO.field_0x14);
if (m_alpha_flag == 0) {
if (m_alpha != 0) {
if (m_alpha > ((s32*)l_HIO)[3]) {
m_alpha = m_alpha - ((s32*)l_HIO)[3];
if (m_alpha > l_HIO.field_0xc) {
m_alpha = m_alpha - l_HIO.field_0xc;
} else {
m_alpha = 0;
}
}
} else if (m_alpha < 0xff) {
if (m_alpha < 0xff - ((s32*)l_HIO)[3]) {
m_alpha = m_alpha + ((s32*)l_HIO)[3];
if (m_alpha < 0xff - l_HIO.field_0xc) {
m_alpha = m_alpha + l_HIO.field_0xc;
} else {
m_alpha = 0xff;
}
@@ -432,33 +198,12 @@ static int daYkgrExecute(void* i_this) {
return static_cast<daYkgr_c*>(i_this)->_execute();
}
/* ############################################################################################## */
/* 805A9000-805A9004 000044 0004+00 0/1 0/0 0/0 .rodata @4032 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4032 = 100.0f;
COMPILER_STRIP_GATE(0x805A9000, &lit_4032);
#pragma pop
/* 805A9004-805A9008 000048 0004+00 0/1 0/0 0/0 .rodata @4033 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4033 = 255.0f;
COMPILER_STRIP_GATE(0x805A9004, &lit_4033);
#pragma pop
/* 805A9018-805A9018 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_805A9018 = "D_MN04A";
#pragma pop
/* 805A8BBC-805A8D90 00081C 01D4+00 1/0 0/0 0/0 .text daYkgrDraw__FPv */
inline int daYkgr_c::_draw() {
bool rv;
if (strcmp(dComIfGp_getStartStageName(), "D_MN04A") == 0) {
m_alpha = (dComIfGs_BossLife_public_Get() / 100.0f) * 255.0f;
f32 alpha = dComIfGs_BossLife_public_Get() / 100.0f;
m_alpha = alpha * 255.0f;
if (m_alpha == 0) {
m_alpha++;
}
@@ -480,13 +225,16 @@ static int daYkgrDraw(void* i_this) {
return static_cast<daYkgr_c*>(i_this)->_draw();
}
/* 805A8D90-805A8D98 0009F0 0008+00 1/0 0/0 0/0 .text daYkgrIsDelete__FPv */
static int daYkgrIsDelete(void* param_0) {
return 1;
}
/* ############################################################################################## */
/* 805A8D98-805A8DF4 0009F8 005C+00 2/1 0/0 0/0 .text __dt__12daYkgr_HIO_cFv */
daYkgr_HIO_c::~daYkgr_HIO_c() {
/* empty function */
}
/* 805A9020-805A9040 -00001 0020+00 1/0 0/0 0/0 .data daYkgrMethodTable */
static actor_method_class daYkgrMethodTable = {
daYkgrCreate,
@@ -513,280 +261,4 @@ extern actor_process_profile_definition g_profile_Ykgr = {
0,
};
/* 805A9070-805A9084 000050 0014+00 2/2 0/0 0/0 .data __vt__17dPa_YkgrPcallBack */
SECTION_DATA extern void* __vt__17dPa_YkgrPcallBack[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__17dPa_YkgrPcallBackFv,
(void*)execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle,
(void*)draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle,
};
/* 805A9084-805A9098 000064 0014+00 1/1 0/0 0/0 .data __vt__19JPAParticleCallBack */
SECTION_DATA extern void* __vt__19JPAParticleCallBack[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)NULL,
(void*)execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle,
(void*)draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle,
};
/* 805A9098-805A90A4 000078 000C+00 2/2 0/0 0/0 .data __vt__12daYkgr_HIO_c */
SECTION_DATA extern void* __vt__12daYkgr_HIO_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12daYkgr_HIO_cFv,
};
/* 805A90A4-805A90B0 000084 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */
SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__14mDoHIO_entry_cFv,
};
/* 805A8D98-805A8DF4 0009F8 005C+00 2/1 0/0 0/0 .text __dt__12daYkgr_HIO_cFv */
daYkgr_HIO_c::~daYkgr_HIO_c() {
// NONMATCHING
}
/* 805A8DF4-805A8E3C 000A54 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */
void __dt__14mDoHIO_entry_cFv() {
//asm mDoHIO_entry_c::~mDoHIO_entry_c() {
// NONMATCHING
}
/* 805A8E3C-805A8E9C 000A9C 0060+00 2/1 0/0 0/0 .text __dt__17dPa_YkgrPcallBackFv */
#ifdef NONMATCHING
dPa_YkgrPcallBack::~dPa_YkgrPcallBack() {
}
#else
dPa_YkgrPcallBack::~dPa_YkgrPcallBack() {
// NONMATCHING
}
#endif
/* 805A8E9C-805A8EA0 000AFC 0004+00 2/0 0/0 0/0 .text
* execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle */
void JPAParticleCallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
/* empty function */
}
/* ############################################################################################## */
/* 805A9008-805A900C 00004C 0004+00 0/1 0/0 0/0 .rodata @4061 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4061 = -16.0f;
COMPILER_STRIP_GATE(0x805A9008, &lit_4061);
#pragma pop
/* 805A900C-805A9010 000050 0004+00 0/1 0/0 0/0 .rodata @4062 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4062 = -5.0f;
COMPILER_STRIP_GATE(0x805A900C, &lit_4062);
#pragma pop
/* 805A9010-805A9014 000054 0004+00 0/1 0/0 0/0 .rodata @4063 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4063 = 1500.0f;
COMPILER_STRIP_GATE(0x805A9010, &lit_4063);
#pragma pop
/* 805A9014-805A9018 000058 0004+00 0/1 0/0 0/0 .rodata @4064 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4064 = 500.0f;
COMPILER_STRIP_GATE(0x805A9014, &lit_4064);
#pragma pop
/* 805A8EA0-805A8FA4 000B00 0104+00 0/0 1/0 0/0 .text __sinit_d_a_ykgr_cpp */
void __sinit_d_a_ykgr_cpp() {
// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x805A8EA0, __sinit_d_a_ykgr_cpp);
#pragma pop
/* 805A8FA4-805A8FA8 000C04 0004+00 1/0 0/0 0/0 .text
* draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle */
void JPAParticleCallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
/* empty function */
}
/* ############################################################################################## */
/* 805A9158-805A915C 0000A8 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */
#pragma push
#pragma force_active on
static u8 data_805A9158[4];
#pragma pop
/* 805A915C-805A9160 0000AC 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14JASAudioThread> */
#pragma push
#pragma force_active on
static u8 data_805A915C[4];
#pragma pop
/* 805A9160-805A9164 0000B0 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
#pragma push
#pragma force_active on
static u8 data_805A9160[4];
#pragma pop
/* 805A9164-805A9168 0000B4 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
#pragma push
#pragma force_active on
static u8 data_805A9164[4];
#pragma pop
/* 805A9168-805A916C 0000B8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A9168[4];
#pragma pop
/* 805A916C-805A9170 0000BC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A916C[4];
#pragma pop
/* 805A9170-805A9174 0000C0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
*/
#pragma push
#pragma force_active on
static u8 data_805A9170[4];
#pragma pop
/* 805A9174-805A9178 0000C4 0004+00 0/0 0/0 0/0 .bss
* sInstance__36JASGlobalInstance<15JAISoundStarter> */
#pragma push
#pragma force_active on
static u8 data_805A9174[4];
#pragma pop
/* 805A9178-805A917C 0000C8 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14Z2SoundStarter> */
#pragma push
#pragma force_active on
static u8 data_805A9178[4];
#pragma pop
/* 805A917C-805A9180 0000CC 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */
#pragma push
#pragma force_active on
static u8 data_805A917C[4];
#pragma pop
/* 805A9180-805A9184 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
#pragma push
#pragma force_active on
static u8 data_805A9180[4];
#pragma pop
/* 805A9184-805A9188 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
#pragma push
#pragma force_active on
static u8 data_805A9184[4];
#pragma pop
/* 805A9188-805A918C 0000D8 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAIStreamMgr> */
#pragma push
#pragma force_active on
static u8 data_805A9188[4];
#pragma pop
/* 805A918C-805A9190 0000DC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A918C[4];
#pragma pop
/* 805A9190-805A9194 0000E0 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAISoundInfo> */
#pragma push
#pragma force_active on
static u8 data_805A9190[4];
#pragma pop
/* 805A9194-805A9198 0000E4 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13JAUSoundTable> */
#pragma push
#pragma force_active on
static u8 data_805A9194[4];
#pragma pop
/* 805A9198-805A919C 0000E8 0004+00 0/0 0/0 0/0 .bss
* sInstance__38JASGlobalInstance<17JAUSoundNameTable> */
#pragma push
#pragma force_active on
static u8 data_805A9198[4];
#pragma pop
/* 805A919C-805A91A0 0000EC 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAUSoundInfo> */
#pragma push
#pragma force_active on
static u8 data_805A919C[4];
#pragma pop
/* 805A91A0-805A91A4 0000F0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
*/
#pragma push
#pragma force_active on
static u8 data_805A91A0[4];
#pragma pop
/* 805A91A4-805A91A8 0000F4 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */
#pragma push
#pragma force_active on
static u8 data_805A91A4[4];
#pragma pop
/* 805A91A8-805A91AC 0000F8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
*/
#pragma push
#pragma force_active on
static u8 data_805A91A8[4];
#pragma pop
/* 805A91AC-805A91B0 0000FC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A91AC[4];
#pragma pop
/* 805A91B0-805A91B4 000100 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A91B0[4];
#pragma pop
/* 805A91B4-805A91B8 000104 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A91B4[4];
#pragma pop
/* 805A91B8-805A91BC 000108 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */
#pragma push
#pragma force_active on
static u8 data_805A91B8[4];
#pragma pop
/* 805A9018-805A9018 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
AUDIO_INSTANCES;
src/d/d_a_obj.cpp
+3 -18
View File
@@ -17,18 +17,15 @@ void eff_break_tsubo(fopAc_ac_c* i_actor, cXyz i_scale, int i_type) {
J3DModelData* tubo_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 0x20);
J3DAnmTexPattern* tubo_btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", 0x42);
s32 roomNo = fopAcM_GetRoomNo(i_actor);
JPABaseEmitter* emitter = dComIfGp_particle_set(
dPa_name::ZI_J_M_tuboHahen_e, &i_actor->current.pos, NULL, NULL, 0xFF,
(dPa_modelEcallBack*)&dPa_modelEcallBack::mEcallback, roomNo, NULL, NULL, &i_scale);
&dPa_modelEcallBack::mEcallback, fopAcM_GetRoomNo(i_actor), NULL, NULL, &i_scale);
dPa_modelEcallBack::setModel(emitter, tubo_bmd, i_actor->tevStr, 3, tubo_btp, 0, i_type);
s32 roomNo2 = fopAcM_GetRoomNo(i_actor);
dComIfGp_particle_set(dPa_name::ZI_J_tuboHahen_e, &i_actor->current.pos, NULL, NULL, 0xFF,
dPa_control_c::getTsuboSelectTexEcallBack(i_type), roomNo2, NULL, NULL,
&i_scale);
dPa_control_c::getTsuboSelectTexEcallBack(i_type),
fopAcM_GetRoomNo(i_actor), NULL, NULL, &i_scale);
}
/* 80037180-80037210 031AC0 0090+00 0/0 0/0 2/2 .text make_eff_break_kotubo__5daObjFP10fopAc_ac_c
@@ -221,15 +218,3 @@ void HitSeStart(cXyz const* i_sePos, int i_roomNo, dCcD_GObjInf const* i_CcObj,
}
}
} // namespace daObj
/* 80037A4C-80037A54 03238C 0008+00 0/0 2/0 0/0 .text GetCoCP__12cCcD_CylAttrFv */
// void cCcD_CylAttr::GetCoCP() {
extern "C" void GetCoCP__12cCcD_CylAttrFv() {
// NONMATCHING
}
/* 80037A54-80037A5C 032394 0008+00 0/0 2/0 0/0 .text GetCoCP__12cCcD_SphAttrFv */
// void cCcD_SphAttr::GetCoCP() {
extern "C" void GetCoCP__12cCcD_SphAttrFv() {
// NONMATCHING
}
src/d/d_attention.cpp
+20 -377
View File
@@ -12,10 +12,6 @@
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_controller_pad.h"
//
// Types:
//
class dAttDrawParam_c {
public:
/* 80070158 */ dAttDrawParam_c();
@@ -26,156 +22,6 @@ public:
/* 0xC */ f32 field_0xc;
};
//
// Forward References:
//
extern "C" void __ct__11dAttParam_cFl();
extern "C" void __dt__11dAttParam_cFv();
extern "C" void __ct__15dAttDrawParam_cFv();
extern "C" void execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo();
extern "C" void __ct__12dAttention_cFP10fopAc_ac_cUl();
extern "C" void __dt__12dAttention_cFv();
extern "C" void GetLockonList__12dAttention_cFl();
extern "C" void getActionBtnB__12dAttention_cFv();
extern "C" void getActionBtnXY__12dAttention_cFv();
extern "C" void chkAttMask__12dAttention_cFUlUl();
extern "C" static void check_event_condition__FUlUs();
extern "C" static void check_flontofplayer__FUlss();
extern "C" static void distace_weight__Ffsf();
extern "C" static void distace_angle_adjust__Ffsf();
extern "C" static void check_distace__FP4cXyzsP4cXyzffff();
extern "C" void calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl();
extern "C" void setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl();
extern "C" void initList__12dAttention_cFUl();
extern "C" static void select_attention__FP10fopAc_ac_cPv();
extern "C" void makeList__12dAttention_cFv();
extern "C" void setOwnerAttentionPos__12dAttention_cFv();
extern "C" void SelectAttention__12dAttention_cFP10fopAc_ac_c();
extern "C" void __dt__7cSGlobeFv();
extern "C" void sortList__12dAttention_cFv();
extern "C" void stockAttention__12dAttention_cFv();
extern "C" void nextAttention__12dAttention_cFv();
extern "C" void freeAttention__12dAttention_cFv();
extern "C" void chaseAttention__12dAttention_cFv();
extern "C" void EnemyDistance__12dAttention_cFP10fopAc_ac_c();
extern "C" static void sound_attention__FP10fopAc_ac_cPv();
extern "C" void runSoundProc__12dAttention_cFv();
extern "C" void runDrawProc__12dAttention_cFv();
extern "C" void runDebugDisp__12dAttention_cFv();
extern "C" void checkButton__12dAttention_cFv();
extern "C" void triggerProc__12dAttention_cFv();
extern "C" void lostCheck__12dAttention_cFv();
extern "C" void judgementStatus4Hold__12dAttention_cFv();
extern "C" void judgementStatus4Switch__12dAttention_cFv();
extern "C" void Run__12dAttention_cFv();
extern "C" void Draw__12dAttention_cFv();
extern "C" void lockSoundStart__12dAttention_cFUl();
extern "C" void setAnm__10dAttDraw_cFUcf();
extern "C" void setAlphaAnm__10dAttDraw_cFUcUc();
extern "C" void alphaAnm__10dAttDraw_cFv();
extern "C" void setTevKColor__11J3DTevBlockFUlPC10J3DGXColor();
extern "C" void draw__10dAttDraw_cFR4cXyzPA4_f();
extern "C" void LockonTarget__12dAttention_cFl();
extern "C" void LockonReleaseDistanse__12dAttention_cFv();
extern "C" void LockonTargetPId__12dAttention_cFl();
extern "C" void ActionTarget__12dAttention_cFl();
extern "C" void CheckObjectTarget__12dAttention_cFl();
extern "C" void LockonTruth__12dAttention_cFv();
extern "C" void checkDistance__12dAttention_cFP4cXyzsP4cXyzffff();
extern "C" void getActor__10dAttList_cFv();
extern "C" void setActor__10dAttList_cFP10fopAc_ac_c();
extern "C" void getPId__10dAttHint_cFPv();
extern "C" void convPId__10dAttHint_cFUi();
extern "C" void request__10dAttHint_cFP10fopAc_ac_ci();
extern "C" void init__10dAttHint_cFv();
extern "C" void proc__10dAttHint_cFv();
extern "C" void convPId__11dAttCatch_cFUi();
extern "C" void init__11dAttCatch_cFv();
extern "C" void proc__11dAttCatch_cFv();
extern "C" void request__11dAttCatch_cFP10fopAc_ac_cUcfffsi();
extern "C" void convPId__10dAttLook_cFUi();
extern "C" void init__10dAttLook_cFv();
extern "C" void proc__10dAttLook_cFv();
extern "C" void request__10dAttLook_cFP10fopAc_ac_cfffsi();
extern "C" void __dt__15dAttDrawParam_cFv();
extern "C" void __sinit_d_attention_cpp();
extern "C" extern char const* const d_d_attention__stringBase0;
extern "C" u8 loc_type_tbl__12dAttention_c[12];
extern "C" u8 act_type_tbl__12dAttention_c[20];
extern "C" u32 loc_type_num__12dAttention_c;
extern "C" u32 act_type_num__12dAttention_c;
extern "C" u32 chk_type_tbl__12dAttention_c;
extern "C" u32 chk_type_num__12dAttention_c;
extern "C" extern u8 data_80450680[8];
extern "C" extern u8 data_80450688[8];
//
// External References:
//
extern "C" void play__14mDoExt_baseAnmFv();
extern "C" void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss();
extern "C" void entry__13mDoExt_bpkAnmFP16J3DMaterialTablef();
extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss();
extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef();
extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss();
extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef();
extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb();
extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_createSolidHeapFromGameToCurrent__FUlUl();
extern "C" void mDoExt_adjustSolidHeap__FP12JKRSolidHeap();
extern "C" void mDoExt_destroySolidHeap__FP12JKRSolidHeap();
extern "C" void mDoExt_restoreCurrentHeap__Fv();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void fopAcIt_Executor__FPFPvPv_iPv();
extern "C" void fopAcIt_Judge__FPFPvPv_PvPv();
extern "C" void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c();
extern "C" void fpcSch_JudgeByID__FPvPv();
extern "C" void __dt__10dAttList_cFv();
extern "C" void __ct__10dAttList_cFv();
extern "C" void __dt__10dAttDraw_cFv();
extern "C" void __ct__10dAttDraw_cFv();
extern "C" void isSwitch__12dSv_danBit_cCFi();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void getAttentionOffsetY__9daPy_py_cFv();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void __ct__7cSAngleFRC7cSAngle();
extern "C" void __ct__7cSAngleFs();
extern "C" void Inv__7cSAngleCFv();
extern "C" void __mi__7cSAngleCFs();
extern "C" void __ct__7cSGlobeFRC4cXyz();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void bgmNowBattle__8Z2SeqMgrFf();
extern "C" void __dl__FPv();
extern "C" void __register_global_object();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void _savegpr_21();
extern "C" void _savegpr_22();
extern "C" void _savegpr_24();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_21();
extern "C" void _restgpr_22();
extern "C" void _restgpr_24();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__25mDoExt_McaMorfCallBack1_c[3];
extern "C" u8 dist_table__12dAttention_c[6552];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
//
/* 80070018-80070038 06A958 0020+00 2/2 0/0 0/0 .text padLockButton__25@unnamed@d_attention_cpp@Fl
*/
namespace {
@@ -184,103 +30,18 @@ static bool padLockButton(s32 i_padNo) {
}
} // namespace
/* ############################################################################################## */
/* 8037A770-8037A770 006DD0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A770 = "D_MN09B";
#pragma pop
/* 803A9BF8-803A9C04 006D18 000C+00 2/2 0/0 0/0 .data loc_type_tbl__12dAttention_c */
SECTION_DATA type_tbl_entry dAttention_c::loc_type_tbl[3] = {
type_tbl_entry dAttention_c::loc_type_tbl[3] = {
{0, 1},
{1, 2},
{2, 4},
};
/* 803A9C04-803A9C18 006D24 0014+00 1/1 0/0 0/0 .data act_type_tbl__12dAttention_c */
SECTION_DATA type_tbl_entry dAttention_c::act_type_tbl[5] = {
type_tbl_entry dAttention_c::act_type_tbl[5] = {
{3, 8}, {4, 16}, {5, 32}, {6, 64}, {7, 128},
};
/* 803A9C18-803A9C3C 006D38 0024+00 1/1 0/0 0/0 .data ftp_table$4417 */
SECTION_DATA static int ftp_table[9] = {
4, 1, 2, 8, 16, 32, 64, 128, 256,
};
/* 803A9C3C-803A9C48 006D5C 000C+00 1/1 0/0 0/0 .data ang_table2$4419 */
SECTION_DATA static s16 ang_table2[6] = {
0x0AAA, 0x2000, 0x2AAA, 0x4000, 0x4E38, 0x6000,
};
/* 803A9C48-803A9C54 006D68 000C+00 1/1 1/1 0/0 .data __vt__19dAttDraw_CallBack_c */
SECTION_DATA extern void* __vt__19dAttDraw_CallBack_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo,
};
/* 803A9C54-803A9C60 006D74 000C+00 2/2 0/0 0/0 .data __vt__15dAttDrawParam_c */
SECTION_DATA extern void* __vt__15dAttDrawParam_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__15dAttDrawParam_cFv,
};
/* 803A9C60-803A9C70 006D80 000C+04 3/3 1/1 0/0 .data __vt__11dAttParam_c */
SECTION_DATA extern void* __vt__11dAttParam_c[3 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__11dAttParam_cFv,
/* padding */
NULL,
};
/* 80452628-8045262C 000C28 0004+00 1/1 0/0 0/0 .sdata2 @4061 */
SECTION_SDATA2 static f32 lit_4061 = 45.0f;
/* 8045262C-80452630 000C2C 0004+00 1/1 0/0 0/0 .sdata2 @4062 */
SECTION_SDATA2 static f32 lit_4062 = 30.0f;
/* 80452630-80452634 000C30 0004+00 1/1 0/0 0/0 .sdata2 @4063 */
SECTION_SDATA2 static f32 lit_4063 = 90.0f;
/* 80452634-80452638 000C34 0004+00 2/2 0/0 0/0 .sdata2 @4064 */
SECTION_SDATA2 static f32 lit_4064 = -9.0f / 10.0f;
/* 80452638-8045263C 000C38 0004+00 1/1 0/0 0/0 .sdata2 @4065 */
SECTION_SDATA2 static f32 lit_4065 = 3000.0f;
/* 8045263C-80452640 000C3C 0004+00 1/1 0/0 0/0 .sdata2 @4066 */
SECTION_SDATA2 static f32 lit_4066 = 1000.0f;
/* 80452640-80452644 000C40 0004+00 1/1 0/0 0/0 .sdata2 @4067 */
SECTION_SDATA2 static f32 lit_4067 = 6.0f;
/* 80452644-80452648 000C44 0004+00 1/1 0/0 0/0 .sdata2 @4068 */
SECTION_SDATA2 static f32 lit_4068 = 4.5f;
/* 80452648-8045264C 000C48 0004+00 1/1 0/0 0/0 .sdata2 @4069 */
SECTION_SDATA2 static f32 lit_4069 = 14.0f;
/* 8045264C-80452650 000C4C 0004+00 1/1 0/0 0/0 .sdata2 @4070 */
SECTION_SDATA2 static f32 lit_4070 = 10.0f;
/* 80452650-80452654 000C50 0004+00 12/12 0/0 0/0 .sdata2 @4071 */
SECTION_SDATA2 static u8 lit_4071[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 80452654-80452658 000C54 0004+00 1/1 0/0 0/0 .sdata2 @4072 */
SECTION_SDATA2 static f32 lit_4072 = 17.0f / 10.0f;
/* 80452658-8045265C 000C58 0004+00 10/10 0/0 0/0 .sdata2 @4073 */
SECTION_SDATA2 static f32 lit_4073 = 1.0f;
/* ############################################################################################## */
/* 80450F58-80450F60 000458 0008+00 0/0 2/2 0/0 .sbss None */
extern bool on_final_boss_stg;
bool on_final_boss_stg;
@@ -324,14 +85,8 @@ dAttDrawParam_c::dAttDrawParam_c() {
field_0xc = 2.0f;
}
/* ############################################################################################## */
/* 80452664-80452668 000C64 0004+00 1/1 0/0 0/0 .sdata2 @4092 */
SECTION_SDATA2 static f32 lit_4092 = 3.0f / 5.0f;
/* 80070178-80070198 06AAB8 0020+00 1/0 0/0 0/0 .text
* execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo */
// vtable issues
#ifdef NONMATCHING
int dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* param_1) {
if (param_0 == 0) {
param_1->mTranslate.y *= 0.6f;
@@ -339,21 +94,6 @@ int dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* param_1) {
return 1;
}
#else
// void dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* param_1) {
extern "C" void execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo() {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 8037A770-8037A770 006DD0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A778 = "Always";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A77F = "";
#pragma pop
/* 80424B0C-80424B20 05182C 0010+04 3/3 0/0 0/0 .bss g_AttDwHIO */
static dAttDrawParam_c g_AttDwHIO;
@@ -529,9 +269,8 @@ dAttList_c* dAttention_c::getActionBtnXY() {
return NULL;
}
/* ############################################################################################## */
/* 80450660-80450664 0000E0 0004+00 2/2 0/0 0/0 .sdata loc_type_num__12dAttention_c */
SECTION_SDATA int dAttention_c::loc_type_num = 3;
int dAttention_c::loc_type_num = 3;
/* 80070A70-80070AC0 06B3B0 0050+00 1/1 0/0 0/0 .text chkAttMask__12dAttention_cFUlUl */
int dAttention_c::chkAttMask(u32 param_0, u32 param_1) {
@@ -571,27 +310,32 @@ static int check_event_condition(u32 i_listType, u16 i_condition) {
return false;
}
/* ############################################################################################## */
/* 80450664-80450668 0000E4 0004+00 1/1 0/0 0/0 .sdata act_type_num__12dAttention_c */
SECTION_SDATA int dAttention_c::act_type_num = 5;
int dAttention_c::act_type_num = 5;
/* 80450668-8045066C 0000E8 0004+00 1/1 0/0 0/0 .sdata chk_type_tbl__12dAttention_c */
SECTION_SDATA type_tbl_entry dAttention_c::chk_type_tbl[1] = {
type_tbl_entry dAttention_c::chk_type_tbl[1] = {
{8, 256},
};
/* 8045066C-80450670 0000EC 0004+00 1/1 0/0 0/0 .sdata chk_type_num__12dAttention_c */
SECTION_SDATA int dAttention_c::chk_type_num = 1;
int dAttention_c::chk_type_num = 1;
/* 80450670-80450674 0000F0 0004+00 2/2 0/0 0/0 .sdata None */
SECTION_SDATA static bool attn_opt_hold = true;
static bool attn_opt_hold = true;
/* 80070B2C-80070BF4 06B46C 00C8+00 2/2 0/0 0/0 .text check_flontofplayer__FUlss */
static int check_flontofplayer(u32 param_0, s16 param_1, s16 param_2) {
static int ftp_table[9] = {
4, 1, 2, 8, 16, 32, 64, 128, 256,
};
static s16 ang_table[3] = {
0x4000,
0x2000,
0x0AAA,
0x4000, 0x2000, 0x0AAA,
};
static s16 ang_table2[6] = {
0x0AAA, 0x2000, 0x2AAA, 0x4000, 0x4E38, 0x6000,
};
if (param_1 < 0) {
@@ -621,17 +365,6 @@ static int check_flontofplayer(u32 param_0, s16 param_1, s16 param_2) {
return false;
}
/* ############################################################################################## */
/* 80452668-80452670 000C68 0004+04 2/2 0/0 0/0 .sdata2 @4448 */
SECTION_SDATA2 static f32 lit_4448[1 + 1 /* padding */] = {
32768.0f,
/* padding */
0.0f,
};
/* 80452670-80452678 000C70 0008+00 3/3 0/0 0/0 .sdata2 @4450 */
SECTION_SDATA2 static f64 lit_4450 = 4503601774854144.0 /* cast s32 to float */;
/* 80070BF4-80070C40 06B534 004C+00 2/2 0/0 0/0 .text distace_weight__Ffsf */
static f32 distace_weight(f32 param_0, s16 param_1, f32 param_2) {
f32 tmp = param_1 / 32768.0f;
@@ -649,22 +382,9 @@ static f32 distace_angle_adjust(f32 param_0, s16 param_1, f32 param_2) {
return param_0 * ((1.0f - param_2) + (param_2 * ((1.0f - tmp) * (1.0f - tmp))));
}
/* ############################################################################################## */
/* 80452678-80452680 000C78 0008+00 3/3 0/0 0/0 .sdata2 @4514 */
SECTION_SDATA2 static f64 lit_4514 = 0.5;
/* 80452680-80452688 000C80 0008+00 3/3 0/0 0/0 .sdata2 @4515 */
SECTION_SDATA2 static f64 lit_4515 = 3.0;
/* 80452688-80452690 000C88 0008+00 3/3 0/0 0/0 .sdata2 @4516 */
SECTION_SDATA2 static u8 lit_4516[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80070CA0-80070E90 06B5E0 01F0+00 3/3 0/0 0/0 .text check_distace__FP4cXyzsP4cXyzffff
*/
static bool check_distace(cXyz* param_0, s16 param_1, cXyz* param_2, f32 param_3, f32 param_4,
static BOOL check_distace(cXyz* param_0, s16 param_1, cXyz* param_2, f32 param_3, f32 param_4,
f32 param_5, f32 param_6) {
cXyz tmp = *param_2 - *param_0;
@@ -680,14 +400,6 @@ static bool check_distace(cXyz* param_0, s16 param_1, cXyz* param_2, f32 param_3
return true;
}
/* ############################################################################################## */
/* 80452690-80452694 000C90 0004+00 3/3 0/0 0/0 .sdata2 @4562 */
SECTION_SDATA2 static f32 lit_4562 = -1.0f;
/* 80452694-80452698 000C94 0004+00 3/3 0/0 0/0 .sdata2 @4563 */
SECTION_SDATA2 static f32 lit_4563 = 0.5f;
/* 80070E90-800710C0 06B7D0 0230+00 2/2 0/0 0/0 .text
* calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl */
f32 dAttention_c::calcWeight(int param_0, fopAc_ac_c* param_1, f32 param_2, s16 param_3,
@@ -759,7 +471,6 @@ f32 dAttention_c::calcWeight(int param_0, fopAc_ac_c* param_1, f32 param_2, s16
return weight;
}
/* 800710C0-80071240 06BA00 0180+00 1/1 0/0 0/0 .text
* setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl */
void dAttention_c::setList(int param_0, fopAc_ac_c* param_1, f32 param_2, f32 param_3,
@@ -820,7 +531,6 @@ void dAttention_c::setList(int param_0, fopAc_ac_c* param_1, f32 param_2, f32 pa
}
}
/* 80071240-8007138C 06BB80 014C+00 6/6 0/0 0/0 .text initList__12dAttention_cFUl */
void dAttention_c::initList(u32 flags) {
mPlayerAttentionFlags = flags;
@@ -851,7 +561,6 @@ void dAttention_c::initList(u32 flags) {
setFlag(0x1000);
}
/* 8007138C-800713CC 06BCCC 0040+00 1/1 0/0 0/0 .text select_attention__FP10fopAc_ac_cPv
*/
static int select_attention(fopAc_ac_c* param_0, void* i_attention) {
@@ -907,12 +616,6 @@ int dAttention_c::SelectAttention(fopAc_ac_c* param_0) {
return 0;
}
/* 8007167C-800716B8 06BFBC 003C+00 0/0 9/9 0/0 .text __dt__7cSGlobeFv */
extern "C" void __dt__7cSGlobeFv() {
// NONMATCHING
}
/* 800716B8-800718A4 06BFF8 01EC+00 4/4 0/0 0/0 .text sortList__12dAttention_cFv */
void dAttention_c::sortList() {
int i;
@@ -1387,7 +1090,7 @@ void dAttention_c::judgementStatus4Switch() {
setFlag(0x800000);
}
} else if (field_0x32b == 0) {
if (mDoCPd_c::getStickY(mPadNo) < lit_4064) {
if (mDoCPd_c::getStickY(mPadNo) < -0.9f) {
mAttnStatus = ST_NONE;
freeAttention();
} else if (nextAttention()) {
@@ -1600,7 +1303,6 @@ void dAttention_c::lockSoundStart(u32 i_sfxID) {
}
}
/* 80072DD8-80072FE8 06D718 0210+00 1/1 0/0 0/0 .text setAnm__10dAttDraw_cFUcf */
void dAttDraw_c::setAnm(u8 param_0, f32 param_1) {
field_0x170 = param_0;
@@ -1623,7 +1325,6 @@ void dAttDraw_c::setAnm(u8 param_0, f32 param_1) {
}
}
/* 80072FE8-80073004 06D928 001C+00 1/1 0/0 0/0 .text setAlphaAnm__10dAttDraw_cFUcUc */
void dAttDraw_c::setAlphaAnm(u8 param_0, u8 param_1) {
field_0x171 = param_0;
@@ -1632,17 +1333,6 @@ void dAttDraw_c::setAlphaAnm(u8 param_0, u8 param_1) {
field_0x174 = param_1;
}
/* ############################################################################################## */
/* 804526A0-804526A8 000CA0 0004+04 1/1 0/0 0/0 .sdata2 @5668 */
SECTION_SDATA2 static f32 lit_5668[1 + 1 /* padding */] = {
255.0f,
/* padding */
0.0f,
};
/* 804526A8-804526B0 000CA8 0008+00 1/1 0/0 0/0 .sdata2 @5670 */
SECTION_SDATA2 static f64 lit_5670 = 4503599627370496.0 /* cast u32 to float */;
/* 80073004-800732AC 06D944 02A8+00 1/1 0/0 0/0 .text alphaAnm__10dAttDraw_cFv */
void dAttDraw_c::alphaAnm() {
f32 dVar9 = (f32)field_0x172 / (f32)field_0x171;
@@ -1686,20 +1376,6 @@ void dAttDraw_c::alphaAnm() {
}
}
/* 800732AC-800732B0 06DBEC 0004+00 0/0 3/0 0/0 .text setTevKColor__11J3DTevBlockFUlPC10J3DGXColor
*/
void J3DTevBlock::setTevKColor(u32 param_0, J3DGXColor const* param_1) {
/* empty function */
}
/* ############################################################################################## */
/* 804526B0-804526B4 000CB0 0004+00 1/1 0/0 0/0 .sdata2 @5784 */
SECTION_SDATA2 static f32 lit_5784 = 0.01745329238474369f;
/* 804526B4-804526B8 000CB4 0004+00 1/1 0/0 0/0 .sdata2 @5785 */
SECTION_SDATA2 static f32 lit_5785 = -100.0f;
/* 800732B0-8007353C 06DBF0 028C+00 1/1 0/0 0/0 .text draw__10dAttDraw_cFR4cXyzPA4_f */
void dAttDraw_c::draw(cXyz& param_0, Mtx param_1) {
J3DModelData* modelData = mModel[field_0x170]->getModelData();
@@ -1743,7 +1419,6 @@ void dAttDraw_c::draw(cXyz& param_0, Mtx param_1) {
dComIfGd_setList();
}
/* 8007353C-800735DC 06DE7C 00A0+00 8/8 13/13 21/21 .text LockonTarget__12dAttention_cFl
*/
fopAc_ac_c* dAttention_c::LockonTarget(s32 param_0) {
@@ -1786,7 +1461,6 @@ f32 dAttention_c::LockonReleaseDistanse() {
return distace_angle_adjust(dist_table[idx].mDistanceAdjust, tmp_a, 1.0f) + dist_table[idx].mDistMaxRelease;
}
/* 800736CC-80073734 06E00C 0068+00 2/2 0/0 0/0 .text LockonTargetPId__12dAttention_cFl
*/
fpc_ProcID dAttention_c::LockonTargetPId(s32 param_0) {
@@ -1920,11 +1594,10 @@ void dAttCatch_c::proc() {
/* 80073A08-80073CA4 06E348 029C+00 0/0 0/0 10/10 .text
* request__11dAttCatch_cFP10fopAc_ac_cUcfffsi */
// regalloc
// NONMATCHING regalloc
// This is a weird one. Some solution was found that changes dComIfGp_getPlayer but it is incompatible
// with other calls.
// https://decomp.me/scratch/aMCEI
#ifdef NONMATCHING
int dAttCatch_c::request(fopAc_ac_c* param_1, u8 param_2, f32 param_3, f32 param_4,
f32 param_5, s16 param_6, int param_7) {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1941,7 +1614,7 @@ int dAttCatch_c::request(fopAc_ac_c* param_1, u8 param_2, f32 param_3, f32 param
}
if (param_6 != 0) {
cSGlobe acStack_50(acStack_48);
s16 sVar5 = acStack_50.U() - fopAcM_GetShapeAngle_p((fopAc_ac_c*)player)->y;
s16 sVar5 = acStack_50.U() - fopAcM_GetShapeAngle_p(player)->y;
if (sVar5 < 0) {
sVar5 = -sVar5;
}
@@ -1961,12 +1634,6 @@ int dAttCatch_c::request(fopAc_ac_c* param_1, u8 param_2, f32 param_3, f32 param
}
return 0;
}
#else
int dAttCatch_c::request(fopAc_ac_c* param_0, u8 param_1, f32 param_2, f32 param_3,
f32 param_4, s16 param_5, int param_6) {
// NONMATCHING
}
#endif
/* 80073CA4-80073CD4 06E5E4 0030+00 0/0 1/1 0/0 .text convPId__10dAttLook_cFUi */
fopAc_ac_c* dAttLook_c::convPId(fpc_ProcID i_id) {
@@ -2027,27 +1694,3 @@ int dAttLook_c::request(fopAc_ac_c* param_1, f32 param_2, f32 param_3, f32 param
/* 80073FC4-8007400C 06E904 0048+00 2/1 0/0 0/0 .text __dt__15dAttDrawParam_cFv */
dAttDrawParam_c::~dAttDrawParam_c() {}
/* ############################################################################################## */
/* 8045067A-8045067E -00001 0004+00 0/0 0/0 0/0 .sdata None */
#pragma push
#pragma force_active on
SECTION_SDATA static u8 pad_8045067A[4] = {
0x00,
0x00,
0x00,
0x00,
};
#pragma pop
/* 80450680-80450688 000100 0008+00 0/0 2/2 0/0 .sdata None */
SECTION_SDATA extern u8 data_80450680[8] = {
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80450688-80450690 000108 0008+00 0/0 1/1 0/0 .sdata None */
SECTION_SDATA extern u8 data_80450688[8] = {
0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 8037A770-8037A770 006DD0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_bg_w_kcol.cpp
+4 -2
View File
@@ -141,13 +141,15 @@ dBgWKCol::dBgWKCol() {
dBgWKCol::~dBgWKCol() {}
/* 8007E7D0-8007E804 079110 0034+00 0/0 1/1 0/0 .text initKCollision__8dBgWKColFPv */
void dBgWKCol::initKCollision(void* i_kclData) {
void* dBgWKCol::initKCollision(void* i_kclData) {
KCol_Header* header_p = (KCol_Header*)i_kclData;
header_p->pos_data_offset = (u32)header_p + header_p->pos_data_offset;
header_p->nrm_data_offset = (u32)header_p + header_p->nrm_data_offset;
header_p->prism_data_offset = (u32)header_p + header_p->prism_data_offset;
header_p->block_data_offset = (u32)header_p + header_p->block_data_offset;
return i_kclData;
}
/* 8007E804-8007E850 079144 004C+00 0/0 0/0 1/1 .text create__8dBgWKColFPvPv */
@@ -840,4 +842,4 @@ void dBgWKCol::TransPos(cBgS_PolyInfo const& param_0, void* param_1, bool param_
/* 80082F94-80082F98 07D8D4 0004+00 1/0 0/0 0/0 .text
* MatrixCrrPos__8dBgWKColFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */
void dBgWKCol::MatrixCrrPos(cBgS_PolyInfo const& param_0, void* param_1, bool param_2,
cXyz* param_3, csXyz* param_4, csXyz* param_5) {}
cXyz* param_3, csXyz* param_4, csXyz* param_5) {}
src/d/d_cam_param.cpp
+15 -75
View File
@@ -7,25 +7,6 @@
#include "SSystem/SComponent/c_math.h"
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void __dt__11dCamParam_cFv();
extern "C" void __dt__11dCamSetup_cFv();
extern "C" void __dt__9dCstick_cFv();
//
// External References:
//
extern "C" void __dl__FPv();
//
// Declarations:
//
/* 8008813C-80088284 082A7C 0148+00 0/0 12/12 0/0 .text rationalBezierRatio__8dCamMathFff
*/
@@ -69,9 +50,9 @@ f32 dCamMath::rationalBezierRatio(f32 param_0, f32 param_1) {
return 0.0f;
}
/* ############################################################################################## */
/* 80452810-80452814 000E10 0004+00 2/2 0/0 0/0 .sdata2 @3791 */
SECTION_SDATA2 static f32 lit_3791 = 1.0f; // placed in a weird order, so can't remove until fixed
static f32 dummy_literal1() {
return 1.0f;
}
/* 80088284-800882E0 082BC4 005C+00 0/0 1/1 0/0 .text zoomFovy__8dCamMathFff */
f32 dCamMath::zoomFovy(f32 param_0, f32 param_1) {
@@ -112,30 +93,6 @@ f32 dCamMath::xyzHorizontalDistance(cXyz& i_posA, cXyz& i_posB) {
return sqrt((x * x) + (z * z));
}
/* ############################################################################################## */
/* 803AC500-803AC50C 009620 000C+00 2/2 0/0 0/0 .data __vt__11dCamSetup_c */
SECTION_DATA extern void* __vt__11dCamSetup_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__11dCamSetup_cFv,
};
/* 803AC50C-803AC518 00962C 000C+00 2/2 0/0 0/0 .data __vt__11dCamParam_c */
SECTION_DATA extern void* __vt__11dCamParam_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__11dCamParam_cFv,
};
/* 803AC518-803AC528 009638 000C+04 3/3 0/0 0/0 .data __vt__9dCstick_c */
SECTION_DATA extern void* __vt__9dCstick_c[3 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__9dCstick_cFv,
/* padding */
NULL,
};
/* 80088434-8008845C 082D74 0028+00 1/1 0/0 0/0 .text __ct__9dCstick_cFv */
dCstick_c::dCstick_c() {
mThresholdLow = 0.2f;
@@ -152,7 +109,7 @@ bool dCstick_c::Shift(u32 param_0) {
dCamBGChk_c::dCamBGChk_c() {
mFloorMargin = 32.0f;
mChkInfo[0].mDistance = lit_3791;
mChkInfo[0].mDistance = 1.0f;
mChkInfo[0].mChkAngle = 25.0f;
mChkInfo[0].mWeightH = 0.4f;
mChkInfo[0].mWeightL = 0.6f;
@@ -187,12 +144,6 @@ dCamParam_c::dCamParam_c(s32 i_styleID) {
mMapToolArg2 = -1;
}
/* 8008858C-800885D4 082ECC 0048+00 1/0 1/1 0/0 .text __dt__11dCamParam_cFv */
// dCamParam_c::~dCamParam_c() {
extern "C" void __dt__11dCamParam_cFv() {
// NONMATCHING
}
/* 800885D4-80088620 082F14 004C+00 1/1 7/7 0/0 .text Change__11dCamParam_cFl */
int dCamParam_c::Change(s32 i_styleID) {
if (i_styleID >= 0 && i_styleID < mStyleNum) {
@@ -220,15 +171,13 @@ int dCamParam_c::SearchStyle(u32 param_0) {
return styleID;
}
/* ############################################################################################## */
/* 80452858-8045285C 000E58 0004+00 1/1 0/0 0/0 .sdata2 @4058 */
SECTION_SDATA2 static f32 lit_4058 = 0.25f; // placed in a weird order, so can't remove until fixed
static f32 dummy_literal2() {
return 0.25f;
}
/* 80088668-800888B8 082FA8 0250+00 0/0 1/1 0/0 .text __ct__11dCamSetup_cFv */
dCamSetup_c::dCamSetup_c() {
f32 temp_1 = lit_3791;
mDrawNear = temp_1;
mDrawNear = 1.0f;
mDrawFar = 100000.0f;
field_0xc = 1;
mModeSwitchType = -1;
@@ -242,11 +191,11 @@ dCamSetup_c::dCamSetup_c() {
field_0x50 = 100.0f;
field_0x30 = 0.75f;
mBaseCushion = 0.28f;
mJumpCushion = temp_1;
mJumpCushion = 1.0f;
field_0x58 = 0.15f;
field_0x44 = 0.005f;
field_0x54 = 0.06f;
mCurveWeight = temp_1;
mCurveWeight = 1.0f;
field_0x34 = 25.0f;
mSubjLinkCullDist = 70.0f;
mParallelDist = 60.0f;
@@ -260,15 +209,15 @@ dCamSetup_c::dCamSetup_c() {
mFalseAngle = 30.0f;
mDebugFlags = 1;
field_0xa = 0x118;
field_0xa |= 0x200;
field_0xa |= 0x400;
mFlags2 = 0x118;
mFlags2 |= 0x200;
mFlags2 |= 0x400;
mChargeLatitude = 27.0f;
mChargeTimer = 90;
mChargeBRatio = 0.5f;
mLockonChangeTimer = 40;
mLockonChangeCushion = lit_4058;
mLockonChangeCushion = 0.25f;
field_0x6c = 45.0f;
mForceLockOffDist = 3500.0f;
mForceLockOffTimer = 90;
@@ -296,7 +245,7 @@ dCamSetup_c::dCamSetup_c() {
field_0xe0 = 0.06f;
field_0xec = 25;
field_0xf4 = 0.85f;
field_0xf8 = temp_1;
field_0xf8 = 1.0f;
field_0xf0 = 12;
field_0xe4 = 50.0f;
field_0xe8 = 0.0f;
@@ -307,12 +256,6 @@ dCamSetup_c::dCamSetup_c() {
dCam_getBody()->EventRecoverNotime();
}
/* 800888B8-80088918 0831F8 0060+00 1/0 1/1 0/0 .text __dt__11dCamSetup_cFv */
// dCamSetup_c::~dCamSetup_c() {
extern "C" void __dt__11dCamSetup_cFv() {
// NONMATCHING
}
/* 80088918-80088988 083258 0070+00 0/0 1/1 0/0 .text CheckLatitudeRange__11dCamSetup_cFPs */
bool dCamSetup_c::CheckLatitudeRange(s16* param_0) {
s16 temp0 = cAngle::d2s(field_0x60);
@@ -339,6 +282,3 @@ f32 dCamSetup_c::PlayerHideDist() {
return mSubjLinkCullDist;
}
/* 800889B0-800889F8 0832F0 0048+00 1/0 0/0 0/0 .text __dt__9dCstick_cFv */
dCstick_c::~dCstick_c() {}
src/d/d_camera.cpp
-327
View File
@@ -5043,330 +5043,3 @@ void clrFlag__9dCamera_cFUl() {
void chkFlag__9dCamera_cFUl() {
// NONMATCHING
}
/* 80182994-8018299C 17D2D4 0008+00 1/1 0/0 0/0 .text GetCheckObjectCount__12dAttention_cFv */
void dAttention_c::GetCheckObjectCount() {
// NONMATCHING
}
/* 8018299C-801829AC 17D2DC 0010+00 4/4 0/0 0/0 .text dComIfGp_getAttention__Fv */
// static void dComIfGp_getAttention() {
void dComIfGp_getAttention__Fv() {
// NONMATCHING
}
/* 801829AC-801829E0 17D2EC 0034+00 1/1 0/0 0/0 .text Bank__9dCamera_cFv */
void dCamera_c::Bank() {
// NONMATCHING
}
/* 801829E0-801829EC 17D320 000C+00 2/2 0/0 0/0 .text checkThrowDamage__9daPy_py_cCFv */
// void daPy_py_c::checkThrowDamage() const {
void checkThrowDamage__9daPy_py_cCFv() {
// NONMATCHING
}
/* 801829EC-801829F0 17D32C 0004+00 1/1 0/0 0/0 .text GetNP__8cM3dGPlaFv */
// void cM3dGPla::GetNP() {
void GetNP__8cM3dGPlaFv() {
/* empty function */
}
/* 801829F0-801829F8 17D330 0008+00 4/4 0/0 0/0 .text GetCross__11cBgS_LinChkFv */
void cBgS_LinChk::GetCross() {
// NONMATCHING
}
/* 801829F8-80182A08 17D338 0010+00 1/1 0/0 0/0 .text dComIfG_Bgsp__Fv */
// static void dComIfG_Bgsp() {
void dComIfG_Bgsp__Fv() {
// NONMATCHING
}
/* 80182A08-80182A10 17D348 0008+00 2/2 0/0 0/0 .text V__7cSGlobeCFv */
// void cSGlobe::V() const {
void V__7cSGlobeCFv() {
// NONMATCHING
}
/* 80182A10-80182A24 17D350 0014+00 1/1 0/0 0/0 .text checkGoronSideMove__9daPy_py_cCFv
*/
// void daPy_py_c::checkGoronSideMove() const {
void checkGoronSideMove__9daPy_py_cCFv() {
// NONMATCHING
}
/* 80182A24-80182A3C 17D364 0018+00 3/3 0/0 0/0 .text JMAFastSqrt__Ff */
// static void JMAFastSqrt(f32 param_0) {
static asm void JMAFastSqrt__Ff() {
// NONMATCHING
}
/* 80182A3C-80182A48 17D37C 000C+00 5/5 0/0 0/0 .text fabsf__3stdFf */
void fabsf__3stdFf() {
// asm void std::fabsf(f32 param_0) {
// NONMATCHING
}
/* 80182A48-80182A4C 17D388 0004+00 2/2 0/0 0/0 .text __ct__7cSAngleFv */
// cSAngle::cSAngle() {
void __ct__7cSAngleFv() {
/* empty function */
}
/* 80182A4C-80182A54 17D38C 0008+00 2/2 0/0 0/0 .text R__7cSGlobeFf */
// void cSGlobe::R(f32 param_0) {
void R__7cSGlobeFf() {
// NONMATCHING
}
/* 80182A54-80182A64 17D394 0010+00 5/5 0/0 0/0 .text dComIfGp_evmng_cameraPlay__Fv */
// static void dComIfGp_evmng_cameraPlay() {
void dComIfGp_evmng_cameraPlay__Fv() {
// NONMATCHING
}
/* 80182A64-80182A6C 17D3A4 0008+00 2/2 0/0 0/0 .text R__7cSGlobeCFv */
// void cSGlobe::R() const {
void R__7cSGlobeCFv() {
// NONMATCHING
}
/* 80182A6C-80182A8C 17D3AC 0020+00 2/2 0/0 0/0 .text __lt__7cSAngleCFRC7cSAngle */
// bool cSAngle::operator<(cSAngle const& param_0) const {
bool __lt__7cSAngleCFRC7cSAngle() {
// NONMATCHING
}
/* 80182A8C-80182AAC 17D3CC 0020+00 2/2 0/0 0/0 .text __gt__7cSAngleCFRC7cSAngle */
// bool cSAngle::operator>(cSAngle const& param_0) const {
bool __gt__7cSAngleCFRC7cSAngle() {
// NONMATCHING
}
/* 80182AAC-80182AB4 17D3EC 0008+00 1/1 0/0 0/0 .text getRightFootPosP__9daPy_py_cFv */
// void daPy_py_c::getRightFootPosP() {
void getRightFootPosP__9daPy_py_cFv() {
// NONMATCHING
}
/* 80182AB4-80182ABC 17D3F4 0008+00 1/1 0/0 0/0 .text getLeftFootPosP__9daPy_py_cFv */
// void daPy_py_c::getLeftFootPosP() {
void getLeftFootPosP__9daPy_py_cFv() {
// NONMATCHING
}
/* 80182AC4-80182AD0 17D404 000C+00 1/1 0/0 0/0 .text checkCopyRodThrowAfter__9daPy_py_cCFv */
// void daPy_py_c::checkCopyRodThrowAfter() const {
void checkCopyRodThrowAfter__9daPy_py_cCFv() {
// NONMATCHING
}
/* 80182AD0-80182AD8 -00001 0008+00 0/0 0/0 0/0 .text keepLock__12dAttention_cFi */
void dAttention_c::keepLock(int param_0) {
*(u32*)(((u8*)this) + 1220) /* this->field_0x4c4 */ = (u32)(param_0);
}
/* 80182AD8-80182B9C 17D418 00C4+00 1/1 0/0 0/0 .text checkRide__9daPy_py_cCFv */
// void daPy_py_c::checkRide() const {
void checkRide__9daPy_py_cCFv() {
// NONMATCHING
}
/* 80182B9C-80182BB8 17D4DC 001C+00 1/1 0/0 0/0 .text getRightHandPos__9daPy_py_cCFv */
// void daPy_py_c::getRightHandPos() const {
void getRightHandPos__9daPy_py_cCFv() {
// NONMATCHING
}
/* 80182BB8-80182BD0 17D4F8 0018+00 1/1 0/0 0/0 .text CheckFlag2__11dCamSetup_cFUs */
// void dCamSetup_c::CheckFlag2(u16 param_0) {
void CheckFlag2__11dCamSetup_cFUs() {
// NONMATCHING
}
/* 80182BD0-80182BE8 17D510 0018+00 2/2 0/0 0/0 .text CheckFlag__11dCamSetup_cFUs */
// void dCamSetup_c::CheckFlag(u16 param_0) {
void CheckFlag__11dCamSetup_cFUs() {
// NONMATCHING
}
/* 80182BE8-80182BF0 17D528 0008+00 1/1 0/0 0/0 .text WaitRollSpeed__11dCamSetup_cFv */
void dCamSetup_c::WaitRollSpeed() {
// NONMATCHING
}
/* 80182BF0-80182BF8 17D530 0008+00 1/1 0/0 0/0 .text WaitRollTimer__11dCamSetup_cFv */
void dCamSetup_c::WaitRollTimer() {
// NONMATCHING
}
/* 80182BF8-80182C14 17D538 001C+00 1/1 0/0 0/0 .text getTrigA__8mDoCPd_cFUl */
// void mDoCPd_c::getTrigA(u32 param_0) {
void getTrigA__8mDoCPd_cFUl() {
// NONMATCHING
}
/* 80182C14-80182C1C 17D554 0008+00 1/1 0/0 0/0 .text __ops__7cSAngleCFv */
// void cSAngle::__ops() const {
void __ops__7cSAngleCFv() {
// NONMATCHING
}
/* 80182C24-80182C2C 17D564 0008+00 1/1 0/0 0/0 .text ThrowCushion__11dCamSetup_cFv */
void dCamSetup_c::ThrowCushion() {
// NONMATCHING
}
/* 80182C2C-80182C34 17D56C 0008+00 1/1 0/0 0/0 .text ThrowVAngle__11dCamSetup_cFv */
void dCamSetup_c::ThrowVAngle() {
// NONMATCHING
}
/* 80182C34-80182C3C 17D574 0008+00 1/1 0/0 0/0 .text ThrowCtrAdjust__11dCamSetup_cFv */
void dCamSetup_c::ThrowCtrAdjust() {
// NONMATCHING
}
/* 80182C3C-80182C48 17D57C 000C+00 1/1 0/0 0/0 .text Arg2__11dCamParam_cFv */
void dCamParam_c::Arg2() {
// NONMATCHING
}
/* 80182C48-80182C50 17D588 0008+00 1/1 0/0 0/0 .text Arg1__11dCamParam_cFv */
void dCamParam_c::Arg1() {
// NONMATCHING
}
/* 80182C50-80182C58 17D590 0008+00 1/1 0/0 0/0 .text Arg0__11dCamParam_cFv */
void dCamParam_c::Arg0() {
// NONMATCHING
}
/* 80182C58-80182C60 17D598 0008+00 1/1 0/0 0/0 .text Fovy__11dCamParam_cFv */
void dCamParam_c::Fovy() {
// NONMATCHING
}
/* 80182C60-80182C6C 17D5A0 000C+00 1/1 0/0 0/0 .text Arg2__11dCamParam_cFs */
void dCamParam_c::Arg2(s16 param_0) {
// NONMATCHING
}
/* 80182C6C-80182C74 -00001 0008+00 0/0 0/0 0/0 .text Arg1__11dCamParam_cFUc */
void dCamParam_c::Arg1(u8 param_0) {
*(u8*)(((u8*)this) + 2) /* this->field_0x2 */ = (u8)(param_0);
}
/* 80182C74-80182C7C -00001 0008+00 0/0 0/0 0/0 .text Arg0__11dCamParam_cFUc */
void dCamParam_c::Arg0(u8 param_0) {
*(u8*)(((u8*)this) + 1) /* this->field_0x1 */ = (u8)(param_0);
}
/* 80182C7C-80182C84 -00001 0008+00 0/0 0/0 0/0 .text Fovy__11dCamParam_cFUc */
void dCamParam_c::Fovy(u8 param_0) {
*(u8*)this = (u8)(param_0);
}
/* 80182C84-80182C8C 17D5C4 0008+00 2/2 0/0 0/0 .text U__7cSGlobeCFv */
// void cSGlobe::U() const {
void U__7cSGlobeCFv() {
// NONMATCHING
}
/* 80182C8C-80182CA8 17D5CC 001C+00 5/5 0/0 0/0 .text Flag__11dCamParam_cFlUs */
// void dCamParam_c::Flag(s32 param_0, u16 param_1) {
void Flag__11dCamParam_cFlUs() {
// NONMATCHING
}
/* 80182CA8-80182CB4 17D5E8 000C+00 5/5 0/0 0/0 .text __as__7cSAngleFRC7cSAngle */
// void cSAngle::operator=(cSAngle const& param_0) {
void __as__7cSAngleFRC7cSAngle() {
// NONMATCHING
}
/* 80182CD0-80182CEC 17D610 001C+00 5/5 0/0 0/0 .text Val__11dCamParam_cFli */
void dCamParam_c::Val(s32 param_0, int param_1) {
// NONMATCHING
}
/* 80182CEC-80182CF4 17D62C 0008+00 1/1 0/0 0/0 .text ChargeBRatio__11dCamSetup_cFv */
void dCamSetup_c::ChargeBRatio() {
// NONMATCHING
}
/* 80182CF4-80182CFC 17D634 0008+00 1/1 0/0 0/0 .text ChargeTimer__11dCamSetup_cFv */
void dCamSetup_c::ChargeTimer() {
// NONMATCHING
}
/* 80182CFC-80182D04 17D63C 0008+00 1/1 0/0 0/0 .text ChargeLatitude__11dCamSetup_cFv */
void dCamSetup_c::ChargeLatitude() {
// NONMATCHING
}
/* 80182D04-80182D10 17D644 000C+00 2/2 0/0 0/0 .text getLashDashStart__9daHorse_cCFv */
void daHorse_c::getLashDashStart() const {
// NONMATCHING
}
/* 80182D10-80182D1C 17D650 000C+00 1/1 0/0 0/0 .text fabs__3stdFf */
// void std::fabs(f32 param_0) {
void fabs__3stdFf() {
// NONMATCHING
}
/* 80182D1C-80182D28 17D65C 000C+00 1/1 0/0 0/0 .text checkTurnStandCamera__9daHorse_cCFv
*/
// void daHorse_c::checkTurnStandCamera() const {
void checkTurnStandCamera__9daHorse_cCFv() {
// NONMATCHING
}
/* 80182D28-80182D48 17D668 0020+00 1/1 0/0 0/0 .text d2s__6cAngleFf */
// void cAngle::d2s(f32 param_0) {
void d2s__6cAngleFf() {
// NONMATCHING
}
/* 80182D48-80182D5C 17D688 0014+00 1/1 0/0 0/0 .text checkJump__9daHorse_cCFv */
// void daHorse_c::checkJump() const {
void checkJump__9daHorse_cCFv() {
// NONMATCHING
}
/* 80182D5C-80182D64 17D69C 0008+00 1/1 0/0 0/0 .text fopAcM_GetParam__FPCv */
// static void fopAcM_GetParam(void const* param_0) {
static asm void fopAcM_GetParam__FPCv() {
// NONMATCHING
}
/* 80182D64-80182D78 17D6A4 0014+00 1/1 0/0 0/0 .text checkNoAttention__12daTagMstop_cCFv
*/
// void daTagMstop_c::checkNoAttention() const {
void checkNoAttention__12daTagMstop_cCFv() {
// NONMATCHING
}
/* 80182D78-80182D8C 17D6B8 0014+00 1/1 0/0 0/0 .text checkNoAttention__12daTagMhint_cCFv
*/
// void daTagMhint_c::checkNoAttention() const {
void checkNoAttention__12daTagMhint_cCFv() {
// NONMATCHING
}
/* 80182D8C-80182D9C 17D6CC 0010+00 1/1 0/0 0/0 .text set__4cXyzFfff */
// void cXyz::set(f32 param_0, f32 param_1, f32 param_2) {
void set__4cXyzFfff() {
// NONMATCHING
}
/* 80182D9C-80182DD4 17D6DC 0038+00 1/1 0/0 0/0 .text checkEndMessage__12daTagMwait_cFv
*/
// void daTagMwait_c::checkEndMessage() {
void checkEndMessage__12daTagMwait_cFv() {
// NONMATCHING
}
/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_cc_d.cpp
+8 -13
View File
@@ -7,10 +7,6 @@
#include "f_pc/f_pc_searcher.h"
#include "f_op/f_op_actor_mng.h"
//
// Declarations:
//
/* 8008364C-80083660 07DF8C 0014+00 3/3 0/0 0/0 .text ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv */
void dCcD_GAtTgCoCommonBase::ClrActorInfo() {
mApid = -1;
@@ -293,17 +289,16 @@ u8 dCcD_GObjInf::GetTgHitObjSe() {
}
}
/* ############################################################################################## */
/* 8037A780-8037A7E0 006DE0 0060+00 1/1 0/0 0/0 .rodata m_hitSeID__12dCcD_GObjInf */
Z2SoundID const dCcD_GObjInf::m_hitSeID[24] = {
Z2SE_HIT_DUMMY_CANCEL, Z2SE_HIT_SWORD, Z2SE_HIT_SHIELD_ATTACK,
Z2SE_HIT_WOLFKICK, Z2SE_HIT_HOOKSHOT_STICK, Z2SE_HIT_METAL_WEAPON,
Z2SE_HIT_STONE_WEAPON, Z2SE_HIT_HARD_BODY, Z2SE_HIT_SOFT_BODY,
Z2SE_HIT_DUMMY_CANCEL, Z2SE_HIT_SWORD_STAB, Z2SE_HIT_WOLFKICK,
Z2SE_HIT_SWORD_RUN, Z2SE_HIT_EN_WOOD_WEAPON, Z2SE_HIT_THOROW_OBJ,
Z2SE_HIT_SPINNER, Z2SE_HIT_COPYROD, Z2SE_HIT_STATUE_HAMMER,
Z2SE_HIT_PACHINKO, Z2SE_HIT_AL_ARROW_STICK, Z2SE_HIT_WOLFBITE,
Z2SE_HIT_WOOD_WEAPON, Z2SE_HIT_HAMMER, Z2SE_HIT_ARROW_STICK,
Z2SE_HIT_DUMMY_CANCEL, Z2SE_HIT_SWORD, Z2SE_HIT_SHIELD_ATTACK,
Z2SE_HIT_WOLFKICK, Z2SE_HIT_WOLFBITE, Z2SE_HIT_WOOD_WEAPON,
Z2SE_HIT_HAMMER, Z2SE_HIT_ARROW_STICK, Z2SE_HIT_HOOKSHOT_STICK,
Z2SE_HIT_METAL_WEAPON, Z2SE_HIT_STONE_WEAPON, Z2SE_HIT_HARD_BODY,
Z2SE_HIT_SOFT_BODY, Z2SE_HIT_DUMMY_CANCEL, Z2SE_HIT_SWORD_STAB,
Z2SE_HIT_WOLFKICK, Z2SE_HIT_SWORD_RUN, Z2SE_HIT_EN_WOOD_WEAPON,
Z2SE_HIT_THOROW_OBJ, Z2SE_HIT_SPINNER, Z2SE_HIT_COPYROD,
Z2SE_HIT_STATUE_HAMMER, Z2SE_HIT_PACHINKO, Z2SE_HIT_AL_ARROW_STICK,
};
/* 800845B0-8008460C 07EEF0 005C+00 0/0 3/3 32/32 .text getHitSeID__12dCcD_GObjInfFUci */
src/d/d_cc_s.cpp
+3 -112
View File
@@ -8,98 +8,6 @@
#include "d/d_jnt_col.h"
#include "f_op/f_op_actor_mng.h"
//
// Forward References:
//
extern "C" void Ct__4dCcSFv();
extern "C" void Dt__4dCcSFv();
extern "C" void ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz();
extern "C" void ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz();
extern "C" void CalcTgPlusDmg__4dCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts();
extern "C" void
ChkAtTgHitAfterCross__4dCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts();
extern "C" void
SetCoGObjInf__4dCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts();
extern "C" void GetRank__4dCcSFUc();
extern "C" bool ChkNoHitGCo__4dCcSFP8cCcD_ObjP8cCcD_Obj();
extern "C" void SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf();
extern "C" void CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz();
extern "C" void
ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb();
extern "C" void
SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz();
extern "C" void ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c();
extern "C" void chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c();
extern "C" void __dt__12cCcD_SphAttrFv();
extern "C" void MoveAfterCheck__4dCcSFv();
extern "C" void DrawAfter__4dCcSFv();
extern "C" void Move__4dCcSFv();
extern "C" void Draw__4dCcSFv();
extern "C" void MassClear__4dCcSFv();
extern "C" void ChkAtTgMtrlHit__4dCcSFUcUc();
extern "C" void ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts();
extern "C" u8 m_mtrl_hit_tbl__4dCcS[64];
extern "C" extern void* __vt__4dCcS[13];
//
// External References:
//
extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz();
extern "C" void __dt__4dCcSFv();
extern "C" void getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi();
extern "C" void setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl();
extern "C" void SetHitApid__22dCcD_GAtTgCoCommonBaseFUi();
extern "C" void SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv();
extern "C" void ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv();
extern "C" void ChkAtNoGuard__12dCcD_GObjInfFv();
extern "C" void Ct__12dCcMassS_MngFv();
extern "C" void Clear__12dCcMassS_MngFv();
extern "C" void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo();
extern "C" void CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab();
extern "C" void PlusCcMove__9cCcD_SttsFfff();
extern "C" void PlusDmg__9cCcD_SttsFi();
extern "C" void GetAc__8cCcD_ObjFv();
extern "C" void CalcAabBox__12cCcD_CpsAttrFv();
extern "C" void CalcAabBox__12cCcD_SphAttrFv();
extern "C" void Ct__4cCcSFv();
extern "C" void Dt__4cCcSFv();
extern "C" void Move__4cCcSFv();
extern "C" void DrawClear__4cCcSFv();
extern "C" void SetCoGCorrectProc__4cCcSFP8cCcD_ObjP8cCcD_Obj();
extern "C" void cM3d_CalcVecZAngle__FRC3VecP5csXyz();
extern "C" void __ct__8cM3dGCpsFv();
extern "C" void __dt__8cM3dGCpsFv();
extern "C" void Set__8cM3dGCpsFRC4cXyzRC4cXyzf();
extern "C" void Set__8cM3dGSphFRC9cM3dGSphS();
extern "C" void cLib_distanceAngleS__Fss();
extern "C" void __dl__FPv();
extern "C" void _savegpr_17();
extern "C" void _savegpr_23();
extern "C" void _savegpr_24();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_29();
extern "C" void _restgpr_17();
extern "C" void _restgpr_23();
extern "C" void _restgpr_24();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern void* __vt__15cCcD_DivideInfo[3];
extern "C" extern void* __vt__8cM3dGSph[3];
extern "C" extern void* __vt__12cCcD_SphAttr[25];
extern "C" extern void* __vt__12cCcD_CpsAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 BaseZ__4cXyz[12];
//
// Declarations:
//
/* 80085ED4-80085F08 080814 0034+00 0/0 1/1 0/0 .text Ct__4dCcSFv */
void dCcS::Ct() {
cCcS::Ct();
@@ -243,8 +151,7 @@ bool dCcS::ChkAtTgHitAfterCross(bool i_setAt, bool i_setTg, cCcD_GObjInf const*
/* 80086240-80086360 080B80 0120+00 1/0 0/0 0/0 .text
* SetCoGObjInf__4dCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts
*/
// weird reg alloc
#ifdef NONMATCHING
// NONMATCHING weird reg alloc
void dCcS::SetCoGObjInf(bool i_co2Set, bool i_co1Set, cCcD_GObjInf* i_co1Obj, cCcD_GObjInf* i_co2Obj,
cCcD_Stts* i_co1Stts, cCcD_Stts* i_co2Stts, cCcD_GStts* i_co1GStts,
cCcD_GStts* i_co2GStts) {
@@ -282,13 +189,6 @@ void dCcS::SetCoGObjInf(bool i_co2Set, bool i_co1Set, cCcD_GObjInf* i_co1Obj, cC
}
}
}
#else
void dCcS::SetCoGObjInf(bool param_0, bool param_1, cCcD_GObjInf* param_2,
cCcD_GObjInf* param_3, cCcD_Stts* param_4, cCcD_Stts* param_5,
cCcD_GStts* param_6, cCcD_GStts* param_7) {
// NONMATCHING
}
#endif
/* 80086360-80086404 080CA0 00A4+00 1/1 0/0 0/0 .text GetRank__4dCcSFUc */
int dCcS::GetRank(u8 weight) {
@@ -478,8 +378,7 @@ void dCcS::CalcParticleAngle(dCcD_GObjInf* i_atObjInf, cCcD_Stts* i_atStts, cCcD
/* 8008685C-80086AC0 08119C 0264+00 1/1 0/0 0/0 .text
* ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb
*/
// one branch issue
#ifdef NONMATCHING
// NONMATCHING one branch issue
void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_Obj* param_3,
dCcD_GObjInf* i_atObjInf, dCcD_GObjInf* i_tgObjInf, cCcD_Stts* param_6,
cCcD_Stts* param_7, dCcD_GStts* param_8, dCcD_GStts* param_9,
@@ -542,14 +441,6 @@ void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_O
}
}
}
#else
void dCcS::ProcAtTgHitmark(bool param_0, bool param_1, cCcD_Obj* param_2, cCcD_Obj* param_3,
dCcD_GObjInf* param_4, dCcD_GObjInf* param_5, cCcD_Stts* param_6,
cCcD_Stts* param_7, dCcD_GStts* param_8, dCcD_GStts* param_9,
cXyz* param_10, bool param_11) {
// NONMATCHING
}
#endif
/* 80086AC0-80086D8C 081400 02CC+00 1/0 0/0 0/0 .text
* SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz
@@ -774,4 +665,4 @@ bool dCcS::ChkNoHitGAtTg(cCcD_GObjInf const* i_atObjInf, cCcD_GObjInf const* i_t
}
return ChkAtTgMtrlHit(atObjInf->GetAtMtrl(), tgObjInf->GetTgMtrl()) == 0;
}
}
src/d/d_com_static.cpp
+19 -198
View File
@@ -5,7 +5,7 @@
#include "d/d_com_static.h"
#include "d/d_demo.h"
#include "dol2asm.h"
#include "d/actor/d_a_arrow.h"
#include "d/actor/d_a_dshutter.h"
#include "d/actor/d_a_grass.h"
#include "d/actor/d_a_mirror.h"
@@ -19,127 +19,6 @@
#include "d/actor/d_a_tag_stream.h"
#include "stdio.h"
//
// Forward References:
//
extern "C" void set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc();
extern "C" void reset__Q27daSus_c6data_cFv();
extern "C" void isSwitch__Q27daSus_c6data_cFv();
extern "C" void check__Q27daSus_c6data_cFRC4cXyz();
extern "C" void check__Q27daSus_c6data_cFP10fopAc_ac_c();
extern "C" void execute__Q27daSus_c6data_cFv();
extern "C" void add__Q27daSus_c6room_cFPQ27daSus_c6data_c();
extern "C" void reset__Q27daSus_c6room_cFv();
extern "C" void newData__7daSus_cFScRC4cXyzRC4cXyzUcUcUc();
extern "C" void reset__7daSus_cFv();
extern "C" void check__7daSus_cFScRC4cXyz();
extern "C" void check__7daSus_cFP10fopAc_ac_c();
extern "C" void execute__7daSus_cFv();
extern "C" void daNpcMsg_setEvtNum__FUc();
extern "C" void daNpcKakashi_chkSwdTutorialStage__Fv();
extern "C" void daNpcKakashi_setSwdTutorialStep__FUc();
extern "C" void daNpcKakashi_getSwdTutorialStep__Fv();
extern "C" void daNpcKakashi_getSwdTutorialResult__Fv();
extern "C" void daNpcKakashi_setSwdTutorialResult__Fb();
extern "C" void daNpcKakashi_getSuccessCount__Fv();
extern "C" void daNpcKakashi_incSuccessCount__Fv();
extern "C" void daNpcKakashi_clrSuccessCount__Fv();
extern "C" void getArcName__12daSetBgObj_cFP10fopAc_ac_c();
extern "C" void checkArea__13daTagStream_cFPC4cXyz();
extern "C" void entry__10daMirror_cFP8J3DModel();
extern "C" void remove__10daMirror_cFv();
extern "C" void deleteRoomGrass__9daGrass_cFi();
extern "C" void deleteRoomFlower__9daGrass_cFi();
extern "C" void daMP_c_Get_MovieRestFrame__6daMP_cFv();
extern "C" void daMP_c_Set_PercentMovieVolume__6daMP_cFf();
extern "C" void daMP_c_THPPlayerPlay__6daMP_cFv();
extern "C" void daMP_c_THPPlayerPause__6daMP_cFv();
extern "C" void checkMagnetCode__12daTagMagne_cFR13cBgS_PolyInfo();
extern "C" void checkMagneA__12daTagMagne_cFv();
extern "C" void checkMagneB__12daTagMagne_cFv();
extern "C" void checkMagneC__12daTagMagne_cFv();
extern "C" void getPlayerNo__11daTagMist_cFv();
extern "C" void clrSaveFlag__12daObjCarry_cFv();
extern "C" void setSaveFlag__12daObjCarry_cFv();
extern "C" void chkSaveFlag__12daObjCarry_cFv();
extern "C" void getPos__12daObjCarry_cFi();
extern "C" void savePos__12daObjCarry_cFi4cXyz();
extern "C" void onSttsFlag__12daObjCarry_cFiUc();
extern "C" void offSttsFlag__12daObjCarry_cFiUc();
extern "C" void chkSttsFlag__12daObjCarry_cFiUc();
extern "C" void setRoomNo__12daObjCarry_cFiSc();
extern "C" void getRoomNo__12daObjCarry_cFi();
extern "C" void __sinit_d_com_static_cpp();
extern "C" void func_80031EAC();
extern "C" void __ct__Q27daSus_c6room_cFv();
extern "C" void func_80031EF0();
extern "C" void __dt__Q27daSus_c6data_cFv();
extern "C" void __ct__Q27daSus_c6data_cFv();
extern "C" extern char const* const d_com_d_com_static__stringBase0;
extern "C" u8 mData__7daSus_c[1152];
extern "C" u8 mRoom__7daSus_c[256];
extern "C" u8 m_entryModel__10daMirror_c[12];
extern "C" u8 m_deleteRoom__15dGrass_packet_c[12];
extern "C" u8 m_deleteRoom__16dFlower_packet_c[12];
extern "C" u8 mPos__12daObjCarry_c[60];
extern "C" u8 m_aim_rate__8daYkgr_c[4];
extern "C" u8 m_path__8daYkgr_c[4];
extern "C" u8 m_emitter__8daYkgr_c[4];
extern "C" u8 m_top__13daTagStream_c[4];
extern "C" u8 m_myObj__10daMirror_c[4];
extern "C" u8 m_myObj__9daGrass_c[4];
extern "C" u8 m_grass__9daGrass_c[4];
extern "C" u8 m_flower__9daGrass_c[4];
extern "C" u8 m_myObj__6daMP_c[4];
extern "C" u8 mTagMagne__12daTagMagne_c[4];
extern "C" u8 mSttsFlag__12daObjCarry_c[5 + 3 /* padding */];
extern "C" u8 mRoomNo__12daObjCarry_c[5 + 3 /* padding */];
extern "C" void* M_dir_base__Q212daObjMovebox5Act_c[2];
extern "C" u32 OPEN_SIZE__7daDsh_c;
extern "C" f32 OPEN_ACCEL__7daDsh_c;
extern "C" f32 OPEN_SPEED__7daDsh_c;
extern "C" f32 OPEN_BOUND_SPEED__7daDsh_c;
extern "C" f32 OPEN_BOUND_RATIO__7daDsh_c;
extern "C" f32 CLOSE_ACCEL__7daDsh_c;
extern "C" f32 CLOSE_SPEED__7daDsh_c;
extern "C" f32 CLOSE_BOUND_SPEED__7daDsh_c;
extern "C" f32 CLOSE_BOUND_RATIO__7daDsh_c;
//
// External References:
//
extern "C" void __dt__4cXyzFv();
extern "C" void mDoMch_Create__Fv();
extern "C" void __ct__4cXyzFv();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz();
extern "C" void getLayerNo__14dComIfG_play_cFi();
extern "C" void onEventBit__11dSv_event_cFUs();
extern "C" void offEventBit__11dSv_event_cFUs();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void setEventReg__11dSv_event_cFUsUc();
extern "C" void getEventReg__11dSv_event_cCFUs();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void GetMagnetCode__4dBgSFRC13cBgS_PolyInfo();
extern "C" void __dl__FPv();
extern "C" void __register_global_object();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
extern "C" u8 m_status__7dDemo_c[4];
extern "C" extern u8 mPlayerNo__11daTagMist_c[4];
//
// Declarations:
//
/* 80030F14-80030FBC 02B854 00A8+00 1/1 0/0 0/0 .text
* set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc */
void daSus_c::data_c::set(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3,
@@ -246,23 +125,15 @@ void daSus_c::room_c::reset() {
}
}
/* ############################################################################################## */
/* 80423FF0-80423FFC 050D10 000C+00 1/1 0/0 0/0 .bss @3840 */
static u8 lit_3840[12];
/* 80423FFC-8042447C 050D1C 0480+00 6/7 0/0 0/0 .bss mData__7daSus_c */
u8 daSus_c::mData[1152];
daSus_c::data_c daSus_c::mData[0x20];
/* 8042447C-8042457C 05119C 0100+00 2/3 0/0 1/1 .bss mRoom__7daSus_c */
u8 daSus_c::mRoom[256];
daSus_c::room_c daSus_c::mRoom[0x40];
/* 80450D88-80450D8C -00001 0004+00 1/1 0/0 2/2 .sbss None */
/* 80450D88 0002+00 data_80450D88 m_count__9daArrow_c */
extern s16 m_count__9daArrow_c;
#pragma push
#pragma force_active on
s16 m_count__9daArrow_c;
#pragma pop
s16 daArrow_c::m_count;
/* 80450D8A 0002+00 data_80450D8A mSetTop__7daSus_c */
s16 daSus_c::mSetTop;
@@ -436,7 +307,7 @@ const char* daSetBgObj_c::getArcName(fopAc_ac_c* i_this) {
/* ############################################################################################## */
/* 80451D28-80451D30 -00001 0008+00 0/0 0/0 3/3 .sdata2 M_dir_base__Q212daObjMovebox5Act_c
*/
SECTION_SDATA2 s16 daObjMovebox::Act_c::M_dir_base[4] = {
s16 const daObjMovebox::Act_c::M_dir_base[4] = {
0x0000,
0x4000,
0x8000,
@@ -444,31 +315,31 @@ SECTION_SDATA2 s16 daObjMovebox::Act_c::M_dir_base[4] = {
};
/* 80451D30-80451D34 000330 0004+00 0/0 0/0 3/3 .sdata2 OPEN_SIZE__7daDsh_c */
SECTION_SDATA2 f32 daDsh_c::OPEN_SIZE = 270.1f;
f32 const daDsh_c::OPEN_SIZE = 270.1f;
/* 80451D34-80451D38 000334 0004+00 0/0 0/0 1/1 .sdata2 OPEN_ACCEL__7daDsh_c */
SECTION_SDATA2 f32 daDsh_c::OPEN_ACCEL = 10.0f;
f32 const daDsh_c::OPEN_ACCEL = 10.0f;
/* 80451D38-80451D3C 000338 0004+00 0/0 0/0 1/1 .sdata2 OPEN_SPEED__7daDsh_c */
SECTION_SDATA2 f32 daDsh_c::OPEN_SPEED = -40.0f;
f32 const daDsh_c::OPEN_SPEED = -40.0f;
/* 80451D3C-80451D40 00033C 0004+00 0/0 0/0 1/1 .sdata2 OPEN_BOUND_SPEED__7daDsh_c */
SECTION_SDATA2 f32 daDsh_c::OPEN_BOUND_SPEED = -30.0f;
f32 const daDsh_c::OPEN_BOUND_SPEED = -30.0f;
/* 80451D40-80451D44 000340 0004+00 0/0 0/0 1/1 .sdata2 OPEN_BOUND_RATIO__7daDsh_c */
SECTION_SDATA2 f32 daDsh_c::OPEN_BOUND_RATIO = -0.4f;
f32 const daDsh_c::OPEN_BOUND_RATIO = -0.4f;
/* 80451D44-80451D48 000344 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_ACCEL__7daDsh_c */
SECTION_SDATA2 f32 daDsh_c::CLOSE_ACCEL = 10.0f;
f32 const daDsh_c::CLOSE_ACCEL = 10.0f;
/* 80451D48-80451D4C 000348 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_SPEED__7daDsh_c */
SECTION_SDATA2 f32 daDsh_c::CLOSE_SPEED = 40.0f;
f32 const daDsh_c::CLOSE_SPEED = 40.0f;
/* 80451D4C-80451D50 00034C 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_BOUND_SPEED__7daDsh_c */
SECTION_SDATA2 f32 daDsh_c::CLOSE_BOUND_SPEED = 30.0f;
f32 const daDsh_c::CLOSE_BOUND_SPEED = 30.0f;
/* 80451D50-80451D54 000350 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_BOUND_RATIO__7daDsh_c */
SECTION_SDATA2 f32 daDsh_c::CLOSE_BOUND_RATIO = -0.4f;
f32 const daDsh_c::CLOSE_BOUND_RATIO = -0.4f;
/* 800318B4-8003194C 02C1F4 0098+00 0/0 1/1 0/0 .text checkArea__13daTagStream_cFPC4cXyz
*/
@@ -485,7 +356,7 @@ int daTagStream_c::checkArea(cXyz const* param_0) {
/* ############################################################################################## */
/* 8042457C-80424588 05129C 000C+00 1/2 0/0 1/1 .bss m_entryModel__10daMirror_c */
daMirror_c::entryModelFunc daMirror_c::m_entryModel;
daMirror_c::entryModelFunc daMirror_c::m_entryModel = NULL;
/* 80450DA4-80450DA8 0002A4 0004+00 0/0 1/1 2/2 .sbss m_top__13daTagStream_c */
daTagStream_c* daTagStream_c::m_top;
@@ -513,7 +384,7 @@ bool daMirror_c::remove() {
/* ############################################################################################## */
/* 80424588-80424594 0512A8 000C+00 1/2 0/0 1/1 .bss m_deleteRoom__15dGrass_packet_c */
dGrass_packet_c::deleteFunc dGrass_packet_c::m_deleteRoom;
dGrass_packet_c::deleteFunc dGrass_packet_c::m_deleteRoom = NULL;
/* 80450DAC-80450DB0 0002AC 0004+00 0/0 0/0 2/2 .sbss m_myObj__9daGrass_c */
daGrass_c* daGrass_c::m_myObj;
@@ -531,7 +402,7 @@ void daGrass_c::deleteRoomGrass(int param_0) {
/* ############################################################################################## */
/* 80424594-804245A0 0512B4 000C+00 1/2 0/0 1/1 .bss m_deleteRoom__16dFlower_packet_c */
dFlower_packet_c::deleteFunc dFlower_packet_c::m_deleteRoom;
dFlower_packet_c::deleteFunc dFlower_packet_c::m_deleteRoom = NULL;
/* 80450DB4-80450DB8 0002B4 0004+00 1/1 0/0 9/9 .sbss m_flower__9daGrass_c */
dFlower_packet_c* daGrass_c::m_flower;
@@ -650,19 +521,12 @@ bool daObjCarry_c::chkSaveFlag() {
return mSaveFlag == true;
}
/* ############################################################################################## */
/* 804245A0-804245AC 0512C0 000C+00 0/1 0/0 0/0 .bss @4480 */
#pragma push
#pragma force_active on
static u8 lit_4480[12];
#pragma pop
/* 804245AC-804245E8 0512CC 003C+00 3/4 0/0 0/0 .bss mPos__12daObjCarry_c */
Vec daObjCarry_c::mPos[5];
cXyz daObjCarry_c::mPos[5];
/* 80031D24-80031D38 02C664 0014+00 0/0 0/0 1/1 .text getPos__12daObjCarry_cFi */
const cXyz& daObjCarry_c::getPos(int param_0) {
return *(cXyz*)&mPos[param_0];
return mPos[param_0];
}
/* 80031D38-80031D64 02C678 002C+00 0/0 0/0 2/2 .text savePos__12daObjCarry_cFi4cXyz */
@@ -704,46 +568,3 @@ void daObjCarry_c::setRoomNo(int idx, s8 roomNo) {
s8 daObjCarry_c::getRoomNo(int idx) {
return mRoomNo[idx];
}
/* 80031DC4-80031EAC 02C704 00E8+00 0/0 1/0 0/0 .text __sinit_d_com_static_cpp */
void __sinit_d_com_static_cpp(){// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80031DC4, __sinit_d_com_static_cpp);
#pragma pop
/* 80031EAC-80031EE4 02C7EC 0038+00 1/1 0/0 0/0 .text __arraydtor$4479 */
void func_80031EAC() {
// NONMATCHING
}
/* 80031EE4-80031EF0 02C824 000C+00 1/1 0/0 0/0 .text __ct__Q27daSus_c6room_cFv */
daSus_c::room_c::room_c() {
// NONMATCHING
}
/* 80031EF0-80031F28 02C830 0038+00 1/1 0/0 0/0 .text __arraydtor$3839 */
void func_80031EF0() {
// NONMATCHING
}
/* 80031F28-80031F64 02C868 003C+00 2/2 0/0 0/0 .text __dt__Q27daSus_c6data_cFv */
daSus_c::data_c::~data_c() {
// NONMATCHING
}
/* 80031F64-80031F94 02C8A4 0030+00 1/1 0/0 0/0 .text __ct__Q27daSus_c6data_cFv */
daSus_c::data_c::data_c() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80450DD1-80450DD5 -00001 0004+00 0/0 0/0 0/0 .sbss None */
#pragma push
#pragma force_active on
static u8 pad_80450DD1[4];
#pragma pop
/* 803790B0-803790B0 005710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_drawlist.cpp
+52 -321
View File
@@ -3,8 +3,6 @@
// Translation Unit: d/d_drawlist
//
#define NO_INLINE_DLSTBASE_DRAW
#include "d/d_drawlist.h"
#include "d/d_s_play.h"
#include "JSystem/J2DGraph/J2DScreen.h"
@@ -18,10 +16,6 @@
#include "m_Do/m_Do_mtx.h"
#include "JSystem/J2DGraph/J2DGrafContext.h"
//
// Types:
//
class dDlst_blo_c : public dDlst_base_c {
public:
/* 80053B64 */ virtual void draw();
@@ -187,178 +181,6 @@ public:
/* 0x3c */ dDlst_shadowPoly_c* mPoly;
};
//
// Forward References:
//
extern "C" void setViewPort__14dDlst_window_cFffffff();
extern "C" void setScissor__14dDlst_window_cFffff();
extern "C" void draw__13dDlst_2DTri_cFv();
extern "C" void draw__14dDlst_2DQuad_cFv();
extern "C" void draw__15dDlst_2DPoint_cFv();
extern "C" void draw__11dDlst_2DT_cFv();
extern "C" void draw__12dDlst_2DT2_cFv();
extern "C" void __ct__12dDlst_2DT2_cFv();
extern "C" void init__12dDlst_2DT2_cFP7ResTIMGffffUcUcUcff();
extern "C" void draw__11dDlst_2DM_cFv();
extern "C" void draw__11dDlst_2Dm_cFv();
extern "C" void draw__12dDlst_2DMt_cFv();
extern "C" void getTexture__10J2DPictureCFUc();
extern "C" void __ct__10dDlst_2D_cFP7ResTIMGssssUc();
extern "C" void draw__10dDlst_2D_cFv();
extern "C" void draw__11dDlst_blo_cFv();
extern "C" void clearAnmTransform__9J2DScreenFv();
extern "C" void calcMtx__7J2DPaneFv();
extern "C" void makeMatrix__7J2DPaneFff();
extern "C" s32 getTypeID__7J2DPaneCFv();
extern "C" void setWhite__10J2DPictureFQ28JUtility6TColor();
extern "C" void setBlack__10J2DPictureFQ28JUtility6TColor();
extern "C" void __dt__10J2DAnmBaseFv();
extern "C" void init__8cM_rnd_cFiii();
extern "C" void get__8cM_rnd_cFv();
extern "C" void getF__8cM_rnd_cFf();
extern "C" void getFX__8cM_rnd_cFf();
extern "C" void getValue__8cM_rnd_cFff();
extern "C" void draw__18dDlst_effectLine_cFv();
extern "C" void update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff();
extern "C" void set__18dDlst_shadowPoly_cFP10cBgD_Vtx_tUsUsUsP8cM3dGPla();
extern "C" void draw__18dDlst_shadowPoly_cFv();
extern "C" static void J3DDrawBuffer__create__FUl();
extern "C" void reset__18dDlst_shadowReal_cFv();
extern "C" void imageDraw__18dDlst_shadowReal_cFPA4_f();
extern "C" void draw__18dDlst_shadowReal_cFv();
extern "C" static void psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla();
extern "C" static void realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c();
extern "C" void __dt__14ShdwDrawPoly_cFv();
extern "C" static void setkankyoShadow__FP12dKy_tevstr_cPf();
extern "C" void setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c();
extern "C" void set__18dDlst_shadowReal_cFUlP8J3DModelP4cXyzffP12dKy_tevstr_cff();
extern "C" void add__18dDlst_shadowReal_cFP8J3DModel();
extern "C" void draw__20dDlst_shadowSimple_cFv();
extern "C" void set__20dDlst_shadowSimple_cFP4cXyzffP4cXyzsfP9_GXTexObj();
extern "C" void init__21dDlst_shadowControl_cFv();
extern "C" void reset__21dDlst_shadowControl_cFv();
extern "C" void imageDraw__21dDlst_shadowControl_cFPA4_f();
extern "C" void draw__21dDlst_shadowControl_cFPA4_f();
extern "C" void setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c();
extern "C" void addReal__21dDlst_shadowControl_cFUlP8J3DModel();
extern "C" void setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj();
extern "C" void setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG();
extern "C" void newData__13dDlst_peekZ_cFssPUl();
extern "C" void peekData__13dDlst_peekZ_cFv();
extern "C" void __ct__12dDlst_list_cFv();
extern "C" void __ct__26mDoExt_3DlineMatSortPacketFv();
extern "C" void __dt__18dDlst_shadowReal_cFv();
extern "C" void __dt__17dDlst_shadowTri_cFv();
extern "C" void __ct__18dDlst_shadowReal_cFv();
extern "C" void __ct__17dDlst_shadowTri_cFv();
extern "C" void __ct__20dDlst_shadowSimple_cFv();
extern "C" void init__12dDlst_list_cFv();
extern "C" void __dt__12dDlst_list_cFv();
extern "C" void reset__12dDlst_list_cFv();
extern "C" void entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz();
extern "C" void drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer();
extern "C" void drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer();
extern "C" void drawOpaListItem3d__12dDlst_list_cFv();
extern "C" void drawXluListItem3d__12dDlst_list_cFv();
extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
extern "C" void draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c();
extern "C" void wipeIn__12dDlst_list_cFfR8_GXColor();
extern "C" void wipeIn__12dDlst_list_cFf();
extern "C" void calcWipe__12dDlst_list_cFv();
extern "C" dDlst_shadowTri_c* getTri__22dDlst_shadowRealPoly_cFv();
extern "C" s32 getTriMax__22dDlst_shadowRealPoly_cFv();
extern "C" void searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen();
extern "C" void __sinit_d_drawlist_cpp();
extern "C" extern char const* const d_d_drawlist__stringBase0;
extern "C" extern void* __vt__11dDlst_2DT_c[3];
extern "C" extern void* __vt__15dDlst_2DPoint_c[3];
extern "C" extern void* __vt__14dDlst_2DQuad_c[3];
extern "C" extern void* __vt__13dDlst_2DTri_c[3];
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" u8 mWipeDlst__12dDlst_list_c[72];
extern "C" u8 mWipeColor__12dDlst_list_c[4];
extern "C" f32 mWipeRate__12dDlst_list_c;
extern "C" f32 mWipeSpeed__12dDlst_list_c[1 + 1 /* padding */];
extern "C" extern u8 data_80450EE0;
//
// External References:
//
extern "C" void __dt__4cXyzFv();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs();
extern "C" void scaleM__14mDoMtx_stack_cFfff();
extern "C" void __ct__4cXyzFv();
extern "C" void __dt__26mDoExt_3DlineMatSortPacketFv();
extern "C" void mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj();
extern "C" void ShdwDraw__4cBgSFP13cBgS_ShdwDraw();
extern "C" void dKy_plight_near_pos__Fv();
extern "C" void dKy_GxFog_set__Fv();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void normalize__4cXyzFv();
extern "C" void isZero__4cXyzCFv();
extern "C" void __ct__13cBgS_ShdwDrawFv();
extern "C" void __dt__13cBgS_ShdwDrawFv();
extern "C" void Set__13cBgS_ShdwDrawFR4cXyzR4cXyz();
extern "C" void SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i();
extern "C" void cLib_chaseUC__FPUcUcUc();
extern "C" void calcViewFrustum__11J3DUClipperFv();
extern "C" void clip__11J3DUClipperCFPA4_CfP3VecP3Vec();
extern "C" void* __nw__FUl();
extern "C" void* __nwa__FUli();
extern "C" void __dl__FPv();
extern "C" void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive();
extern "C" void clearAnmTransform__7J2DPaneFv();
extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
extern "C" void __ct__10J2DPictureFv();
extern "C" void reinitGX__6J3DSysFv();
extern "C" void drawFast__14J3DShapePacketFv();
extern "C" void loadPreDrawSetting__8J3DShapeCFv();
extern "C" void initialize__13J3DDrawBufferFv();
extern "C" void allocBuffer__13J3DDrawBufferFUl();
extern "C" void __dt__13J3DDrawBufferFv();
extern "C" void frameInit__13J3DDrawBufferFv();
extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs();
extern "C" void draw__13J3DDrawBufferCFv();
extern "C" void GXClearVtxDesc();
extern "C" void GXPixModeSync();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void _savefpr_26();
extern "C" void _restfpr_26();
extern "C" void _savegpr_22();
extern "C" void _savegpr_23();
extern "C" void _savegpr_24();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_22();
extern "C" void _restgpr_23();
extern "C" void _restgpr_24();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__26mDoExt_3DlineMatSortPacket[5];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__9J3DPacket[5];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mClipper__14mDoLib_clipper[92];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mBackColor__13mDoGph_gInf_c[4];
extern "C" f32 mSystemFar__14mDoLib_clipper;
extern "C" f32 mFovyRate__14mDoLib_clipper;
extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
//
// Declarations:
//
/* 80051AC0-80051ADC 04C400 001C+00 0/0 3/3 0/0 .text setViewPort__14dDlst_window_cFffffff */
void dDlst_window_c::setViewPort(f32 xOrig, f32 yOrig, f32 width, f32 height, f32 nearZ, f32 farZ) {
mViewport.mXOrig = xOrig;
@@ -715,55 +537,42 @@ void dDlst_2DT2_c::draw() {
dComIfGp_getCurrentGrafPort()->setup2D();
}
/* ############################################################################################## */
/* 803A87A0-803A87C0 0058C0 000C+14 2/2 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 803A87C0-803A8800 0058E0 003C+04 0/0 0/0 0/0 .data l_frontZMat */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_frontZMat[] ALIGN_DECL(32) = {
static u8 l_frontZMat[] ALIGN_DECL(32) = {
0x61, 0x40, 0x00, 0x00, 0x07, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x40, 0x10, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A8800-803A882C 005920 002A+02 0/0 0/0 0/0 .data l_frontNoZSubMat */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_frontNoZSubMat[] ALIGN_DECL(32) = {
static u8 l_frontNoZSubMat[] ALIGN_DECL(32) = {
0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x09, 0x35, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A882C-803A88A0 00594C 0060+14 0/1 0/0 0/0 .data l_shadowVolPos */
#pragma push
#pragma force_active on
SECTION_DATA static Vec l_shadowVolPos[] = {
static Vec l_shadowVolPos[] = {
{-1.0f, -1.0f, 0.0f}, {-1.0f, -1.0f, -300.0f}, {-1.0f, 1.0f, 0.0f}, {-1.0f, 1.0f, -300.0f},
{1.0f, -1.0f, 0.0f}, {1.0f, -1.0f, -300.0f}, {1.0f, 1.0f, 0.0f}, {1.0f, 1.0f, -300.0f},
};
#pragma pop
/* 803A88A0-803A88E0 0059C0 003B+05 0/0 0/0 0/0 .data l_shadowVolDL */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_shadowVolDL[] ALIGN_DECL(32) = {
static u8 l_shadowVolDL[] ALIGN_DECL(32) = {
0x80, 0x00, 0x18, 0x06, 0x02, 0x03, 0x07, 0x00, 0x04, 0x05, 0x01, 0x06, 0x04, 0x00, 0x02,
0x07, 0x05, 0x04, 0x06, 0x03, 0x01, 0x05, 0x07, 0x02, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A88E0-803A8940 005A00 005A+06 1/1 0/0 0/0 .data l_shadowProjMat */
SECTION_DATA static u8 l_shadowProjMat[] ALIGN_DECL(32) = {
static u8 l_shadowProjMat[] ALIGN_DECL(32) = {
0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xE6, 0x70,
0x61, 0x43, 0x00, 0x00, 0x01, 0x61, 0x40, 0x00, 0x00, 0x07, 0x61, 0x41, 0x00, 0x04, 0xAD,
0x61, 0xF3, 0x64, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10,
@@ -773,9 +582,7 @@ SECTION_DATA static u8 l_shadowProjMat[] ALIGN_DECL(32) = {
};
/* 803A8940-803A89A0 005A60 005A+06 0/0 0/0 0/0 .data l_shadowVolMat */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_shadowVolMat[] ALIGN_DECL(32) = {
static u8 l_shadowVolMat[] ALIGN_DECL(32) = {
0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFC, 0x61, 0xC1, 0x08, 0xFF, 0x90,
0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x0D, 0x61, 0x41, 0x00, 0x01, 0x35,
0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
@@ -783,12 +590,9 @@ SECTION_DATA static u8 l_shadowVolMat[] ALIGN_DECL(32) = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A89A0-803A8A00 005AC0 0055+0B 0/1 0/0 0/0 .data l_clearMat */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_clearMat[] ALIGN_DECL(32) = {
static u8 l_clearMat[] ALIGN_DECL(32) = {
0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xFF, 0xA0,
0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x00, 0x14, 0x61, 0xF3, 0x7F, 0x00, 0x00,
0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
@@ -796,12 +600,9 @@ SECTION_DATA static u8 l_clearMat[] ALIGN_DECL(32) = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A8A00-803A8A60 005B20 0055+0B 0/1 0/0 0/0 .data l_frontMat */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_frontMat[] ALIGN_DECL(32) = {
static u8 l_frontMat[] ALIGN_DECL(32) = {
0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xFF, 0x90,
0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x07, 0x61, 0x41, 0x00, 0x01, 0x15,
0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
@@ -809,34 +610,25 @@ SECTION_DATA static u8 l_frontMat[] ALIGN_DECL(32) = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A8A60-803A8A9C 005B80 003C+00 0/1 0/0 0/0 .data l_backSubMat */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_backSubMat[] ALIGN_DECL(32) = {
static u8 l_backSubMat[] ALIGN_DECL(32) = {
0x61, 0x41, 0x00, 0x09, 0x35, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A8A9C-803A8B60 005BBC 00A8+1C 0/1 0/0 0/0 .data l_simpleShadowPos */
#pragma push
#pragma force_active on
SECTION_DATA static Vec l_simpleShadowPos[] = {
static Vec l_simpleShadowPos[] = {
{0.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, -1.0f, -1.0f}, {1.0f, 0.0f, -1.0f},
{-1.0f, -1.0f, -1.0f}, {-1.0f, 0.0f, -1.0f}, {-1.0f, -1.0f, 1.0f}, {-1.0f, 0.0f, 1.0f},
{1.0f, -1.0f, 1.0f}, {1.0f, 0.0f, 1.0f}, {-1.0f, 1.0f, -1.0f}, {1.0f, 1.0f, -1.0f},
{1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f},
};
#pragma pop
/* 803A8B60-803A8BC0 005C80 0058+08 0/1 0/0 0/0 .data l_shadowVolumeDL */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_shadowVolumeDL[] ALIGN_DECL(32) = {
static u8 l_shadowVolumeDL[] ALIGN_DECL(32) = {
0x98, 0x00, 0x05, 0x03, 0x09, 0x01, 0x07, 0x05, 0x98, 0x00, 0x05, 0x04, 0x06, 0x00, 0x08,
0x02, 0x98, 0x00, 0x04, 0x04, 0x05, 0x06, 0x07, 0x98, 0x00, 0x04, 0x02, 0x03, 0x04, 0x05,
0x98, 0x00, 0x04, 0x08, 0x09, 0x02, 0x03, 0x98, 0x00, 0x04, 0x06, 0x07, 0x08, 0x09, 0x98,
@@ -844,12 +636,9 @@ SECTION_DATA static u8 l_shadowVolumeDL[] ALIGN_DECL(32) = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A8BC0-803A8C20 005CE0 0055+0B 0/1 0/0 0/0 .data l_shadowSealTexDL */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_shadowSealTexDL[] ALIGN_DECL(32) = {
static u8 l_shadowSealTexDL[] ALIGN_DECL(32) = {
0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0x15,
0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x40, 0x01, 0x80, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x0B,
@@ -857,12 +646,9 @@ SECTION_DATA static u8 l_shadowSealTexDL[] ALIGN_DECL(32) = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A8C20-803A8C80 005D40 0055+0B 0/1 0/0 0/0 .data l_shadowSealTex2DL */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_shadowSealTex2DL[] ALIGN_DECL(32) = {
static u8 l_shadowSealTex2DL[] ALIGN_DECL(32) = {
0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0x15,
0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x40, 0x01, 0x80, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x0B,
@@ -870,12 +656,9 @@ SECTION_DATA static u8 l_shadowSealTex2DL[] ALIGN_DECL(32) = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A8C80-803A8D00 005DA0 0069+17 0/1 0/0 0/0 .data l_shadowSealDL */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_shadowSealDL[] ALIGN_DECL(32) = {
static u8 l_shadowSealDL[] ALIGN_DECL(32) = {
0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x05, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00,
0x00, 0x05, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1,
0x08, 0xFF, 0xB0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0xED, 0x10, 0x00,
@@ -884,48 +667,6 @@ SECTION_DATA static u8 l_shadowSealDL[] ALIGN_DECL(32) = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803A8D00-803A8D7C 005E20 007B+01 1/1 0/0 0/0 .data l_matDL$5404 */
SECTION_DATA static u8 l_matDL[] ALIGN_DECL(32) = {
0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
0x04, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xF2, 0x61, 0xC1, 0x08, 0xFF,
0x90, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F,
0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00,
0x40, 0x10, 0x61, 0xEE, 0x00, 0x00, 0x00, 0x61, 0xEF, 0x00, 0x00, 0x00, 0x61, 0xF0, 0x00, 0x00,
0x00, 0x61, 0xF1, 0x00, 0x00, 0x00, 0x61, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 803A8D7C-803A8D8C 005E9C 0010+00 1/1 0/0 0/0 .data l_imageDrawColor$5405 */
SECTION_DATA static GXColor l_imageDrawColor[4] = {
{255, 0, 0, 0},
{0, 255, 0, 0},
{0, 0, 255, 0},
{0, 0, 0, 255},
};
/* 803A8D8C-803A8D9C 005EAC 0010+00 0/1 0/0 0/0 .data l_tevColorChan$5438 */
#pragma push
#pragma force_active on
SECTION_DATA static GXTevColor l_tevColorChan[4] = {
GX_CH_RED,
GX_CH_GREEN,
GX_CH_BLUE,
GX_CH_ALPHA,
};
#pragma pop
/* 803A8D9C-803A8DCC 005EBC 0030+00 0/0 0/0 0/0 .data mtx_adj$5842 */
#pragma push
#pragma force_active on
SECTION_DATA static Mtx mtx_adj = {
{0.5f, 0.0f, 0.0f, 0.5f},
{0.0f, -0.5f, 0.0f, 0.5f},
{0.0f, 0.0f, 1.0f, 0.0f},
};
#pragma pop
/* 80052B00-80052B4C 04D440 004C+00 1/1 0/0 0/0 .text __ct__12dDlst_2DT2_cFv */
dDlst_2DT2_c::dDlst_2DT2_c() {
@@ -1186,50 +927,11 @@ void dDlst_2D_c::draw() {
mpPicture.draw(mPosX, mPosY, mSizeX, mSizeY, false, false, false);
}
/* 80053B64-80053BA0 04E4A4 003C+00 1/0 0/0 0/0 .text draw__11dDlst_blo_cFv */
void dDlst_blo_c::draw() {
mScreen.draw(field_0x120, field_0x124, dComIfGp_getCurrentGrafPort());
}
/* 80053BA0-80053BC0 04E4E0 0020+00 0/0 1/0 0/0 .text clearAnmTransform__9J2DScreenFv */
void J2DScreen::clearAnmTransform() {
// NONMATCHING
}
/* 80053BC0-80053C00 04E500 0040+00 0/0 7/0 0/0 .text calcMtx__7J2DPaneFv */
void J2DPane::calcMtx() {
// NONMATCHING
}
/* 80053C00-80053C3C 04E540 003C+00 0/0 8/0 0/0 .text makeMatrix__7J2DPaneFff */
void J2DPane::makeMatrix(f32 param_0, f32 param_1) {
// NONMATCHING
}
/* 80053C3C-80053C44 04E57C 0008+00 0/0 1/0 0/0 .text getTypeID__7J2DPaneCFv */
// s32 J2DPane::getTypeID() const {
extern "C" s32 getTypeID__7J2DPaneCFv() {
return 16;
}
/* 80053C44-80053C6C 04E584 0028+00 0/0 1/0 0/0 .text setWhite__10J2DPictureFQ28JUtility6TColor */
bool J2DPicture::setWhite(JUtility::TColor param_0) {
// NONMATCHING
}
/* 80053C6C-80053C94 04E5AC 0028+00 0/0 1/0 0/0 .text setBlack__10J2DPictureFQ28JUtility6TColor */
bool J2DPicture::setBlack(JUtility::TColor param_0) {
// NONMATCHING
}
/* 80053C94-80053CDC 04E5D4 0048+00 1/0 0/0 0/0 .text __dt__10J2DAnmBaseFv */
// J2DAnmBase::~J2DAnmBase() {
extern "C" void __dt__10J2DAnmBaseFv() {
// NONMATCHING
}
/* 80053CDC-80053CEC 04E61C 0010+00 0/0 2/2 0/0 .text init__8cM_rnd_cFiii */
void cM_rnd_c::init(int s0, int s1, int s2) {
seed0 = s0;
@@ -1247,7 +949,6 @@ f32 cM_rnd_c::get() {
return fabsf(rm);
}
/* 80053DE0-80053E18 04E720 0038+00 1/1 0/0 0/0 .text getF__8cM_rnd_cFf */
f32 cM_rnd_c::getF(f32 param_0) {
return get() * param_0;
@@ -1776,6 +1477,26 @@ void dDlst_shadowControl_c::reset() {
/* 800557C8-80055A14 050108 024C+00 0/0 1/1 0/0 .text imageDraw__21dDlst_shadowControl_cFPA4_f */
void dDlst_shadowControl_c::imageDraw(Mtx param_0) {
static u8 l_matDL[] ALIGN_DECL(32) = {
0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10,
0x00, 0x00, 0x04, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xF2,
0x61, 0xC1, 0x08, 0xFF, 0x90, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0xF3, 0x7F, 0x00,
0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10,
0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x40, 0x10, 0x61, 0xEE, 0x00, 0x00,
0x00, 0x61, 0xEF, 0x00, 0x00, 0x00, 0x61, 0xF0, 0x00, 0x00, 0x00, 0x61, 0xF1, 0x00,
0x00, 0x00, 0x61, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
static GXColor l_imageDrawColor[4] = {
{255, 0, 0, 0},
{0, 255, 0, 0},
{0, 0, 255, 0},
{0, 0, 0, 255},
};
GXCallDisplayList(l_matDL, 0x60);
GXSetZMode(GX_DISABLE, GX_LEQUAL, GX_DISABLE);
GXSetZCompLoc(GX_TRUE);
@@ -1827,6 +1548,13 @@ void dDlst_shadowControl_c::imageDraw(Mtx param_0) {
/* 80055A14-80055C74 050354 0260+00 0/0 1/1 0/0 .text draw__21dDlst_shadowControl_cFPA4_f
*/
void dDlst_shadowControl_c::draw(Mtx param_0) {
static GXTevColor l_tevColorChan[4] = {
GX_CH_RED,
GX_CH_GREEN,
GX_CH_BLUE,
GX_CH_ALPHA,
};
j3dSys.reinitGX();
GXSetNumIndStages(0);
dKy_GxFog_set();
@@ -1879,6 +1607,16 @@ void dDlst_shadowControl_c::draw(Mtx param_0) {
GXSetAlphaUpdate(GX_DISABLE);
}
/* 803A8D9C-803A8DCC 005EBC 0030+00 0/0 0/0 0/0 .data mtx_adj$5842 */
#pragma push
#pragma force_active on
SECTION_DATA static Mtx mtx_adj = {
{0.5f, 0.0f, 0.0f, 0.5f},
{0.0f, -0.5f, 0.0f, 0.5f},
{0.0f, 0.0f, 1.0f, 0.0f},
};
#pragma pop
/* 80055C74-80055F1C 0505B4 02A8+00 0/0 1/1 1/1 .text
* setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c */
int dDlst_shadowControl_c::setReal(u32 param_1, s8 param_2, J3DModel* param_3, cXyz* param_4,
@@ -2260,10 +1998,3 @@ void dDlst_list_c::calcWipe() {
dComIfGd_set2DXlu(&mWipeDlst);
}
}
/* 800569B0-800569B4 0512F0 0004+00 1/0 7/0 0/0 .text
* searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen */
// void J2DAnmBase::searchUpdateMaterialID(J2DScreen* param_0) {
extern "C" void searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen() {
/* empty function */
}
src/d/d_event.cpp
+6 -7
View File
@@ -205,8 +205,9 @@ s32 dEvt_control_c::beforeFlagProc(dEvt_order_c* p_order) {
return 1;
}
/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
static char const* const stringBase_80379D80 = "？？？";
static char const* dummy1() {
return "？？？";
}
/* 80041964-800419A8 03C2A4 0044+00 2/2 0/0 0/0 .text
* afterFlagProc__14dEvt_control_cFP12dEvt_order_c */
@@ -834,9 +835,6 @@ bool dEvt_control_c::skipper() {
return startSkip;
}
/* 80451EC8-80451ECC 0004C8 0004+00 1/1 0/0 0/0 .sdata2 @5013 */
static f32 lit_5013 = -1.0f / 20.0f;
/* 80042BBC-80042FA8 03D4FC 03EC+00 0/0 1/1 0/0 .text Step__14dEvt_control_cFv */
int dEvt_control_c::Step() {
dEvent_manager_c* evtMng = &dComIfGp_getEventManager();
@@ -1219,5 +1217,6 @@ void dEvt_control_c::setGtItm(u8 itemNo) {
mGtItm = itemNo;
}
/* 80379DC6-80379DD0 006426 0008+02 0/0 0/0 0/0 .rodata None */
static char const* const stringBase_80379DC6 = "GIVEMAN";
static char const* dummy2() {
return "GIVEMAN";
}
src/d/d_file_select.cpp
+229 -2228
View File
File diff suppressed because it is too large Load Diff
src/d/d_gameover.cpp
+27 -462
View File
@@ -3,17 +3,12 @@
// Translation Unit: d/d_gameover
//
/**
* This TU mostly matches except for the dGov_HIO_c vtable being the incorrect size
* Once that's fixed, inline the dGov_HIO_c / dDlst_Gameover_CAPTURE_c dtors.
*/
#include "d/d_gameover.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "d/d_com_inf_game.h"
#include "d/d_meter2_info.h"
#include "d/d_meter_HIO.h"
#include "dol2asm.h"
#include "d/d_msg_scrn_light.h"
#include "m_Do/m_Do_Reset.h"
#include "m_Do/m_Do_graphic.h"
#include "JSystem/JUtility/JUTTexture.h"
@@ -24,7 +19,7 @@
class dGov_HIO_c : public mDoHIO_entry_c {
public:
/* 8019AFE0 */ dGov_HIO_c();
/* 8019C06C */ virtual ~dGov_HIO_c(); // supposed to be inlined
/* 8019C06C */ virtual ~dGov_HIO_c() {}
/* 0x04 */ u8 unk_0x4;
/* 0x08 */ f32 mScale;
@@ -34,139 +29,8 @@ public:
/* 0x18 */ GXColor mWhite;
}; // Size: 0x1C
struct dMsgScrnLight_c {
/* 80245934 */ dMsgScrnLight_c(u8, u8);
/* 80245F90 */ void draw(f32*, f32, f32, f32, f32, f32, f32, JUtility::TColor,
JUtility::TColor);
/* 0x00 */ u8 field_0x0[0x24];
};
//
// Forward References:
//
extern "C" void draw__24dDlst_Gameover_CAPTURE_cFv();
extern "C" void __ct__10dGov_HIO_cFv();
extern "C" void _create__11dGameover_cFv();
extern "C" void _execute__11dGameover_cFv();
extern "C" void playerAnmWait_init__11dGameover_cFv();
extern "C" void playerAnmWait_proc__11dGameover_cFv();
extern "C" void dispFadeOut_init__11dGameover_cFv();
extern "C" void dispFadeOut_proc__11dGameover_cFv();
extern "C" void dispWait_init__11dGameover_cFv();
extern "C" void dispWait_proc__11dGameover_cFv();
extern "C" void demoFadeIn_init__11dGameover_cFv();
extern "C" void demoFadeIn_proc__11dGameover_cFv();
extern "C" void demoFadeOut_init__11dGameover_cFv();
extern "C" void demoFadeOut_proc__11dGameover_cFv();
extern "C" void saveOpen_init__11dGameover_cFv();
extern "C" void saveOpen_proc__11dGameover_cFv();
extern "C" void saveMove_init__11dGameover_cFv();
extern "C" void saveMove_proc__11dGameover_cFv();
extern "C" void saveClose_init__11dGameover_cFv();
extern "C" void saveClose_proc__11dGameover_cFv();
extern "C" void deleteWait_init__11dGameover_cFv();
extern "C" void deleteWait_proc__11dGameover_cFv();
extern "C" void _draw__11dGameover_cFv();
extern "C" void _delete__11dGameover_cFv();
extern "C" void __ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive();
extern "C" void __dt__24dDlst_GameOverScrnDraw_cFv();
extern "C" void setBackAlpha__24dDlst_GameOverScrnDraw_cFf();
extern "C" void draw__24dDlst_GameOverScrnDraw_cFv();
extern "C" static void dGameover_Draw__FP11dGameover_c();
extern "C" static void dGameover_Execute__FP11dGameover_c();
extern "C" static bool dGameover_IsDelete__FP11dGameover_c();
extern "C" static void dGameover_Delete__FP11dGameover_c();
extern "C" static void dGameover_Create__FP9msg_class();
extern "C" void d_GameOver_Create__FUc();
extern "C" void d_GameOver_Delete__FRUi();
extern "C" void __dt__10dGov_HIO_cFv();
extern "C" void __sinit_d_gameover_cpp();
extern "C" void __dt__24dDlst_Gameover_CAPTURE_cFv();
extern "C" void __dt__12dMenu_save_cFv();
extern "C" extern char const* const d_d_gameover__stringBase0;
//
// External References:
//
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void mDoExt_getSubFont__Fv();
extern "C" void fopMsgM_SearchByID__FUi();
extern "C" void fopMsgM_Delete__FPv();
extern "C" void fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_setHeapLockFlag__FUc();
extern "C" void dComIfGp_offHeapLockFlag__Fi();
extern "C" void setItem__17dSv_player_item_cFiUc();
extern "C" void getItem__17dSv_player_item_cCFib();
extern "C" void isFirstBit__21dSv_player_get_item_cCFUc();
extern "C" void offEventBit__11dSv_event_cFUs();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void getResInfo__14dRes_control_cFPCcP11dRes_info_ci();
extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
extern "C" void __ct__12dMenu_save_cFv();
extern "C" void _create__12dMenu_save_cFv();
extern "C" void _open__12dMenu_save_cFv();
extern "C" void _delete__12dMenu_save_cFv();
extern "C" void _move__12dMenu_save_cFv();
extern "C" void _draw2__12dMenu_save_cFv();
extern "C" void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c();
extern "C" void resetMiniGameItem__13dMeter2Info_cFb();
extern "C" void __ct__15dMsgScrnLight_cFUcUc();
extern "C" void draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor();
extern "C" void dPaneClass_showNullPane__FP9J2DScreen();
extern "C" void freeAll__7JKRHeapFv();
extern "C" void getTotalFreeSize__7JKRHeapFv();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void __ct__9J2DScreenFv();
extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive();
extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
extern "C" void func_802FC800();
extern "C" void setString__10J2DTextBoxFPCce();
extern "C" void __register_global_object();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_24();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_24();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__14mDoHIO_entry_c[3];
extern "C" extern void* __vt__16dDlst_MenuSave_c[4];
extern "C" extern void* __vt__23dDlst_MenuSaveExplain_c[4 + 18 /* padding */];
extern "C" u8 mFadeColor__13mDoGph_gInf_c[4];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" u8 mZbufferTex__13mDoGph_gInf_c[4];
extern "C" f32 mFadeRate__13mDoGph_gInf_c;
extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" u8 sManager__10JFWDisplay[4];
//
// Declarations:
//
/* ############################################################################################## */
/* 80453B80-80453B84 002180 0004+00 3/3 0/0 0/0 .sdata2 @3868 */
SECTION_SDATA2 static u8 lit_3868[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 80453B84-80453B88 002184 0004+00 6/6 0/0 0/0 .sdata2 @3869 */
SECTION_SDATA2 static f32 lit_3869 = 1.0f;
/* 80453B88-80453B8C 002188 0004+00 1/1 0/0 0/0 .sdata2 @3870 */
SECTION_SDATA2 static f32 lit_3870 = 10.0f;
/* 8042CA2C-8042CA48 05974C 001C+00 2/2 0/0 0/0 .bss l_HIO */
static dGov_HIO_c l_HIO;
/* 8019ACF8-8019AFE0 195638 02E8+00 1/0 0/0 0/0 .text draw__24dDlst_Gameover_CAPTURE_cFv
*/
@@ -227,264 +91,31 @@ void dDlst_Gameover_CAPTURE_c::draw() {
GXEnd();
}
/* ############################################################################################## */
/* 803BBB50-803BBB5C 018C70 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 803BBB5C-803BBB68 -00001 000C+00 0/1 0/0 0/0 .data @3883 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3883[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)playerAnmWait_init__11dGameover_cFv,
};
#pragma pop
/* 803BBB68-803BBB74 -00001 000C+00 0/1 0/0 0/0 .data @3884 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3884[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)dispFadeOut_init__11dGameover_cFv,
};
#pragma pop
/* 803BBB74-803BBB80 -00001 000C+00 0/1 0/0 0/0 .data @3885 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3885[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)dispWait_init__11dGameover_cFv,
};
#pragma pop
/* 803BBB80-803BBB8C -00001 000C+00 0/1 0/0 0/0 .data @3886 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3886[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)demoFadeIn_init__11dGameover_cFv,
};
#pragma pop
/* 803BBB8C-803BBB98 -00001 000C+00 0/1 0/0 0/0 .data @3887 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3887[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)demoFadeOut_init__11dGameover_cFv,
};
#pragma pop
/* 803BBB98-803BBBA4 -00001 000C+00 0/1 0/0 0/0 .data @3888 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3888[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)saveOpen_init__11dGameover_cFv,
};
#pragma pop
/* 803BBBA4-803BBBB0 -00001 000C+00 0/1 0/0 0/0 .data @3889 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3889[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)saveMove_init__11dGameover_cFv,
};
#pragma pop
/* 803BBBB0-803BBBBC -00001 000C+00 0/1 0/0 0/0 .data @3890 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3890[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)saveClose_init__11dGameover_cFv,
};
#pragma pop
/* 803BBBBC-803BBBC8 -00001 000C+00 0/1 0/0 0/0 .data @3891 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3891[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)deleteWait_init__11dGameover_cFv,
};
#pragma pop
/* 803BBBC8-803BBC34 018CE8 006C+00 2/3 0/0 0/0 .data init_process */
typedef void (dGameover_c::*initFunc)();
SECTION_DATA initFunc init_process[] = {
initFunc init_process[] = {
&dGameover_c::playerAnmWait_init, &dGameover_c::dispFadeOut_init, &dGameover_c::dispWait_init,
&dGameover_c::demoFadeIn_init, &dGameover_c::demoFadeOut_init, &dGameover_c::saveOpen_init,
&dGameover_c::saveMove_init, &dGameover_c::saveClose_init, &dGameover_c::deleteWait_init,
};
/* 803BBC34-803BBC40 -00001 000C+00 0/1 0/0 0/0 .data @3892 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3892[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)playerAnmWait_proc__11dGameover_cFv,
};
#pragma pop
/* 803BBC40-803BBC4C -00001 000C+00 0/1 0/0 0/0 .data @3893 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3893[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)dispFadeOut_proc__11dGameover_cFv,
};
#pragma pop
/* 803BBC4C-803BBC58 -00001 000C+00 0/1 0/0 0/0 .data @3894 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3894[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)dispWait_proc__11dGameover_cFv,
};
#pragma pop
/* 803BBC58-803BBC64 -00001 000C+00 0/1 0/0 0/0 .data @3895 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3895[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)demoFadeIn_proc__11dGameover_cFv,
};
#pragma pop
/* 803BBC64-803BBC70 -00001 000C+00 0/1 0/0 0/0 .data @3896 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3896[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)demoFadeOut_proc__11dGameover_cFv,
};
#pragma pop
/* 803BBC70-803BBC7C -00001 000C+00 0/1 0/0 0/0 .data @3897 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3897[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)saveOpen_proc__11dGameover_cFv,
};
#pragma pop
/* 803BBC7C-803BBC88 -00001 000C+00 0/1 0/0 0/0 .data @3898 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3898[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)saveMove_proc__11dGameover_cFv,
};
#pragma pop
/* 803BBC88-803BBC94 -00001 000C+00 0/1 0/0 0/0 .data @3899 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3899[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)saveClose_proc__11dGameover_cFv,
};
#pragma pop
/* 803BBC94-803BBCA0 -00001 000C+00 0/1 0/0 0/0 .data @3900 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3900[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)deleteWait_proc__11dGameover_cFv,
};
#pragma pop
/* 803BBCA0-803BBD0C 018DC0 006C+00 1/2 0/0 0/0 .data move_process */
typedef void (dGameover_c::*moveFunc)();
SECTION_DATA moveFunc move_process[] = {
moveFunc move_process[] = {
&dGameover_c::playerAnmWait_proc, &dGameover_c::dispFadeOut_proc, &dGameover_c::dispWait_proc,
&dGameover_c::demoFadeIn_proc, &dGameover_c::demoFadeOut_proc, &dGameover_c::saveOpen_proc,
&dGameover_c::saveMove_proc, &dGameover_c::saveClose_proc, &dGameover_c::deleteWait_proc,
};
/* 803BBD0C-803BBD2C 018E2C 0020+00 1/1 0/0 0/0 .data offset$4331 */
SECTION_DATA static f32 offset[8] = {
-138.0f, -96.0f, -56.0f, -18.0f, 42.0f, 75.0f, 110.0f, 143.0f,
};
/* 803BBD2C-803BBD40 -00001 0014+00 1/0 0/0 0/0 .data l_dGameover_Method */
SECTION_DATA static void* l_dGameover_Method[5] = {
(void*)dGameover_Create__FP9msg_class, (void*)dGameover_Delete__FP11dGameover_c,
(void*)dGameover_Execute__FP11dGameover_c, (void*)dGameover_IsDelete__FP11dGameover_c,
(void*)dGameover_Draw__FP11dGameover_c,
};
/* 803BBD40-803BBD68 -00001 0028+00 0/0 0/0 1/0 .data g_profile_GAMEOVER */
SECTION_DATA extern void* g_profile_GAMEOVER[10] = {
(void*)0xFFFFFFFD, (void*)0x000CFFFD,
(void*)0x03170000, (void*)&g_fpcLf_Method,
(void*)0x0000011C, (void*)NULL,
(void*)NULL, (void*)&g_fopMsg_Method,
(void*)0x03030000, (void*)&l_dGameover_Method,
};
/* 803BBD68-803BBD78 018E88 0010+00 2/2 0/0 0/0 .data __vt__24dDlst_GameOverScrnDraw_c */
SECTION_DATA extern void* __vt__24dDlst_GameOverScrnDraw_c[4] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__24dDlst_GameOverScrnDraw_cFv,
(void*)__dt__24dDlst_GameOverScrnDraw_cFv,
};
/* 803BBD78-803BBD90 018E98 000C+0C 1/1 1/1 0/0 .data __vt__12dMenu_save_c */
SECTION_DATA extern void* __vt__12dMenu_save_c[3 + 3 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dMenu_save_cFv,
/* padding */
NULL,
NULL,
NULL,
};
/* 803BBD90-803BBDA8 018EB0 000C+0C 2/2 0/0 0/0 .data __vt__10dGov_HIO_c */
SECTION_DATA extern void* __vt__10dGov_HIO_c[3 + 3 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10dGov_HIO_cFv,
/* padding */
NULL,
NULL,
NULL,
};
/* 8019AFE0-8019B044 195920 0064+00 1/1 0/0 0/0 .text __ct__10dGov_HIO_cFv */
dGov_HIO_c::dGov_HIO_c() {
mScale = 2.7f;
mAlpha = lit_3869;
mAlpha = 1.0f;
mAnimSpeed = 0.2f;
mBlack.r = 0;
@@ -498,22 +129,6 @@ dGov_HIO_c::dGov_HIO_c() {
mWhite.a = 255;
}
/* ############################################################################################## */
/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394C28 = "Gover";
SECTION_DEAD static char const* const stringBase_80394C2E = "D_MN10A";
#pragma pop
/* 803BBDA8-803BBDB8 018EC8 0010+00 2/2 0/0 0/0 .data __vt__24dDlst_Gameover_CAPTURE_c */
SECTION_DATA extern void* __vt__24dDlst_Gameover_CAPTURE_c[4] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__24dDlst_Gameover_CAPTURE_cFv,
(void*)__dt__24dDlst_Gameover_CAPTURE_cFv,
};
/* 8019B044-8019B2F4 195984 02B0+00 1/1 0/0 0/0 .text _create__11dGameover_cFv */
int dGameover_c::_create() {
int phase = dComIfG_resLoad(&mPhase, "Gover");
@@ -654,7 +269,7 @@ void dGameover_c::demoFadeIn_init() {
/* 8019B484-8019B4D8 195DC4 0054+00 1/0 0/0 0/0 .text demoFadeIn_proc__11dGameover_cFv */
void dGameover_c::demoFadeIn_proc() {
mTimer++;
dgo_screen_c->setBackAlpha(lit_3869);
dgo_screen_c->setBackAlpha(1.0f);
if (mTimer >= 30) {
mProc = PROC_SAVE_OPEN;
@@ -785,22 +400,6 @@ int dGameover_c::_delete() {
return 1;
}
/* ############################################################################################## */
/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394C36 = "zelda_game_over.blo";
SECTION_DEAD static char const* const stringBase_80394C4A = "tt_block8x8.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394C5A = "\0\0\0\0\0";
#pragma pop
/* 80453BA0-80453BA4 0021A0 0004+00 1/1 0/0 0/0 .sdata2 @4290 */
SECTION_SDATA2 static f32 lit_4290 = 486.0f;
/* 80453BA4-80453BA8 0021A4 0004+00 1/1 0/0 0/0 .sdata2 @4291 */
SECTION_SDATA2 static f32 lit_4291 = 660.0f;
/* 8019B940-8019BBFC 196280 02BC+00 1/1 0/0 0/0 .text
* __ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive */
dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) {
@@ -856,31 +455,6 @@ void dDlst_GameOverScrnDraw_c::setBackAlpha(f32 i_alpha) {
mpBackImg->setAlpha(i_alpha * 255.0f);
}
/* 80453BAC-80453BB0 0021AC 0004+00 1/1 0/0 0/0 .sdata2 @4374 */
SECTION_SDATA2 static f32 lit_4374 = 608.0f;
/* 80453BB0-80453BB4 0021B0 0004+00 1/1 0/0 0/0 .sdata2 @4375 */
SECTION_SDATA2 static f32 lit_4375 = 448.0f;
/* 80453BB4-80453BB8 0021B4 0004+00 1/1 0/0 0/0 .sdata2 @4376 */
SECTION_SDATA2 static f32 lit_4376 = 304.0f;
/* 80453BB8-80453BC0 0021B8 0004+04 1/1 0/0 0/0 .sdata2 @4377 */
SECTION_SDATA2 static f32 lit_4377[1 + 1 /* padding */] = {
224.0f,
/* padding */
0.0f,
};
/* 8019BCF4-8019BF3C 196634 0248+00 1/0 0/0 0/0 .text draw__24dDlst_GameOverScrnDraw_cFv
*/
/* ############################################################################################## */
/* 8042CA20-8042CA2C 059740 000C+00 1/1 0/0 0/0 .bss @3882 */
// static u8 lit_3882[12];
/* 8042CA2C-8042CA48 05974C 001C+00 2/2 0/0 0/0 .bss l_HIO */
static dGov_HIO_c l_HIO;
void dDlst_GameOverScrnDraw_c::draw() {
J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
graf_ctx->setup2D();
@@ -913,6 +487,8 @@ void dDlst_GameOverScrnDraw_c::draw() {
mpBackImg->draw(0.0f, 0.0f, 608.0f, 448.0f, false, false, false);
static f32 offset[8] = {-138.0f, -96.0f, -56.0f, -18.0f, 42.0f, 75.0f, 110.0f, 143.0f};
for (int i = 0; i < 8; i++) {
mpLight->draw(&field_0x10, offset[i] + 304.0f, 224.0f, l_HIO.mScale, l_HIO.mScale,
l_HIO.mAlpha, l_HIO.mAnimSpeed, img_black, img_white);
@@ -969,31 +545,20 @@ bool d_GameOver_Delete(fpc_ProcID& i_id) {
return false;
}
/* 8019C06C-8019C0C8 1969AC 005C+00 2/1 0/0 0/0 .text __dt__10dGov_HIO_cFv */
// dGov_HIO_c::~dGov_HIO_c() {
extern "C" void __dt__10dGov_HIO_cFv() {
// NONMATCHING
}
/* 803BBD2C-803BBD40 -00001 0014+00 1/0 0/0 0/0 .data l_dGameover_Method */
static void* l_dGameover_Method[5] = {
(void*)dGameover_Create,
(void*)dGameover_Delete,
(void*)dGameover_Execute,
(void*)dGameover_IsDelete,
(void*)dGameover_Draw,
};
/* 8019C0C8-8019C2CC 196A08 0204+00 0/0 1/0 0/0 .text __sinit_d_gameover_cpp */
void __sinit_d_gameover_cpp(){// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x8019C0C8, __sinit_d_gameover_cpp);
#pragma pop
/* 8019C2CC-8019C314 196C0C 0048+00 1/0 0/0 0/0 .text __dt__24dDlst_Gameover_CAPTURE_cFv
*/
dDlst_Gameover_CAPTURE_c::~dDlst_Gameover_CAPTURE_c() {
// NONMATCHING
}
/* 8019C314-8019C388 196C54 0074+00 1/0 0/0 0/0 .text __dt__12dMenu_save_cFv */
// dMenu_save_c::~dMenu_save_c() {
extern "C" void __dt__12dMenu_save_cFv() {
// NONMATCHING
}
/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 803BBD40-803BBD68 -00001 0028+00 0/0 0/0 1/0 .data g_profile_GAMEOVER */
extern void* g_profile_GAMEOVER[10] = {
(void*)0xFFFFFFFD, (void*)0x000CFFFD,
(void*)0x03170000, (void*)&g_fpcLf_Method,
(void*)0x0000011C, (void*)NULL,
(void*)NULL, (void*)&g_fopMsg_Method,
(void*)0x03030000, (void*)&l_dGameover_Method,
};
src/d/d_map_path_dmap.cpp
+32 -60
View File
@@ -399,7 +399,6 @@ bool dMpath_c::isExistMapPathData() {
return data_80450E88;
}
/* ############################################################################################## */
/* 80450630-80450634 0000B0 0004+00 0/0 1/1 2/2 .sdata mNextRoomNo__10dMapInfo_c */
int dMapInfo_c::mNextRoomNo = -1;
@@ -407,7 +406,7 @@ int dMapInfo_c::mNextRoomNo = -1;
s8 dMpath_c::mBottomFloorNo = 127;
/* 80450635 0001+00 data_80450635 None */
s8 dMpath_c::mTopFloorNo = 128;
s8 dMpath_c::mTopFloorNo = -128;
/* 8003F760-8003F7E8 03A0A0 0088+00 0/0 1/1 0/0 .text getTopBottomFloorNo__8dMpath_cFPScPSc */
int dMpath_c::getTopBottomFloorNo(s8* i_topFloorNo, s8* i_bottomFloorNo) {
@@ -662,13 +661,10 @@ void renderingDAmap_c::draw() {
mIsDraw = true;
}
/* ############################################################################################## */
/* 80451E48-80451E4C 000448 0004+00 1/1 0/0 0/0 .sdata2 l_mapBaseColor$4239 */
static const GXColor l_mapBaseColor = {4, 0, 0, 0};
/* 8003FE4C-8003FE54 03A78C 0008+00 3/0 3/0 0/0 .text getBackColor__16renderingDAmap_cCFv
*/
const GXColor* renderingDAmap_c::getBackColor() const {
static const GXColor l_mapBaseColor = {4, 0, 0, 0};
return &l_mapBaseColor;
}
@@ -899,7 +895,6 @@ void renderingPlusDoor_c::drawDoor2() {
drawDoorCommon(door_info->mDrTgData, door_info->mNum, false);
}
/* ############################################################################################## */
/* 80451E58-80451E5C 000458 0004+00 1/1 0/0 0/0 .sdata2 l_doorWhite */
static const GXColor l_doorWhite = {100, 0, 0, 0};
@@ -912,15 +907,11 @@ static const GXColor l_doorWhite2 = {100, 0, 0, 0};
/* 80451E64-80451E68 000464 0004+00 1/1 0/0 0/0 .sdata2 l_doorWhiteNoStay2 */
static const GXColor l_doorWhiteNoStay2 = {108, 0, 0, 0};
/* 80451E68-80451E70 000468 0008+00 1/1 0/0 0/0 .sdata2 l_tex0$4406 */
static const u8 l_tex0[8] = {
0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01,
};
/* 800405FC-80040710 03AF3C 0114+00 2/2 0/0 0/0 .text
* drawDoorCommon__19renderingPlusDoor_cFPC21stage_tgsc_data_classib */
void renderingPlusDoor_c::drawDoorCommon(stage_tgsc_data_class const* i_doorData, int i_dataNum,
bool param_2) {
static const u8 l_tex0[8] = {0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01};
int prm0;
int prm1;
@@ -1091,31 +1082,24 @@ static const GXColor l_npcYkwStartColor = {140, 0, 0, 0};
/* 80451E98-80451E9C 000498 0004+00 1/0 0/0 0/0 .sdata2 l_tksStartColor */
static const GXColor l_tksStartColor = {164, 0, 0, 0};
/* 80451E9C-80451EA4 00049C 0008+00 1/1 0/0 0/0 .sdata2 l_iconTex0$4523 */
static const u8 l_iconTex0_4523[8] = {
0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
};
/* 80451EA4-80451EA8 0004A4 0004+00 1/1 0/0 0/0 .sdata2 tboxNotStayColor$4542 */
static const GXColor tboxNotStayColor_4542 = {128, 0, 0, 0};
struct treasureDispData {
/* 0x0 */ u8 field_0x0;
/* 0x4 */ int field_0x4;
/* 0x8 */ const GXColor* field_0x8;
};
/* 80379C88-80379CB8 -00001 0030+00 1/1 0/0 0/0 .rodata l_treasureDispList$4524 */
static const treasureDispData l_treasureDispList_4524[4] = {
{1, 2, &l_entranceStartColor},
{8, 5, &l_entranceLv8StartColor},
{0, 1, &l_treasureStartColor},
{5, 3, &l_destinationStartColor},
};
/* 80040B00-80040E84 03B440 0384+00 1/1 0/0 0/0 .text
* drawTreasure__28renderingPlusDoorAndCursor_cFv */
void renderingPlusDoorAndCursor_c::drawTreasure() {
static const u8 l_iconTex0[8] = {0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00};
static const GXColor tboxNotStayColor = {128, 0, 0, 0};
static const treasureDispData l_treasureDispList[4] = {
{1, 2, &l_entranceStartColor},
{8, 5, &l_entranceLv8StartColor},
{0, 1, &l_treasureStartColor},
{5, 3, &l_destinationStartColor},
};
bool rend_all_room = isRendAllRoom();
GXClearVtxDesc();
@@ -1123,13 +1107,13 @@ void renderingPlusDoorAndCursor_c::drawTreasure() {
GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0);
GXSetArray(GX_VA_TEX0, (void*)l_iconTex0_4523, 2);
GXSetArray(GX_VA_TEX0, (void*)l_iconTex0, 2);
setTevSettingIntensityTextureToCI();
for (int i = 0; i < 4; i++) {
dTres_c::typeGroupData_c* typeGroupData_p;
u8 tmp = l_treasureDispList_4524[i].field_0x0;
u8 tmp = l_treasureDispList[i].field_0x0;
typeGroupData_p = getFirstData(tmp);
int group_num = getIconGroupNumber(tmp);
@@ -1138,10 +1122,10 @@ void renderingPlusDoorAndCursor_c::drawTreasure() {
GXInvalidateTexAll();
GXTexObj* texObj_p =
dMpath_n::m_texObjAgg.getTexObjPointer(l_treasureDispList_4524[i].field_0x4);
dMpath_n::m_texObjAgg.getTexObjPointer(l_treasureDispList[i].field_0x4);
GXLoadTexObj(texObj_p, GX_TEXMAP0);
GXColor sp18;
const GXColor* temp_r3_2 = l_treasureDispList_4524[i].field_0x8;
const GXColor* temp_r3_2 = l_treasureDispList[i].field_0x8;
sp18.r = temp_r3_2->r;
sp18.g = temp_r3_2->g;
sp18.b = temp_r3_2->b;
@@ -1157,7 +1141,7 @@ void renderingPlusDoorAndCursor_c::drawTreasure() {
if (tmp == 0) {
if (mRoomNoSingle != typeGroupData_p->getRoomNo()) {
sp18 = tboxNotStayColor_4542;
sp18 = tboxNotStayColor;
} else {
sp18 = l_treasureStartColor;
}
@@ -1183,30 +1167,18 @@ void renderingPlusDoorAndCursor_c::drawTreasure() {
setTevSettingNonTextureDirectColor();
}
/* 80379CB8-80379D3C -00001 0084+00 1/1 0/0 0/0 .rodata l_treasureDispList$4606 */
static const treasureDispData l_treasureDispList_4606[11] = {
{16, 4, &l_tksStartColor}, {2, 4, &l_smallKeyStartColor}, {10, 4, &l_npc0StartColor},
{9, 4, &l_npc0StartColor}, {14, 4, &l_npcYkwStartColor}, {13, 4, &l_npcYkmStartColor},
{15, 4, &l_npc0StartColor}, {11, 4, &l_npc0StartColor}, {12, 4, &l_npc0StartColor},
{4, 4, &l_smallKeyStartColor}, {3, 4, &l_bossStartColor},
};
/* 80451EAC-80451EB4 0004AC 0008+00 1/1 0/0 0/0 .sdata2 l_iconTex0$4605 */
static const u8 l_iconTex0_4605[8] = {
0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
};
/* 80451EB4-80451EB8 0004B4 0004+00 1/1 0/0 0/0 .sdata2 tboxNotStayColor$4624 */
static const GXColor tboxNotStayColor_4624 = {
0x80,
0x00,
0x00,
0x00,
};
/* 80040E84-80041208 03B7C4 0384+00 1/1 0/0 0/0 .text
* drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv */
void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() {
static const treasureDispData l_treasureDispList[11] = {
{16, 4, &l_tksStartColor}, {2, 4, &l_smallKeyStartColor}, {10, 4, &l_npc0StartColor},
{9, 4, &l_npc0StartColor}, {14, 4, &l_npcYkwStartColor}, {13, 4, &l_npcYkmStartColor},
{15, 4, &l_npc0StartColor}, {11, 4, &l_npc0StartColor}, {12, 4, &l_npc0StartColor},
{4, 4, &l_smallKeyStartColor}, {3, 4, &l_bossStartColor},
};
static const u8 l_iconTex0[8] = {0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00};
static const GXColor tboxNotStayColor = {0x80, 0x00, 0x00, 0x00};
bool rend_all_room = isRendAllRoom();
GXClearVtxDesc();
@@ -1214,13 +1186,13 @@ void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() {
GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0);
GXSetArray(GX_VA_TEX0, (void*)l_iconTex0_4605, 2);
GXSetArray(GX_VA_TEX0, (void*)l_iconTex0, 2);
setTevSettingIntensityTextureToCI();
for (int i = 0; i < 11; i++) {
dTres_c::typeGroupData_c* typeGroupData_p;
u8 tmp = l_treasureDispList_4606[i].field_0x0;
u8 tmp = l_treasureDispList[i].field_0x0;
typeGroupData_p = getFirstData(tmp);
int group_num = getIconGroupNumber(tmp);
@@ -1229,10 +1201,10 @@ void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() {
GXInvalidateTexAll();
GXTexObj* texObj_p =
dMpath_n::m_texObjAgg.getTexObjPointer(l_treasureDispList_4606[i].field_0x4);
dMpath_n::m_texObjAgg.getTexObjPointer(l_treasureDispList[i].field_0x4);
GXLoadTexObj(texObj_p, GX_TEXMAP0);
GXColor sp18;
const GXColor* temp_r3_2 = l_treasureDispList_4606[i].field_0x8;
const GXColor* temp_r3_2 = l_treasureDispList[i].field_0x8;
sp18.r = temp_r3_2->r;
sp18.g = temp_r3_2->g;
sp18.b = temp_r3_2->b;
@@ -1248,7 +1220,7 @@ void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() {
if (tmp == 0) {
if (mRoomNoSingle != typeGroupData_p->getRoomNo()) {
sp18 = tboxNotStayColor_4624;
sp18 = tboxNotStayColor;
} else {
sp18 = l_treasureStartColor;
}
@@ -1335,4 +1307,4 @@ void renderingPlusDoorAndCursor_c::drawCursor(Vec const& param_0, s16 param_1, i
}
/* 8004145C-80041460 03BD9C 0004+00 2/0 0/0 0/0 .text beforeDrawPath__19renderingPlusDoor_cFv */
void renderingPlusDoor_c::beforeDrawPath() {}
void renderingPlusDoor_c::beforeDrawPath() {}

Some files were not shown because too many files have changed in this diff Show More