j2d / map_path work, d_drawlist / d_attention cleanup (#208)

* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc

* bunch of j2d work. d_drawlist / d_attention cleanup

* progress / asm

* cleanup wip

* decompile JStage

* setup some more JStudio structs

* set up d_demo classes

* some d_demo work

* cleanup dolphin os stuff

* some initial dEvent documentation

* some At collision documentation

* match JUTConsole::doDraw

* dbgs work / split up some of d_a_alink into .inc files

* d_a_alink_spinner work
This commit is contained in:
TakaRikka
2022-08-30 15:22:17 -06:00
committed by GitHub
parent bc30d007e1
commit f8979749e3
613 changed files with 30182 additions and 40087 deletions
+16 -16
View File
@@ -9,7 +9,7 @@
/* 80268074-802680B0 2629B4 003C+00 0/0 7/7 9/9 .text __ct__13cBgS_PolyInfoFv */
cBgS_PolyInfo::cBgS_PolyInfo() {
this->ClearPi();
ClearPi();
}
/* 802680B0-802680F8 2629F0 0048+00 1/0 10/10 393/393 .text __dt__13cBgS_PolyInfoFv */
@@ -26,32 +26,32 @@ bool cBgS_PolyInfo::ChkSetInfo() const {
/* 80268120-80268148 262A60 0028+00 1/1 11/11 0/0 .text ClearPi__13cBgS_PolyInfoFv */
void cBgS_PolyInfo::ClearPi() {
mPolyIndex = 0xFFFF;
mPolyIndex = -1;
mBgIndex = 0x100;
unk_0x04 = 0;
unk_0x08 = -1;
mActorId = -1;
}
/* 80268148-8026816C 262A88 0024+00 0/0 11/11 1/1 .text
* SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo */
void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo& pOther) {
mPolyIndex = pOther.mPolyIndex;
mBgIndex = pOther.mBgIndex;
unk_0x04 = pOther.unk_0x04;
unk_0x08 = pOther.unk_0x08;
void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo& poly) {
mPolyIndex = poly.mPolyIndex;
mBgIndex = poly.mBgIndex;
unk_0x04 = poly.unk_0x04;
mActorId = poly.mActorId;
}
/* 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) {
mBgIndex = param_1;
unk_0x04 = param_2;
unk_0x08 = param_3;
void cBgS_PolyInfo::SetActorInfo(int bg_index, void* p_data, unsigned int actor_id) {
mBgIndex = bg_index;
unk_0x04 = p_data;
mActorId = actor_id;
}
/* 8026817C-802681A4 262ABC 0028+00 0/0 1/1 0/0 .text ChkSafe__13cBgS_PolyInfoCFPCvUi */
bool cBgS_PolyInfo::ChkSafe(const void* param_1, unsigned int param_2) const {
if (unk_0x04 == param_1 && unk_0x08 == param_2) {
bool cBgS_PolyInfo::ChkSafe(const void* param_1, unsigned int actor_id) const {
if (unk_0x04 == param_1 && mActorId == actor_id) {
return true;
} else {
return false;
@@ -60,8 +60,8 @@ bool cBgS_PolyInfo::ChkSafe(const void* param_1, unsigned int param_2) const {
/* 802681A4-802681AC 262AE4 0008+00 0/0 11/11 0/0 .text SetPolyIndex__13cBgS_PolyInfoFi
*/
void cBgS_PolyInfo::SetPolyIndex(int pPolyIndex) {
mPolyIndex = pPolyIndex;
void cBgS_PolyInfo::SetPolyIndex(int poly_index) {
mPolyIndex = poly_index;
}
/* 802681AC-802681C0 262AEC 0014+00 0/0 3/3 0/0 .text ChkBgIndex__13cBgS_PolyInfoCFv */
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -223,7 +223,7 @@ void cCcS::SetAtTgCommonHitInf(cCcD_Obj* obj1, cCcD_Obj* obj2, cXyz* pXyz) {
obj1->SetAtHit(obj2);
}
bool tmp = !(obj1->ChkAtNoTgHitInfSet() ||
(obj1->ChkAtType(0x80) && obj2->ChkTgNoSlingHitInfSet()));
(obj1->ChkAtType(AT_TYPE_SLINGSHOT) && obj2->ChkTgNoSlingHitInfSet()));
if (tmp) {
obj2->SetTgHit(obj1);
this->CalcTgPlusDmg(obj1, obj2, obj1Stts, obj2Stts);