* wip

* d_bg_s

* most of d_bg_s

* small cleanup

* clang

* fixes
This commit is contained in:
TakaRikka
2021-11-10 10:56:51 -08:00
committed by GitHub
parent 901b222eb8
commit 74ed2da8bc
178 changed files with 2148 additions and 4699 deletions
+5 -5
View File
@@ -18,9 +18,9 @@
/* 80267C1C-80267C94 26255C 0078+00 0/0 2/2 123/123 .text __ct__11cBgS_GndChkFv */
cBgS_GndChk::cBgS_GndChk() {
mPosition = cXyz::Zero;
m_pos = cXyz::Zero;
setActorPid(0xFFFFFFFF);
_30 = 2;
mFlags = 2;
}
/* 80267C94-80267D0C 2625D4 0078+00 2/1 4/4 110/110 .text __dt__11cBgS_GndChkFv */
@@ -28,16 +28,16 @@ cBgS_GndChk::~cBgS_GndChk() {}
/* 80267D0C-80267D28 26264C 001C+00 0/0 0/0 62/62 .text SetPos__11cBgS_GndChkFPC3Vec */
void cBgS_GndChk::SetPos(Vec const* pVec) {
mPosition = *pVec;
m_pos = *pVec;
}
/* 80267D28-80267D44 262668 001C+00 0/0 51/51 185/185 .text SetPos__11cBgS_GndChkFPC4cXyz
*/
void cBgS_GndChk::SetPos(cXyz const* pVec) {
mPosition = *pVec;
m_pos = *pVec;
}
/* 80267D44-80267D54 262684 0010+00 0/0 1/1 0/0 .text PreCheck__11cBgS_GndChkFv */
void cBgS_GndChk::PreCheck() {
mWallPrecheck = _30 & 2;
mWallPrecheck = mFlags & 2;
}
+2 -2
View File
@@ -24,7 +24,7 @@ cBgS_LinChk::~cBgS_LinChk() {}
/* 80267E48-80267ED0 262788 0088+00 1/1 0/0 0/0 .text ct__11cBgS_LinChkFv */
void cBgS_LinChk::ct() {
cXyz xyz(cXyz::Zero);
mLin.SetStartEnd(xyz, xyz);
mLinP.SetStartEnd(xyz, xyz);
field_0x40 = xyz;
setActorPid(0xFFFFFFFF);
field_0x4c = 0;
@@ -34,7 +34,7 @@ void cBgS_LinChk::ct() {
/* 80267ED0-80267F40 262810 0070+00 0/0 2/2 0/0 .text Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi */
void cBgS_LinChk::Set2(cXyz const* pStart, cXyz const* pEnd, unsigned int actorPid) {
mLin.SetStartEnd(*pStart, *pEnd);
mLinP.SetStartEnd(*pStart, *pEnd);
field_0x40 = *pEnd;
setActorPid(actorPid);
field_0x4c &= ~0x10;
+10 -10
View File
@@ -8,16 +8,16 @@
#include "dolphin/types.h"
/* 80268074-802680B0 2629B4 003C+00 0/0 7/7 9/9 .text __ct__13cBgS_PolyInfoFv */
cBgS_PolyInfo::cBgS_PolyInfo(void) {
cBgS_PolyInfo::cBgS_PolyInfo() {
this->ClearPi();
}
/* 802680B0-802680F8 2629F0 0048+00 1/0 10/10 393/393 .text __dt__13cBgS_PolyInfoFv */
cBgS_PolyInfo::~cBgS_PolyInfo(void) {}
cBgS_PolyInfo::~cBgS_PolyInfo() {}
/* 802680F8-80268120 262A38 0028+00 0/0 4/4 0/0 .text ChkSetInfo__13cBgS_PolyInfoCFv */
bool cBgS_PolyInfo::ChkSetInfo(void) const {
if (mPolyIndex == 0xFFFF || unk_0x02 == 0x100) {
bool cBgS_PolyInfo::ChkSetInfo() const {
if (mPolyIndex == 0xFFFF || mBgIndex == 0x100) {
return false;
} else {
return true;
@@ -25,9 +25,9 @@ bool cBgS_PolyInfo::ChkSetInfo(void) const {
}
/* 80268120-80268148 262A60 0028+00 1/1 11/11 0/0 .text ClearPi__13cBgS_PolyInfoFv */
void cBgS_PolyInfo::ClearPi(void) {
void cBgS_PolyInfo::ClearPi() {
mPolyIndex = 0xFFFF;
unk_0x02 = 0x100;
mBgIndex = 0x100;
unk_0x04 = 0;
unk_0x08 = -1;
}
@@ -36,7 +36,7 @@ void cBgS_PolyInfo::ClearPi(void) {
* SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo */
void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo& pOther) {
mPolyIndex = pOther.mPolyIndex;
unk_0x02 = pOther.unk_0x02;
mBgIndex = pOther.mBgIndex;
unk_0x04 = pOther.unk_0x04;
unk_0x08 = pOther.unk_0x08;
}
@@ -44,7 +44,7 @@ void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo& pOther) {
/* 8026816C-8026817C 262AAC 0010+00 0/0 6/6 0/0 .text SetActorInfo__13cBgS_PolyInfoFiPvUi
*/
void cBgS_PolyInfo::SetActorInfo(int param_1, void* param_2, unsigned int param_3) {
unk_0x02 = param_1;
mBgIndex = param_1;
unk_0x04 = param_2;
unk_0x08 = param_3;
}
@@ -65,6 +65,6 @@ void cBgS_PolyInfo::SetPolyIndex(int pPolyIndex) {
}
/* 802681AC-802681C0 262AEC 0014+00 0/0 3/3 0/0 .text ChkBgIndex__13cBgS_PolyInfoCFv */
bool cBgS_PolyInfo::ChkBgIndex(void) const {
return unk_0x02 != 0x100;
bool cBgS_PolyInfo::ChkBgIndex() const {
return mBgIndex != 0x100;
}
+4 -4
View File
@@ -13,17 +13,17 @@
/* 802681C0-802681C8 262B00 0008+00 0/0 1/1 0/0 .text Regist__9cBgW_BgIdFi */
void cBgW_BgId::Regist(int a1) {
mId = a1;
m_id = a1;
}
/* 802681C8-802681D4 262B08 000C+00 0/0 2/2 0/0 .text Release__9cBgW_BgIdFv */
void cBgW_BgId::Release() {
mId = 0x100;
m_id = 0x100;
}
/* 802681D4-802681E4 262B14 0010+00 0/0 7/7 121/121 .text ChkUsed__9cBgW_BgIdCFv */
unsigned int cBgW_BgId::ChkUsed() const {
return mId < 0x100;
bool cBgW_BgId::ChkUsed() const {
return m_id < 0x100;
}
/* 802681E4-802681FC 262B24 0018+00 1/1 22/22 8/8 .text cBgW_CheckBGround__Ff */