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

d_camera work (#2369)

Browse Source 
* bumpCheck matching

* checkGroundInfo matching

* chaseCamera matching

* lockonCamera attempted

* talktoCamera matching

* subjectCamera, magneCamera matching

* colosseumCamera close, plus various fixes

* towerCamera attempted

* hookshotCamera matching
This commit is contained in:
Caroline Madsen
2025-04-01 22:05:30 -04:00
committed by GitHub
parent 2976066aa6
commit 03fafe3e15
56 changed files with 5623 additions and 2230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/splits.txt
+3 -1
View File
@@ -582,7 +582,7 @@ d/d_attention.cpp:
.rodata start:0x8037A770 end:0x8037A780
.data start:0x803A9BF8 end:0x803A9C70
.bss start:0x80424B00 end:0x80424B20
.sdata start:0x80450660 end:0x80450690
.sdata start:0x80450660 end:0x80450680
.sbss start:0x80450F58 end:0x80450F60
.sdata2 start:0x80452628 end:0x804526B8
@@ -727,6 +727,7 @@ d/d_tresure.cpp:
.text start:0x8009BBD8 end:0x8009C4FC
.rodata start:0x8037B0D8 end:0x8037B100
.bss start:0x80425438 end:0x80425508
.sdata start:0x80450680 end:0x80450688
.sbss start:0x80450F98 end:0x80450FA0
.sdata2 start:0x80452BE8 end:0x80452C10
@@ -745,6 +746,7 @@ d/d_eye_hl.cpp:
d/d_error_msg.cpp:
.text start:0x8009CB88 end:0x8009D87C
.rodata start:0x8037B140 end:0x8038D658
.sdata start:0x80450688 end:0x80450690
.sbss start:0x80450FB0 end:0x80450FB8
.sdata2 start:0x80452C18 end:0x80452C50
.sbss2 start:0x80456B78 end:0x80456B80
config/GZ2E01/symbols.txt
+5 -4
View File
@@ -21385,9 +21385,8 @@ chk_type_tbl__12dAttention_c = .sdata:0x80450668; // type:object size:0x4 scope:
chk_type_num__12dAttention_c = .sdata:0x8045066C; // type:object size:0x4 scope:global align:4 data:4byte
attn_opt_hold = .sdata:0x80450670; // type:object size:0x1 scope:local align:1 data:byte
ang_table$4418 = .sdata:0x80450674; // type:object size:0x6 scope:local align:4
pad_8045067A = .sdata:0x8045067C; // type:object size:0x4 scope:local align:4
data_80450680 = .sdata:0x80450680; // type:object size:0x8 scope:global align:4 data:byte
data_80450688 = .sdata:0x80450688; // type:object size:0x8 scope:global align:4 data:byte
data_80450680 = .sdata:0x80450680; // type:object size:0x1 scope:global align:4 data:byte
data_80450688 = .sdata:0x80450688; // type:object size:0x1 scope:global align:4 data:byte
l_autoUpHeight = .sdata:0x80450690; // type:object size:0x4 scope:global align:4 data:float
l_autoDownHeight = .sdata:0x80450694; // type:object size:0x4 scope:global align:4 data:float
l_ladderAnmBaseTransY = .sdata:0x80450698; // type:object size:0x4 scope:global align:4 data:float
@@ -21903,7 +21902,9 @@ mTypeGroupData__7dTres_c = .sbss:0x80450F98; // type:object size:0x4 scope:globa
mNum__7dTres_c = .sbss:0x80450F9C; // type:object size:0x2 scope:global align:2 data:2byte
m_myObj__10dMdl_mng_c = .sbss:0x80450FA0; // type:object size:0x4 scope:global align:4 data:4byte
m_obj__12dEyeHL_mng_c = .sbss:0x80450FA8; // type:object size:0x4 scope:global align:4 data:4byte
struct_80450FB0 = .sbss:0x80450FB0; // type:object size:0x8 scope:global align:8 data:byte
struct_80450FB0 = .sbss:0x80450FB0; // type:object size:0x1 scope:global align:8 data:byte
lbl_80450FB1 = .sbss:0x80450FB1; // type:object size:0x1 data:byte
lbl_80450FB2 = .sbss:0x80450FB2; // type:object size:0x1 data:byte
struct_80450FB8 = .sbss:0x80450FB8; // type:object size:0x4 scope:global align:4 data:byte
struct_80450FBC = .sbss:0x80450FBC; // type:object size:0x4 scope:global align:4 data:byte
it$36766 = .sbss:0x80450FC0; // type:object size:0x4 scope:local align:4 data:4byte
configure.py
+15 -15
View File
@@ -503,7 +503,7 @@ config.libs = [
Object(MatchingFor("GZ2E01"), "d/d_save.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_save_init.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_jnt_col.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "d/d_a_obj.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_a_obj.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_a_itembase_static.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_a_item_static.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_a_shop_item_static.cpp"),
@@ -512,7 +512,7 @@ config.libs = [
Object(MatchingFor("GZ2E01"), "d/d_door_param2.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "d/d_resorce.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_map_path.cpp"),
Object(NonMatching, "d/d_map_path_fmap.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_map_path_fmap.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "d/d_map_path_dmap.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_event.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_event_data.cpp"),
@@ -530,7 +530,7 @@ config.libs = [
Object(NonMatching, "d/d_kankyo_rain.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_vibration.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_vib_pattern.cpp"),
Object(NonMatching, "d/d_attention.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_attention.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(MatchingFor("GZ2E01"), "d/d_bg_pc.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_att_dist.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_bg_plc.cpp"),
@@ -554,7 +554,7 @@ config.libs = [
Object(MatchingFor("GZ2E01"), "d/d_cc_mass_s.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "d/d_cc_s.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_cc_uty.cpp"),
Object(NonMatching, "d/d_cam_param.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(Equivalent, "d/d_cam_param.cpp", extra_cflags=['-pragma "nosyminline on"']), # weak func order
Object(NonMatching, "d/d_ev_camera.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_spline_path.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_item_data.cpp"),
@@ -562,7 +562,7 @@ config.libs = [
Object(MatchingFor("GZ2E01"), "d/d_tresure.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_model.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_eye_hl.cpp"),
Object(NonMatching, "d/d_error_msg.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_error_msg.cpp"),
Object(NonMatching, "d/d_debug_viewer.cpp"),
Object(NonMatching, "d/actor/d_a_alink.cpp"),
Object(MatchingFor("GZ2E01"), "d/actor/d_a_itembase.cpp"),
@@ -580,7 +580,7 @@ config.libs = [
Object(NonMatching, "d/d_file_sel_warning.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_file_sel_info.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_bright_check.cpp"),
Object(NonMatching, "d/d_scope.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(Equivalent, "d/d_scope.cpp", extra_cflags=['-pragma "nosyminline on"']), # weak func order
Object(MatchingFor("GZ2E01"), "d/d_select_cursor.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_select_icon.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_shop_camera.cpp"),
@@ -609,7 +609,7 @@ config.libs = [
Object(Equivalent, "d/d_menu_save.cpp"), # missing 0x30 bytes of padding between vtables, likely some abstract base class vtable that gets stripped out
Object(MatchingFor("GZ2E01"), "d/d_menu_skill.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_menu_window_HIO.cpp"),
Object(NonMatching, "d/d_menu_window.cpp"),
Object(Equivalent, "d/d_menu_window.cpp"), # weak func order
Object(MatchingFor("GZ2E01"), "d/d_meter_HIO.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_meter_button.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_meter_haihai.cpp"),
@@ -640,18 +640,18 @@ config.libs = [
Object(MatchingFor("GZ2E01"), "d/d_msg_string_base.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_msg_string.cpp"),
Object(NonMatching, "d/d_msg_flow.cpp"),
Object(NonMatching, "d/d_name.cpp"),
Object(Equivalent, "d/d_name.cpp"), # missing vtable padding
Object(NonMatching, "d/d_npc_lib.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_ovlp_fade.cpp"),
Object(NonMatching, "d/d_ovlp_fade2.cpp"),
Object(NonMatching, "d/d_ovlp_fade3.cpp"),
Object(Equivalent, "d/d_ovlp_fade2.cpp"), # weak func order
Object(MatchingFor("GZ2E01"), "d/d_ovlp_fade3.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_pane_class.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_pane_class_alpha.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_pane_class_ex.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(MatchingFor("GZ2E01"), "d/d_s_logo.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_s_menu.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_s_name.cpp"),
Object(NonMatching, "d/d_s_play.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_s_play.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_s_room.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_s_title.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_save_HIO.cpp"),
@@ -1512,10 +1512,10 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_econt"),
ActorRel(NonMatching, "d_a_fr"),
ActorRel(NonMatching, "d_a_grass"),
ActorRel(NonMatching, "d_a_kytag05"),
ActorRel(NonMatching, "d_a_kytag10"),
ActorRel(NonMatching, "d_a_kytag11"),
ActorRel(NonMatching, "d_a_kytag14"),
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag05"),
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag10"),
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag11"),
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag14"),
ActorRel(NonMatching, "d_a_mg_fish"),
ActorRel(NonMatching, "d_a_npc_besu"),
ActorRel(NonMatching, "d_a_npc_fairy_seirei"),
include/SSystem/SComponent/c_angle.h
+3
View File
@@ -42,6 +42,8 @@ public:
void operator*=(float);
bool operator<(const cSAngle& other) const { return mAngle < other.mAngle; }
bool operator>(const cSAngle& other) const { return mAngle > other.mAngle; }
bool operator<=(const cSAngle& other) const { return mAngle <= other.mAngle; }
bool operator>=(const cSAngle& other) const { return mAngle >= other.mAngle; }
operator s16(void) const { return mAngle; }
void operator=(const cSAngle& other) { mAngle = other.mAngle; }
static inline cSAngle getMaxNegative(void) { return cSAngle((s16)-0x8000); }
@@ -133,6 +135,7 @@ public:
void R(f32 i_radius) { mRadius = i_radius; }
void U(cSAngle const& i_azimuth) { mAzimuth = i_azimuth.Val(); }
void V(cSAngle const& i_inclination) { mInclination = i_inclination.Val(); }
cSGlobe(const cSGlobe&);
cSGlobe(float, short, short);
include/SSystem/SComponent/c_cc_d.h
+2 -4
View File
@@ -69,12 +69,10 @@ public:
/* 0x1C vtable */
struct Shape {
/* 80167BBC */ ~Shape();
/* 80167BBC */ ~Shape() {}
/* 0x00 */ int _0;
/* 0x04 */ f32 _4;
/* 0x08 */ f32 _8;
/* 0x0C */ f32 _C;
/* 0x04 */ cXyz _4;
/* 0x10 */ f32 _10;
/* 0x14 */ f32 _14;
};
include/d/actor/d_a_alink.h
+10 -2
View File
@@ -3088,7 +3088,7 @@ public:
virtual bool cancelWolfLock(fopAc_ac_c*);
virtual s32 getAtnActorID() const;
virtual s32 getItemID() const;
virtual s32 getGrabActorID() const;
virtual u32 getGrabActorID() const;
virtual BOOL exchangeGrabActor(fopAc_ac_c*);
virtual BOOL setForceGrab(fopAc_ac_c*, int, int);
virtual void setForcePutPos(cXyz const&);
@@ -3346,10 +3346,16 @@ public:
const daAlink_AnmData* getAnmData(daAlink_ANM anmID) const { return &m_anmDataTable[anmID]; }
const daAlink_FaceTexData* getFaceTexData(daAlink_FTANM i_anmID) const { return &m_faceTexDataTable[i_anmID]; }
s16 getCameraAngleX() const { return field_0x310a; }
s16 getCameraAngleY() const { return field_0x310c; }
cXyz* getSubjectEyePos() { return &field_0x3768; }
u32 checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
int getGrassHowlEventActor() const { return field_0x3198; }
MtxP getShieldMtx() const { return mShieldModel->getBaseTRMtx(); }
MtxP getMagneBootsMtx() { return mMagneBootMtx; }
MtxP getMagneBootsInvMtx() { return mMagneBootInvMtx; }
s16 getMagneBootsModelShapeAngle() const { return field_0x3118; }
bool checkFishingCastMode() const {
bool var_r5;
@@ -3439,6 +3445,7 @@ public:
bool checkSpinnerRideWait() const {
return mProcID == PROC_SPINNER_WAIT && mProcVar2.field_0x300c == 0;
}
bool checkRoofSwitchHang() const { return mProcID == PROC_ROOF_SWITCH_HANG; }
fopAc_ac_c* getCopyRodActor() { return mCopyRodAcKeep.getActor(); }
fopAc_ac_c* getHookshotRoofWaitActor() { return mCargoCarryAcKeep.getActor(); }
@@ -3507,10 +3514,11 @@ public:
const cXyz& getWindSpeed() const { return mWindSpeed; }
const cXyz& getHsChainTopPos() const { return mHookshotTopPos; }
const cXyz& getHsChainRootPos() const { return mHeldItemRootPos; }
const cXyz& getHsSubChainRootPos() const { return field_0x3810; }
const csXyz& getHsAngle() const { return field_0x316c; }
s16 getHookshotStopTime() const { return field_0x3026; }
bool getHookshotLeft() const { return field_0x3020 == 0; }
static int getBallModelIdx() { return 0x25; }
static int getBallBtkIdx() { return 0x49; }
include/d/actor/d_a_horse.h
+2 -1
View File
@@ -221,7 +221,8 @@ public:
/* 80844590 */ int draw();
/* 8084478C */ ~daHorse_c();
/* 80182D04 */ void getLashDashStart() const;
/* 80182D04 */ bool getLashDashStart() const { return checkResetStateFlg0(RFLG0_LASH_DASH_START); }
bool checkNoBombProc() const { return m_procID == PROC_WAIT_e || m_procID == PROC_MOVE_e; }
bool checkResetStateFlg0(daHorse_RFLG0 flag) const { return m_resetStateFlg0 & flag; }
include/d/actor/d_a_player.h
+4 -4
View File
@@ -694,12 +694,12 @@ public:
inline static BOOL checkSwordGet();
cXyz getHeadTopPos() const { return mHeadTopPos; }
BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; }
u32 checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
bool checkGoronSideMove() const { return mSpecialMode == 0x2B; }
cXyz* getRightFootPosP() { return &mRightFootPos; }
cXyz* getLeftFootPosP() { return &mLeftFootPos; }
BOOL checkCopyRodThrowAfter() const { return checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); }
BOOL checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); }
u32 checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); }
cXyz getRightHandPos() const { return mRightHandPos; }
const cXyz getLeftHandPos() const { return mLeftHandPos; }
const cXyz getItemPos() const { return mItemPos; }
@@ -765,7 +765,7 @@ public:
virtual bool cancelWolfLock(fopAc_ac_c*);
virtual s32 getAtnActorID() const { return -1; }
virtual s32 getItemID() const;
virtual s32 getGrabActorID() const { return -1; }
virtual u32 getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
virtual BOOL exchangeGrabActor(fopAc_ac_c*);
virtual BOOL setForceGrab(fopAc_ac_c*, int, int);
virtual void setForcePutPos(cXyz const&);
include/d/actor/d_a_tag_mwait.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
/* 80D5C01C */ ~daTagMwait_c();
/* 80D5C0A8 */ int execute();
bool checkEndMessage() {return fopAcM_isSwitch(this, mEnterSw); }
BOOL checkEndMessage() {return fopAcM_isSwitch(this, mEnterSw); }
/* 0x568 */ u8 mOnSw;
/* 0x569 */ u8 mEnterSw;
include/d/d_attention.h
+3 -3
View File
@@ -213,9 +213,9 @@ public:
/* 8007378C */ fopAc_ac_c* CheckObjectTarget(s32);
/* 800737E4 */ bool LockonTruth();
/* 80073838 */ int checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32);
/* 8016E424 */ void LockEdge();
/* 80182994 */ void GetCheckObjectCount();
/* 80182AD0 */ void keepLock(int);
/* 8016E424 */ bool LockEdge() { return chkFlag(8) || chkFlag(0x20); }
/* 80182994 */ int GetCheckObjectCount() { return mCheckObjectCount; }
/* 80182AD0 */ void keepLock(int timer) { mAttnBlockTimer = timer; }
/* 8014B010 */ static dist_entry& getDistTable(int i_no) { return dist_table[i_no]; }
fopAc_ac_c* getCatghTarget() { return mCatghTarget.getCatghTarget(); }
include/d/d_bg_s.h
+1
View File
@@ -110,6 +110,7 @@ public:
bool WaterChk(dBgS_SplGrpChk* chk) { return SplGrpChk(chk); }
u32 GetMtrlSndId(const cBgS_PolyInfo& param_0) { return dKy_pol_sound_get(&param_0); }
void DebugDrawPoly(dBgW_Base *param_1) {}
fopAc_ac_c* GetActorPointer(cBgS_PolyInfo const& param_0) { return cBgS::GetActorPointer(param_0); }
}; // Size: 0x1404
bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const&);
include/d/d_cam_param.h
+21 -5
View File
@@ -37,6 +37,12 @@ public:
f32 FwdWeightL(s32 param_0) { return mChkInfo[param_0].mWeightL; }
f32 FwdBackMargin() { return mFwdBackMargin; }
f32 FwdCushion() { return mFwdCushion; }
f32 GazeBackMargin() { return mGazeBackMargin; }
f32 WallCushion() { return mWallCushion; }
f32 WallBackCushion() { return mWallBackCushion; }
f32 CornerCushion() { return mCornerCushion; }
f32 CornerAngleMax() { return mCornerAngleMax; }
f32 FloorMargin() { return mFloorMargin; }
// name is a guess for now
struct ChkInfo {
@@ -79,14 +85,14 @@ public:
/* 80088620 */ int SearchStyle(u32);
/* 80182C60 */ void Arg2(s16 val) { mMapToolArg2 = val; }
/* 80182C3C */ int Arg2() { return mMapToolArg2; }
/* 80182C3C */ s16 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; }
/* 80182CB4 */ bool CheckFlag(u16 flag) { return (flag & mCurrentStyle->field_0x6) != 0; }
/* 80182CD0 */ f32 Val(s32 param_0, int param_1) {
return mCamStyleData[param_0].field_0x8[param_1];
}
@@ -104,7 +110,8 @@ public:
u32 Id(s32 i_style) { return mCamStyleData[i_style].field_0x0; }
int Algorythmn(s32 i_style) { return mCamStyleData[i_style].field_0x4; }
int Algorythmn() { return mCurrentStyle->field_0x4; }
bool Flag(s32 param_0, u16 param_1) { return mCamStyleData[param_0].field_0x6 & param_1; }
u16 Flag(s32 param_0, u16 param_1) { return mCamStyleData[param_0].field_0x6 & param_1; }
void SetFlag(u16 i_flag) { mCurrentStyle->field_0x6 |= i_flag; }
/* 8008858C */ virtual ~dCamParam_c();
};
@@ -115,7 +122,7 @@ public:
/* 80088918 */ bool CheckLatitudeRange(s16*);
/* 80088988 */ f32 PlayerHideDist();
/* 80182BB8 */ bool CheckFlag2(u16 i_flag) { return mFlags2 & i_flag; }
/* 80182BB8 */ bool CheckFlag2(u16 i_flag) { return (i_flag & mFlags2) != 0; }
/* 80182BE8 */ f32 WaitRollSpeed() { return mWaitRollSpeed; }
/* 80182BF0 */ int WaitRollTimer() { return mWaitRollTimer; }
/* 80182C1C */ int ThrowTimer() { return mThrowTimer; }
@@ -126,7 +133,7 @@ public:
/* 80182CF4 */ int ChargeTimer() { return mChargeTimer; }
/* 80182CFC */ f32 ChargeLatitude() { return mChargeLatitude; }
bool CheckFlag(u16 i_flag) { return mDebugFlags & i_flag; }
bool CheckFlag(u16 i_flag) { return (i_flag & mDebugFlags) != 0; }
f32 ManualEndVal() { return mManualEndVal; }
f32 CinemaScopeTrimHeight() { return mTrimCineScopeHeight; }
f32 VistaTrimHeight() { return mTrimVistaHeight; }
@@ -134,6 +141,15 @@ public:
f32 ForceLockOffDist() { return mForceLockOffDist; }
f32 USOValue() { return mFalseValue; }
f32 USOAngle() { return mFalseAngle; }
f32 WindShakeGap4Ctr() { return mWindShakeCtr; }
f32 WindShakeGap4Fvy() { return mWindShakeFvy; }
f32 LockonChangeCushion() { return mLockonChangeCushion; }
int LockonChangeTimer() { return mLockonChangeTimer; }
f32 Cushion4Base() { return mBaseCushion; }
f32 Cushion4Jump() { return mJumpCushion; }
f32 CusCus() { return mCusCus; }
f32 ParallelDist() { return mParallelDist; }
f32 CurveWeight() { return mCurveWeight; }
/* 0x000 */ f32 mDrawNear;
/* 0x004 */ f32 mDrawFar;
include/d/d_camera.h
+267 -90
View File
@@ -6,10 +6,10 @@
#include "d/d_bg_s_gnd_chk.h"
#include "d/d_cam_param.h"
#include "d/d_drawlist.h"
#include "d/d_spline_path.h"
#include "d/d_stage.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
class fopAc_ac_c;
dAttention_c& dComIfGp_getAttention();
struct dCamMapToolData {
@@ -84,27 +84,6 @@ struct dCamera_monitoring_things {
/* 0x14 */ cXyz field_0x14;
};
struct d2DBSplinePath {
/* 0x00 */ s32 field_0x0;
/* 0x04 */ s32 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 */ u32 field_0x20;
/* 0x24 */ u32 field_0x24;
/* 0x28 */ u32 field_0x28;
/* 0x2C */ u32 field_0x2c;
d2DBSplinePath() { Init(0, 0); }
/* 80097878 */ void Init(s32, s32);
/* 80097B68 */ void Spot(f32*, f32);
/* 801828D4 */ virtual ~d2DBSplinePath() {}
};
struct dCamera_event_param {
/* 0x00 */ char name[16];
/* 0x10 */ int field_0x10;
@@ -190,13 +169,13 @@ public:
struct BG {
class {
public:
/* 0x00 */ u8 field_0x0;
/* 0x00 */ bool field_0x0;
/* 0x04 */ dBgS_CamGndChk field_0x4;
/* 0x58 */ f32 field_0x58;
} /* 0x000 */ field_0x0;
class {
public:
/* 0x00 */ u8 field_0x0;
/* 0x00 */ bool field_0x0;
/* 0x04 */ dBgS_CamGndChk field_0x4;
/* 0x58 */ f32 field_0x58;
} /* 0x05C */ field_0x5c;
@@ -209,7 +188,7 @@ public:
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ cSAngle field_0x1c;
/* 0x1E */ cSAngle field_0x1e;
/* 0x20 */ int field_0x20;
/* 0x20 */ fopAc_ac_c* field_0x20;
/* 0x24 */ cSGlobe field_0x24;
/* 0x2C */ cSGlobe field_0x2c;
/* 0x34 */ int field_0x34;
@@ -255,42 +234,42 @@ public:
/* 8008933C */ bool getEvStringData(char*, char*, char*);
/* 800894C4 */ fopAc_ac_c* getEvActor(char*);
/* 800895F4 */ fopAc_ac_c* getEvActor(char*, char*);
/* 80089730 */ int pauseEvCamera();
/* 800897E8 */ int fixedFrameEvCamera();
/* 8008A510 */ int stokerEvCamera();
/* 8008A974 */ int rollingEvCamera();
/* 8008B9B0 */ int fixedPositionEvCamera();
/* 8008BE2C */ int uniformTransEvCamera();
/* 8008BE50 */ int uniformBrakeEvCamera();
/* 8008BE74 */ int uniformAcceleEvCamera();
/* 80089730 */ bool pauseEvCamera();
/* 800897E8 */ bool fixedFrameEvCamera();
/* 8008A510 */ bool stokerEvCamera();
/* 8008A974 */ bool rollingEvCamera();
/* 8008B9B0 */ bool fixedPositionEvCamera();
/* 8008BE2C */ bool uniformTransEvCamera();
/* 8008BE50 */ bool uniformBrakeEvCamera();
/* 8008BE74 */ bool uniformAcceleEvCamera();
/* 8008BE98 */ void transEvCamera(int);
/* 8008E938 */ int watchActorEvCamera();
/* 8008FAE8 */ int restorePosEvCamera();
/* 80090174 */ int talktoEvCamera();
/* 8008E938 */ bool watchActorEvCamera();
/* 8008FAE8 */ bool restorePosEvCamera();
/* 80090174 */ bool talktoEvCamera();
/* 80090230 */ bool maptoolIdEvCamera();
/* 80090478 */ int styleEvCamera();
/* 80090514 */ int gameOverEvCamera();
/* 80091468 */ int tactEvCamera();
/* 800923B8 */ int turnToActorEvCamera();
/* 800923C0 */ int stbWaitEvCamera();
/* 800924D0 */ int saveEvCamera();
/* 8009258C */ int loadEvCamera();
/* 800929AC */ int useItem0EvCamera();
/* 800937AC */ int useItem1EvCamera();
/* 80094240 */ int getItemEvCamera();
/* 80094A70 */ int possessedEvCamera();
/* 80095010 */ int fixedFramesEvCamera();
/* 8009544C */ int bSplineEvCamera();
/* 800956E4 */ int twoActor0EvCamera();
/* 80095E7C */ int peepHoleEvCamera();
/* 80095FD0 */ int digHoleEvCamera();
/* 800965AC */ int hintTalkEvCamera();
/* 80096EDC */ int bspTransEvCamera();
/* 80097694 */ int portalWarpEvCamera();
/* 80090478 */ bool styleEvCamera();
/* 80090514 */ bool gameOverEvCamera();
/* 80091468 */ bool tactEvCamera();
/* 800923B8 */ bool turnToActorEvCamera();
/* 800923C0 */ bool stbWaitEvCamera();
/* 800924D0 */ bool saveEvCamera();
/* 8009258C */ bool loadEvCamera();
/* 800929AC */ bool useItem0EvCamera();
/* 800937AC */ bool useItem1EvCamera();
/* 80094240 */ bool getItemEvCamera();
/* 80094A70 */ bool possessedEvCamera();
/* 80095010 */ bool fixedFramesEvCamera();
/* 8009544C */ bool bSplineEvCamera();
/* 800956E4 */ bool twoActor0EvCamera();
/* 80095E7C */ bool peepHoleEvCamera();
/* 80095FD0 */ bool digHoleEvCamera();
/* 800965AC */ bool hintTalkEvCamera();
/* 80096EDC */ bool bspTransEvCamera();
/* 80097694 */ bool portalWarpEvCamera();
/* 8009771C */ cXyz attentionPos(fopAc_ac_c*);
/* 80097738 */ cSAngle directionOf(fopAc_ac_c*);
/* 8009775C */ cXyz positionOf(fopAc_ac_c*);
/* 8009778C */ void eyePos(fopAc_ac_c*);
/* 8009778C */ cXyz eyePos(fopAc_ac_c*);
/* 8016008C */ dCamera_c(camera_class*);
/* 80160304 */ ~dCamera_c();
/* 80160470 */ void initialize(camera_class*, fopAc_ac_c*, u32, u32);
@@ -347,7 +326,7 @@ public:
/* 80165EF4 */ int defaultTriming();
/* 80165FB4 */ void setView(f32, f32, f32, f32);
/* 8016608C */ cSAngle forwardCheckAngle();
/* 80166764 */ void bumpCheck(u32);
/* 80166764 */ bool bumpCheck(u32);
/* 80167BF8 */ bool lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, u32);
/* 80167CD8 */ BOOL jutOutCheck(cXyz*, f32);
/* 80167E3C */ void tooNearEscape(cXyz*);
@@ -355,13 +334,11 @@ public:
/* 80167FEC */ void checkGroundInfo();
/* 80168744 */ bool chaseCamera(s32);
/* 8016C384 */ bool lockonCamera(s32);
/* 8016E448 */ void getMsgCmdSpeaker();
/* 8016E4A4 */ void getMsgCmdCut(s32);
/* 8016E448 */ fopAc_ac_c* getMsgCmdSpeaker();
/* 8016E4A4 */ s32 getMsgCmdCut(s32);
/* 8016E4F4 */ bool talktoCamera(s32);
/* 80174E18 */ void talkBasePos(fopAc_ac_c*);
/* 80174E34 */ void talkEyePos(fopAc_ac_c*);
/* 80174EA4 */ bool CalcSubjectAngle(s16*, s16*);
/* 80174EAC */ void SaveZoomRatio();
/* 80174EAC */ bool SaveZoomRatio();
/* 80174ED4 */ bool subjectCamera(s32);
/* 80176074 */ bool magneCamera(s32);
/* 801767F8 */ bool colosseumCamera(s32);
@@ -378,7 +355,7 @@ public:
/* 8017E730 */ bool fixedPositionCamera(s32);
/* 8017F25C */ bool oneSideCamera(s32);
/* 8017F828 */ bool eventCamera(s32);
/* 8018050C */ int currentEvCamera();
/* 8018050C */ bool currentEvCamera();
/* 801806D4 */ bool letCamera(s32);
/* 801806DC */ void setEventRecoveryTrans(s16);
/* 80180738 */ void runEventRecoveryTrans();
@@ -407,8 +384,11 @@ public:
/* 80181E20 */ cXyz Up();
/* 80181E64 */ cXyz Eye();
/* 80181E98 */ cXyz Center();
/* 8018295C */ void footHeightOf(fopAc_ac_c*);
/* 8018295C */ f32 footHeightOf(fopAc_ac_c* i_actor) { return i_actor->current.pos.y; }
/* 801829AC */ cSAngle Bank() { return mBank + mShake.field_0x40; }
/* 80174E18 */ cXyz talkBasePos(fopAc_ac_c* i_actor) { return i_actor->current.pos; }
/* 80174E34 */ cXyz talkEyePos(fopAc_ac_c* i_actor) { return i_actor->eyePos; }
void debugDraw();
@@ -416,13 +396,13 @@ public:
f32 TrimHeight() { return mTrimHeight; }
int Type() { return mCurType; }
int Mode() { return mCurMode; }
f32 Fovy() { return mFovY + mShake.field_0x3c; }
f32 Fovy() { return mFovy + mShake.field_0x3c; }
bool isModeOK() { return field_0x158.field_0x0; }
bool push_any_key() { return field_0x224; }
bool chkFlag(u32 i_flag) { return mEventFlags & i_flag; }
void setFlag(u32 i_flag) { mEventFlags |= i_flag; }
void clrFlag(u32 i_flag) { mEventFlags &= ~i_flag; }
bool chkFlag(u32 i_flag) { return (mEventFlags & i_flag) != 0; }
u32 setFlag(u32 i_flag) { return mEventFlags |= i_flag; }
u32 clrFlag(u32 i_flag) { return mEventFlags &= ~i_flag; }
bool CheckFlag(u32 i_flag) { return mEventFlags & i_flag; }
@@ -450,7 +430,7 @@ public:
s16 U2() {
if (chkFlag(0x10)) {
return field_0x5c.field_0x0.U();
return field_0x5c.mDirection.U();
} else {
return field_0x8c;
}
@@ -469,27 +449,27 @@ public:
/* 0x021 */ u8 field_0x21;
/* 0x022 */ u8 field_0x22[2];
/* 0x024 */ int field_0x24;
/* 0x028 */ cSGlobe field_0x28;
/* 0x028 */ cSGlobe mDirection;
/* 0x030 */ cXyz mCenter;
/* 0x03C */ cXyz mEye;
/* 0x048 */ cXyz mUp;
/* 0x054 */ cSAngle mBank;
/* 0x058 */ f32 mFovY;
/* 0x058 */ f32 mFovy;
class {
public:
/* 0x00 */ cSGlobe field_0x0;
/* 0x08 */ cXyz field_0x8;
/* 0x14 */ cXyz field_0x14;
/* 0x20 */ cSAngle field_0x20;
/* 0x00 */ cSGlobe mDirection;
/* 0x08 */ cXyz mCenter;
/* 0x14 */ cXyz mEye;
/* 0x20 */ cSAngle mBank;
/* 0x24 */ f32 mFovy;
}
/* 0x05C */ field_0x5c;
/* 0x080 */ f32 field_0x80;
/* 0x084 */ f32 field_0x84;
/* 0x088 */ u32 field_0x88;
/* 0x08C */ cSAngle field_0x8c;
/* 0x090 */ cXyz field_0x90;
/* 0x09C */ cXyz field_0x9c;
/* 0x0A8 */ int field_0xa8;
/* 0x0A8 */ u32 field_0xa8;
/* 0x0AC */ u32 field_0xac;
/* 0x0B0 */ dCamInfo_c field_0xb0;
/* 0x0D0 */ dCamInfo_c field_0xd0[2];
@@ -514,19 +494,19 @@ public:
/* 0x4 */ cSAngle field_0x4;
}
/* 0x158 */ field_0x158;
/* 0x160 */ int field_0x160;
/* 0x160 */ u32 field_0x160;
/* 0x164 */ int field_0x164;
/* 0x168 */ u8 field_0x168;
/* 0x169 */ int field_0x16c;
/* 0x170 */ int field_0x170;
/* 0x174 */ u32 mCurCamTypeTimer;
/* 0x174 */ u32 mCurCamStyleTimer;
/* 0x178 */ u32 mCameraID;
/* 0x17C */ u32 mPadID;
/* 0x180 */ fopAc_ac_c* mpPlayerActor;
/* 0x184 */ fopAc_ac_c* mpLockonTarget;
/* 0x188 */ u32 field_0x188;
/* 0x18C */ u32 field_0x18c;
/* 0x190 */ int field_0x190;
/* 0x188 */ fopAc_ac_c* field_0x188;
/* 0x18C */ fopAc_ac_c* field_0x18c;
/* 0x190 */ int mIsWolf;
/* 0x194 */ bool field_0x194;
/* 0x198 */ fpc_ProcID mLockOnActorID;
/* 0x19C */ fopAc_ac_c* mpLockOnActor;
@@ -565,7 +545,7 @@ public:
/* 0x221 */ bool mTrigB;
/* 0x222 */ u8 field_0x222;
/* 0x223 */ u8 field_0x223;
/* 0x224 */ u8 field_0x224;
/* 0x224 */ bool field_0x224;
/* 0x228 */ dCamForcusLine mFocusLine;
/* 0x298 */ dCamera_FakeAngle_system mFakeAngleSys;
/* 0x2A0 */ dCamera_monitoring_things mMonitor;
@@ -573,10 +553,206 @@ public:
/* 0x2C4 */ int field_0x2c4;
/* 0x2C8 */ f32 field_0x2c8;
/* 0x2CC */ BG mBG;
/* 0x3E8 */ u8 field_0x3e8;
/* 0x3EC */ int field_0x3ec;
/* 0x3F0 */ int field_0x3f0;
/* 0x3F4 */ u8 field_0x3f4[0x4E8 - 0x3F4];
/* 0x3E8 */ union {
struct {
/* 0x00 */ int field_0x0;
/* 0x04 */ int field_0x4;
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ int field_0x10;
/* 0x14 */ int field_0x14;
/* 0x18 */ s16 field_0x18;
/* 0x1A */ s16 field_0x1a;
/* 0x1C */ s16 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ f32 field_0x38;
/* 0x3C */ f32 field_0x3c;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ int field_0x44;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ f32 field_0x4c;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ cXyz field_0x58;
/* 0x64 */ cXyz field_0x64;
/* 0x70 */ bool field_0x70;
/* 0x71 */ bool field_0x71;
/* 0x72 */ bool field_0x72;
/* 0x73 */ bool field_0x73;
/* 0x74 */ f32 field_0x74;
/* 0x78 */ f32 field_0x78;
/* 0x7C */ f32 field_0x7c;
/* 0x80 */ f32 field_0x80;
/* 0x84 */ f32 field_0x84;
/* 0x88 */ f32 field_0x88;
/* 0x8C */ int field_0x8c;
/* 0x90 */ bool field_0x90;
/* 0x91 */ bool field_0x91;
/* 0x92 */ bool field_0x92;
/* 0x93 */ bool field_0x93;
/* 0x94 */ bool field_0x94;
/* 0x95 */ bool field_0x95;
/* 0x96 */ cSAngle field_0x96;
/* 0x98 */ cSAngle field_0x98;
/* 0x9A */ cSAngle field_0x9a;
/* 0x9C */ int field_0x9c;
/* 0xA0 */ int field_0xa0;
/* 0xA4 */ f32 field_0xa4;
/* 0xA8 */ int field_0xa8;
/* 0xAC */ f32 field_0xac;
} chase;
struct {
/* 0x00 */ int field_0x0;
/* 0x04 */ u8 field_0x4[8];
/* 0x0C */ int field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ int field_0x14;
/* 0x18 */ bool field_0x18;
/* 0x1C */ cXyz field_0x1c;
/* 0x28 */ bool field_0x28;
/* 0x29 */ bool field_0x29;
/* 0x2A */ bool field_0x2a;
/* 0x2C */ int field_0x2c;
/* 0x30 */ int field_0x30;
/* 0x34 */ cSGlobe field_0x34;
/* 0x3C */ fpc_ProcID field_0x3c;
/* 0x40 */ bool field_0x40;
/* 0x42 */ cSAngle field_0x42;
/* 0x44 */ int field_0x44;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ f32 field_0x4c;
/* 0x50 */ cSAngle field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ f32 field_0x60;
} lockon;
struct {
/* 0x00 */ int field_0x0;
/* 0x04 */ cXyz field_0x4;
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ cXyz field_0x1c;
/* 0x28 */ cSGlobe field_0x28;
/* 0x30 */ cSGlobe field_0x30;
/* 0x38 */ int field_0x38;
/* 0x3C */ int field_0x3c;
/* 0x40 */ int field_0x40;
/* 0x44 */ int field_0x44;
/* 0x48 */ int field_0x48;
/* 0x4C */ f32 field_0x4c;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ f32 field_0x60;
/* 0x64 */ f32 field_0x64;
/* 0x68 */ f32 field_0x68;
/* 0x6C */ f32 field_0x6c;
/* 0x70 */ fopAc_ac_c* field_0x70;
/* 0x74 */ fopAc_ac_c* field_0x74;
/* 0x78 */ fopAc_ac_c* field_0x78;
/* 0x7C */ f32 field_0x7c;
/* 0x80 */ f32 field_0x80;
/* 0x84 */ s16 field_0x84;
/* 0x86 */ s16 field_0x86;
/* 0x88 */ bool field_0x88;
/* 0x89 */ bool field_0x89;
/* 0x8C */ u32 field_0x8c;
/* 0x90 */ cXyz field_0x90;
/* 0x9C */ cXyz field_0x9c;
/* 0xA8 */ cSGlobe field_0xa8;
/* 0xB0 */ f32 field_0xb0;
/* 0xB4 */ cXyz field_0xb4;
/* 0xC0 */ cXyz field_0xc0;
/* 0xCC */ cXyz field_0xcc;
/* 0xD8 */ cXyz field_0xd8;
} talk;
struct {
/* 0x00 */ int field_0x0;
/* 0x04 */ cXyz field_0x4;
/* 0x10 */ int field_0x10;
/* 0x14 */ int field_0x14;
/* 0x18 */ int field_0x18;
/* 0x1C */ bool field_0x1c;
/* 0x1D */ bool field_0x1d;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ cSAngle field_0x28;
/* 0x2A */ cSAngle field_0x2a;
/* 0x2C */ cSAngle field_0x2c;
/* 0x2E */ cSAngle field_0x2e;
/* 0x30 */ cXyz field_0x30;
/* 0x3C */ cXyz field_0x3c;
/* 0x48 */ cSGlobe field_0x48;
} subject;
struct {
/* 0x00 */ int field_0x0;
/* 0x04 */ cXyz field_0x4;
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ cSGlobe field_0x1c;
} magne;
struct {
/* 0x00 */ u8 field_0x0[8];
/* 0x08 */ cXyz field_0x8;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ int field_0x18;
} colosseum;
struct {
/* 0x00 */ int field_0x0;
/* 0x04 */ int field_0x4;
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ int field_0x10;
/* 0x14 */ int field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ cSAngle field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ int field_0x38;
/* 0x3C */ f32 field_0x3c;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ f32 field_0x44;
/* 0x48 */ cXyz field_0x48;
/* 0x54 */ cXyz field_0x54;
/* 0x60 */ cSAngle field_0x60;
/* 0x64 */ int field_0x64;
/* 0x68 */ bool field_0x68;
/* 0x69 */ bool field_0x69;
/* 0x6A */ bool field_0x6a;
/* 0x6B */ bool field_0x6b;
/* 0x6C */ bool field_0x6c;
/* 0x70 */ f32 field_0x70;
/* 0x74 */ f32 field_0x74;
/* 0x78 */ f32 field_0x78;
/* 0x7C */ f32 field_0x7c;
/* 0x80 */ f32 field_0x80;
/* 0x84 */ f32 field_0x84;
} tower;
struct {
/* 0x00 */ int field_0x0;
/* 0x04 */ u8 field_0x4[4];
/* 0x08 */ cXyz field_0x8;
/* 0x14 */ cXyz field_0x14;
/* 0x20 */ bool field_0x20;
} hookshot;
struct {
/* 0x00 */ bool field_0x0;
/* 0x04 */ int field_0x4;
/* 0x08 */ int field_0x8;
} event;
struct {
u8 field_0x0[0x100];
} bytes;
} mWork;
/* 0x4E8 */ dCamera_event_data mEventData;
/* 0x60C */ u32 mEventFlags;
/* 0x610 */ u8 field_0x610;
@@ -652,7 +828,7 @@ public:
/* 0x92C */ f32 field_0x92c;
/* 0x930 */ u8 field_0x930[0x930 - 0x92c];
/* 0x934 */ f32 field_0x934;
/* 0x938 */ u8 field_0x938[0x93C - 0x938];
/* 0x938 */ int field_0x938;
/* 0x93C */ int field_0x93c;
/* 0x940 */ int field_0x940;
/* 0x944 */ u8 field_0x944;
@@ -662,7 +838,8 @@ public:
/* 0x954 */ u8 field_0x954[0x958 - 0x954];
/* 0x958 */ int field_0x958;
/* 0x95C */ cXyz field_0x95c;
/* 0x968 */ u8 field_0x968[0x970 - 0x968];
/* 0x968 */ f32 field_0x968;
/* 0x96C */ f32 field_0x96c;
/* 0x970 */ dCamSetup_c mCamSetup;
/* 0xAEC */ dCamParam_c mCamParam;
/* 0xB0C */ u8 field_0xb0c;
include/d/d_cc_s.h
+1
View File
@@ -47,6 +47,7 @@ public:
void SetMass(cCcD_Obj* i_obj, u8 i_priority) { mMass_Mng.Set(i_obj, i_priority); }
void SetMassCam(cM3dGCps& i_cps) { mMass_Mng.SetCam(i_cps); }
u32 GetMassResultCam() { return mMass_Mng.GetResultCam(); }
void GetMassCamTopPos(Vec* o_pos) { mMass_Mng.GetCamTopPos(o_pos); }
void PrepareMass() { mMass_Mng.Prepare(); }
u32 ChkMass(cXyz* param_0, fopAc_ac_c** param_1, dCcMassS_HitInf* param_2) {
include/d/d_com_inf_game.h
+31 -30
View File
@@ -85,6 +85,13 @@ class daAlink_c;
class dMsgObject_c;
class J2DOrthoGraph;
class dComIfG_MesgCamInfo_c {
public:
/* 0x00 */ int mID;
/* 0x04 */ int mBasicID;
/* 0x08 */ fopAc_ac_c* mActor[10];
};
class dComIfG_play_c {
public:
dComIfG_play_c() { this->ct(); }
@@ -361,10 +368,10 @@ public:
s32 getItemRupeeCount() { return mItemRupeeCount; }
s16 getItemKeyNumCount() { return mItemKeyNumCount; }
void clearNowAnimeID() { mNowAnimeID = -1; }
void clearMesgCamInfoID() { mMesgCamInfo = -1; }
void clearMesgCamInfoID() { mMesgCamInfo.mID = -1; }
void clearBaseAnimeID() { mBaseAnimeID = 0; }
void clearFaceAnimeID() { mFaceAnimeID = 0; }
void clearMesgCamInfoBasicID() { mMesgCamInfoBasicID = 0; }
void clearMesgCamInfoBasicID() { mMesgCamInfo.mBasicID = 0; }
void clearItemMaxLifeCount() { mItemMaxLifeCount = 0; }
void clearItemMaxOilCount() { mItemMaxOilCount = 0; }
void clearItemOilCount() { mItemOilCount = 0; }
@@ -463,23 +470,23 @@ public:
void setMsgCommonArchive(JKRArchive* arc) { mMsgCommonArchive = arc; }
void setMsgArchive(int i, JKRArchive* arc) { mMsgArchive[i] = arc; }
void setMsgObjectClass(dMsgObject_c* obj) { mMsgObjectClass = obj; }
void setMesgCamInfoBasicID(int id) { mMesgCamInfoBasicID = id; }
void setMesgCamInfoBasicID(int id) { mMesgCamInfo.mBasicID = id; }
void setMesgCamInfoActor(fopAc_ac_c* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3,
fopAc_ac_c* param_4, fopAc_ac_c* param_5, fopAc_ac_c* param_6,
fopAc_ac_c* param_7, fopAc_ac_c* param_8, fopAc_ac_c* param_9,
fopAc_ac_c* param_10) {
mMesgCamInfoActor1 = param_1;
mMesgCamInfoActor2 = param_2;
mMesgCamInfoActor3 = param_3;
mMesgCamInfoActor4 = param_4;
mMesgCamInfoActor5 = param_5;
mMesgCamInfoActor6 = param_6;
mMesgCamInfoActor7 = param_7;
mMesgCamInfoActor8 = param_8;
mMesgCamInfoActor9 = param_9;
mMesgCamInfoActor10 = param_10;
mMesgCamInfo.mActor[0] = param_1;
mMesgCamInfo.mActor[1] = param_2;
mMesgCamInfo.mActor[2] = param_3;
mMesgCamInfo.mActor[3] = param_4;
mMesgCamInfo.mActor[4] = param_5;
mMesgCamInfo.mActor[5] = param_6;
mMesgCamInfo.mActor[6] = param_7;
mMesgCamInfo.mActor[7] = param_8;
mMesgCamInfo.mActor[8] = param_9;
mMesgCamInfo.mActor[9] = param_10;
}
int getMesgCamInfo() { return mMesgCamInfoBasicID; }
dComIfG_MesgCamInfo_c* getMesgCamInfo() { return &mMesgCamInfo; }
void setFontArchive(JKRArchive* arc) { mFontArchive = arc; }
void setRubyArchive(JKRArchive* arc) { mRubyArchive = arc; }
void setMain2DArchive(JKRArchive* arc) { mMain2DArchive = arc; }
@@ -494,7 +501,7 @@ public:
}
void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] |= flag; }
void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] &= ~flag; }
u32 checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[param_0][i]; }
u32 checkPlayerStatus(int param_0, int i, u32 flag) { return mPlayerStatus[param_0][i] & flag; }
int getPlayerCameraID(int i) { return mPlayerCameraID[i * 8]; }
int getCameraPlayer1ID(int i) { return mCameraInfo[i].field_0x5; }
@@ -521,6 +528,7 @@ public:
}
f32 getCameraZoomForcus(int i_no) { return mCameraInfo[i_no].mCameraZoomForcus; }
void setCameraZoomForcus(int i_no, f32 i_focus) { mCameraInfo[i_no].mCameraZoomForcus = i_focus; }
f32 getCameraZoomScale(int i_no) { return mCameraInfo[i_no].mCameraZoomScale; }
void setCameraZoomScale(int i_no, f32 i_scale) { mCameraInfo[i_no].mCameraZoomScale = i_scale; }
@@ -539,7 +547,7 @@ public:
*o_bank = mCameraInfo[i].mCameraBank;
}
void setMesgCamInfoID(int param_0) { mMesgCamInfo = param_0; }
void setMesgCamInfoID(int param_0) { mMesgCamInfo.mID = param_0; }
void setStatus(u16 status) { mStatus = status; }
s32 checkStatus(u16 flags) { return flags & mStatus; }
@@ -778,18 +786,7 @@ public:
/* 0x04FAB */ u8 field_0x4fab; // related to setWarpItemData
/* 0x04FAC */ u8 field_0x4fac; // related to setWarpItemData
/* 0x04FAD */ u8 field_0x4fad[3];
/* 0x04FB0 */ int mMesgCamInfo;
/* 0x04FB4 */ int mMesgCamInfoBasicID;
/* 0x04FB8 */ fopAc_ac_c* mMesgCamInfoActor1;
/* 0x04FBC */ fopAc_ac_c* mMesgCamInfoActor2;
/* 0x04FC0 */ fopAc_ac_c* mMesgCamInfoActor3;
/* 0x04FC4 */ fopAc_ac_c* mMesgCamInfoActor4;
/* 0x04FC8 */ fopAc_ac_c* mMesgCamInfoActor5;
/* 0x04FCC */ fopAc_ac_c* mMesgCamInfoActor6;
/* 0x04FD0 */ fopAc_ac_c* mMesgCamInfoActor7;
/* 0x04FD4 */ fopAc_ac_c* mMesgCamInfoActor8;
/* 0x04FD8 */ fopAc_ac_c* mMesgCamInfoActor9;
/* 0x04FDC */ fopAc_ac_c* mMesgCamInfoActor10;
/* 0x04FB0 */ dComIfG_MesgCamInfo_c mMesgCamInfo;
/* 0x04FE0 */ u32 mPlayerStatus[1][4];
/* 0x04FF0 */ u8 field_0x4ff0[0x8];
/* 0x04FF8 */ __d_timer_info_c mTimerInfo;
@@ -2792,6 +2789,10 @@ inline f32 dComIfGp_getCameraZoomScale(int i_no) {
return g_dComIfG_gameInfo.play.getCameraZoomScale(i_no);
}
inline void dComIfGp_setCameraZoomForcus(int i_no, f32 i_focus) {
g_dComIfG_gameInfo.play.setCameraZoomForcus(i_no, i_focus);
}
inline f32 dComIfGp_getCameraZoomForcus(int i_no) {
return g_dComIfG_gameInfo.play.getCameraZoomForcus(i_no);
}
@@ -3236,11 +3237,11 @@ inline void dComIfGp_setMesgCameraAttrInfo(int param_1) {
g_dComIfG_gameInfo.play.setMesgCamInfoBasicID(param_1);
}
inline int dComIfGp_getMesgCameraInfo() {
inline dComIfG_MesgCamInfo_c* dComIfGp_getMesgCameraInfo() {
return g_dComIfG_gameInfo.play.getMesgCamInfo();
}
inline s32 dComIfGp_roomControl_getStayNo() {
inline int dComIfGp_roomControl_getStayNo() {
return dStage_roomControl_c::getStayNo();
}
include/d/d_name.h
+2 -2
View File
@@ -14,7 +14,7 @@ class STControl;
class dNm_HIO_c {
public:
/* 8024E3E0 */ dNm_HIO_c();
/* 802511A4 */ virtual ~dNm_HIO_c();
/* 802511A4 */ virtual ~dNm_HIO_c() {}
/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 mMenuScale;
@@ -27,7 +27,7 @@ public:
dDlst_NameIN_c() {}
/* 80251094 */ virtual void draw();
/* 8025115C */ virtual ~dDlst_NameIN_c();
/* 8025115C */ virtual ~dDlst_NameIN_c() {}
/* 0x04 */ J2DScreen* NameInScr;
/* 0x08 */ JUTFont* font;
include/d/d_particle.h
+10 -8
View File
@@ -6,6 +6,8 @@
#include "d/d_particle_name.h"
#include "d/d_kankyo.h"
void dPa_cleanupGX();
class J3DAnmTexPattern;
class J3DModel;
class J3DModelData;
@@ -114,8 +116,8 @@ public:
dPa_setColorEcallBack(const GXColor& color) { mColor = color; }
/* 800502E4 */ virtual ~dPa_setColorEcallBack() {}
/* 800502B0 */ virtual void draw(JPABaseEmitter*);
/* 800502E0 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
/* 800502B0 */ virtual void draw(JPABaseEmitter*) { GXSetTevColor(GX_TEVREG1, mColor); }
/* 800502E0 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {}
/* 0x4 */ GXColor mColor;
};
@@ -126,7 +128,7 @@ public:
/* 8004FF8C */ virtual ~dPa_selectTexEcallBack() {}
/* 8004ADC4 */ virtual void draw(JPABaseEmitter*);
/* 80050010 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
/* 80050010 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {}
/* 0x4 */ u8 field_0x4;
};
@@ -184,7 +186,7 @@ public:
/* 80050378 */ virtual ~dPa_modelEcallBack() {}
/* 8004AA34 */ virtual void draw(JPABaseEmitter*);
/* 80050014 */ virtual void drawAfter(JPABaseEmitter*);
/* 80050014 */ virtual void drawAfter(JPABaseEmitter* param_0) { cleanupModel(param_0); }
/* 8004AAA8 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
static void setModel(JPABaseEmitter* param_0, J3DModelData* param_1,
@@ -211,7 +213,7 @@ class dPa_light8EcallBack : public dPa_levelEcallBack {
public:
/* 8005015C */ virtual ~dPa_light8EcallBack() {}
/* 8004A340 */ virtual void draw(JPABaseEmitter*);
/* 800501E0 */ virtual void drawAfter(JPABaseEmitter*);
/* 800501E0 */ virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
/* 8004979C */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
};
@@ -226,7 +228,7 @@ class dPa_gen_d_light8EcallBack : public dPa_levelEcallBack {
public:
/* 800503FC */ virtual ~dPa_gen_d_light8EcallBack() {}
/* 8004A388 */ virtual void draw(JPABaseEmitter*);
/* 80050098 */ virtual void drawAfter(JPABaseEmitter*);
/* 80050098 */ virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
/* 800497CC */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
};
@@ -241,7 +243,7 @@ class dPa_gen_b_light8EcallBack : public dPa_levelEcallBack {
public:
/* 800500B8 */ virtual ~dPa_gen_b_light8EcallBack() {}
/* 8004A364 */ virtual void draw(JPABaseEmitter*);
/* 8005013C */ virtual void drawAfter(JPABaseEmitter*);
/* 8005013C */ virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
/* 800497B0 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
};
@@ -452,7 +454,7 @@ public:
}
static dPa_selectTexEcallBack mTsubo[8];
static u8 mLifeBall[24];
static dPa_setColorEcallBack mLifeBall[3];
static Mtx mWindViewMatrix;
static JPAEmitterManager* mEmitterMng;
static dPa_wbPcallBack_c mWaterBubblePcallBack;
include/d/d_s_play.h
+1 -30
View File
@@ -1,7 +1,7 @@
#ifndef D_S_D_S_PLAY_H
#define D_S_D_S_PLAY_H
#include "SSystem/SComponent/c_xyz.h"
#include "d/d_s_play_env.h"
#include "f_op/f_op_scene.h"
#include "m_Do/m_Do_hostIO.h"
@@ -32,32 +32,6 @@ public:
void genMessage(JORMContext*);
};
class dScnPly_env_otherHIO_c {
public:
/* 80259440 */ dScnPly_env_otherHIO_c();
/* 8025AC0C */ virtual ~dScnPly_env_otherHIO_c() {}
/* 0x4 */ f32 mShadowDensity;
/* 0x8 */ u8 mLODBias;
/* 0x9 */ u8 field_0x9;
/* 0xA */ u8 mDispTransCylinder;
};
class dScnPly_env_debugHIO_c {
public:
/* 80259468 */ dScnPly_env_debugHIO_c();
/* 8025ABC4 */ virtual ~dScnPly_env_debugHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x08 */ cXyz mBoxCullMinSize;
/* 0x14 */ cXyz mBoxCullMaxSize;
/* 0x20 */ cXyz mSphereCullCenter;
/* 0x2C */ f32 mSphereCullRadius;
};
class dScnPly_env_HIO_c {
public:
/* 8025AD04 */ virtual ~dScnPly_env_HIO_c() {}
@@ -67,9 +41,6 @@ public:
/* 0x14 */ dScnPly_env_debugHIO_c mDebug;
};
extern s8 pauseTimer__9dScnPly_c;
extern s8 nextPauseTimer__9dScnPly_c; // sPauseTimer
class dScnPly_c : public scene_class {
public:
/* 80259400 */ s8 calcPauseTimer();
include/d/d_s_play_env.h
+27
View File
@@ -0,0 +1,27 @@
#include "SSystem/SComponent/c_xyz.h"
class dScnPly_env_otherHIO_c {
public:
/* 80259440 */ dScnPly_env_otherHIO_c();
/* 8025AC0C */ virtual ~dScnPly_env_otherHIO_c() {}
/* 0x4 */ f32 mShadowDensity;
/* 0x8 */ u8 mLODBias;
/* 0x9 */ u8 field_0x9;
/* 0xA */ u8 mDispTransCylinder;
};
class dScnPly_env_debugHIO_c {
public:
/* 80259468 */ dScnPly_env_debugHIO_c();
/* 8025ABC4 */ virtual ~dScnPly_env_debugHIO_c() {}
private:
/* 0x04 */ u8 field_0x4;
/* 0x08 */ cXyz mBoxCullMinSize;
/* 0x14 */ cXyz mBoxCullMaxSize;
/* 0x20 */ cXyz mSphereCullCenter;
/* 0x2C */ f32 mSphereCullRadius;
};
include/d/d_spline_path.h
+8 -7
View File
@@ -16,12 +16,6 @@ struct dPathCurve {
class d2DBSplinePath {
public:
/* 80097878 */ void Init(s32, s32);
/* 80097904 */ bool Step();
/* 80097B20 */ f32 Calc(f32*);
/* 80097A6C */ cXyz Calc(cXyz*);
/* 80097B68 */ f32 Spot(f32*, f32);
/* 0x00 */ s32 field_0x00;
/* 0x04 */ s32 field_0x04;
/* 0x08 */ s32 field_0x08;
@@ -30,7 +24,14 @@ public:
/* 0x14 */ f32 mCurveWeight[3];
/* 0x20 */ int mCurveKey[3];
/* 0x2C */ int field_0x2c;
/* 0x30 */ void* field_0x30;
d2DBSplinePath() { Init(0, 0); }
/* 80097878 */ void Init(s32, s32);
/* 80097904 */ bool Step();
/* 80097B20 */ f32 Calc(f32*);
/* 80097A6C */ cXyz Calc(cXyz*);
/* 80097B68 */ f32 Spot(f32*, f32);
/* 801828D4 */ virtual ~d2DBSplinePath() {}
};
#endif /* D_D_SPLINE_PATH_H */
include/d/d_stage.h
+1 -1
View File
@@ -561,7 +561,7 @@ public:
void setTreasure(stage_tresure_class*);
s16 getWorldRollAngleX() { return mWorldRollAngleX; }
s16 getWorldRollAngleX() { return (s16)mWorldRollAngleX; }
s16 getWorldRollDirAngleY() { return mWorldRollDirAngleY; }
public:
include/f_op/f_op_camera.h
+1
View File
@@ -8,6 +8,7 @@ class camera_class;
struct camera_process_profile_definition {
/* 0x00 */ view_process_profile_definition base;
/* 0x3C */ leafdraw_method_class* sub_method; // Subclass methods
/* 0x40 */ u32 unk_0x40;
};
static s32 fopCam_Draw(camera_class* i_this);
src/SSystem/SComponent/c_cc_d.cpp
+10 -10
View File
@@ -294,9 +294,9 @@ void cCcD_ShapeAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
pshape->_0 = 2;
pshape->_14 = 0.0f;
pshape->_10 = 0.0f;
pshape->_C = 0.0f;
pshape->_8 = 0.0f;
pshape->_4 = 0.0f;
pshape->_4.z = 0.0f;
pshape->_4.y = 0.0f;
pshape->_4.x = 0.0f;
}
/* 80263A88-80263B58 25E3C8 00D0+00 1/0 1/0 0/0 .text
@@ -594,9 +594,9 @@ bool cCcD_CylAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
* getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape */
void cCcD_CylAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
pshape->_0 = 1;
pshape->_4 = mCenter.x;
pshape->_8 = mCenter.y;
pshape->_C = mCenter.z;
pshape->_4.x = mCenter.x;
pshape->_4.y = mCenter.y;
pshape->_4.z = mCenter.z;
pshape->_10 = mRadius;
pshape->_14 = mHeight;
}
@@ -716,9 +716,9 @@ bool cCcD_SphAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
* getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape */
void cCcD_SphAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
pshape->_0 = 0;
pshape->_4 = mCenter.x;
pshape->_8 = mCenter.y;
pshape->_C = mCenter.z;
pshape->_4.x = mCenter.x;
pshape->_4.y = mCenter.y;
pshape->_4.z = mCenter.z;
pshape->_10 = mRadius;
pshape->_14 = 0.0f;
}
@@ -790,4 +790,4 @@ void cCcD_ObjCo::SetIGrp(u32 grp) {
void cCcD_ObjCo::SetVsGrp(u32 grp) {
mSPrm &= ~0x70;
mSPrm |= grp;
}
}
src/d/actor/d_a_alink_grab.inc
+1 -1
View File
@@ -1703,7 +1703,7 @@ int daAlink_c::endPushPull() {
*/
f32 daAlink_c::getPushPullAnimeSpeed() {
f32 var_f31;
if ((getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Movebox && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1.GetBgIndex()))->getType() != 0) ||
if ((getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Movebox && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1))->getType() != 0) ||
getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Bemos)
{
if (checkWolf()) {
src/d/actor/d_a_e_fz.cpp
+1 -1
View File
@@ -731,7 +731,7 @@ void daE_FZ_c::action() {
}
if (1 < health && mAcchCir.ChkWallHit()) {
if (fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(mAcchCir.GetBgIndex())) != PROC_BG) {
if (fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(mAcchCir)) != PROC_BG) {
dBgS_LinChk lin_chk;
dBgS_LinChk lin_chk2;
src/d/actor/d_a_e_s1.cpp
+1 -2
View File
@@ -536,8 +536,7 @@ static void e_s1_roof(e_s1_class* i_this) {
case 1:
roof_wait = true;
if (i_this->mSwBit != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->mSwBit, room_no)) {
if (dComIfGs_isSwitch(i_this->mSwBit, dComIfGp_roomControl_getStayNo())) {
i_this->mMode = 2;
}
} else if (fopAcM_searchPlayerDistanceXZ(a_this) < i_this->mPrm1 * 100.0f) {
src/d/actor/d_a_kytag00.cpp
+10 -30
View File
@@ -395,24 +395,14 @@ static int daKytag00_Draw(kytag00_class* i_this) {
/* 8046C684-8046C76C 000FE4 00E8+00 1/0 0/0 0/0 .text daKytag00_Execute__FP13kytag00_class */
static int daKytag00_Execute(kytag00_class* i_this) {
BOOL var_r30 = true;
BOOL var_r30 = TRUE;
if (i_this->field_0x571 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->field_0x571, room_no)) {
var_r30 = 0;
goto label;
}
if (i_this->field_0x571 != 0xFF && dComIfGs_isSwitch(i_this->field_0x571, dComIfGp_roomControl_getStayNo())) {
var_r30 = FALSE;
} else if (i_this->field_0x572 != 0xFF && !dComIfGs_isSwitch(i_this->field_0x572, dComIfGp_roomControl_getStayNo())) {
var_r30 = FALSE;
}
if (i_this->field_0x572 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (!dComIfGs_isSwitch(i_this->field_0x572, room_no)) {
var_r30 = 0;
}
}
label:
if (var_r30 == TRUE) {
cLib_addCalc(&i_this->field_0x588, 1.0f, 0.1f, 0.01f, 0.0001f);
} else {
@@ -450,24 +440,14 @@ static int daKytag00_Create(fopAc_ac_c* i_this) {
a_this->field_0x571 = a_this->current.angle.x & 0xFF;
a_this->field_0x572 = (a_this->current.angle.x >> 8) & 0xFF;
BOOL var_r30 = true;
BOOL var_r30 = TRUE;
if (a_this->field_0x571 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(a_this->field_0x571, room_no)) {
var_r30 = 0;
goto label;
}
if (a_this->field_0x571 != 0xFF && dComIfGs_isSwitch(a_this->field_0x571, dComIfGp_roomControl_getStayNo())) {
var_r30 = FALSE;
} else if (a_this->field_0x572 != 0xFF && !dComIfGs_isSwitch(a_this->field_0x572, dComIfGp_roomControl_getStayNo())) {
var_r30 = FALSE;
}
if (a_this->field_0x572 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (!dComIfGs_isSwitch(a_this->field_0x572, room_no)) {
var_r30 = 0;
}
}
label:
if (var_r30 == TRUE) {
a_this->field_0x588 = 1.0f;
} else {
src/d/actor/d_a_kytag04.cpp
+5 -10
View File
@@ -34,8 +34,7 @@ static int daKytag04_Draw(kytag04_class* i_this) {
if (i_this->field_0x5b4 == 4 || i_this->field_0x5b4 == 5) {
if (i_this->field_0x5b4 == 4) {
if (i_this->field_0x5b5 != 0xFF && i_this->field_0x5d1 == 1) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->field_0x5b5, room_no)) {
if (dComIfGs_isSwitch(i_this->field_0x5b5, dComIfGp_roomControl_getStayNo())) {
var_r30 = 1;
}
}
@@ -301,8 +300,7 @@ static int daKytag04_Create(fopAc_ac_c* i_this) {
dComIfGp_setNeedLightDropNum(a_this->mNeedDropNum);
if (a_this->field_0x5b5 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(a_this->field_0x5b5, room_no)) {
if (dComIfGs_isSwitch(a_this->field_0x5b5, dComIfGp_roomControl_getStayNo())) {
a_this->field_0x5b7 = 1;
}
}
@@ -317,14 +315,12 @@ static int daKytag04_Create(fopAc_ac_c* i_this) {
OS_WARNING("\n緊急事態！！　雫がそろってるのにまだ闇世界なので強引に進めます]");
a_this->field_0x5b7 = -1;
s32 room_no = dComIfGp_roomControl_getStayNo();
dComIfGs_onSwitch(a_this->field_0x5b5, room_no);
dComIfGs_onSwitch(a_this->field_0x5b5, dComIfGp_roomControl_getStayNo());
}
}
} else if (a_this->field_0x5b4 == 4) {
if (a_this->field_0x5b5 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(a_this->field_0x5b5, room_no)) {
if (dComIfGs_isSwitch(a_this->field_0x5b5, dComIfGp_roomControl_getStayNo())) {
a_this->field_0x5d1 = 1;
a_this->field_0x5c8 = 999.0f;
a_this->field_0x5cc = 20;
@@ -345,8 +341,7 @@ static int daKytag04_Create(fopAc_ac_c* i_this) {
}
if (a_this->field_0x5b4 == 4 && a_this->field_0x5b5 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(a_this->field_0x5b5, room_no)) {
if (dComIfGs_isSwitch(a_this->field_0x5b5, dComIfGp_roomControl_getStayNo())) {
a_this->mBtk.setFrame(a_this->mBtk.getEndFrame());
a_this->mBrk.setFrame(a_this->mBrk.getEndFrame());
}
src/d/actor/d_a_kytag06.cpp
+3 -7
View File
@@ -952,8 +952,7 @@ static void daKytag06_type_03_Execute(kytag06_class* i_this) {
i_this->field_0x578 = 450;
dKy_change_colpat(i_this->field_0x591);
s32 stayNo = dComIfGp_roomControl_getStayNo();
dComIfGs_onSwitch(i_this->mSwNo, stayNo);
dComIfGs_onSwitch(i_this->mSwNo, dComIfGp_roomControl_getStayNo());
}
break;
case 1:
@@ -1046,8 +1045,7 @@ static int daKytag06_Execute(kytag06_class* i_this) {
break;
case 2:
if (i_this->mSwNo != 0xFF) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->mSwNo, stayNo) && i_this->mMode == 0) {
if (dComIfGs_isSwitch(i_this->mSwNo, dComIfGp_roomControl_getStayNo()) && i_this->mMode == 0) {
i_this->mMode = 1;
dKy_change_colpat(i_this->field_0x591);
}
@@ -1247,9 +1245,7 @@ static void daKytag06_type03_init(fopAc_ac_c* i_this) {
// 0C01: Midna's Desperate Hour started 1E08: Midna's Desperate Hour Completed
if (dComIfGs_isEventBit(0x0C01) && !dComIfGs_isEventBit(0x1E08) && a_this->mSwNo != 0xFF)
{
s32 stayNo = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(a_this->mSwNo, stayNo)) {
if (dComIfGs_isSwitch(a_this->mSwNo, dComIfGp_roomControl_getStayNo())) {
a_this->mMode = 9;
g_env_light.raincnt = 250;
g_env_light.mColpatWeather = a_this->field_0x591;
src/d/actor/d_a_kytag11.cpp
+2 -4
View File
@@ -25,8 +25,7 @@ static int daKytag11_Execute(kytag11_class* i_this) {
i_this->mChangeTime = false;
}
} else if (i_this->mOnSwitchNo != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (!dComIfGs_isSwitch(i_this->mOnSwitchNo, room_no)) {
if (!dComIfGs_isSwitch(i_this->mOnSwitchNo, dComIfGp_roomControl_getStayNo())) {
i_this->mChangeTime = false;
}
}
@@ -36,8 +35,7 @@ static int daKytag11_Execute(kytag11_class* i_this) {
i_this->mChangeTime = false;
}
} else if (i_this->mOffSwitchNo != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->mOffSwitchNo, room_no)) {
if (dComIfGs_isSwitch(i_this->mOffSwitchNo, dComIfGp_roomControl_getStayNo())) {
i_this->mChangeTime = false;
}
}
src/d/actor/d_a_kytag13.cpp
+28 -423
View File
@@ -7,59 +7,6 @@
#include "SSystem/SComponent/c_math.h"
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_rain.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" static bool daKytag13_Draw__FP13kytag13_class();
extern "C" static void vectle_calc__FP10DOUBLE_POSP4cXyz();
extern "C" static void daKytag13_Execute_standard__FP13kytag13_class();
extern "C" void __dt__14dBgS_ObjGndChkFv();
extern "C" static void daKytag13_Execute__FP13kytag13_class();
extern "C" static bool daKytag13_IsDelete__FP13kytag13_class();
extern "C" static bool daKytag13_Delete__FP13kytag13_class();
extern "C" static void daKytag13_Create__FP10fopAc_ac_c();
extern "C" static void func_80860450();
extern "C" static void func_80860458();
extern "C" static void func_80860460();
extern "C" extern char const* const d_a_kytag13__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void mDoMtx_ZrotM__FPA4_fs();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void dKyw_get_wind_vec__Fv();
extern "C" void dKyw_get_wind_pow__Fv();
extern "C" void dKyw_get_wind_vecpow__Fv();
extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz();
extern "C" void GroundCross__4cBgSFP11cBgS_GndChk();
extern "C" void __ct__11dBgS_GndChkFv();
extern "C" void __dt__11dBgS_GndChkFv();
extern "C" void __dt__18dBgS_ObjGndChk_AllFv();
extern "C" void SetObj__16dBgS_PolyPassChkFv();
extern "C" void cM_rndF__Ff();
extern "C" void cM_rndFX__Ff();
extern "C" void SetPos__11cBgS_GndChkFPC4cXyz();
extern "C" void cM3d_VectorProduct2d__Fffffff();
extern "C" void cLib_addCalc__FPfffff();
extern "C" void __dl__FPv();
extern "C" void _savegpr_21();
extern "C" void _restgpr_21();
extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
//
/* 8085F1F8-8085F200 000078 0008+00 1/0 0/0 0/0 .text daKytag13_Draw__FP13kytag13_class
*/
@@ -67,22 +14,6 @@ static int daKytag13_Draw(kytag13_class* i_this) {
return 1;
}
/* ############################################################################################## */
/* 80860470-80860478 000000 0008+00 2/2 0/0 0/0 .rodata @3783 */
SECTION_RODATA static u8 const lit_3783[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80860470, &lit_3783);
/* 80860478-8086047C 000008 0004+00 1/2 0/0 0/0 .rodata @3784 */
SECTION_RODATA static u8 const lit_3784[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80860478, &lit_3784);
/* 8085F200-8085F2B0 000080 00B0+00 1/1 0/0 0/0 .text vectle_calc__FP10DOUBLE_POSP4cXyz
*/
static void vectle_calc(DOUBLE_POS* pos, cXyz* out) {
@@ -98,352 +29,6 @@ static void vectle_calc(DOUBLE_POS* pos, cXyz* out) {
}
}
/* ############################################################################################## */
/* 8086047C-80860480 00000C 0004+00 0/1 0/0 0/0 .rodata @4177 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4177 = 100.0f;
COMPILER_STRIP_GATE(0x8086047C, &lit_4177);
#pragma pop
/* 80860480-80860484 000010 0004+00 0/1 0/0 0/0 .rodata @4178 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4178 = 5.0f;
COMPILER_STRIP_GATE(0x80860480, &lit_4178);
#pragma pop
/* 80860484-80860488 000014 0004+00 0/1 0/0 0/0 .rodata @4179 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4179 = 1000.0f;
COMPILER_STRIP_GATE(0x80860484, &lit_4179);
#pragma pop
/* 80860488-8086048C 000018 0004+00 0/1 0/0 0/0 .rodata @4180 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4180 = 3.0f / 10.0f;
COMPILER_STRIP_GATE(0x80860488, &lit_4180);
#pragma pop
/* 8086048C-80860490 00001C 0004+00 0/1 0/0 0/0 .rodata @4181 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4181 = 1.0f;
COMPILER_STRIP_GATE(0x8086048C, &lit_4181);
#pragma pop
/* 80860490-80860494 000020 0004+00 0/1 0/0 0/0 .rodata @4182 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4182 = -0.0f;
COMPILER_STRIP_GATE(0x80860490, &lit_4182);
#pragma pop
/* 80860494-80860498 000024 0004+00 0/1 0/0 0/0 .rodata @4183 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4183 = -3.0f / 10.0f;
COMPILER_STRIP_GATE(0x80860494, &lit_4183);
#pragma pop
/* 80860498-8086049C 000028 0004+00 0/1 0/0 0/0 .rodata @4184 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4184 = -2.0f / 5.0f;
COMPILER_STRIP_GATE(0x80860498, &lit_4184);
#pragma pop
/* 8086049C-808604A0 00002C 0004+00 0/1 0/0 0/0 .rodata @4185 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4185 = 1.0f / 5.0f;
COMPILER_STRIP_GATE(0x8086049C, &lit_4185);
#pragma pop
/* 808604A0-808604A4 000030 0004+00 0/1 0/0 0/0 .rodata @4186 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4186 = 4.0f;
COMPILER_STRIP_GATE(0x808604A0, &lit_4186);
#pragma pop
/* 808604A4-808604A8 000034 0004+00 0/1 0/0 0/0 .rodata @4187 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4187 = 6.0f;
COMPILER_STRIP_GATE(0x808604A4, &lit_4187);
#pragma pop
/* 808604A8-808604AC 000038 0004+00 0/1 0/0 0/0 .rodata @4188 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4188 = 500.0f;
COMPILER_STRIP_GATE(0x808604A8, &lit_4188);
#pragma pop
/* 808604AC-808604B0 00003C 0004+00 0/1 0/0 0/0 .rodata @4189 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4189 = 65536.0f;
COMPILER_STRIP_GATE(0x808604AC, &lit_4189);
#pragma pop
/* 808604B0-808604B4 000040 0004+00 0/1 0/0 0/0 .rodata @4190 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4190 = 1680.0f;
COMPILER_STRIP_GATE(0x808604B0, &lit_4190);
#pragma pop
/* 808604B4-808604B8 000044 0004+00 0/1 0/0 0/0 .rodata @4191 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4191 = 200.0f;
COMPILER_STRIP_GATE(0x808604B4, &lit_4191);
#pragma pop
/* 808604B8-808604BC 000048 0004+00 0/1 0/0 0/0 .rodata @4192 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4192 = 1630.0f;
COMPILER_STRIP_GATE(0x808604B8, &lit_4192);
#pragma pop
/* 808604BC-808604C0 00004C 0004+00 0/1 0/0 0/0 .rodata @4193 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4193 = 4280.0f;
COMPILER_STRIP_GATE(0x808604BC, &lit_4193);
#pragma pop
/* 808604C0-808604C4 000050 0004+00 0/1 0/0 0/0 .rodata @4194 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4194 = -1680.0f;
COMPILER_STRIP_GATE(0x808604C0, &lit_4194);
#pragma pop
/* 808604C4-808604C8 000054 0004+00 0/1 0/0 0/0 .rodata @4195 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4195 = 5000.0f;
COMPILER_STRIP_GATE(0x808604C4, &lit_4195);
#pragma pop
/* 808604C8-808604CC 000058 0004+00 0/1 0/0 0/0 .rodata @4196 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4196 = 750.0f;
COMPILER_STRIP_GATE(0x808604C8, &lit_4196);
#pragma pop
/* 808604CC-808604D0 00005C 0004+00 0/1 0/0 0/0 .rodata @4197 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4197 = 7110.0f;
COMPILER_STRIP_GATE(0x808604CC, &lit_4197);
#pragma pop
/* 808604D0-808604D4 000060 0004+00 0/1 0/0 0/0 .rodata @4198 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4198 = -22.0f;
COMPILER_STRIP_GATE(0x808604D0, &lit_4198);
#pragma pop
/* 808604D4-808604D8 000064 0004+00 0/1 0/0 0/0 .rodata @4199 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4199 = 950.0f;
COMPILER_STRIP_GATE(0x808604D4, &lit_4199);
#pragma pop
/* 808604D8-808604E0 000068 0004+04 0/1 0/0 0/0 .rodata @4200 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4200[1 + 1 /* padding */] = {
-50.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x808604D8, &lit_4200);
#pragma pop
/* 808604E0-808604E8 000070 0008+00 0/1 0/0 0/0 .rodata @4201 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4201[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x808604E0, &lit_4201);
#pragma pop
/* 808604E8-808604F0 000078 0008+00 0/1 0/0 0/0 .rodata @4202 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4202[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x808604E8, &lit_4202);
#pragma pop
/* 808604F0-808604F4 000080 0004+00 0/1 0/0 0/0 .rodata @4203 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4203 = 2.0f / 25.0f;
COMPILER_STRIP_GATE(0x808604F0, &lit_4203);
#pragma pop
/* 808604F4-808604F8 000084 0004+00 0/1 0/0 0/0 .rodata @4204 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4204 = 0.5f;
COMPILER_STRIP_GATE(0x808604F4, &lit_4204);
#pragma pop
/* 808604F8-808604FC 000088 0004+00 0/1 0/0 0/0 .rodata @4205 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4205 = 1.0f / 10.0f;
COMPILER_STRIP_GATE(0x808604F8, &lit_4205);
#pragma pop
/* 808604FC-80860500 00008C 0004+00 0/1 0/0 0/0 .rodata @4206 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4206 = 1.0f / 100.0f;
COMPILER_STRIP_GATE(0x808604FC, &lit_4206);
#pragma pop
/* 80860500-80860504 000090 0004+00 0/1 0/0 0/0 .rodata @4207 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4207 = 37.0f / 10.0f;
COMPILER_STRIP_GATE(0x80860500, &lit_4207);
#pragma pop
/* 80860504-80860508 000094 0004+00 0/1 0/0 0/0 .rodata @4208 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4208 = 3.0f;
COMPILER_STRIP_GATE(0x80860504, &lit_4208);
#pragma pop
/* 80860508-8086050C 000098 0004+00 0/1 0/0 0/0 .rodata @4209 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4209 = 3000.0f;
COMPILER_STRIP_GATE(0x80860508, &lit_4209);
#pragma pop
/* 8086050C-80860510 00009C 0004+00 0/1 0/0 0/0 .rodata @4210 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4210 = 0.25f;
COMPILER_STRIP_GATE(0x8086050C, &lit_4210);
#pragma pop
/* 80860510-80860514 0000A0 0004+00 0/1 0/0 0/0 .rodata @4211 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4211 = 1500.0f;
COMPILER_STRIP_GATE(0x80860510, &lit_4211);
#pragma pop
/* 80860514-80860518 0000A4 0004+00 0/1 0/0 0/0 .rodata @4212 */
#pragma push
#pragma force_active on
SECTION_RODATA static u32 const lit_4212 = 0x3A83126F;
COMPILER_STRIP_GATE(0x80860514, &lit_4212);
#pragma pop
/* 80860518-8086051C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4213 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4213 = 1.0f / 20.0f;
COMPILER_STRIP_GATE(0x80860518, &lit_4213);
#pragma pop
/* 8086051C-80860520 0000AC 0004+00 0/1 0/0 0/0 .rodata @4214 */
#pragma push
#pragma force_active on
SECTION_RODATA static u32 const lit_4214 = 0x38D1B717;
COMPILER_STRIP_GATE(0x8086051C, &lit_4214);
#pragma pop
/* 80860520-80860524 0000B0 0004+00 0/1 0/0 0/0 .rodata @4215 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4215 = 10.0f;
COMPILER_STRIP_GATE(0x80860520, &lit_4215);
#pragma pop
/* 80860524-80860528 0000B4 0004+00 0/1 0/0 0/0 .rodata @4216 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4216 = -5560.0f;
COMPILER_STRIP_GATE(0x80860524, &lit_4216);
#pragma pop
/* 80860528-8086052C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4217 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4217 = 925.0f;
COMPILER_STRIP_GATE(0x80860528, &lit_4217);
#pragma pop
/* 80860538-80860538 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80860538 = "D_MN11";
#pragma pop
/* 80860540-80860560 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag13_Method */
static actor_method_class l_daKytag13_Method = {
(process_method_func)daKytag13_Create__FP10fopAc_ac_c,
(process_method_func)daKytag13_Delete__FP13kytag13_class,
(process_method_func)daKytag13_Execute__FP13kytag13_class,
(process_method_func)daKytag13_IsDelete__FP13kytag13_class,
(process_method_func)daKytag13_Draw__FP13kytag13_class,
};
/* 80860560-80860590 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG13 */
extern actor_process_profile_definition g_profile_KYTAG13 = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_KYTAG13, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(kytag13_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
107, // mPriority
&l_daKytag13_Method, // sub_method
0x00060000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
};
/* 80860590-808605C0 000050 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */
SECTION_DATA extern void* __vt__14dBgS_ObjGndChk[12] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__14dBgS_ObjGndChkFv,
(void*)NULL,
(void*)NULL,
(void*)func_80860450,
(void*)NULL,
(void*)NULL,
(void*)func_80860460,
(void*)NULL,
(void*)NULL,
(void*)func_80860458,
};
/* 8085F2B0-80860148 000130 0E98+00 1/1 0/0 0/0 .text
* daKytag13_Execute_standard__FP13kytag13_class */
// NONMATCHING - some regalloc
@@ -481,8 +66,7 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) {
f32 temp_f27 = a_this->current.pos.y;
if (i_this->field_0x57a != 0xFF) {
s32 roomNo = dComIfGp_roomControl_getStayNo();
if (!dComIfGs_isSwitch(i_this->field_0x57a, roomNo)) {
if (!dComIfGs_isSwitch(i_this->field_0x57a, dComIfGp_roomControl_getStayNo())) {
g_env_light.field_0xe90 = 0;
}
}
@@ -754,12 +338,6 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) {
return 1;
}
/* 80860148-808601C0 000FC8 0078+00 4/3 0/0 0/0 .text __dt__14dBgS_ObjGndChkFv */
// dBgS_ObjGndChk::~dBgS_ObjGndChk() {
extern "C" void __dt__14dBgS_ObjGndChkFv() {
// NONMATCHING
}
/* 808601C0-80860200 001040 0040+00 1/0 0/0 0/0 .text daKytag13_Execute__FP13kytag13_class */
static int daKytag13_Execute(kytag13_class* i_this) {
if (i_this->home.roomNo == dComIfGp_roomControl_getStayNo()) {
@@ -846,3 +424,30 @@ static int daKytag13_Create(fopAc_ac_c* i_this) {
return cPhs_COMPLEATE_e;
}
/* 80860540-80860560 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag13_Method */
static actor_method_class l_daKytag13_Method = {
(process_method_func)daKytag13_Create,
(process_method_func)daKytag13_Delete,
(process_method_func)daKytag13_Execute,
(process_method_func)daKytag13_IsDelete,
(process_method_func)daKytag13_Draw,
};
/* 80860560-80860590 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG13 */
extern actor_process_profile_definition g_profile_KYTAG13 = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_KYTAG13, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(kytag13_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
107, // mPriority
&l_daKytag13_Method, // sub_method
0x00060000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
};
src/d/actor/d_a_kytag14.cpp
+2 -4
View File
@@ -42,8 +42,7 @@ static int daKytag14_Execute(kytag14_class* i_this) {
}
if (i_this->mSwitchNo1 != 0xFF) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->mSwitchNo1, stayNo)) {
if (dComIfGs_isSwitch(i_this->mSwitchNo1, dComIfGp_roomControl_getStayNo())) {
switch1_set = true;
} else {
switch1_set = false;
@@ -51,8 +50,7 @@ static int daKytag14_Execute(kytag14_class* i_this) {
}
if (i_this->mSwitchNo2 != 0xFF) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
if (!dComIfGs_isSwitch(i_this->mSwitchNo2, stayNo)) {
if (!dComIfGs_isSwitch(i_this->mSwitchNo2, dComIfGp_roomControl_getStayNo())) {
switch2_unset = true;
} else {
switch2_unset = false;
src/d/actor/d_a_kytag16.cpp
+1 -3
View File
@@ -41,9 +41,7 @@ static int daKytag16_Execute(kytag16_class* i_this) {
var_r29 = false;
if (i_this->mSwitch != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->mSwitch, room_no)) {
if (dComIfGs_isSwitch(i_this->mSwitch, dComIfGp_roomControl_getStayNo())) {
var_r29 = true;
}
} else {
src/d/d_a_obj.cpp
+9
View File
@@ -217,4 +217,13 @@ void HitSeStart(cXyz const* i_sePos, int i_roomNo, dCcD_GObjInf const* i_CcObj,
mDoAud_seStart(sfx, i_sePos, param_3 & 0xFF, (s8)reverb);
}
}
static cXyz dummy1(cCcD_CylAttr* cyl) {
return cyl->GetCoCP();
}
static cXyz dummy2(cCcD_SphAttr* sph) {
return sph->GetCoCP();
}
} // namespace daObj
src/d/d_camera.cpp
+4907 -767
View File
File diff suppressed because it is too large Load Diff
src/d/d_com_inf_game.cpp
+4 -6
View File
@@ -841,9 +841,9 @@ int dComIfG_play_c::getLayerNo_common(char const* i_stageName, int i_roomID, int
/* 8002C97C-8002C9D8 0272BC 005C+00 1/1 22/22 68/68 .text getLayerNo__14dComIfG_play_cFi
*/
int dComIfG_play_c::getLayerNo(int) {
s32 roomNo = dComIfGp_roomControl_getStayNo();
int roomNo = dComIfGp_roomControl_getStayNo();
if ((s8)roomNo <= -1) {
if (roomNo <= -1) {
roomNo = dComIfGp_getStartStageRoomNo();
}
@@ -2367,16 +2367,14 @@ void dComIfGs_onVisitedRoom(int i_roomNo) {
/* 8002FC3C-8002FC98 02A57C 005C+00 0/0 0/0 1/1 .text dComIfGs_offVisitedRoom__Fi */
void dComIfGs_offVisitedRoom(int i_roomNo) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
dStage_FileList2_dt_c* list = dStage_roomControl_c::getFileList2(stayNo);
dStage_FileList2_dt_c* list = dStage_roomControl_c::getFileList2(dComIfGp_roomControl_getStayNo());
dComIfGs_offSaveVisitedRoom(list->field_0x13, i_roomNo);
}
/* 8002FC98-8002FCF4 02A5D8 005C+00 0/0 1/1 0/0 .text dComIfGs_isVisitedRoom__Fi */
BOOL dComIfGs_isVisitedRoom(int param_0) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(stayNo);
dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(dComIfGp_roomControl_getStayNo());
return dComIfGs_isSaveVisitedRoom(fileList->field_0x13, param_0);
}
src/d/d_demo.cpp
+2 -2
View File
@@ -1162,8 +1162,8 @@ void dDemo_c::reset() {
/* 80039F1C-80039F9C 03485C 0080+00 1/0 0/0 0/0 .text emitter_create__16dDemo_particle_cFUl */
JPABaseEmitter* dDemo_particle_c::emitter_create(u32 i_id) {
cXyz pos(0.0f, 0.0f, 0.0f);
int stayNo = dComIfGp_roomControl_getStayNo();
return dComIfGp_particle_set(i_id, &pos, NULL, NULL, 0xFF, NULL, stayNo, NULL, NULL, NULL);
return dComIfGp_particle_set(i_id, &pos, NULL, NULL, 0xFF, NULL,
dComIfGp_roomControl_getStayNo(), NULL, NULL, NULL);
}
/* 80039F9C-80039FFC 0348DC 0060+00 1/0 0/0 0/0 .text __dt__16dDemo_particle_cFv */
src/d/d_envse.cpp
+2 -2
View File
@@ -69,7 +69,7 @@ static void dEnvSe_getNearPathPos(cXyz* param_0, cXyz* param_1, dPath* i_path) {
/* 80182FD8-80183480 17D918 04A8+00 1/1 0/0 0/0 .text
* execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc */
int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 param_2) {
s32 roomNo = dComIfGp_roomControl_getStayNo();
int roomNo = dComIfGp_roomControl_getStayNo();
int path_roomNo = dComIfGp_roomControl_getStayNo();
BOOL var_r25 = false;
@@ -189,7 +189,7 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par
/* 80183480-801835A0 17DDC0 0120+00 1/1 0/0 0/0 .text execute__8dEnvSe_cFv */
int dEnvSe_c::execute() {
s32 roomNo = dComIfGp_roomControl_getStayNo();
int roomNo = dComIfGp_roomControl_getStayNo();
dStage_roomDt_c* roomDt_p = dComIfGp_roomControl_getStatusRoomDt(roomNo);
if (roomDt_p == NULL) {
src/d/d_error_msg.cpp
+2 -3
View File
@@ -177,7 +177,6 @@ u8 dDvdErrorMsg_c::execute() {
static u8 l_captureAlpha = 0xFF;
/* 8009D410-8009D790 097D50 0380+00 1/1 0/0 0/0 .text drawCapture__FUc */
// NONMATCHING - stack too small
static void drawCapture(u8 alpha) {
static bool l_texCopied = false;
@@ -188,7 +187,7 @@ static void drawCapture(u8 alpha) {
l_texCopied = true;
}
JFWDisplay::getManager()->setClearColor(g_clearColor);
mDoGph_gInf_c::setClearColor(g_clearColor);
mDoGph_gInf_c::beginRender();
GXSetAlphaUpdate(GX_FALSE);
j3dSys.drawInit();
@@ -218,7 +217,7 @@ static void drawCapture(u8 alpha) {
GXSetCullMode(GX_CULL_NONE);
GXSetDither(GX_ENABLE);
Mtx m;
Mtx44 m;
C_MTXOrtho(m, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 10.0f);
GXLoadPosMtxImm(g_mDoMtx_identity, GX_PNMTX0);
GXSetProjection(m, GX_ORTHOGRAPHIC);
src/d/d_ev_camera.cpp
+84 -135
View File
@@ -237,7 +237,7 @@ int dCamera_c::StartEventCamera(int param_0, int param_1, ...) {
va_end(args);
setFlag(0x20000000);
mCurCamTypeTimer = 0;
mCurCamStyleTimer = 0;
mEventData.field_0x0 = 0;
return 1;
}
@@ -299,7 +299,7 @@ bool dCamera_c::getEvIntData(int* i_data, char* i_event) {
*i_data = *dComIfGp_evmng_getMyIntegerP(mEventData.field_0x4, i_event);
} else {
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: (int) not found\n", i_event);
}
#endif
@@ -308,7 +308,7 @@ bool dCamera_c::getEvIntData(int* i_data, char* i_event) {
return 0;
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %d\n", i_event, *i_data);
}
#endif
@@ -329,7 +329,7 @@ bool dCamera_c::getEvFloatData(f32* i_data, char* i_event) {
*i_data = *dComIfGp_evmng_getMyFloatP(mEventData.field_0x4, i_event);
} else {
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: (float) not found\n", i_event);
}
#endif
@@ -338,7 +338,7 @@ bool dCamera_c::getEvFloatData(f32* i_data, char* i_event) {
return 0;
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %f\n", i_event, *i_data);
}
#endif
@@ -362,7 +362,7 @@ int dCamera_c::getEvFloatListData(f32** i_data, char* i_event) {
*i_data = dComIfGp_evmng_getMyFloatP(mEventData.field_0x4, i_event);
} else {
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: (float[]) not found\n", i_event);
}
#endif
@@ -371,7 +371,7 @@ int dCamera_c::getEvFloatListData(f32** i_data, char* i_event) {
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %f ... [%d]\n", i_event, **i_data, num);
}
#endif
@@ -395,7 +395,7 @@ int dCamera_c::getEvXyzListData(cXyz** i_data, char* i_event) {
*i_data = dComIfGp_evmng_getMyXyzP(mEventData.field_0x4, i_event);
} else {
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: (xyz[]) not found\n", i_event);
}
#endif
@@ -404,7 +404,7 @@ int dCamera_c::getEvXyzListData(cXyz** i_data, char* i_event) {
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %f %f %f ... [%d]\n", i_event, (*i_data)->x, (*i_data)->y, (*i_data)->z, num);
}
#endif
@@ -428,7 +428,7 @@ char* dCamera_c::getEvStringPntData(char* i_event) {
string = dComIfGp_evmng_getMyStringP(mEventData.field_0x4, i_event);
} else {
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: (string) not found\n", i_event);
}
#endif
@@ -437,7 +437,7 @@ char* dCamera_c::getEvStringPntData(char* i_event) {
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %s\n", i_event, string);
}
#endif
@@ -459,7 +459,7 @@ bool dCamera_c::getEvIntData(int* i_data, char* i_event, int param_2) {
} else {
*i_data = param_2;
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %d (d)\n", i_event, *i_data);
}
#endif
@@ -467,7 +467,7 @@ bool dCamera_c::getEvIntData(int* i_data, char* i_event, int param_2) {
return 0;
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %d\n", i_event, *i_data);
}
#endif
@@ -490,14 +490,14 @@ bool dCamera_c::getEvFloatData(f32* i_data, char* i_event, f32 param_2) {
} else {
*i_data = param_2;
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %f (d)\n", i_event, *i_data);
}
#endif
return 0;
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %f\n", i_event, *i_data);
}
#endif
@@ -519,14 +519,14 @@ bool dCamera_c::getEvXyzData(cXyz* i_data, char* i_event, cXyz param_2) {
} else {
*i_data = param_2;
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %f %f %f (d)\n", i_event, i_data->x, i_data->y, i_data->z);
}
#endif
return 0;
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %f %f %f\n", i_event, i_data->x, i_data->y, i_data->z);
}
#endif
@@ -549,14 +549,14 @@ bool dCamera_c::getEvStringData(char* i_data, char* i_event, char* param_2) {
} else {
strcpy(i_data, param_2);
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %s (d)\n", i_event, i_data);
}
#endif
return 0;
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %s\n", i_event, i_data);
}
#endif
@@ -581,7 +581,7 @@ char* dCamera_c::getEvStringPntData(char* i_event, char* param_1) {
} else {
string = param_1;
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %s (d)\n", i_event, string);
}
#endif
@@ -589,7 +589,7 @@ char* dCamera_c::getEvStringPntData(char* i_event, char* param_1) {
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
OS_REPORT("camera: event: %16s: %s\n", i_event, string);
}
#endif
@@ -624,7 +624,7 @@ fopAc_ac_c* dCamera_c::getEvActor(char* i_event) {
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (actor != NULL) {
char name[16];
fopAcM_getNameString(actor, name);
@@ -665,7 +665,7 @@ fopAc_ac_c* dCamera_c::getEvActor(char* i_event, char* param_1) {
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (actor != NULL) {
char name[16];
fopAcM_getNameString(actor, name);
@@ -680,23 +680,23 @@ fopAc_ac_c* dCamera_c::getEvActor(char* i_event, char* param_1) {
}
/* 80089730-800897E8 084070 00B8+00 0/0 3/0 0/0 .text pauseEvCamera__9dCamera_cFv */
int dCamera_c::pauseEvCamera() {
if (mCurCamTypeTimer == 0) {
bool dCamera_c::pauseEvCamera() {
if (mCurCamStyleTimer == 0) {
Reset();
field_0x158.field_0x0 = 1;
field_0x3e8 = getEvIntData(&field_0x3f0, "Timer", -1);
getEvIntData(&field_0x3ec, "Stay", 0);
mWork.event.field_0x0 = getEvIntData(&mWork.event.field_0x8, "Timer", -1);
getEvIntData(&mWork.event.field_0x4, "Stay", 0);
}
if (field_0x3ec != 0) {
if (mWork.event.field_0x4 != 0) {
setFlag(1);
}
if (field_0x3e8 && mCurCamTypeTimer < field_0x3f0) {
return 0;
if (mWork.event.field_0x0 && mCurCamStyleTimer < mWork.event.field_0x8) {
return false;
}
return 1;
return true;
}
/* ############################################################################################## */
@@ -742,7 +742,7 @@ SECTION_SDATA2 static u8 lit_5144[8] = {
SECTION_SDATA2 static f32 lit_5145 = 182.04444885253906f;
/* 800897E8-8008A510 084128 0D28+00 0/0 1/0 0/0 .text fixedFrameEvCamera__9dCamera_cFv */
int dCamera_c::fixedFrameEvCamera() {
bool dCamera_c::fixedFrameEvCamera() {
// NONMATCHING
}
@@ -764,7 +764,7 @@ SECTION_DEAD static char const* const stringBase_8037AB66 = "@PLAYER";
SECTION_SDATA2 static f32 lit_5346 = 1.0f;
/* 8008A510-8008A974 084E50 0464+00 0/0 1/0 0/0 .text stokerEvCamera__9dCamera_cFv */
int dCamera_c::stokerEvCamera() {
bool dCamera_c::stokerEvCamera() {
// NONMATCHING
}
@@ -789,7 +789,7 @@ SECTION_SDATA2 static f32 lit_5844[1 + 1 /* padding */] = {
SECTION_SDATA2 static f64 lit_5846 = 4503599627370496.0 /* cast u32 to float */;
/* 8008A974-8008B9B0 0852B4 103C+00 0/0 1/0 0/0 .text rollingEvCamera__9dCamera_cFv */
int dCamera_c::rollingEvCamera() {
bool dCamera_c::rollingEvCamera() {
// NONMATCHING
}
@@ -830,25 +830,25 @@ SECTION_SDATA2 static f64 lit_5962 = 4503601774854144.0 /* cast s32 to float */;
/* 8008B9B0-8008BE2C 0862F0 047C+00 0/0 1/0 0/0 .text fixedPositionEvCamera__9dCamera_cFv
*/
int dCamera_c::fixedPositionEvCamera() {
bool dCamera_c::fixedPositionEvCamera() {
// NONMATCHING
}
/* 8008BE2C-8008BE50 08676C 0024+00 0/0 1/0 0/0 .text uniformTransEvCamera__9dCamera_cFv
*/
int dCamera_c::uniformTransEvCamera() {
bool dCamera_c::uniformTransEvCamera() {
transEvCamera(1);
}
/* 8008BE50-8008BE74 086790 0024+00 0/0 1/0 0/0 .text uniformBrakeEvCamera__9dCamera_cFv
*/
int dCamera_c::uniformBrakeEvCamera() {
bool dCamera_c::uniformBrakeEvCamera() {
transEvCamera(2);
}
/* 8008BE74-8008BE98 0867B4 0024+00 0/0 1/0 0/0 .text uniformAcceleEvCamera__9dCamera_cFv
*/
int dCamera_c::uniformAcceleEvCamera() {
bool dCamera_c::uniformAcceleEvCamera() {
transEvCamera(3);
}
@@ -899,36 +899,6 @@ static bool func_8008E750(char param_0) {
return param_0 != '-' && param_0 != 'x';
}
/* 8008E774-8008E790 0890B4 001C+00 3/3 6/6 0/0 .text __as__7cSGlobeFRC7cSGlobe */
// void cSGlobe::operator=(cSGlobe const& param_0) {
extern "C" void __as__7cSGlobeFRC7cSGlobe() {
// NONMATCHING
}
/* 8008E790-8008E894 0890D0 0104+00 1/1 7/7 0/0 .text abs__4cXyzCFv */
// void cXyz::abs() const {
extern "C" void abs__4cXyzCFv() {
// NONMATCHING
}
/* 8008E894-8008E8D0 0891D4 003C+00 2/2 6/6 0/0 .text U__7cSGlobeFRC7cSAngle */
// void cSGlobe::U(cSAngle const& param_0) {
extern "C" void U__7cSGlobeFRC7cSAngle() {
// NONMATCHING
}
/* 8008E8D0-8008E904 089210 0034+00 1/1 1/1 0/0 .text __ami__4cXyzFRC3Vec */
// void cXyz::operator-=(Vec const& param_0) {
extern "C" void __ami__4cXyzFRC3Vec() {
// NONMATCHING
}
/* 8008E904-8008E938 089244 0034+00 1/1 5/5 0/0 .text __apl__4cXyzFRC3Vec */
// void cXyz::operator+=(Vec const& param_0) {
extern "C" void __apl__4cXyzFRC3Vec() {
// NONMATCHING
}
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
@@ -992,13 +962,7 @@ SECTION_SDATA2 static f32 lit_7346 = 1.0f / 10.0f;
SECTION_SDATA2 static f32 lit_7347 = 30.0f;
/* 8008E938-8008FA58 089278 1120+00 0/0 1/0 0/0 .text watchActorEvCamera__9dCamera_cFv */
int dCamera_c::watchActorEvCamera() {
// NONMATCHING
}
/* 8008FA58-8008FA94 08A398 003C+00 2/2 7/7 0/0 .text V__7cSGlobeFRC7cSAngle */
// void cSGlobe::V(cSAngle const& param_0) {
extern "C" void V__7cSGlobeFRC7cSAngle() {
bool dCamera_c::watchActorEvCamera() {
// NONMATCHING
}
@@ -1006,13 +970,6 @@ extern "C" void V__7cSGlobeFRC7cSAngle() {
/* 80452940-80452944 000F40 0004+00 5/5 0/0 0/0 .sdata2 @7357 */
SECTION_SDATA2 static f32 lit_7357 = 15.0f;
/* 8008FA94-8008FAE8 08A3D4 0054+00 7/7 0/0 0/0 .text
* lineCollisionCheck__25@unnamed@d_ev_camera_cpp@F4cXyz4cXyzP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c
*/
static void func_8008FA94() {
// NONMATCHING
}
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
@@ -1028,16 +985,16 @@ static u8 lit_7364[12];
static f32 DefaultGap_7363[3];
/* 8008FAE8-80090174 08A428 068C+00 0/0 1/0 0/0 .text restorePosEvCamera__9dCamera_cFv */
int dCamera_c::restorePosEvCamera() {
bool dCamera_c::restorePosEvCamera() {
// NONMATCHING
}
/* 80090174-80090230 08AAB4 00BC+00 0/0 1/0 0/0 .text talktoEvCamera__9dCamera_cFv */
int dCamera_c::talktoEvCamera() {
bool dCamera_c::talktoEvCamera() {
dComIfGp_event_getPt1();
s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[field_0x190][3];
s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[mIsWolf][3];
if (mCurCamTypeTimer == 0) {
if (mCurCamStyleTimer == 0) {
clrFlag(0x200000);
}
@@ -1046,13 +1003,13 @@ int dCamera_c::talktoEvCamera() {
}
#if DEBUG
if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
if (mCurCamStyleTimer == 0 && mCamSetup.CheckFlag(0x40)) {
u32 id = mCamParam.Id(style);
OS_REPORT("camera: event: %16s = %d (%c%c%c%c)\n", "style", style, (u8)(id >> 0x18), (u8)(id >> 0x10), (u8)(id >> 0x8), (u8)(id));
}
#endif
(this->*engine_tbl[mCamParam.Algorythmn(style)])(style);
return (this->*engine_tbl[mCamParam.Algorythmn(style)])(style);
}
@@ -1066,13 +1023,13 @@ SECTION_DEAD static char const* const stringBase_8037AC5C = "CameraID";
/* 80090230-80090478 08AB70 0248+00 0/0 1/0 0/0 .text maptoolIdEvCamera__9dCamera_cFv */
bool dCamera_c::maptoolIdEvCamera() {
if (mCurCamTypeTimer == 0) {
if (mCurCamStyleTimer == 0) {
int id;
getEvIntData(&id, "ID", g_dComIfG_gameInfo.play.getEvent().getMapToolId());
mEventData.field_0x8 = 0;
field_0x160 = 0;
mCurCamTypeTimer = 0;
mCurCamStyleTimer = 0;
mEventData.field_0xec = dEvt_control_c::searchMapEventData(id);
#ifdef DEBUG
OSReport("%06d: %s: %d: map data ID %d %x\n", field_0xa8, __FILE__, 2792, id,
@@ -1092,7 +1049,7 @@ bool dCamera_c::maptoolIdEvCamera() {
#ifdef DEBUG
OSReport("%d: %s: %d: ERROR!! no map data!!!\n", field_0xa8, __FILE__, 2805);
#endif
return 1;
return true;
}
int room_no = dComIfGp_roomControl_getStayNo();
@@ -1111,12 +1068,12 @@ bool dCamera_c::maptoolIdEvCamera() {
}
mEventData.field_0xc = GetCameraTypeFromMapToolID(temp_r31, room_no);
bool var_r31 = 0;
bool var_r31 = false;
if (mEventData.field_0xc != 0xFF) {
s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[field_0x190][0];
s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[mIsWolf][0];
#ifdef DEBUG
if (mCurCamTypeTimer == 0) {
if (mCurCamStyleTimer == 0) {
OSReport("type %d mode %d style %d\n", mEventData.field_0xc, 0, style);
}
#endif
@@ -1124,26 +1081,26 @@ bool dCamera_c::maptoolIdEvCamera() {
if (mEventData.field_0xec->mType == 0) {
if (mEventData.field_0xec->field_0x14 == 0xFF ||
mCurCamTypeTimer > mEventData.field_0xec->field_0x14)
mCurCamStyleTimer > mEventData.field_0xec->field_0x14)
{
var_r31 = 1;
var_r31 = true;
}
} else {
return var_r3;
}
} else {
mEventData.field_0xec = NULL;
var_r31 = 1;
var_r31 = true;
}
if (var_r31) {
if (mEventData.field_0xec->mType == 0 && (mEventData.field_0xec->field_0xC & 0x20)) {
return mDoCPd_c::getHoldA(mPadID) || mDoCPd_c::getHoldB(mPadID);
}
return 1;
return true;
}
return 0;
return false;
}
@@ -1156,8 +1113,8 @@ SECTION_DEAD static char const* const stringBase_8037AC6A = "FN01";
#pragma pop
/* 80090478-80090514 08ADB8 009C+00 0/0 1/0 0/0 .text styleEvCamera__9dCamera_cFv */
int dCamera_c::styleEvCamera() {
if (mCurCamTypeTimer == 0) {
bool dCamera_c::styleEvCamera() {
if (mCurCamStyleTimer == 0) {
mEventData.field_0x8 = 0;
field_0x160 = 0;
}
@@ -1322,7 +1279,7 @@ SECTION_SDATA2 static f32 lit_8225 = 350.0f;
SECTION_SDATA2 static f32 lit_8226 = 49.0f / 50.0f;
/* 80090514-80091468 08AE54 0F54+00 0/0 1/0 0/0 .text gameOverEvCamera__9dCamera_cFv */
int dCamera_c::gameOverEvCamera() {
bool dCamera_c::gameOverEvCamera() {
// NONMATCHING
}
@@ -1505,26 +1462,18 @@ SECTION_SDATA2 static f32 lit_8752 = -30.0f;
SECTION_SDATA2 static f32 lit_8753 = -160.0f;
/* 80091468-8009236C 08BDA8 0F04+00 1/0 1/0 0/0 .text tactEvCamera__9dCamera_cFv */
int dCamera_c::tactEvCamera() {
// NONMATCHING
}
/* 8009236C-800923B8 08CCAC 004C+00 1/1 0/0 0/0 .text
* dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs */
/* static void dComIfGp_saveCameraPosition(int param_0, cXyz* param_1, cXyz* param_2, f32 param_3,
s16 param_4) { */
extern "C" void dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs() {
bool dCamera_c::tactEvCamera() {
// NONMATCHING
}
/* 800923B8-800923C0 08CCF8 0008+00 0/0 1/0 0/0 .text turnToActorEvCamera__9dCamera_cFv
*/
int dCamera_c::turnToActorEvCamera() {
bool dCamera_c::turnToActorEvCamera() {
return true;
}
/* 800923C0-800924D0 08CD00 0110+00 0/0 1/0 0/0 .text stbWaitEvCamera__9dCamera_cFv */
int dCamera_c::stbWaitEvCamera() {
bool dCamera_c::stbWaitEvCamera() {
dDemo_camera_c* demo_cam = dDemo_c::getCamera();
#if DEBUG
char* enabled_report = "-----";
@@ -1532,21 +1481,21 @@ int dCamera_c::stbWaitEvCamera() {
if (demo_cam != NULL) {
if (demo_cam->checkEnable(0x40)) {
field_0x5c.field_0x8 = demo_cam->getTarget();
field_0x5c.mCenter = demo_cam->getTarget();
#if DEBUG
enabled_report[0] = 'C';
#endif
}
if (demo_cam->checkEnable(0x10)) {
field_0x5c.field_0x14 = demo_cam->getTrans();
field_0x5c.mEye = demo_cam->getTrans();
#if DEBUG
enabled_report[1] = 'E';
#endif
}
if (demo_cam->checkEnable(0x4)) {
field_0x80 = demo_cam->getFovy();
field_0x5c.mFovy = demo_cam->getFovy();
#if DEBUG
enabled_report[2] = 'F';
#endif
@@ -1560,7 +1509,7 @@ int dCamera_c::stbWaitEvCamera() {
}
if (demo_cam->checkEnable(0x80)) {
field_0x5c.field_0x20 = cAngle::d2s(-demo_cam->getRoll());
field_0x5c.mBank = cAngle::d2s(-demo_cam->getRoll());
#if DEBUG
enabled_report[4] = 'B';
#endif
@@ -1572,7 +1521,7 @@ int dCamera_c::stbWaitEvCamera() {
}
#endif
field_0x5c.field_0x0.Val(field_0x5c.field_0x14 - field_0x5c.field_0x8);
field_0x5c.mDirection.Val(field_0x5c.mEye - field_0x5c.mCenter);
}
return true;
@@ -1580,18 +1529,18 @@ int dCamera_c::stbWaitEvCamera() {
/* 800924D0-8009258C 08CE10 00BC+00 0/0 1/0 0/0 .text saveEvCamera__9dCamera_cFv */
int dCamera_c::saveEvCamera() {
bool dCamera_c::saveEvCamera() {
int slot;
getEvIntData(&slot, "Slot", 0);
if (slot == 9) {
dComIfGp_saveCameraPosition(0, &field_0x5c.field_0x8, &field_0x5c.field_0x14, field_0x80, field_0x5c.field_0x20.Val());
dComIfGp_saveCameraPosition(0, &field_0x5c.mCenter, &field_0x5c.mEye, field_0x5c.mFovy, field_0x5c.mBank.Val());
} else {
pushInfo(&field_0xd0[slot], 1);
}
field_0x158.field_0x0 = 1;
return 1;
return true;
}
/* ############################################################################################## */
@@ -1603,7 +1552,7 @@ SECTION_RODATA static u8 const lit_8840[24] = {
COMPILER_STRIP_GATE(0x8037A884, &lit_8840);
/* 8009258C-800929AC 08CECC 0420+00 0/0 1/0 0/0 .text loadEvCamera__9dCamera_cFv */
int dCamera_c::loadEvCamera() {
bool dCamera_c::loadEvCamera() {
// NONMATCHING
}
@@ -1778,7 +1727,7 @@ SECTION_SDATA2 static f32 lit_9440 = 270.0f;
SECTION_SDATA2 static f32 lit_9441 = 300.0f;
/* 800929AC-800937AC 08D2EC 0E00+00 0/0 1/0 0/0 .text useItem0EvCamera__9dCamera_cFv */
int dCamera_c::useItem0EvCamera() {
bool dCamera_c::useItem0EvCamera() {
// NONMATCHING
}
@@ -1805,7 +1754,7 @@ SECTION_SDATA2 static f32 lit_9800 = -180.0f;
SECTION_SDATA2 static f32 lit_9801 = 170.0f;
/* 800937AC-80094240 08E0EC 0A94+00 0/0 1/0 0/0 .text useItem1EvCamera__9dCamera_cFv */
int dCamera_c::useItem1EvCamera() {
bool dCamera_c::useItem1EvCamera() {
// NONMATCHING
}
@@ -1863,7 +1812,7 @@ SECTION_SDATA2 static f32 lit_10125 = -164.0f;
SECTION_SDATA2 static f32 lit_10126 = -220.0f;
/* 80094240-80094A70 08EB80 0830+00 0/0 1/0 0/0 .text getItemEvCamera__9dCamera_cFv */
int dCamera_c::getItemEvCamera() {
bool dCamera_c::getItemEvCamera() {
// NONMATCHING
}
@@ -1896,7 +1845,7 @@ SECTION_SDATA2 static f32 lit_10283 = 9.0f / 100.0f;
SECTION_SDATA2 static f32 lit_10284 = 9.0f / 50.0f;
/* 80094A70-80095010 08F3B0 05A0+00 0/0 1/0 0/0 .text possessedEvCamera__9dCamera_cFv */
int dCamera_c::possessedEvCamera() {
bool dCamera_c::possessedEvCamera() {
// NONMATCHING
}
@@ -1915,12 +1864,12 @@ SECTION_SDATA2 static f32 lit_10437 = 1.0f / 100.0f;
/* 80095010-8009544C 08F950 043C+00 0/0 1/0 0/0 .text fixedFramesEvCamera__9dCamera_cFv
*/
int dCamera_c::fixedFramesEvCamera() {
bool dCamera_c::fixedFramesEvCamera() {
// NONMATCHING
}
/* 8009544C-800956E4 08FD8C 0298+00 0/0 1/0 0/0 .text bSplineEvCamera__9dCamera_cFv */
int dCamera_c::bSplineEvCamera() {
bool dCamera_c::bSplineEvCamera() {
// NONMATCHING
}
@@ -1956,12 +1905,12 @@ SECTION_SDATA2 static f32 lit_10781 = 10000.0f;
SECTION_SDATA2 static f32 lit_10782 = 0.25f;
/* 800956E4-80095E7C 090024 0798+00 0/0 1/0 0/0 .text twoActor0EvCamera__9dCamera_cFv */
int dCamera_c::twoActor0EvCamera() {
bool dCamera_c::twoActor0EvCamera() {
// NONMATCHING
}
/* 80095E7C-80095FD0 0907BC 0154+00 0/0 1/0 0/0 .text peepHoleEvCamera__9dCamera_cFv */
int dCamera_c::peepHoleEvCamera() {
bool dCamera_c::peepHoleEvCamera() {
// NONMATCHING
}
@@ -1976,7 +1925,7 @@ SECTION_DEAD static char const* const stringBase_8037AD14 = "R_SP01";
SECTION_SDATA2 static f32 lit_11068 = 245.0f;
/* 80095FD0-800965AC 090910 05DC+00 0/0 1/0 0/0 .text digHoleEvCamera__9dCamera_cFv */
int dCamera_c::digHoleEvCamera() {
bool dCamera_c::digHoleEvCamera() {
// NONMATCHING
}
@@ -2023,7 +1972,7 @@ SECTION_SDATA2 static f32 lit_11421 = 0.75f;
SECTION_SDATA2 static f32 lit_11422 = 2.0f / 5.0f;
/* 800965AC-80096EDC 090EEC 0930+00 0/0 1/0 0/0 .text hintTalkEvCamera__9dCamera_cFv */
int dCamera_c::hintTalkEvCamera() {
bool dCamera_c::hintTalkEvCamera() {
// NONMATCHING
}
@@ -2048,12 +1997,12 @@ SECTION_DEAD static char const* const stringBase_8037AD60 = "xxooox";
#pragma pop
/* 80096EDC-80097694 09181C 07B8+00 0/0 1/0 0/0 .text bspTransEvCamera__9dCamera_cFv */
int dCamera_c::bspTransEvCamera() {
bool dCamera_c::bspTransEvCamera() {
// NONMATCHING
}
/* 80097694-8009769C 091FD4 0008+00 0/0 1/0 0/0 .text portalWarpEvCamera__9dCamera_cFv */
int dCamera_c::portalWarpEvCamera() {
bool dCamera_c::portalWarpEvCamera() {
return true;
}
@@ -2091,7 +2040,7 @@ extern "C" void setFlag__9dCamera_cFUl() {
}
/* 8009778C-800977A8 0920CC 001C+00 1/1 2/2 0/0 .text eyePos__9dCamera_cFP10fopAc_ac_c */
void dCamera_c::eyePos(fopAc_ac_c* param_0) {
cXyz dCamera_c::eyePos(fopAc_ac_c* param_0) {
// NONMATCHING
}
src/d/d_event_manager.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ const char* dEvent_exception_c::getEventName() {
"PORTALWARP_START", "PORTALWARP_START_B",
};
s32 roomNo = dComIfGp_roomControl_getStayNo();
int roomNo = dComIfGp_roomControl_getStayNo();
dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo);
dStage_MapEventInfo_c* eventInfo = roomDt->getMapEventInfo();
if (mEventInfoIdx == -1) {
src/d/d_item.cpp
+1 -2
View File
@@ -774,8 +774,7 @@ void item_func_WOOD_STICK() {
dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD);
dComIfGs_setSelectEquipSword(fpcNm_ITEM_WOOD_STICK);
s32 roomNo = dComIfGp_roomControl_getStayNo();
dComIfGs_onSwitch(28, roomNo);
dComIfGs_onSwitch(28, dComIfGp_roomControl_getStayNo());
}
void item_func_BOOMERANG() {
src/d/d_kankyo.cpp
+3 -5
View File
@@ -5402,7 +5402,7 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p
J3DLightInfo* sp44;
GXColor sp40;
int sp3C;
s32 sp38;
int sp38;
stage_pure_lightvec_info_class* stage_light_info_p;
int sp30;
@@ -5463,10 +5463,8 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p
sp3C = dComIfGp_roomControl_getStatusRoomDt(param_1->room_no)
->getLightVecInfoNum();
} else {
s32 room_no = dComIfGp_roomControl_getStayNo(); // fakematch, fixes instruction order
stage_light_info_p = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo();
room_no = dComIfGp_roomControl_getStayNo(); // fakematch, fixes instruction order
sp3C = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum();
stage_light_info_p = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getLightVecInfo();
sp3C = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getLightVecInfoNum();
}
f32 var_f27;
src/d/d_kankyo_wether.cpp
+4 -8
View File
@@ -1269,11 +1269,9 @@ void dKyw_wind_set() {
var_r28 = dStage_FileList_dt_GlobalWindDir(fili_p);
}
s32 var_r4 = dComIfGp_roomControl_getStayNo();
if (dComIfGp_roomControl_getStatusRoomDt(var_r4) != NULL) {
s32 var_r4_2 = dComIfGp_roomControl_getStayNo();
if (dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo()) != NULL) {
dStage_Lbnk_c* lbnk_p =
dComIfGp_roomControl_getStatusRoomDt(var_r4_2)->getLbnk();
dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getLbnk();
if (lbnk_p != NULL) {
dStage_Lbnk_dt_c* data_p = lbnk_p->entries;
@@ -1318,11 +1316,9 @@ void dKyw_wind_set() {
wind_level = dStage_FileList_dt_GlobalWindLevel(fili_p);
}
s32 var_r4_3 = dComIfGp_roomControl_getStayNo();
if (dComIfGp_roomControl_getStatusRoomDt(var_r4_3) != NULL) {
s32 var_r4_4 = dComIfGp_roomControl_getStayNo();
if (dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo()) != NULL) {
dStage_Lbnk_c* lbnk_p =
dComIfGp_roomControl_getStatusRoomDt(var_r4_4)->getLbnk();
dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getLbnk();
if (lbnk_p != NULL) {
dStage_Lbnk_dt_c* data_p = lbnk_p->entries;
src/d/d_map_path_dmap.cpp
+1 -2
View File
@@ -74,8 +74,7 @@ Vec dMapInfo_n::getMapPlayerPos() {
pos.z = 0.0f;
}
s32 stayNo = dComIfGp_roomControl_getStayNo();
dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(stayNo);
dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(dComIfGp_roomControl_getStayNo());
if (fileList2_p != NULL) {
rotAngle(fileList2_p, &pos);
offsetPlus(fileList2_p, &pos);
src/d/d_map_path_fmap.cpp
+5 -9
View File
@@ -569,17 +569,15 @@ bool dMenuFmapIconDisp_c::getPosition(int* o_stageNo, int* o_roomNo, f32* o_posX
*/
// NONMATCHING regalloc
bool dMenuFmapIconDisp_c::isDrawDisp() {
bool ret;
dMenu_Fmap_stage_arc_data_c* stage_arc = mpStageData->getStageArc();
if (stage_arc == NULL) {
return false;
}
u8 save_table_no = stage_arc->getSaveTableNo();
int room_no = mpRoomData->getRoomNo();
s32 room_no = mpRoomData->getRoomNo();
bool bVar2 = (mStayStageNo == mStageNo && mStayRoomNo == room_no) || mpRoomData->isArrival();
ret = false;
bool ret = false;
bool bVar1;
switch (mTypeGroupNo) {
@@ -633,11 +631,9 @@ bool dMenuFmapIconDisp_c::isDrawDisp() {
case 6:
if (save_table_no == mSaveTbl) {
ret = dComIfGs_isSwitch(mpTresData->mSwBit, room_no) ? true : false;
} else {
if (mpTresData->mSwBit < 0x80) {
ret = dComIfGs_isStageSwitch(save_table_no, mpTresData->mSwBit) ? true : false;
}
ret = dComIfGs_isSwitch(mpTresData->mSwBit, room_no) != FALSE;
} else if (mpTresData->mSwBit < 0x80) {
ret = dComIfGs_isStageSwitch(save_table_no, mpTresData->mSwBit) != FALSE;
}
break;
src/d/d_menu_fmap.cpp
+5 -4
View File
@@ -1617,7 +1617,7 @@ void dMenu_Fmap_c::table_demo1_init() {
for (int i = 0; i < 8; i++) {
if (mpRegionData[i] != NULL && mpStageData[i] != NULL) {
s32 stay_no = dComIfGp_roomControl_getStayNo();
int stay_no = dComIfGp_roomControl_getStayNo();
icon.init(mpRegionData[i], mpStageData[i], 5, mStayStageNo, stay_no);
while (!icon.getValidData()) {
@@ -2740,7 +2740,8 @@ bool dMenu_Fmap_c::checkDrawPortalIcon(int i_stageNo, int i_switchNo) {
bool dMenu_Fmap_c::searchIcon(u8 i_typeGroupNo, int i_swBit, f32* o_posX, f32* o_posZ) {
dMenuFmapIconDisp_c icon;
dMenu_Fmap_stage_data_c* stage_data;
int tmp_r26, stay_no;
int tmp_r26;
s32 stay_no;
bool ret = false;
stay_no = dComIfGp_roomControl_getStayNo();
tmp_r26 = mStayStageNo;
@@ -2774,7 +2775,7 @@ void dMenu_Fmap_c::drawIcon(u8 i_typeGroupNo, int param_1) {
dMenuFmapIconDisp_c icon;
dMenu_Fmap_stage_data_c* stage_data;
int tmp_r30;
int stay_no = dComIfGp_roomControl_getStayNo();
s32 stay_no = dComIfGp_roomControl_getStayNo();
tmp_r30 = mStayStageNo;
stage_data = getNowFmapStageData();
dMenu_Fmap_region_data_c* region_data = getNowFmapRegionData();
@@ -3014,4 +3015,4 @@ cXyz* dMenu_Fmap_c::getPlayerPos2D() {
&mPlayerPos.x, &mPlayerPos.y);
mPlayerPos.z = 0.0f;
return &mPlayerPos;
}
}
src/d/d_menu_fmap_map.cpp
+6 -107
View File
@@ -8,104 +8,6 @@
#include "SSystem/SComponent/c_math.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_graphic.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" static void twoValueLineInterpolation__FUcUcf();
extern "C" static void twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor();
extern "C" void init__15renderingFmap_cFPUcUsUsUsUs();
extern "C" void entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff();
extern "C" void isSwitchSpecialOff__15renderingFmap_cFi();
extern "C" void isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class();
extern "C" void getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi();
extern "C" void preDrawPath__15renderingFmap_cFv();
extern "C" bool isDrawPath__15renderingFmap_cFv();
extern "C" void isDrawRoom__15renderingFmap_cFv();
extern "C" void postDrawPath__15renderingFmap_cFv();
extern "C" void postRenderingMap__15renderingFmap_cFv();
extern "C" void roomSetteing__15renderingFmap_cFv();
extern "C" void getFirstRoomPointer__15renderingFmap_cFv();
extern "C" void getFirstRegion__15renderingFmap_cFv();
extern "C" void getFirstStage__15renderingFmap_cFv();
extern "C" void getFirstRoom__15renderingFmap_cFv();
extern "C" void getNextRoom__15renderingFmap_cFv();
extern "C" void getNextStage__15renderingFmap_cFv();
extern "C" void getNextRegion__15renderingFmap_cFv();
extern "C" void getNextRoomPointer__15renderingFmap_cFv();
extern "C" void setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc();
extern "C" void setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor();
extern "C" void isFlashRoomNoCheck__15dMenu_FmapMap_cCFi();
extern "C" void setPointColor__15dMenu_FmapMap_cFf();
extern "C" void __ct__15dMenu_FmapMap_cFv();
extern "C" void __dt__15dMenu_FmapMap_cFv();
extern "C" void _create__15dMenu_FmapMap_cFUsUsUsUsPv();
extern "C" void _delete__15dMenu_FmapMap_cFv();
extern "C" void draw__15dMenu_FmapMap_cFv();
extern "C" void rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class();
extern "C" void getLineWidth__15dMenu_FmapMap_cFi();
extern "C" void isDrawType__15dMenu_FmapMap_cFi();
extern "C" void setFlashOn__15dMenu_FmapMap_cFiiPUci();
extern "C" void getLineColor__15dMenu_FmapMap_cFii();
extern "C" void getBackColor__15dMenu_FmapMap_cCFv();
extern "C" void getColor__15dMenu_FmapMap_cFi();
extern "C" void setTexture__15dMenu_FmapMap_cFUsUsUsUs();
extern "C" void setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff();
extern "C" void __dt__15renderingFmap_cFv();
extern "C" bool isRenderingFloor__15renderingFmap_cFi();
extern "C" void beforeDrawPath__15renderingFmap_cFv();
extern "C" void afterDrawPath__15renderingFmap_cFv();
extern "C" extern char const* const d_menu_d_menu_fmap_map__stringBase0;
extern "C" u8 m_other__22dMfm_HIO_prm_res_src_s[1 + 3 /* padding */];
//
// External References:
//
extern "C" void mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs();
extern "C" void draw__12dDlst_base_cFv();
extern "C" bool isDrawType__11dDrawPath_cFi();
extern "C" void getLineColor__11dDrawPath_cFii();
extern "C" void dComIfGs_isStageSwitch__Fii();
extern "C" void dComIfGp_getNowLevel__Fv();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class();
extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class();
extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class();
extern "C" void drawPath__11dDrawPath_cFv();
extern "C" void makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs();
extern "C" void renderingMap__15dRenderingMap_cFv();
extern "C" void preRenderingMap__18dRenderingFDAmap_cFv();
extern "C" void postRenderingMap__18dRenderingFDAmap_cFv();
extern "C" void renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class();
extern "C" void getDecoLineColor__18dRenderingFDAmap_cFii();
extern "C" void getDecorationLineWidth__18dRenderingFDAmap_cFi();
extern "C" void isArrival__22dMenu_Fmap_room_data_cFv();
extern "C" void getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi();
extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
extern "C" void* __nw__FUli();
extern "C" void* __nwa__FUli();
extern "C" void __dl__FPv();
extern "C" void __dla__FPv();
extern "C" void GXClearVtxDesc();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16];
extern "C" extern void* __vt__15dRenderingMap_c[23];
extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
//
/* 801CE068-801CE0CC 1C89A8 0064+00 1/1 0/0 0/0 .text twoValueLineInterpolation__FUcUcf
*/
@@ -523,16 +425,13 @@ void dMenu_FmapMap_c::_delete() {
const dMfm_HIO_prm_res_src_s dMfm_HIO_prm_res_src_s::m_other = {30};
/* 801CEE94-801CF0B4 1C97D4 0220+00 1/0 0/0 0/0 .text draw__15dMenu_FmapMap_cFv */
// NONMATCHING regalloc and instructions out of order
// NONMATCHING instructions out of order
void dMenu_FmapMap_c::draw() {
f32 fVar3;
int iVar2 = mFlashTimer;
int iVar1 = dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2;
if (iVar2 < iVar1) {
fVar3 = (f32)(iVar1 - iVar2) / (f32)iVar1;
} else {
fVar3 = (f32)(iVar2 - iVar1) / (f32)iVar1;
}
f32 fVar3 = mFlashTimer < dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2 ?
(f32)(dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2 - mFlashTimer)
/ (f32)(dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2) :
(f32)(mFlashTimer - dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2)
/ (f32)(dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2);
setPointColor(1.0f - fVar3);
GXColor color;
src/d/d_meter_map.cpp
+2 -3
View File
@@ -32,10 +32,9 @@ bool dMeterMap_c::isEnableDispMap() {
/* 8020D528-8020D650 207E68 0128+00 3/3 0/0 0/0 .text getMapDispSizeTypeNo__11dMeterMap_cFv */
int dMeterMap_c::getMapDispSizeTypeNo() {
int uvar6 = 7;
s32 stayNo = dComIfGp_roomControl_getStayNo();
dStage_FileList_dt_c* fList =
dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo();
dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo();
if (fList != NULL) {
uvar6 = dStage_FileList_dt_getMiniMap(fList);
}
@@ -291,7 +290,7 @@ void dMeterMap_c::_move(u32 param_0) {
dMeter2Info_setPauseStatus(2);
}
}
s32 stayNo = dComIfGp_roomControl_getStayNo();
int stayNo = dComIfGp_roomControl_getStayNo();
field_0x14 = param_0;
field_0x2a = checkMoveStatus();
src/d/d_msg_flow.cpp
+4 -5
View File
@@ -513,9 +513,9 @@ int dMsgFlow_c::messageNodeProc(fopAc_ac_c* param_1, fopAc_ac_c** param_2) {
if (msg == NULL) {
field_0x25 = 1;
} else {
int mesgCamInfo = dComIfGp_getMesgCameraInfo();
if (mesgCamInfo != field_0x34) {
field_0x34 = mesgCamInfo;
int mesgCamInfoBasicID = dComIfGp_getMesgCameraInfo()->mBasicID;
if (mesgCamInfoBasicID != field_0x34) {
field_0x34 = mesgCamInfoBasicID;
}
switch (msg->mode) {
case 2:
@@ -591,9 +591,8 @@ int dMsgFlow_c::eventNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) {
if (getParam(node->params) == 0) {
int msgNum;
if (daAlink_getAlinkActorClass()->getMidnaMsgNum() == 0xFFFF) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
msgNum =
dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo()->mMsg;
dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo()->mMsg;
} else {
msgNum = daAlink_getAlinkActorClass()->getMidnaMsgNum();
daAlink_getAlinkActorClass()->setMidnaMsg();
src/d/d_msg_unit.cpp
+2 -56
View File
@@ -5,71 +5,17 @@
#include "d/d_msg_unit.h"
#include "stdio.h"
#include "dol2asm.h"
#include "d/d_kankyo.h"
#include "d/d_meter2_info.h"
//
// Forward References:
//
extern "C" void __ct__10dMsgUnit_cFv();
extern "C" void __dt__10dMsgUnit_cFv();
extern "C" void setTag__10dMsgUnit_cFiiPcb();
extern "C" void __sinit_d_msg_unit_cpp();
extern "C" extern char const* const d_msg_d_msg_unit__stringBase0;
extern "C" extern u8 data_804510D8[8];
//
// External References:
//
extern "C" void getDaytime__18dScnKy_env_light_cFv();
extern "C" void __dl__FPv();
extern "C" void __register_global_object();
extern "C" void _savegpr_26();
extern "C" void _restgpr_26();
//
// Declarations:
//
/* 80238C94-80238CA4 2335D4 0010+00 1/1 0/0 0/0 .text __ct__10dMsgUnit_cFv */
dMsgUnit_c::dMsgUnit_c() {}
/* 80238CA4-80238CEC 2335E4 0048+00 2/1 0/0 0/0 .text __dt__10dMsgUnit_cFv */
dMsgUnit_c::~dMsgUnit_c() {}
/* ############################################################################################## */
/* 803996E8-803996E8 025D48 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803996E8 = "%d";
SECTION_DEAD static char const* const stringBase_803996EB = "%d-%d";
SECTION_DEAD static char const* const stringBase_803996F1 = "%d:%02d";
SECTION_DEAD static char const* const stringBase_803996F9 = "";
SECTION_DEAD static char const* const stringBase_803996FA = "%d%s";
SECTION_DEAD static char const* const stringBase_803996FF = "%d %s";
#pragma pop
/* 80454B40-80454B44 003140 0004+00 1/1 0/0 0/0 .sdata2 @3702 */
SECTION_SDATA2 static f32 lit_3702 = 1000000.0f;
/* 80454B44-80454B48 003144 0004+00 1/1 0/0 0/0 .sdata2 @3703 */
SECTION_SDATA2 static f32 lit_3703 = 60.0f;
/* 80454B48-80454B50 003148 0004+04 1/1 0/0 0/0 .sdata2 @3704 */
SECTION_SDATA2 static f32 lit_3704[1 + 1 /* padding */] = {
15.0f,
/* padding */
0.0f,
};
/* 80454B50-80454B58 003150 0008+00 1/1 0/0 0/0 .sdata2 @3707 */
SECTION_SDATA2 static f64 lit_3707 = 4503601774854144.0 /* cast s32 to float */;
/* 80238CEC-8023907C 23362C 0390+00 0/0 5/5 0/0 .text setTag__10dMsgUnit_cFiiPcb */
// NONMATCHING - regalloc + mulli issue
// NONMATCHING - regalloc
void dMsgUnit_c::setTag(int param_1, int param_2, char* param_3, bool param_4) {
*param_3 = 0;
if (param_1 == 0x10000) {
@@ -79,7 +25,7 @@ void dMsgUnit_c::setTag(int param_1, int param_2, char* param_3, bool param_4) {
} else if (param_1 == 4 && param_4 == true) {
int r6 = param_2 / 1000;
int r5 = r6 / 60;
r6 %= 60;
r6 -= r5 * 60;
if (r5 > 99) {
r5 = 99;
r6 = 59;
src/d/d_name.cpp
+59 -298
View File
@@ -3,8 +3,6 @@
// Translation Unit: d/d_name
//
#define NO_INLINE_DLSTBASE_DRAW
#include "d/d_name.h"
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "d/d_com_inf_game.h"
@@ -16,123 +14,13 @@
#include "JSystem/J2DGraph/J2DAnmLoader.h"
#include "f_op/f_op_msg_mng.h"
//
// Forward References:
//
extern "C" void __ct__9dNm_HIO_cFv();
extern "C" void __ct__7dName_cFP7J2DPane();
extern "C" void __dt__7dName_cFv();
extern "C" void _create__7dName_cFv();
extern "C" void init__7dName_cFv();
extern "C" void initial__7dName_cFv();
extern "C" void showIcon__7dName_cFv();
extern "C" void _move__7dName_cFv();
extern "C" void nameCheck__7dName_cFv();
extern "C" void playNameSet__7dName_cFi();
extern "C" void cursorAnm__7dName_cFv();
extern "C" void Wait__7dName_cFv();
extern "C" void MojiSelect__7dName_cFv();
extern "C" void MojiSelectAnmInit__7dName_cFv();
extern "C" void MojiSelectAnm__7dName_cFv();
extern "C" void MojiSelectAnm2__7dName_cFv();
extern "C" void MojiSelectAnm3__7dName_cFv();
extern "C" void mojiChange__7dName_cFUc();
extern "C" void selectMojiSet__7dName_cFv();
extern "C" void getMoji__7dName_cFv();
extern "C" void setMoji__7dName_cFi();
extern "C" void setNameText__7dName_cFv();
extern "C" void nameCursorMove__7dName_cFv();
extern "C" void selectCursorMove__7dName_cFv();
extern "C" void menuCursorPosSet__7dName_cFv();
extern "C" void MenuSelect__7dName_cFv();
extern "C" void MenuSelectAnmInit__7dName_cFv();
extern "C" void MenuSelectAnm__7dName_cFv();
extern "C" void MenuSelectAnm2__7dName_cFv();
extern "C" void MenuSelectAnm3__7dName_cFv();
extern "C" void menuAbtnSelect__7dName_cFv();
extern "C" void backSpace__7dName_cFv();
extern "C" void mojiListChange__7dName_cFv();
extern "C" void menuCursorMove__7dName_cFv();
extern "C" void menuCursorMove2__7dName_cFv();
extern "C" void selectCursorPosSet__7dName_cFi();
extern "C" void _draw__7dName_cFv();
extern "C" void screenSet__7dName_cFv();
extern "C" void displayInit__7dName_cFv();
extern "C" void NameStrSet__7dName_cFv();
extern "C" void getMenuPosIdx__7dName_cFUc();
extern "C" void draw__14dDlst_NameIN_cFv();
extern "C" void __dt__14dDlst_NameIN_cFv();
extern "C" void __dt__9dNm_HIO_cFv();
extern "C" void __sinit_d_name_cpp();
extern "C" extern char const* const d_d_name__stringBase0;
//
// External References:
//
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void mDoExt_removeMesgFont__Fv();
extern "C" void fopMsgM_messageGet__FPcUl();
extern "C" void __ct__9STControlFssssffss();
extern "C" void checkTrigger__9STControlFv();
extern "C" void checkLeftTrigger__9STControlFv();
extern "C" void checkRightTrigger__9STControlFv();
extern "C" void checkUpTrigger__9STControlFv();
extern "C" void checkDownTrigger__9STControlFv();
extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
extern "C" void __ct__16dSelect_cursor_cFUcfP10JKRArchive();
extern "C" void setPos__16dSelect_cursor_cFffP7J2DPaneb();
extern "C" void setParam__16dSelect_cursor_cFfffff();
extern "C" void setAlphaRate__16dSelect_cursor_cFf();
extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap();
extern "C" void scaleAnime__8CPaneMgrFsffUc();
extern "C" void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs();
extern "C" void dPaneClass_showNullPane__FP9J2DScreen();
extern "C" void __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap();
extern "C" void show__13CPaneMgrAlphaFv();
extern "C" void hide__13CPaneMgrAlphaFv();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader();
extern "C" void __ct__9J2DScreenFv();
extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive();
extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
extern "C" void animation__9J2DScreenFv();
extern "C" void getStringPtr__10J2DTextBoxCFv();
extern "C" void setString__10J2DTextBoxFPCce();
extern "C" void setString__10J2DTextBoxFsPCce();
extern "C" void load__20J2DAnmLoaderDataBaseFPCv();
extern "C" void __register_global_object();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_19();
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_19();
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__12dDlst_base_c[3];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
//
/* 803C1F50-803C1F5C 01F070 000C+00 5/5 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,
};
/* 803C1F5C-803C2060 -00001 0104+00 0/3 0/0 0/0 .data l_mojiHira */
SECTION_DATA static const char* l_mojiHira[65] = {
static const char* l_mojiHira[65] = {
"あ", "い", "う", "え", "お", "か", "き", "く", "け", "こ", "さ", "し", "す",
"せ", "そ", "た", "ち", "つ", "て", "と", "な", "に", "ぬ", "ね", "の", "は",
"ひ", "ふ", "へ", "ほ", "ま", "み", "む", "め", "も", "や", "　", "ゆ", "　",
@@ -141,7 +29,7 @@ SECTION_DATA static const char* l_mojiHira[65] = {
};
/* 803C2060-803C2164 -00001 0104+00 0/1 0/0 0/0 .data l_mojiHira2 */
SECTION_DATA static const char* l_mojiHira2[65] = {
static const char* l_mojiHira2[65] = {
"￥", "￥", "￥", "￥", "￥", "が", "ぎ", "ぐ", "げ", "ご", "ざ", "じ", "ず",
"ぜ", "ぞ", "だ", "ぢ", "づ", "で", "ど", "￥", "￥", "￥", "￥", "￥", "ば",
"び", "ぶ", "べ", "ぼ", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
@@ -150,7 +38,7 @@ SECTION_DATA static const char* l_mojiHira2[65] = {
};
/* 803C2164-803C2268 -00001 0104+00 0/1 0/0 0/0 .data l_mojiHira3 */
SECTION_DATA static const char* l_mojiHira3[65] = {
static const char* l_mojiHira3[65] = {
"￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
"￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "ぱ",
"ぴ", "ぷ", "ぺ", "ぽ", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
@@ -159,7 +47,7 @@ SECTION_DATA static const char* l_mojiHira3[65] = {
};
/* 803C2268-803C236C -00001 0104+00 0/3 0/0 0/0 .data l_mojikata */
SECTION_DATA static const char* l_mojikata[65] = {
static const char* l_mojikata[65] = {
"ア", "イ", "ウ", "エ", "オ", "カ", "キ", "ク", "ケ", "コ", "サ", "シ", "ス",
"セ", "\x83\x5C", "タ", "チ", "ツ", "テ", "ト", "ナ", "ニ", "ヌ", "ネ", "ノ", "ハ",
"ヒ", "フ", "ヘ", "ホ", "マ", "ミ", "ム", "メ", "モ", "ヤ", "　", "ユ", "　",
@@ -168,7 +56,7 @@ SECTION_DATA static const char* l_mojikata[65] = {
};
/* 803C236C-803C2470 -00001 0104+00 0/1 0/0 0/0 .data l_mojikata2 */
SECTION_DATA static const char* l_mojikata2[65] = {
static const char* l_mojikata2[65] = {
"￥", "￥", "ヴ", "￥", "￥", "ガ", "ギ", "グ", "ゲ", "ゴ", "ザ", "ジ", "ズ",
"ゼ", "ゾ", "ダ", "ヂ", "ヅ", "デ", "ド", "￥", "￥", "￥", "￥", "￥", "バ",
"ビ", "ブ", "ベ", "ボ", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
@@ -177,7 +65,7 @@ SECTION_DATA static const char* l_mojikata2[65] = {
};
/* 803C2470-803C2574 -00001 0104+00 0/1 0/0 0/0 .data l_mojikata3 */
SECTION_DATA static const char* l_mojikata3[65] = {
static const char* l_mojikata3[65] = {
"￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
"￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "パ",
"ピ", "プ", "ペ", "ポ", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
@@ -186,7 +74,7 @@ SECTION_DATA static const char* l_mojikata3[65] = {
};
/* 803C2574-803C2678 -00001 0104+00 0/3 0/0 0/0 .data l_mojiEisu */
SECTION_DATA static const char* l_mojiEisu[65] = {
static const char* l_mojiEisu[65] = {
"A", "N", "a", "n", "1", "B", "O", "b", "o", "2", "C", "P", "c", "p", "3", "D", "Q",
"d", "q", "4", "E", "R", "e", "r", "5", "F", "S", "f", "s", "6", "G", "T", "g", "t",
"7", "H", "U", "h", "u", "8", "I", "V", "i", "v", "9", "J", "W", "j", "w", "0", "K",
@@ -203,9 +91,6 @@ SECTION_DATA static selProcFunc SelProc[9] = {
&dName_c::MojiSelectAnm3, &dName_c::MenuSelect, &dName_c::MenuSelectAnm,
&dName_c::MenuSelectAnm2, &dName_c::MenuSelectAnm3, &dName_c::Wait};
extern void* __vt__14dDlst_NameIN_c[4 + 7 /* padding */];
extern void* __vt__7dName_c[3 + 3 /* padding */];
/* 8024E3E0-8024E408 248D20 0028+00 1/1 0/0 0/0 .text __ct__9dNm_HIO_cFv */
dNm_HIO_c::dNm_HIO_c() {
mMenuScale = 1.3f;
@@ -246,7 +131,6 @@ dName_c::~dName_c() {
archive->removeResourceAll();
}
/* 8024E62C-8024E6D4 248F6C 00A8+00 1/1 0/0 0/0 .text _create__7dName_cFv */
void dName_c::_create() {
stick = new STControl(5, 2, 2, 1, 0.9f, 0.5f, 0, 0x800);
@@ -301,10 +185,6 @@ void dName_c::initial() {
}
}
/* ############################################################################################## */
/* 80454DC0-80454DC4 0033C0 0004+00 16/16 0/0 0/0 .sdata2 @3820 */
SECTION_SDATA2 static f32 lit_3820 = 1.0f;
/* 8024E7EC-8024E9A0 24912C 01B4+00 0/0 2/2 0/0 .text showIcon__7dName_cFv */
void dName_c::showIcon() {
Vec pos;
@@ -317,7 +197,7 @@ void dName_c::showIcon() {
true);
((J2DTextBox*)mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr())
->setWhite(JUtility::TColor(0xC8, 0xC8, 0xC8, 0xFF));
mSelIcon->setAlphaRate(lit_3820);
mSelIcon->setAlphaRate(1.0f);
}
break;
case PROC_MENU_SELECT:
@@ -327,16 +207,12 @@ void dName_c::showIcon() {
pos = mMenuIcon[menu_i]->getGlobalVtxCenter(false, 0);
mSelIcon->setPos(pos.x, pos.y, mMenuIcon[menu_i]->getPanePtr(), true);
mMenuText[menu_i]->setWhite(JUtility::TColor(0xC8, 0xC8, 0xC8, 0xFF));
mSelIcon->setAlphaRate(lit_3820);
mSelIcon->setAlphaRate(1.0f);
}
break;
}
}
/* ############################################################################################## */
/* 80454DC4-80454DC8 0033C4 0004+00 6/6 0/0 0/0 .sdata2 @3886 */
SECTION_SDATA2 static f32 lit_3886 = -1.0f;
/* 8024E9A0-8024EC10 2492E0 0270+00 0/0 2/2 0/0 .text _move__7dName_cFv */
void dName_c::_move() {
stick->checkTrigger();
@@ -394,7 +270,6 @@ void dName_c::_move() {
cursorAnm();
}
/* 8024EC10-8024EC4C 249550 003C+00 3/3 0/0 0/0 .text nameCheck__7dName_cFv */
int dName_c::nameCheck() {
for (int i = 8, len = 7; i > 0; i--) {
@@ -498,19 +373,9 @@ void dName_c::MojiSelect() {
}
}
/* ############################################################################################## */
/* 80454DD0-80454DD4 0033D0 0004+00 5/5 0/0 0/0 .sdata2 @4009 */
SECTION_SDATA2 static u8 lit_4009[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 8024F034-8024F0E0 249974 00AC+00 2/2 0/0 0/0 .text MojiSelectAnmInit__7dName_cFv */
void dName_c::MojiSelectAnmInit() {
mSelIcon->setAlphaRate(FLOAT_LABEL(lit_4009));
mSelIcon->setAlphaRate(0.0f);
mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnimeStart(0);
((J2DTextBox*)mMojiIcon[mPrevRow + mPrevColumn * 5]->getPanePtr())
->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xFF));
@@ -519,7 +384,7 @@ void dName_c::MojiSelectAnmInit() {
/* 8024F0E0-8024F164 249A20 0084+00 1/0 0/0 0/0 .text MojiSelectAnm__7dName_cFv */
void dName_c::MojiSelectAnm() {
if (mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnime(mCursorDelay, g_nmHIO.mSelCharScale,
lit_3820, 0) == 1)
1.0f, 0) == 1)
{
selectCursorMove();
mSelProc = PROC_MOJI_SELECT;
@@ -530,7 +395,7 @@ void dName_c::MojiSelectAnm() {
/* 8024F164-8024F1E8 249AA4 0084+00 1/0 0/0 0/0 .text MojiSelectAnm2__7dName_cFv */
void dName_c::MojiSelectAnm2() {
if (mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnime(mCursorDelay, g_nmHIO.mSelCharScale,
lit_3820, 0) == 1)
1.0f, 0) == 1)
{
menuCursorMove2();
mSelProc = PROC_MENU_SELECT;
@@ -777,7 +642,7 @@ void dName_c::selectCursorMove() {
Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0);
mSelIcon->setPos(pos.x, pos.y, mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr(), true);
mSelIcon->setAlphaRate(lit_3820);
mSelIcon->setAlphaRate(1.0f);
}
/* 8024FAF4-8024FB08 24A434 0014+00 1/1 0/0 0/0 .text menuCursorPosSet__7dName_cFv */
@@ -825,10 +690,9 @@ void dName_c::MenuSelect() {
}
}
/* 8024FDA0-8024FDF4 24A6E0 0054+00 2/2 0/0 0/0 .text MenuSelectAnmInit__7dName_cFv */
void dName_c::MenuSelectAnmInit() {
mSelIcon->setAlphaRate(FLOAT_LABEL(lit_4009));
mSelIcon->setAlphaRate(0.0f);
int prevMenu_i = getMenuPosIdx(mPrevSelMenu);
mMenuIcon[prevMenu_i]->scaleAnimeStart(0);
@@ -838,7 +702,7 @@ void dName_c::MenuSelectAnmInit() {
void dName_c::MenuSelectAnm() {
int prevMenu_i = getMenuPosIdx(mPrevSelMenu);
if (mMenuIcon[prevMenu_i]->scaleAnime(mCursorDelay, g_nmHIO.mMenuScale, lit_3820, 0) == 1) {
if (mMenuIcon[prevMenu_i]->scaleAnime(mCursorDelay, g_nmHIO.mMenuScale, 1.0f, 0) == 1) {
mMenuText[prevMenu_i]->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xFF));
menuCursorMove();
mSelProc = PROC_MENU_SELECT;
@@ -853,7 +717,7 @@ void dName_c::MenuSelectAnm2() {
bool canMove = true;
if (prevMenu_i != mojiSet_i) {
canMove = mMenuIcon[prevMenu_i]->scaleAnime(mCursorDelay, g_nmHIO.mMenuScale, lit_3820, 0);
canMove = mMenuIcon[prevMenu_i]->scaleAnime(mCursorDelay, g_nmHIO.mMenuScale, 1.0f, 0);
}
if (canMove == true) {
@@ -896,7 +760,6 @@ void dName_c::menuAbtnSelect() {
}
}
/* 80250074-802501B0 24A9B4 013C+00 1/1 0/0 0/0 .text backSpace__7dName_cFv */
void dName_c::backSpace() {
if (mCurPos != 0) {
@@ -926,7 +789,6 @@ void dName_c::backSpace() {
}
}
/* 802501B0-80250284 24AAF0 00D4+00 2/2 0/0 0/0 .text mojiListChange__7dName_cFv */
void dName_c::mojiListChange() {
const char** mojiSet;
@@ -973,7 +835,7 @@ void dName_c::menuCursorMove() {
Vec pos = mMenuIcon[menu_i]->getGlobalVtxCenter(false, 0);
mSelIcon->setPos(pos.x, pos.y, mMenuIcon[menu_i]->getPanePtr(), true);
mSelIcon->setAlphaRate(lit_3820);
mSelIcon->setAlphaRate(1.0f);
}
/* 80250380-802504A0 24ACC0 0120+00 1/1 0/0 0/0 .text menuCursorMove2__7dName_cFv */
@@ -988,7 +850,7 @@ void dName_c::menuCursorMove2() {
Vec pos = mMenuIcon[menu_i]->getGlobalVtxCenter(false, 0);
mSelIcon->setPos(pos.x, pos.y, mMenuIcon[menu_i]->getPanePtr(), true);
mSelIcon->setAlphaRate(lit_3820);
mSelIcon->setAlphaRate(1.0f);
}
/* 802504A0-80250560 24ADE0 00C0+00 1/1 0/0 0/0 .text selectCursorPosSet__7dName_cFi */
@@ -1025,139 +887,47 @@ void dName_c::_draw() {
dComIfGd_set2DOpa(mSelIcon);
}
/* ############################################################################################## */
/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399F99 = "zelda_player_name.blo";
SECTION_DEAD static char const* const stringBase_80399FAF = "zelda_player_name.bpk";
SECTION_DEAD static char const* const stringBase_80399FC5 = "zelda_player_name.btk";
SECTION_DEAD static char const* const stringBase_80399FDB = "";
#pragma pop
/* 80454DD4-80454DD8 0033D4 0004+00 1/1 0/0 0/0 .sdata2 @4722 */
SECTION_SDATA2 static f32 lit_4722 = 41.0f / 50.0f;
/* 80454DD8-80454DDC 0033D8 0004+00 1/1 0/0 0/0 .sdata2 @4723 */
SECTION_SDATA2 static f32 lit_4723 = 77.0f / 100.0f;
/* 80454DDC-80454DE0 0033DC 0004+00 1/1 0/0 0/0 .sdata2 @4724 */
SECTION_SDATA2 static f32 lit_4724 = 1.0f / 20.0f;
/* 80454DE0-80454DE8 0033E0 0004+04 1/1 0/0 0/0 .sdata2 @4725 */
SECTION_SDATA2 static f32 lit_4725[1 + 1 /* padding */] = {
2.0f / 5.0f,
/* padding */
0.0f,
};
/* 803C2788-803C27C8 01F8A8 0040+00 0/1 0/0 0/0 .data l_cur0TagName$4610 */
#pragma push
#pragma force_active on
SECTION_DATA static u64 l_cur0TagName[8] = {
's_00', 's_01', 's_02', 's_03', 's_04', 's_05', 's_06', 's_07',
};
#pragma pop
/* 803C27C8-803C2808 01F8E8 0040+00 0/1 0/0 0/0 .data l_cur1TagName$4611 */
#pragma push
#pragma force_active on
SECTION_DATA static u64 l_cur1TagName[8] = {
's_0r', 's_01r', 's_02r', 's_03r', 's_04r', 's_05r', 's_06r', 's_07r',
};
#pragma pop
/* 803C2808-803C2828 01F928 0020+00 0/1 0/0 0/0 .data l_menu_icon_tag$4617 */
#pragma push
#pragma force_active on
SECTION_DATA static u64 l_menu_icon_tag[4] = {
'p_ABC_n',
'p_abc_n',
'j_eigo_n',
'p_end_n',
};
#pragma pop
/* 803C2828-803C28A0 01F948 0078+00 0/1 0/0 0/0 .data l_menu_tag$4618 */
#pragma push
#pragma force_active on
SECTION_DATA static u64 l_menu_tag[5][3] = {
'p_ABC_0', 'p_ABC_1', 'p_ABC_2', 'p_abc_0', 'p_abc_1', 'p_abc_2',
'm_eigo_0', 'm_eigo_1', 'm_eigo_2', 'p_end_0', 'p_end_1', 'p_end_2',
};
#pragma pop
/* 803C28A0-803C28B0 01F9C0 0010+00 0/1 0/0 0/0 .data l_menu_msg$4619 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 l_menu_msg[4] = {
0x38B,
0x38C,
0x388,
0x38E,
};
#pragma pop
/* 803C28B0-803C2AB8 01F9D0 0208+00 0/1 0/0 0/0 .data l_tagName$4635 */
#pragma push
#pragma force_active on
SECTION_DATA static u64 l_tagName[65] = {
'm_00_0', 'm_00_1', 'm_00_2', 'm_00_3', 'm_00_4', 'm_01_0', 'm_01_1', 'm_01_2', 'm_01_3',
'm_01_4', 'm_02_0', 'm_02_1', 'm_02_2', 'm_02_3', 'm_02_4', 'm03_0', 'm03_1', 'm03_2',
'm03_3', 'm03_4', 'm_04_0', 'm_04_1', 'm_04_2', 'm_04_3', 'm_04_4', 'm_05_0', 'm_05_1',
'm_05_2', 'm_05_3', 'm_05_4', 'm_06_0', 'm_06_1', 'm_06_2', 'm_06_3', 'm_06_4', 'm_07_0',
'm_07_1', 'm_07_2', 'm_07_3', 'm_07_4', 'm_08_0', 'm_08_1', 'm_08_2', 'm_08_3', 'm_08_4',
'm_09_0', 'm_09_1', 'm_09_2', 'm_09_3', 'm_09_4', 'm_10_0', 'm_10_1', 'm_10_2', 'm_10_3',
'm_10_4', 'm_11_0', 'm_11_1', 'm_11_2', 'm_11_3', 'm_11_4', 'm12_0', 'm12_1', 'm12_2',
'm12_3', 'm12_4',
};
#pragma pop
/* 803C2AB8-803C2AF8 01FBD8 0040+00 0/1 0/0 0/0 .data l_nameTagName$4642 */
#pragma push
#pragma force_active on
SECTION_DATA static u64 l_nameTagName[8] = {
'name_00', 'name_01', 'name_02', 'name_03', 'name_04', 'name_05', 'name_06', 'name_07',
};
#pragma pop
/* 803C2AF8-803C2B38 01FC18 0040+00 0/1 0/0 0/0 .data l_nameCurTagName$4643 */
#pragma push
#pragma force_active on
SECTION_DATA static u64 l_nameCurTagName[8] = {
's__n_00', 's__n_01', 's__n_02', 's__n_03', 's__n_04', 's__n_05', 's__n_06', 's__n_07',
};
#pragma pop
/* 803C2B38-803C2B64 01FC58 0010+1C 3/3 0/0 0/0 .data __vt__14dDlst_NameIN_c */
SECTION_DATA extern void* __vt__14dDlst_NameIN_c[4 + 7 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__14dDlst_NameIN_cFv,
(void*)__dt__14dDlst_NameIN_cFv,
/* padding */
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
};
/* 803C2B64-803C2B7C 01FC84 000C+0C 2/2 0/0 0/0 .data __vt__7dName_c */
SECTION_DATA extern void* __vt__7dName_c[3 + 3 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__7dName_cFv,
/* padding */
NULL,
NULL,
NULL,
};
/* 802505CC-80250CEC 24AF0C 0720+00 1/1 0/0 0/0 .text screenSet__7dName_cFv */
void dName_c::screenSet() {
static u64 l_cur0TagName[8] = {
's_00', 's_01', 's_02', 's_03', 's_04', 's_05', 's_06', 's_07',
};
static u64 l_cur1TagName[8] = {
's_0r', 's_01r', 's_02r', 's_03r', 's_04r', 's_05r', 's_06r', 's_07r',
};
static u64 l_menu_icon_tag[4] = {
'p_ABC_n',
'p_abc_n',
'j_eigo_n',
'p_end_n',
};
static u64 l_menu_tag[5][3] = {
'p_ABC_0', 'p_ABC_1', 'p_ABC_2', 'p_abc_0', 'p_abc_1', 'p_abc_2',
'm_eigo_0', 'm_eigo_1', 'm_eigo_2', 'p_end_0', 'p_end_1', 'p_end_2',
};
static u32 l_menu_msg[4] = {
0x38B,
0x38C,
0x388,
0x38E,
};
static u64 l_tagName[65] = {
'm_00_0', 'm_00_1', 'm_00_2', 'm_00_3', 'm_00_4', 'm_01_0', 'm_01_1', 'm_01_2', 'm_01_3',
'm_01_4', 'm_02_0', 'm_02_1', 'm_02_2', 'm_02_3', 'm_02_4', 'm03_0', 'm03_1', 'm03_2',
'm03_3', 'm03_4', 'm_04_0', 'm_04_1', 'm_04_2', 'm_04_3', 'm_04_4', 'm_05_0', 'm_05_1',
'm_05_2', 'm_05_3', 'm_05_4', 'm_06_0', 'm_06_1', 'm_06_2', 'm_06_3', 'm_06_4', 'm_07_0',
'm_07_1', 'm_07_2', 'm_07_3', 'm_07_4', 'm_08_0', 'm_08_1', 'm_08_2', 'm_08_3', 'm_08_4',
'm_09_0', 'm_09_1', 'm_09_2', 'm_09_3', 'm_09_4', 'm_10_0', 'm_10_1', 'm_10_2', 'm_10_3',
'm_10_4', 'm_11_0', 'm_11_1', 'm_11_2', 'm_11_3', 'm_11_4', 'm12_0', 'm12_1', 'm12_2',
'm12_3', 'm12_4',
};
static u64 l_nameTagName[8] = {
'name_00', 'name_01', 'name_02', 'name_03', 'name_04', 'name_05', 'name_06', 'name_07',
};
static u64 l_nameCurTagName[8] = {
's__n_00', 's__n_01', 's__n_02', 's__n_03', 's__n_04', 's__n_05', 's__n_06', 's__n_07',
};
nameIn.NameInScr = new J2DScreen();
JUT_ASSERT(0, nameIn.NameInScr != 0);
@@ -1257,7 +1027,7 @@ void dName_c::screenSet() {
/* 80250CEC-80250E54 24B62C 0168+00 2/2 0/0 0/0 .text displayInit__7dName_cFv */
void dName_c::displayInit() {
mSelIcon->setAlphaRate(FLOAT_LABEL(lit_4009));
mSelIcon->setAlphaRate(0.0f);
mCurColAnmF = 0;
mCurTexAnmF = 0;
mSelProc = field_0x2ac;
@@ -1374,12 +1144,3 @@ void dDlst_NameIN_c::draw() {
J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
NameInScr->draw(0.0f, 0.0f, graf_ctx);
}
/* 8025115C-802511A4 24BA9C 0048+00 1/0 0/0 0/0 .text __dt__14dDlst_NameIN_cFv */
dDlst_NameIN_c::~dDlst_NameIN_c() {}
/* 802511A4-802511EC 24BAE4 0048+00 2/1 0/0 0/0 .text __dt__9dNm_HIO_cFv */
dNm_HIO_c::~dNm_HIO_c() {}
/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_ovlp_fade3.cpp
+4 -7
View File
@@ -9,9 +9,6 @@
#include "m_Do/m_Do_audio.h"
#include "m_Do/m_Do_graphic.h"
extern "C" u8 func_80141AE8(u8*);
extern "C" s8 func_80252E70(s8*);
/* 80252ED4-80252F28 24D814 0054+00 1/0 0/0 0/0 .text draw__16dDlst_snapShot_cFv */
void dDlst_snapShot_c::draw() {
GXSetTexCopySrc(0, 0, 608, 448);
@@ -130,8 +127,8 @@ dOvlpFd3_c::dOvlpFd3_c() {
/* 80253518-802535AC 24DE58 0094+00 1/0 0/0 0/0 .text execFirstSnap__10dOvlpFd3_cFv */
void dOvlpFd3_c::execFirstSnap() {
if (func_80141AE8(&field_0x11f) == 0 && field_0x11c != 0) {
if (func_80252E70(&mTimer) == 0) {
if (cLib_calcTimer(&field_0x11f) == 0 && field_0x11c != 0) {
if (cLib_calcTimer(&mTimer) == 0) {
setExecute(&execFadeOut);
fopOvlpM_Done(this);
mTimer = 0xFF;
@@ -161,13 +158,13 @@ void dOvlpFd3_c::execFadeOut() {
mDoAud_setFadeOutStart(0);
}
} else {
func_80252E70(&mTimer);
cLib_calcTimer(&mTimer);
}
}
/* 8025368C-80253730 24DFCC 00A4+00 1/0 0/0 0/0 .text execNextSnap__10dOvlpFd3_cFv */
void dOvlpFd3_c::execNextSnap() {
if (func_80252E70(&mTimer) == 0) {
if (cLib_calcTimer(&mTimer) == 0) {
if (!JFWDisplay::getManager()->getFader()->startFadeIn(XREG_S(4) + 26)) {
mDoAud_setFadeInStart(0);
field_0x110 += field_0x112;
src/d/d_particle.cpp
+15 -74
View File
@@ -20,10 +20,10 @@
#include "d/actor/d_a_player.h"
#include "SSystem/SComponent/c_math.h"
extern JPAParticleCallBack* JPTracePCB4;
extern dPa_particleTracePcallBack_c JPTracePCB4;
/* 80049420-80049580 043D60 0160+00 4/4 0/0 0/0 .text dPa_cleanupGX__Fv */
static void dPa_cleanupGX() {
void dPa_cleanupGX() {
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
GXEnableTexOffsets(GX_TEXCOORD0, GX_ENABLE, GX_ENABLE);
@@ -47,8 +47,10 @@ static void dPa_cleanupGX() {
}
/* 803A8308-803A8314 005428 000C+00 1/1 0/0 0/0 .data l_lifeBallColor */
static u8 l_lifeBallColor[12] = {
0xEB, 0x20, 0x78, 0xFF, 0x20, 0xF1, 0x9B, 0xFF, 0xEB, 0xD7, 0x2F, 0xFF,
static GXColor l_lifeBallColor[3] = {
{0xEB, 0x20, 0x78, 0xFF},
{0x20, 0xF1, 0x9B, 0xFF},
{0xEB, 0xD7, 0x2F, 0xFF},
};
/* 80049580-800495BC 043EC0 003C+00 0/0 1/1 8/8 .text __ct__19dPa_followEcallBackFUcUc */
@@ -969,7 +971,7 @@ void dPa_control_c::level_c::emitter_c::cleanup() {
pdVar1 != dPa_control_c::getLight8EcallBack()) {
mEmitter->setEmitterCallBackPtr(NULL);
JPAParticleCallBack* cb = mEmitter->getParticleCallBackPtr();
if (cb == JPTracePCB4 || cb == dPa_control_c::getParticleTracePCB()) {
if (cb == &JPTracePCB4 || cb == dPa_control_c::getParticleTracePCB()) {
mEmitter->setParticleCallBackPtr(NULL);
}
}
@@ -1154,29 +1156,12 @@ dPa_selectTexEcallBack dPa_control_c::mTsubo[] = {
dPa_selectTexEcallBack(7),
};
/* 804247D4-804247E0 0514F4 000C+00 0/1 0/0 0/0 .bss @4731 */
#pragma push
#pragma force_active on
static u8 lit_4731[12];
#pragma pop
/* 804247E0-804247EC 051500 000C+00 0/1 0/0 0/0 .bss @4732 */
#pragma push
#pragma force_active on
static u8 lit_4732[12];
#pragma pop
/* 804247EC-804247F8 05150C 000C+00 0/1 0/0 0/0 .bss @4733 */
#pragma push
#pragma force_active on
static u8 lit_4733[12];
#pragma pop
/* 804247F8-80424810 051518 0018+00 0/1 0/0 0/0 .bss mLifeBall__13dPa_control_c */
#pragma push
#pragma force_active on
u8 dPa_control_c::mLifeBall[24];
#pragma pop
dPa_setColorEcallBack dPa_control_c::mLifeBall[3] = {
dPa_setColorEcallBack(l_lifeBallColor[0]),
dPa_setColorEcallBack(l_lifeBallColor[1]),
dPa_setColorEcallBack(l_lifeBallColor[2]),
};
/* 80450EA0-80450EA4 0003A0 0004+00 14/14 1/1 0/0 .sbss mEmitterMng__13dPa_control_c */
JPAEmitterManager* dPa_control_c::mEmitterMng;
@@ -1211,12 +1196,12 @@ dPa_gen_d_light8PcallBack dPa_control_c::m_d_Light8PcallBack;
/* 80450EC4-80450EC8 0003C4 0004+00 1/1 2/2 0/0 .sbss None */
u8 dPa_control_c::mStatus;
/* 80450EC8-80450ED0 0003C8 0004+04 2/2 1/1 17/17 .sbss mParticleTracePCB__13dPa_control_c */
dPa_particleTracePcallBack_c dPa_control_c::mParticleTracePCB;
/* 80424870-804248A0 051590 0030+00 1/1 0/0 0/0 .bss mWindViewMatrix__13dPa_control_c */
Mtx dPa_control_c::mWindViewMatrix;
/* 80450EC8-80450ED0 0003C8 0004+04 2/2 1/1 17/17 .sbss mParticleTracePCB__13dPa_control_c */
dPa_particleTracePcallBack_c dPa_control_c::mParticleTracePCB;
/* 8004BACC-8004BB70 04640C 00A4+00 0/0 1/1 0/0 .text __ct__13dPa_control_cFv */
dPa_control_c::dPa_control_c() {
m_resHeap = JKRCreateExpHeap(0x96000, mDoExt_getArchiveHeap(), false);
@@ -2408,47 +2393,3 @@ void dPa_particleTracePcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParti
param_1->setOffsetPosition(local_24);
}
}
/* 80050010-80050014 04A950 0004+00 1/0 0/0 0/0 .text
* setup__22dPa_selectTexEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
void dPa_selectTexEcallBack::setup(JPABaseEmitter* param_0, cXyz const* param_1,
csXyz const* param_2, s8 param_3) {
/* empty function */
}
/* 80050014-80050038 04A954 0024+00 1/0 0/0 0/0 .text
* drawAfter__18dPa_modelEcallBackFP14JPABaseEmitter */
void dPa_modelEcallBack::drawAfter(JPABaseEmitter* param_0) {
cleanupModel(param_0);
}
/* 80050098-800500B8 04A9D8 0020+00 1/0 0/0 0/0 .text
* drawAfter__25dPa_gen_d_light8EcallBackFP14JPABaseEmitter */
void dPa_gen_d_light8EcallBack::drawAfter(JPABaseEmitter* param_0) {
dPa_cleanupGX();
}
/* 8005013C-8005015C 04AA7C 0020+00 1/0 0/0 0/0 .text
* drawAfter__25dPa_gen_b_light8EcallBackFP14JPABaseEmitter */
void dPa_gen_b_light8EcallBack::drawAfter(JPABaseEmitter* param_0) {
dPa_cleanupGX();
}
/* 800501E0-80050200 04AB20 0020+00 1/0 0/0 0/0 .text
* drawAfter__19dPa_light8EcallBackFP14JPABaseEmitter */
void dPa_light8EcallBack::drawAfter(JPABaseEmitter* param_0) {
dPa_cleanupGX();
}
/* 800502B0-800502E0 04ABF0 0030+00 1/0 0/0 0/0 .text
* draw__21dPa_setColorEcallBackFP14JPABaseEmitter */
void dPa_setColorEcallBack::draw(JPABaseEmitter* param_0) {
GXSetTevColor(GX_TEVREG1, mColor);
}
/* 800502E0-800502E4 04AC20 0004+00 1/0 0/0 0/0 .text
* setup__21dPa_setColorEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
void dPa_setColorEcallBack::setup(JPABaseEmitter* param_0, cXyz const* param_1,
csXyz const* param_2, s8 param_3) {
/* empty function */
}
src/d/d_tresure.cpp
+1 -14
View File
@@ -9,17 +9,8 @@
#include "d/d_path.h"
#include "SSystem/SComponent/c_math.h"
//
// Forward References:
//
static bool data_80450680 = true;
//
// External References:
//
extern bool data_80450680;
/* ############################################################################################## */
/* 80450F98-80450F9C 000498 0004+00 2/2 0/0 0/0 .sbss mTypeGroupData__7dTres_c */
dTres_c::typeGroupData_c* dTres_c::mTypeGroupData;
@@ -41,7 +32,6 @@ void dTres_c::remove() {
data_80450680 = true;
}
/* ############################################################################################## */
/* 80425438-80425508 052158 00CC+04 6/6 3/3 0/0 .bss mTypeGroupListAll__7dTres_c */
dTres_c::type_group_list dTres_c::mTypeGroupListAll[17];
@@ -101,8 +91,6 @@ void dTres_c::addData(dTres_c::list_class* p_list, s8 roomNo) {
}
}
/* ############################################################################################## */
/* 8009BE28-8009C168 096768 0340+00 1/1 0/0 0/0 .text
* checkTreasureBox__7dTres_cFPQ27dTres_c6data_s */
void dTres_c::checkTreasureBox(dTres_c::data_s* param_0) {
@@ -265,7 +253,6 @@ void dTres_c::setPosition(int dataNo, u8 listIdx, Vec const* i_pos, int i_roomNo
}
}
/* ############################################################################################## */
/* 8037B0D8-8037B100 007738 0022+06 2/2 0/0 0/0 .rodata typeToTypeGroup__7dTres_c */
u8 const dTres_c::typeToTypeGroup[17][2] = {
{0xFF, 0x00}, {0x00, 0x01}, {0x01, 0x02}, {0x02, 0x03}, {0x03, 0x04}, {0x04, 0x05},
src/m_Do/m_Do_mtx.cpp
+17 -17
View File
@@ -249,30 +249,30 @@ void mDoMtx_lookAt(Mtx mtx, Vec const* param_1, Vec const* param_2, s16 param_3)
/* 8000C710-8000C8D0 007050 01C0+00 0/0 10/10 1/1 .text mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs
*/
void mDoMtx_lookAt(Mtx mtx, Vec const* i_eye, Vec const* i_center, Vec const* i_up, s16 i_bank) {
cXyz local_4c(*i_eye);
cXyz local_58(*i_center);
cXyz local_64(*i_up);
cXyz local_70 = local_4c - local_58;
cXyz eye = *i_eye;
cXyz center = *i_center;
cXyz up = *i_up;
cXyz local_70 = eye - center;
if (!local_70.normalizeRS()) {
OS_REPORT("%s: lookat: bad position!\n", __FILE__);
OS_REPORT("%s: ctr %f %f %f+1.0\n", __FILE__, local_58.x, local_58.y, local_58.z);
OS_REPORT("%s: eye %f %f %f\n", __FILE__, local_4c.x, local_4c.y, local_4c.z);
local_58.z += 1.0f;
OS_REPORT("%s: ctr %f %f %f+1.0\n", __FILE__, center.x, center.y, center.z);
OS_REPORT("%s: eye %f %f %f\n", __FILE__, eye.x, eye.y, eye.z);
center.z += 1.0f;
}
if (cM3d_IsZero(local_64.x) && cM3d_IsZero(local_64.y) && cM3d_IsZero(local_64.z)) {
if (cM3d_IsZero(up.x) && cM3d_IsZero(up.y) && cM3d_IsZero(up.z)) {
OS_REPORT("%s: lookat: Zero Vector @ UP!\n", __FILE__);
local_64.y = 1.0f;
up.y = 1.0f;
}
C_MTXLookAt(mtx, &local_4c, &local_64, &local_58);
Mtx local_40;
mDoMtx_ZrotS(local_40, i_bank);
mDoMtx_concat(local_40, mtx, mtx);
C_MTXLookAt(mtx, &eye, &up, &center);
Mtx bank_mtx;
mDoMtx_ZrotS(bank_mtx, i_bank);
mDoMtx_concat(bank_mtx, mtx, mtx);
JGeometry::TVec3<f32> local_7c(0.0f, mtx[1][1], mtx[2][1]);
if (local_7c.isZero()) {
local_58.y += 1.0f;
C_MTXLookAt(mtx, &local_4c, &local_64, &local_58);
mDoMtx_ZrotS(local_40, i_bank);
mDoMtx_concat(local_40, mtx, mtx);
center.y += 1.0f;
C_MTXLookAt(mtx, &eye, &up, &center);
mDoMtx_ZrotS(bank_mtx, i_bank);
mDoMtx_concat(bank_mtx, mtx, mtx);
}
}