encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

move d_a_itembase_static / d_a_item_static / Z2StatusMgr (#123)

Browse Source 
* move d_a_itembase_static

* move d_a_item_static

* moved Z2StatusMgr

* clang

* fixes

* clang?

* move d_save

* move d_meter2_info

* some d_meter2_info fixes

* move most d_a_player

* move d_bg_s stuff

* move c_cc_s stuff

* move d_cc stuff

* move d_attention / d_event / d_stage
This commit is contained in:
TakaRikka
2021-05-02 13:13:14 -04:00
committed by GitHub
parent a9c78b5b0b
commit 2f4904dae2
234 changed files with 5861 additions and 6762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp
+13 -6
View File
@@ -29,12 +29,6 @@ struct J3DModelData {};
struct J3DMaterialTable {};
struct J3DFrameCtrl {
/* 803283FC */ void init(s16);
/* 8032842C */ void checkPass(f32);
/* 803289CC */ void update();
};
struct J3DAnmVtxColorKey {
/* 8032A4E0 */ J3DAnmVtxColorKey();
/* 8032A53C */ void getColor(u8, u16, _GXColor*) const;
@@ -255,6 +249,18 @@ SECTION_SDATA2 static u8 lit_853[4] = {
};
/* 803283FC-8032842C 322D3C 0030+00 0/0 25/25 285/285 .text init__12J3DFrameCtrlFs */
// zero-initialized literal
#ifdef NONMATCHING
void J3DFrameCtrl::init(s16 pEnd) {
mAttribute = 2;
mState = false;
mStart = 0;
mEnd = pEnd;
mLoop = 0;
mRate = 1.0f;
mFrame = 0.0f;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -263,6 +269,7 @@ asm void J3DFrameCtrl::init(s16 param_0) {
#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/init__12J3DFrameCtrlFs.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 80456438-80456440 004A38 0004+04 2/2 0/0 0/0 .sdata2 @973 */
libs/JSystem/JFramework/JFWDisplay.cpp
+2 -2
View File
@@ -6,6 +6,7 @@
#include "JSystem/JFramework/JFWDisplay.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "mtx_vec.h"
//
// Types:
@@ -210,7 +211,6 @@ extern "C" void OSResumeThread();
extern "C" void OSSuspendThread();
extern "C" void OSGetTime();
extern "C" void OSGetTick();
extern "C" void C_MTXOrtho();
extern "C" void VIFlush();
extern "C" void VIGetRetraceCount();
extern "C" void GXInit();
@@ -313,7 +313,7 @@ asm void JFWDisplay::ctor_subroutine(bool param_0) {
/* ############################################################################################## */
/* 803C4020-803C4060 021140 0030+10 1/1 0/0 0/0 .data e_mtx */
SECTION_DATA static u8 e_mtx[48 + 16 /* padding */] = {
SECTION_DATA static u8 e_mtx[48 + 16 /* padding */] ALIGN_DECL(32) = {
0x3F,
0x80,
0x00,
libs/JSystem/JUtility/JUTFont.cpp
-4
View File
@@ -11,10 +11,6 @@
// Types:
//
struct JUtility {
struct TColor {};
};
struct JUTFont {
/* 802DECF8 */ JUTFont();
/* 802DED24 */ void initialize_state();
libs/SSystem/SComponent/c_angle.cpp
+18
View File
@@ -9,6 +9,8 @@
#include "msl_c/math.h"
extern f32 cM_atan2f(f32, f32);
extern "C" void Xyz__7cSGlobeCFv();
extern "C" void __ct__7cSGlobeFfRC7cSAngleRC7cSAngle();
//
// Declarations:
@@ -340,11 +342,27 @@ void cSGlobe::Polar(cSPolar* csp) const {
csp->Val(mRadius, 0x4000 - mAzimuth.Val(), mInclination.Val());
}
/* ############################################################################################## */
/* 8045523C-80455240 00383C 0004+00 1/1 0/0 0/0 .sdata2 @2744 */
SECTION_SDATA2 static f32 lit_2744 = 1.0f;
/* 80271B30-80271B7C 004C+00 s=0 e=3 z=0 None .text Norm__7cSGlobeCFv */
// adding the dtor to class members made this stop matching, idk why
#ifdef NONMATCHING
cXyz cSGlobe::Norm(void) const {
cSGlobe glob(1.0f, mAzimuth, mInclination);
return glob.Xyz();
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cXyz cSGlobe::Norm() const {
nofralloc
#include "asm/SSystem/SComponent/c_angle/Norm__7cSGlobeCFv.s"
}
#pragma pop
#endif
/* 80271B7C-80271BA8 002C+00 s=0 e=2 z=0 None .text Invert__7cSGlobeFv */
cSGlobe& cSGlobe::Invert(void) {
libs/SSystem/SComponent/c_cc_d.cpp
-215
View File
@@ -7,215 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct cXyz {
/* 80009184 */ ~cXyz();
static f32 Zero[3];
};
struct Vec {};
struct cM3dGCyl;
struct cM3dGSph {
/* 8026F710 */ void cross(cM3dGSph const*, cXyz*) const;
/* 8026F73C */ void cross(cM3dGCyl const*, cXyz*) const;
};
struct cM3dGCyl {
/* 8026F208 */ void cross(cM3dGSph const*, cXyz*) const;
/* 8026F22C */ void cross(cM3dGCyl const*, cXyz*) const;
};
struct cM3dGTri {
/* 8026F7B0 */ void cross(cM3dGCyl const*, Vec*) const;
};
struct cM3dGCps {};
struct cM3dGAab {
/* 8026EC54 */ void Set(cXyz const*, cXyz const*);
/* 8026ECF8 */ void ClearForMinMax();
/* 8026ED1C */ void SetMinMax(cXyz const&);
/* 8026EE68 */ void PlusR(f32);
};
struct cCcD_ShapeAttr {
struct Shape {};
/* 80084E38 */ void GetCoCP() const;
/* 80084E2C */ void GetCoCP();
/* 8008556C */ ~cCcD_ShapeAttr();
/* 80263A64 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
/* 802649D8 */ bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 802649E0 */ bool CrossCo(cCcD_ShapeAttr const&, f32*) const;
static f32 m_virtual_center[3];
};
struct cCcD_TriAttr;
struct cCcD_SphAttr;
struct cCcD_PntAttr {};
struct cCcD_AabAttr {};
struct cCcD_CpsAttr;
struct cCcD_CylAttr {
/* 80084CC0 */ void GetCoCP() const;
/* 80037A4C */ void GetCoCP();
/* 8026420C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 802641C8 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084CC8 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80264250 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084CD0 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80084CD8 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 8026417C */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80264288 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 80264310 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084D10 */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80084D18 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084D20 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80084D28 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 802642CC */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 800854E0 */ ~cCcD_CylAttr();
/* 80264368 */ void CalcAabBox();
/* 802643D0 */ void GetNVec(cXyz const&, cXyz*) const;
/* 802644B8 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_CpsAttr {
/* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80085450 */ ~cCcD_CpsAttr();
/* 80263FC4 */ void CalcAabBox();
/* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
};
struct cCcD_SphAttr {
/* 80084B44 */ void GetCoCP() const;
/* 80037A54 */ void GetCoCP();
/* 80264538 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 802645C0 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084B4C */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80084B54 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80084B5C */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 802644EC */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 8026457C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80264688 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084B94 */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80084B9C */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084BA4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80084BAC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80264644 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 802645F8 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 8008721C */ ~cCcD_SphAttr();
/* 802646E0 */ void CalcAabBox();
/* 8026476C */ void GetNVec(cXyz const&, cXyz*) const;
/* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_TriAttr {
/* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80263BCC */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084E4C */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80263B90 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80084E54 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80263B58 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084E9C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80084EBC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80084EA4 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084E8C */ bool CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80084EAC */ bool CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084E94 */ bool CrossCo(cCcD_CylAttr const&, f32*) const;
/* 80084EB4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80263C04 */ void CalcAabBox();
/* 80263C9C */ void GetNVec(cXyz const&, cXyz*) const;
/* 80264938 */ ~cCcD_TriAttr();
};
struct cCcD_Stts {
/* 801410A4 */ ~cCcD_Stts();
/* 80263894 */ bool GetGStts() const;
/* 8026389C */ bool GetGStts();
/* 802638A4 */ void Init(int, int, void*, unsigned int);
/* 80263904 */ void Ct();
/* 80263934 */ void PlusCcMove(f32, f32, f32);
/* 8026395C */ void ClrCcMove();
/* 80263970 */ void PlusDmg(int);
/* 80263984 */ void GetWeightF() const;
/* 802649E8 */ void ClrAt();
/* 802649EC */ void ClrTg();
};
struct cCcD_SrcObjTg {};
struct cCcD_SrcObjHitInf {};
struct cCcD_SrcObjAt {};
struct cCcD_SrcObj {};
struct cCcD_Obj {
/* 80263A10 */ void ct();
/* 80263A1C */ void Set(cCcD_SrcObj const&);
/* 80263A48 */ void GetAc();
};
struct cCcD_ObjTg {
/* 80264880 */ void Set(cCcD_SrcObjTg const&);
/* 80264894 */ void SetGrp(u32);
/* 802648B0 */ void ClrHit();
/* 802648C8 */ void SetHit(cCcD_Obj*);
};
struct cCcD_ObjHitInf {
/* 802639C4 */ void Set(cCcD_SrcObjHitInf const&);
};
struct cCcD_ObjCommonBase {
/* 802639B0 */ void ct();
};
struct cCcD_ObjCo {
/* 802648D8 */ void SetHit(cCcD_Obj*);
/* 802648E8 */ void ClrHit();
/* 80264900 */ void SetIGrp(u32);
/* 8026491C */ void SetVsGrp(u32);
};
struct cCcD_ObjAt {
/* 8026483C */ void SetHit(cCcD_Obj*);
/* 8026484C */ void Set(cCcD_SrcObjAt const&);
/* 80264868 */ void ClrHit();
};
struct cCcD_DivideInfo {
/* 80263358 */ void Set(u32, u32, u32);
/* 80263368 */ void Chk(cCcD_DivideInfo const&) const;
};
struct cCcD_DivideArea {
/* 802633A8 */ void SetArea(cM3dGAab const&);
/* 802634D4 */ void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32);
/* 802636A0 */ void CalcDivideInfoOverArea(cCcD_DivideInfo*, cM3dGAab const&);
};
//
// Forward References:
//
@@ -365,12 +156,6 @@ extern "C" void cross__8cM3dGSphCFPC8cM3dGSphP4cXyz();
extern "C" void cross__8cM3dGSphCFPC8cM3dGCylP4cXyz();
extern "C" void cross__8cM3dGTriCFPC8cM3dGCylP3Vec();
extern "C" void __dl__FPv();
extern "C" void PSVECAdd();
extern "C" void PSVECSubtract();
extern "C" void PSVECScale();
extern "C" void PSVECNormalize();
extern "C" void PSVECMag();
extern "C" void PSVECDotProduct();
extern "C" void __register_global_object();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
libs/SSystem/SComponent/c_cc_s.cpp
-89
View File
@@ -7,91 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct cM3dGAab {
/* 8026ECF8 */ void ClearForMinMax();
/* 8026ED60 */ void SetMinMax(cM3dGAab const&);
/* 8026EE24 */ void CalcCenter(cXyz*) const;
};
struct cCcD_GStts {};
struct cCcD_GObjInf {};
struct cCcD_Obj {
/* 80263A48 */ void GetAc();
};
struct cCcD_Stts {
/* 80263934 */ void PlusCcMove(f32, f32, f32);
/* 8026395C */ void ClrCcMove();
/* 80263970 */ void PlusDmg(int);
/* 80263984 */ void GetWeightF() const;
};
struct cCcS {
/* 80030BDC */ ~cCcS();
/* 80264A6C */ cCcS();
/* 80264A94 */ void Ct();
/* 80264B60 */ void Dt();
/* 80264B80 */ void GetWt(u8) const;
/* 80264BA8 */ void Set(cCcD_Obj*);
/* 80264C5C */ void ClrCoHitInf();
/* 80264CF0 */ void ClrTgHitInf();
/* 80264D90 */ void ClrAtHitInf();
/* 80264E2C */ void ChkNoHitAtTg(cCcD_Obj*, cCcD_Obj*);
/* 80264F40 */ void ChkAtTg();
/* 8026515C */ void ChkNoHitCo(cCcD_Obj*, cCcD_Obj*);
/* 80265230 */ void ChkCo();
/* 802653A0 */ void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*);
/* 802653C8 */ void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*);
/* 802655E4 */ void SetCoCommonHitInf(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
/* 80265750 */ void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
/* 80265BB4 */ void CalcArea();
/* 80265CCC */ void Move();
/* 80265D30 */ void DrawClear();
/* 80265DF4 */ void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*);
/* 80265DF8 */ void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*,
cCcD_Stts*, cCcD_GStts*, cCcD_GStts*);
/* 80265DFC */ void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, cCcD_GObjInf*,
cCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, cCcD_GStts*,
cCcD_GStts*, cXyz*);
/* 80265E00 */ bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*,
cCcD_GStts*);
/* 80265E08 */ bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*, cCcD_GObjInf const*,
cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*);
/* 80265E10 */ bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
/* 80265E18 */ void MoveAfterCheck();
};
struct cCcD_ObjTg {
/* 802648C8 */ void SetHit(cCcD_Obj*);
};
struct cCcD_ObjCo {
/* 802648D8 */ void SetHit(cCcD_Obj*);
};
struct cCcD_ObjAt {
/* 8026483C */ void SetHit(cCcD_Obj*);
};
struct cCcD_DivideInfo {
/* 80263368 */ void Chk(cCcD_DivideInfo const&) const;
};
struct cCcD_DivideArea {
/* 802633A8 */ void SetArea(cM3dGAab const&);
/* 802634D4 */ void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32);
};
//
// Forward References:
//
@@ -146,10 +61,6 @@ extern "C" void SetHit__10cCcD_ObjCoFP8cCcD_Obj();
extern "C" void ClearForMinMax__8cM3dGAabFv();
extern "C" void SetMinMax__8cM3dGAabFRC8cM3dGAab();
extern "C" void CalcCenter__8cM3dGAabCFP4cXyz();
extern "C" void PSVECAdd();
extern "C" void PSVECSubtract();
extern "C" void PSVECScale();
extern "C" void PSVECMag();
extern "C" void __register_global_object();
extern "C" void _savegpr_21();
extern "C" void _savegpr_22();
libs/Z2AudioLib/Z2StatusMgr.cpp
+80 -86
View File
@@ -11,26 +11,6 @@
// Types:
//
struct Vec {};
struct Z2StatusMgr {
/* 802B5F1C */ Z2StatusMgr();
/* 802B5F70 */ void heartGaugeOn();
/* 802B5F7C */ void processHeartGaugeSound();
/* 802B60CC */ void talkIn();
/* 802B6104 */ void talkOut();
/* 802B613C */ void menuIn();
/* 802B617C */ void menuOut();
/* 802B61BC */ void isMovieDemo();
/* 802B61E8 */ void setDemoName(char*);
/* 802B671C */ void processTime();
/* 802B6734 */ void checkDayTime();
/* 802B6758 */ void setEventBit(void*);
/* 802B6760 */ void setCameraPolygonPos(Vec*);
/* 802B6784 */ void setCameraGroupInfo(u8);
/* 802B6788 */ void setCameraInWaterDepth(f32);
};
struct Z2SeqMgr {
/* 802AF49C */ void subBgmStart(u32);
/* 802AF884 */ void subBgmStop();
@@ -87,10 +67,10 @@ extern "C" void talkIn__11Z2StatusMgrFv();
extern "C" void talkOut__11Z2StatusMgrFv();
extern "C" void menuIn__11Z2StatusMgrFv();
extern "C" void menuOut__11Z2StatusMgrFv();
extern "C" void isMovieDemo__11Z2StatusMgrFv();
extern "C" bool isMovieDemo__11Z2StatusMgrFv();
extern "C" void setDemoName__11Z2StatusMgrFPc();
extern "C" void processTime__11Z2StatusMgrFv();
extern "C" void checkDayTime__11Z2StatusMgrFv();
extern "C" bool checkDayTime__11Z2StatusMgrFv();
extern "C" void setEventBit__11Z2StatusMgrFPv();
extern "C" void setCameraPolygonPos__11Z2StatusMgrFP3Vec();
extern "C" void setCameraGroupInfo__11Z2StatusMgrFUc();
@@ -130,8 +110,8 @@ extern "C" extern u8 data_80450B40[4];
extern "C" extern u8 data_80450B60[4];
extern "C" extern u8 data_80450B7C[4];
extern "C" extern u8 data_80450B80[4];
extern "C" extern u8 data_80450B84[4];
extern "C" extern u8 data_80450B88[4];
extern "C" extern Z2SeqMgr* data_80450B84;
extern "C" extern Z2SeMgr* data_80450B88;
extern "C" extern u8 struct_80451124[4];
extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */];
@@ -152,6 +132,29 @@ SECTION_SDATA2 static u8 lit_3396[4] = {
};
/* 802B5F1C-802B5F70 2B085C 0054+00 0/0 1/1 0/0 .text __ct__11Z2StatusMgrFv */
// needs other functions decompiled first
#ifdef NONMATCHING
Z2StatusMgr::Z2StatusMgr() {
data_80450B7C = this;
mHour = 0;
mMinute = 0;
mWeekday = 0;
field_0x03 = 0;
mTime = 3072;
mEventBit = (void*)0;
mIsMenuIn = false;
mCameraMapInfo = 0;
float polygon_pos_init = lit_3395;
mPolygonPosition.x = polygon_pos_init;
mPolygonPosition.y = polygon_pos_init;
mPolygonPosition.z = polygon_pos_init;
float depth_init = 0.0f;
mUnderwaterDepth = depth_init;
mCameraInWaterDepthRatio = depth_init;
mDemoStatus = 0;
mHeartGaugeOn = 0;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -160,16 +163,12 @@ asm Z2StatusMgr::Z2StatusMgr() {
#include "asm/Z2AudioLib/Z2StatusMgr/__ct__11Z2StatusMgrFv.s"
}
#pragma pop
#endif
/* 802B5F70-802B5F7C 2B08B0 000C+00 0/0 1/1 0/0 .text heartGaugeOn__11Z2StatusMgrFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void Z2StatusMgr::heartGaugeOn() {
nofralloc
#include "asm/Z2AudioLib/Z2StatusMgr/heartGaugeOn__11Z2StatusMgrFv.s"
void Z2StatusMgr::heartGaugeOn() {
mHeartGaugeOn = 2;
}
#pragma pop
/* ############################################################################################## */
/* 80455A20-80455A24 004020 0004+00 3/3 0/0 0/0 .sdata2 @3467 */
@@ -189,54 +188,57 @@ asm void Z2StatusMgr::processHeartGaugeSound() {
#pragma pop
/* 802B60CC-802B6104 2B0A0C 0038+00 0/0 1/1 0/0 .text talkIn__11Z2StatusMgrFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void Z2StatusMgr::talkIn() {
nofralloc
#include "asm/Z2AudioLib/Z2StatusMgr/talkIn__11Z2StatusMgrFv.s"
void Z2StatusMgr::talkIn() {
if (!isMovieDemo()) {
data_80450B84->talkInBgm();
data_80450B88->talkInSe();
}
}
#pragma pop
/* 802B6104-802B613C 2B0A44 0038+00 0/0 1/1 0/0 .text talkOut__11Z2StatusMgrFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void Z2StatusMgr::talkOut() {
nofralloc
#include "asm/Z2AudioLib/Z2StatusMgr/talkOut__11Z2StatusMgrFv.s"
void Z2StatusMgr::talkOut() {
if (!isMovieDemo()) {
data_80450B84->talkOutBgm();
data_80450B88->talkOutSe();
}
}
#pragma pop
/* 802B613C-802B617C 2B0A7C 0040+00 0/0 1/1 0/0 .text menuIn__11Z2StatusMgrFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void Z2StatusMgr::menuIn() {
nofralloc
#include "asm/Z2AudioLib/Z2StatusMgr/menuIn__11Z2StatusMgrFv.s"
void Z2StatusMgr::menuIn() {
data_80450B84->menuInBgm();
data_80450B88->menuInSe();
mIsMenuIn = true;
}
#pragma pop
/* 802B617C-802B61BC 2B0ABC 0040+00 0/0 3/3 0/0 .text menuOut__11Z2StatusMgrFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void Z2StatusMgr::menuOut() {
nofralloc
#include "asm/Z2AudioLib/Z2StatusMgr/menuOut__11Z2StatusMgrFv.s"
void Z2StatusMgr::menuOut() {
data_80450B84->menuOutBgm();
data_80450B88->talkOutSe();
mIsMenuIn = false;
}
#pragma pop
/* 802B61BC-802B61E8 2B0AFC 002C+00 2/2 1/1 0/0 .text isMovieDemo__11Z2StatusMgrFv */
#ifdef NONMATCHING
bool Z2StatusMgr::isMovieDemo(void) {
bool isMovieDemo = false;
if (mDemoStatus == 2 || mDemoStatus == 8 || mDemoStatus == 9) {
isMovieDemo = true;
}
return isMovieDemo;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void Z2StatusMgr::isMovieDemo() {
asm bool Z2StatusMgr::isMovieDemo() {
nofralloc
#include "asm/Z2AudioLib/Z2StatusMgr/isMovieDemo__11Z2StatusMgrFv.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 8039BC88-8039BC88 0282E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
@@ -409,44 +411,36 @@ asm void Z2StatusMgr::setDemoName(char* param_0) {
#pragma pop
/* 802B671C-802B6734 2B105C 0018+00 0/0 1/1 0/0 .text processTime__11Z2StatusMgrFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void Z2StatusMgr::processTime() {
nofralloc
#include "asm/Z2AudioLib/Z2StatusMgr/processTime__11Z2StatusMgrFv.s"
void Z2StatusMgr::processTime() {
u16 temp = mHour * 256;
mTime = temp + mMinute;
}
#pragma pop
/* 802B6734-802B6758 2B1074 0024+00 0/0 5/5 0/0 .text checkDayTime__11Z2StatusMgrFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void Z2StatusMgr::checkDayTime() {
nofralloc
#include "asm/Z2AudioLib/Z2StatusMgr/checkDayTime__11Z2StatusMgrFv.s"
bool Z2StatusMgr::checkDayTime() {
if (mHour >= 6 && mHour < 19) {
return true;
} else {
return false;
}
}
#pragma pop
/* 802B6758-802B6760 -00001 0008+00 0/0 0/0 0/0 .text setEventBit__11Z2StatusMgrFPv */
void Z2StatusMgr::setEventBit(void* param_0) {
*(u32*)(((u8*)this) + 8) /* this->field_0x8 */ = (u32)(param_0);
void Z2StatusMgr::setEventBit(void* pBit) {
mEventBit = pBit;
}
/* 802B6760-802B6784 2B10A0 0024+00 0/0 1/1 0/0 .text setCameraPolygonPos__11Z2StatusMgrFP3Vec */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void Z2StatusMgr::setCameraPolygonPos(Vec* param_0) {
nofralloc
#include "asm/Z2AudioLib/Z2StatusMgr/setCameraPolygonPos__11Z2StatusMgrFP3Vec.s"
void Z2StatusMgr::setCameraPolygonPos(Vec* pPolygonPos) {
if (pPolygonPos == 0) {
return;
} else {
mPolygonPosition = *pPolygonPos;
}
}
#pragma pop
/* 802B6784-802B6788 2B10C4 0004+00 0/0 1/1 0/0 .text setCameraGroupInfo__11Z2StatusMgrFUc */
void Z2StatusMgr::setCameraGroupInfo(u8 param_0) {
/* empty function */
}
void Z2StatusMgr::setCameraGroupInfo(u8 param_0) {}
/* ############################################################################################## */
/* 80455A30-80455A34 004030 0004+00 1/1 0/0 0/0 .sdata2 @3798 */