mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_b_oh2 / d_a_obj_web0 / d_a_obj_web1 (#243)

Browse Source 
* d_a_obj_web0 / d_a_obj_web1

* remove asm

* d_a_set_bgobj

* d_cc_s work

* remove asm

* build fix

* fix tp.py progress check and rel sha1 check

* clean up some bg files
This commit is contained in:
TakaRikka
2023-01-15 11:10:23 -08:00
committed by GitHub
parent c90f9dfde9
commit 5e05ae38f8
126 changed files with 2217 additions and 6277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/bg/d_bg_pc.cpp
+5 -2
View File
@@ -1,6 +1,9 @@
/**
* d_bg_pc.cpp
*
*/
#include "d/bg/d_bg_pc.h"
#include "dol2asm.h"
#include "dolphin/types.h"
void dBgPc::setCode(sBgPc& code) {
m_code = code;
src/d/bg/d_bg_s.cpp
-21
View File
@@ -1048,27 +1048,6 @@ f32 dBgS_GetNY(cBgS_PolyInfo const& poly) {
return pla.mNormal.y;
}
/* ############################################################################################## */
/* 803AB608-803AB61C 008728 0014+00 0/0 3/3 0/0 .data __vt__4dBgS */
SECTION_DATA extern void* __vt__4dBgS[5] = {
(void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__4dBgSFv,
(void*)Ct__4dBgSFv, (void*)Dt__4dBgSFv,
};
/* 803AB61C-803AB630 00873C 0014+00 0/0 4/4 0/0 .data __vt__4cBgS */
SECTION_DATA extern void* __vt__4cBgS[5] = {
(void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__4cBgSFv,
(void*)Ct__4cBgSFv, (void*)Dt__4cBgSFv,
};
/* 803AB630-803AB640 008750 0010+00 0/0 2/2 0/0 .data __vt__11cBgS_ChkElm */
SECTION_DATA extern void* __vt__11cBgS_ChkElm[4] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__11cBgS_ChkElmFv,
(void*)Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv,
};
/* 80450F68-80450F70 000468 0008+00 0/0 1/1 0/0 .sbss None */
extern u8 data_80450F68[8];
u8 data_80450F68[8] ALIGN_DECL(8);
src/d/bg/d_bg_s_chk.cpp
+5 -56
View File
@@ -1,56 +1,15 @@
//
// Generated By: dol2asm
// Translation Unit: d/bg/d_bg_s_chk
//
/**
* d_bg_s_chk.cpp
*
*/
#include "d/bg/d_bg_s_chk.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void __ct__8dBgS_ChkFv();
extern "C" void __dt__8dBgS_ChkFv();
extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv();
extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv();
extern "C" static void func_80077574();
//
// External References:
//
extern "C" void __ct__15dBgS_GrpPassChkFv();
extern "C" void __dt__15dBgS_GrpPassChkFv();
extern "C" void __ct__16dBgS_PolyPassChkFv();
extern "C" void __dt__16dBgS_PolyPassChkFv();
extern "C" void __dl__FPv();
//
// Declarations:
//
/* ############################################################################################## */
/* 803AB670-803AB688 008790 0018+00 2/2 0/0 0/0 .data __vt__8dBgS_Chk */
SECTION_DATA extern void* __vt__8dBgS_Chk[6] = {
(void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__8dBgS_ChkFv, (void*)NULL, (void*)NULL,
(void*)func_80077574,
};
/* 8007749C-800774E8 071DDC 004C+00 0/0 6/6 0/0 .text __ct__8dBgS_ChkFv */
dBgS_Chk::dBgS_Chk() {}
/* 800774E8-80077560 071E28 0078+00 2/1 6/6 0/0 .text __dt__8dBgS_ChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dBgS_Chk::~dBgS_Chk() {
extern "C" asm void __dt__8dBgS_ChkFv() {
nofralloc
#include "asm/d/bg/d_bg_s_chk/__dt__8dBgS_ChkFv.s"
}
#pragma pop
dBgS_Chk::~dBgS_Chk() {}
/* 80077560-80077564 071EA0 0004+00 0/0 6/6 0/0 .text GetPolyPassChkInfo__8dBgS_ChkFv */
cBgS_PolyPassChk* dBgS_Chk::GetPolyPassChkInfo() {
@@ -61,13 +20,3 @@ cBgS_PolyPassChk* dBgS_Chk::GetPolyPassChkInfo() {
cBgS_GrpPassChk* dBgS_Chk::GetGrpPassChkInfo() {
return this;
}
/* 80077574-8007757C 071EB4 0008+00 1/0 0/0 0/0 .text @16@__dt__8dBgS_ChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80077574() {
nofralloc
#include "asm/d/bg/d_bg_s_chk/func_80077574.s"
}
#pragma pop
src/d/bg/d_bg_s_movebg_actor.cpp
-15
View File
@@ -56,21 +56,6 @@ extern "C" u8 now__14mDoMtx_stack_c[48];
// Declarations:
//
/* ############################################################################################## */
/* 803AB9A0-803AB9C8 008AC0 0028+00 1/1 0/0 34/34 .data __vt__16dBgS_MoveBgActor */
SECTION_DATA extern void* __vt__16dBgS_MoveBgActor[10] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)CreateHeap__16dBgS_MoveBgActorFv,
(void*)Create__16dBgS_MoveBgActorFv,
(void*)Execute__16dBgS_MoveBgActorFPPA3_A4_f,
(void*)Draw__16dBgS_MoveBgActorFv,
(void*)Delete__16dBgS_MoveBgActorFv,
(void*)IsDelete__16dBgS_MoveBgActorFv,
(void*)ToFore__16dBgS_MoveBgActorFv,
(void*)ToBack__16dBgS_MoveBgActorFv,
};
/* 80078624-80078668 072F64 0044+00 0/0 0/0 173/173 .text __ct__16dBgS_MoveBgActorFv */
dBgS_MoveBgActor::dBgS_MoveBgActor() {
field_0x568 = NULL;
src/d/bg/d_bg_s_roof_chk.cpp
+5 -92
View File
@@ -1,58 +1,9 @@
//
// Generated By: dol2asm
// Translation Unit: d/bg/d_bg_s_roof_chk
//
/**
* d_bg_s_roof_chk.cpp
*
*/
#include "d/bg/d_bg_s_roof_chk.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void __ct__12dBgS_RoofChkFv();
extern "C" void __dt__12dBgS_RoofChkFv();
extern "C" void Init__12dBgS_RoofChkFv();
extern "C" static void func_8007914C();
extern "C" static void func_80079154();
extern "C" static void func_8007915C();
//
// External References:
//
extern "C" void __ct__8dBgS_ChkFv();
extern "C" void __dt__8dBgS_ChkFv();
extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv();
extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv();
extern "C" void __ct__8cBgS_ChkFv();
extern "C" void __dt__8cBgS_ChkFv();
extern "C" void __ct__13cBgS_PolyInfoFv();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void ClearPi__13cBgS_PolyInfoFv();
extern "C" void __dl__FPv();
//
// Declarations:
//
/* ############################################################################################## */
/* 803ABA50-803ABA80 008B70 0030+00 2/2 0/0 0/0 .data __vt__12dBgS_RoofChk */
SECTION_DATA extern void* __vt__12dBgS_RoofChk[12] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_RoofChkFv,
(void*)NULL,
(void*)NULL,
(void*)func_8007914C,
(void*)NULL,
(void*)NULL,
(void*)func_8007915C,
(void*)NULL,
(void*)NULL,
(void*)func_80079154,
};
/* 80078FF4-80079090 073934 009C+00 0/0 10/10 1/1 .text __ct__12dBgS_RoofChkFv */
dBgS_RoofChk::dBgS_RoofChk() {
@@ -66,48 +17,10 @@ dBgS_RoofChk::dBgS_RoofChk() {
}
/* 80079090-80079124 0739D0 0094+00 4/3 11/11 1/1 .text __dt__12dBgS_RoofChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dBgS_RoofChk::~dBgS_RoofChk() {
extern "C" asm void __dt__12dBgS_RoofChkFv() {
nofralloc
#include "asm/d/bg/d_bg_s_roof_chk/__dt__12dBgS_RoofChkFv.s"
}
#pragma pop
dBgS_RoofChk::~dBgS_RoofChk() {}
/* 80079124-8007914C 073A64 0028+00 0/0 1/1 0/0 .text Init__12dBgS_RoofChkFv */
void dBgS_RoofChk::Init() {
SetNowY(1000000000.0f);
ClearPi();
}
/* 8007914C-80079154 073A8C 0008+00 1/0 0/0 0/0 .text @16@__dt__12dBgS_RoofChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_8007914C() {
nofralloc
#include "asm/d/bg/d_bg_s_roof_chk/func_8007914C.s"
}
#pragma pop
/* 80079154-8007915C 073A94 0008+00 1/0 0/0 0/0 .text @52@__dt__12dBgS_RoofChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80079154() {
nofralloc
#include "asm/d/bg/d_bg_s_roof_chk/func_80079154.s"
}
#pragma pop
/* 8007915C-80079164 073A9C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_RoofChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_8007915C() {
nofralloc
#include "asm/d/bg/d_bg_s_roof_chk/func_8007915C.s"
}
#pragma pop
src/d/bg/d_bg_s_sph_chk.cpp
+4 -99
View File
@@ -1,64 +1,9 @@
//
// Generated By: dol2asm
// Translation Unit: d/bg/d_bg_s_sph_chk
//
/**
* d_bg_s_sph_chk.cpp
*
*/
#include "d/bg/d_bg_s_sph_chk.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void __ct__11dBgS_SphChkFv();
extern "C" void __dt__11dBgS_SphChkFv();
extern "C" static void func_80078B70();
extern "C" static void func_80078B78();
extern "C" static void func_80078B80();
extern "C" static void func_80078B88();
//
// External References:
//
extern "C" void __ct__8dBgS_ChkFv();
extern "C" void __dt__8dBgS_ChkFv();
extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv();
extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv();
extern "C" void __ct__8cBgS_ChkFv();
extern "C" void __dt__8cBgS_ChkFv();
extern "C" void __ct__13cBgS_PolyInfoFv();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void ClearPi__13cBgS_PolyInfoFv();
extern "C" void __dl__FPv();
extern "C" extern void* __vt__8cM3dGSph[3];
//
// Declarations:
//
/* ############################################################################################## */
/* 803AB9C8-803ABA08 008AE8 003C+04 2/2 0/0 0/0 .data __vt__11dBgS_SphChk */
SECTION_DATA extern void* __vt__11dBgS_SphChk[15 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__11dBgS_SphChkFv,
(void*)NULL,
(void*)NULL,
(void*)func_80078B70,
(void*)NULL,
(void*)NULL,
(void*)func_80078B78,
(void*)NULL,
(void*)NULL,
(void*)func_80078B88,
(void*)NULL,
(void*)NULL,
(void*)func_80078B80,
/* padding */
NULL,
};
/* 80078A14-80078AC0 073354 00AC+00 0/0 1/1 1/1 .text __ct__11dBgS_SphChkFv */
dBgS_SphChk::dBgS_SphChk() {
@@ -71,43 +16,3 @@ dBgS_SphChk::dBgS_SphChk() {
/* 80078AC0-80078B70 073400 00B0+00 5/4 2/2 0/0 .text __dt__11dBgS_SphChkFv */
dBgS_SphChk::~dBgS_SphChk() {}
/* 80078B70-80078B78 0734B0 0008+00 1/0 0/0 0/0 .text @20@__dt__11dBgS_SphChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80078B70() {
nofralloc
#include "asm/d/bg/d_bg_s_sph_chk/func_80078B70.s"
}
#pragma pop
/* 80078B78-80078B80 0734B8 0008+00 1/0 0/0 0/0 .text @36@__dt__11dBgS_SphChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80078B78() {
nofralloc
#include "asm/d/bg/d_bg_s_sph_chk/func_80078B78.s"
}
#pragma pop
/* 80078B80-80078B88 0734C0 0008+00 1/0 0/0 0/0 .text @72@__dt__11dBgS_SphChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80078B80() {
nofralloc
#include "asm/d/bg/d_bg_s_sph_chk/func_80078B80.s"
}
#pragma pop
/* 80078B88-80078B90 0734C8 0008+00 1/0 0/0 0/0 .text @56@__dt__11dBgS_SphChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80078B88() {
nofralloc
#include "asm/d/bg/d_bg_s_sph_chk/func_80078B88.s"
}
#pragma pop
src/d/bg/d_bg_s_spl_grp_chk.cpp
+4 -84
View File
@@ -1,42 +1,9 @@
//
// Generated By: dol2asm
// Translation Unit: d/bg/d_bg_s_spl_grp_chk
//
/**
* d_bg_s_spl_grp_chk.cpp
*
*/
#include "d/bg/d_bg_s_spl_grp_chk.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void Set__14dBgS_SplGrpChkFR4cXyzf();
extern "C" void __ct__14dBgS_SplGrpChkFv();
extern "C" void __dt__14dBgS_SplGrpChkFv();
extern "C" void Init__14dBgS_SplGrpChkFv();
extern "C" static void func_80078D4C();
extern "C" static void func_80078D54();
extern "C" static void func_80078D5C();
//
// External References:
//
extern "C" void __ct__8dBgS_ChkFv();
extern "C" void __dt__8dBgS_ChkFv();
extern "C" void GetPolyPassChkInfo__8dBgS_ChkFv();
extern "C" void GetGrpPassChkInfo__8dBgS_ChkFv();
extern "C" void __ct__8cBgS_ChkFv();
extern "C" void __dt__8cBgS_ChkFv();
extern "C" void __ct__13cBgS_PolyInfoFv();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void ClearPi__13cBgS_PolyInfoFv();
extern "C" void __dl__FPv();
//
// Declarations:
//
/* 80078B90-80078BB0 0734D0 0020+00 0/0 2/2 3/3 .text Set__14dBgS_SplGrpChkFR4cXyzf */
void dBgS_SplGrpChk::Set(cXyz& ground, f32 roof) {
@@ -44,23 +11,6 @@ void dBgS_SplGrpChk::Set(cXyz& ground, f32 roof) {
m_roof = roof;
}
/* ############################################################################################## */
/* 803ABA08-803ABA38 008B28 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_SplGrpChk */
SECTION_DATA extern void* __vt__14dBgS_SplGrpChk[12] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__14dBgS_SplGrpChkFv,
(void*)NULL,
(void*)NULL,
(void*)func_80078D4C,
(void*)NULL,
(void*)NULL,
(void*)func_80078D5C,
(void*)NULL,
(void*)NULL,
(void*)func_80078D54,
};
/* 80078BB0-80078C78 0734F0 00C8+00 0/0 1/1 0/0 .text __ct__14dBgS_SplGrpChkFv */
dBgS_SplGrpChk::dBgS_SplGrpChk() {
SetPolyPassChk(GetPolyPassChkInfo());
@@ -88,33 +38,3 @@ void dBgS_SplGrpChk::Init() {
SetHeight(GetPosP().y);
ClearPi();
}
/* 80078D4C-80078D54 07368C 0008+00 1/0 0/0 0/0 .text @16@__dt__14dBgS_SplGrpChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80078D4C() {
nofralloc
#include "asm/d/bg/d_bg_s_spl_grp_chk/func_80078D4C.s"
}
#pragma pop
/* 80078D54-80078D5C 073694 0008+00 1/0 0/0 0/0 .text @52@__dt__14dBgS_SplGrpChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80078D54() {
nofralloc
#include "asm/d/bg/d_bg_s_spl_grp_chk/func_80078D54.s"
}
#pragma pop
/* 80078D5C-80078D64 07369C 0008+00 1/0 0/0 0/0 .text @36@__dt__14dBgS_SplGrpChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80078D5C() {
nofralloc
#include "asm/d/bg/d_bg_s_spl_grp_chk/func_80078D5C.s"
}
#pragma pop
src/d/bg/d_bg_s_wtr_chk.cpp
+5 -2
View File
@@ -1,6 +1,9 @@
/**
* d_bg_s_wtr_chk.cpp
*
*/
#include "d/bg/d_bg_s_wtr_chk.h"
#include "dol2asm.h"
#include "dolphin/types.h"
dBgS_WtrChk::dBgS_WtrChk() {
OnWaterGrp();
src/d/bg/d_bg_w_base.cpp
+5 -116
View File
@@ -1,128 +1,17 @@
//
// Generated By: dol2asm
// Translation Unit: d/bg/d_bg_w_base
//
/**
* d_bg_w_base.cpp
*
*/
#include "d/bg/d_bg_w_base.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void __ct__9dBgW_BaseFv();
extern "C" void __dt__9cBgW_BgIdFv();
extern "C" void __dt__9dBgW_BaseFv();
extern "C" void ClrDBgWBase__9dBgW_BaseFv();
extern "C" bool ChkMemoryError__9dBgW_BaseFv();
extern "C" void CallRideCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_c();
extern "C" void CallArrowStickCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_cR4cXyz();
extern "C" void CalcDiffShapeAngleY__9dBgW_BaseFs();
//
// External References:
//
extern "C" void SetOldShapeAngleY__9dBgW_BaseFs();
extern "C" void __dl__FPv();
//
// Declarations:
//
/* ############################################################################################## */
/* 803ABCC8-803ABDB8 008DE8 00F0+00 2/2 0/0 0/0 .data __vt__9dBgW_Base */
SECTION_DATA extern void* __vt__9dBgW_Base[60] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__9dBgW_BaseFv,
(void*)ChkMemoryError__9dBgW_BaseFv,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)SetOldShapeAngleY__9dBgW_BaseFs,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)CallRideCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_c,
(void*)CallArrowStickCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_cR4cXyz,
};
/* 803ABDB8-803ABDC8 008ED8 000C+04 3/3 0/0 0/0 .data __vt__9cBgW_BgId */
SECTION_DATA extern void* __vt__9cBgW_BgId[3 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__9cBgW_BgIdFv,
/* padding */
NULL,
};
/* 8007E5A8-8007E5F8 078EE8 0050+00 0/0 2/2 0/0 .text __ct__9dBgW_BaseFv */
dBgW_Base::dBgW_Base() {
ClrDBgWBase();
}
/* 8007E5F8-8007E640 078F38 0048+00 1/0 0/0 0/0 .text __dt__9cBgW_BgIdFv */
cBgW_BgId::~cBgW_BgId() {}
/* 8007E640-8007E69C 078F80 005C+00 1/0 2/2 0/0 .text __dt__9dBgW_BaseFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dBgW_Base::~dBgW_Base() {
extern "C" asm void __dt__9dBgW_BaseFv() {
nofralloc
#include "asm/d/bg/d_bg_w_base/__dt__9dBgW_BaseFv.s"
}
#pragma pop
dBgW_Base::~dBgW_Base() {}
/* 8007E69C-8007E6D0 078FDC 0034+00 1/1 1/1 0/0 .text ClrDBgWBase__9dBgW_BaseFv */
void dBgW_Base::ClrDBgWBase() {