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

Merge branch 'master' into d_a_do

Browse Source
This commit is contained in:
Pheenoh
2023-01-15 12:23:08 -07:00
parent b25381bfba 6e05f7133b
commit 8b52fd247a
127 changed files with 2217 additions and 6278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rel/d/a/b/d_a_b_go/d_a_b_go.cpp
-1
View File
@@ -61,7 +61,6 @@ public:
/* 0x5AC */ request_of_phase_process_class mPhase;
/* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
/* 0x5B8 */ Z2CreatureEnemy mZ2Enemy;
/* 0x648 */ u8 field_0x648[0x14];
/* 0x65C */ int field_0x65c;
/* 0x660 */ u8 field_0x660;
/* 0x661 */ u8 field_0x661[0x668 - 0x661];
rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp
+302 -461
View File
File diff suppressed because it is too large Load Diff
rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp
+1 -1
View File
@@ -653,7 +653,7 @@ extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern void* calc_mtx[1 + 1 /* padding */];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450C98[4];
extern "C" extern u8 struct_80450C9C[4];
extern "C" extern u8 cDmr_SkipInfo[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __register_global_object();
extern "C" void actionInitWait2__11daObjLife_cFv();
rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp
+62 -157
View File
@@ -1,186 +1,91 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_set_bgobj
//
/**
* d_a_set_bgobj.cpp
*
*/
#include "rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "d/d_procname.h"
//
// Types:
//
extern "C" extern leafdraw_method_class g_fopAc_Method;
struct request_of_phase_process_class {};
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
struct daSetBgObj_c {
/* 80031870 */ void getArcName(fopAc_ac_c*);
/* 80485D78 */ void CreateInit();
/* 80485DFC */ void create();
/* 80485E88 */ void Delete();
};
struct dRes_info_c {};
struct dRes_control_c {
/* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int);
};
struct csXyz {};
struct cXyz {};
//
// Forward References:
//
extern "C" void CreateInit__12daSetBgObj_cFv();
extern "C" void create__12daSetBgObj_cFv();
extern "C" void Delete__12daSetBgObj_cFv();
extern "C" static void daSetBgObj_Delete__FP12daSetBgObj_c();
extern "C" static void daSetBgObj_Create__FP10fopAc_ac_c();
extern "C" extern char const* const d_a_set_bgobj__stringBase0;
extern "C" extern void* g_profile_SET_BG_OBJ[12];
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void getArcName__12daSetBgObj_cFP10fopAc_ac_c();
extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci();
extern "C" void sprintf();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
/* ############################################################################################## */
/* 80485F00-80485F0C 000000 0009+03 1/1 0/0 0/0 .rodata l_specName */
SECTION_RODATA static u8 const l_specName[9 + 3 /* padding */] = {
0x73,
0x70,
0x65,
0x63,
0x2E,
0x64,
0x61,
0x74,
0x00,
/* padding */
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80485F00, &l_specName);
/* 80485F10-80485F1C 000000 000A+02 1/1 0/0 0/0 .data l_bg_profName$3618 */
SECTION_DATA static u8 l_bg_profName[10 + 2 /* padding */] = {
0x02,
0xDE,
0x02,
0xDE,
0x02,
0xDE,
0x01,
0x3C,
0x01,
0x3D,
/* padding */
0x00,
0x00,
};
static const char l_specName[] = "spec.dat";
/* 80485D78-80485DFC 000078 0084+00 1/1 0/0 0/0 .text CreateInit__12daSetBgObj_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daSetBgObj_c::CreateInit() {
nofralloc
#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/CreateInit__12daSetBgObj_cFv.s"
}
#pragma pop
int daSetBgObj_c::CreateInit() {
static s16 l_bg_profName[5] = {
PROC_BG_OBJ, PROC_BG_OBJ, PROC_BG_OBJ, PROC_Obj_Flag2, PROC_Obj_Flag3,
};
/* ############################################################################################## */
/* 80485F0C-80485F0C 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80485F0C = "%s";
#pragma pop
u16* spec_data_p = (u16*)dComIfG_getObjectRes(mArcName, l_specName);
fopAcM_create(l_bg_profName[*spec_data_p], fopAcM_GetParam(this), &current.pos,
fopAcM_GetRoomNo(this), &current.angle, &mScale, -1);
return 1;
}
/* 80485DFC-80485E88 0000FC 008C+00 1/1 0/0 0/0 .text create__12daSetBgObj_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daSetBgObj_c::create() {
nofralloc
#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/create__12daSetBgObj_cFv.s"
int daSetBgObj_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daSetBgObj_c();
fopAcM_OnCondition(this, 8);
}
sprintf(mArcName, "%s", getArcName(this));
int phase = dComIfG_resLoad(&mPhase, mArcName);
if (phase == cPhs_COMPLEATE_e) {
CreateInit();
phase = cPhs_ERROR_e;
}
return phase;
}
#pragma pop
/* 80485E88-80485EB8 000188 0030+00 1/1 0/0 0/0 .text Delete__12daSetBgObj_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daSetBgObj_c::Delete() {
nofralloc
#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/Delete__12daSetBgObj_cFv.s"
int daSetBgObj_c::Delete() {
dComIfG_resDelete(&mPhase, mArcName);
return 1;
}
#pragma pop
/* 80485EB8-80485ED8 0001B8 0020+00 1/0 0/0 0/0 .text daSetBgObj_Delete__FP12daSetBgObj_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daSetBgObj_Delete(daSetBgObj_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Delete__FP12daSetBgObj_c.s"
static int daSetBgObj_Delete(daSetBgObj_c* i_this) {
return i_this->Delete();
}
#pragma pop
/* 80485ED8-80485EF8 0001D8 0020+00 1/0 0/0 0/0 .text daSetBgObj_Create__FP10fopAc_ac_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daSetBgObj_Create(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_set_bgobj/d_a_set_bgobj/daSetBgObj_Create__FP10fopAc_ac_c.s"
static int daSetBgObj_Create(fopAc_ac_c* i_this) {
return static_cast<daSetBgObj_c*>(i_this)->create();
}
#pragma pop
/* ############################################################################################## */
/* 80485F1C-80485F3C -00001 0020+00 1/0 0/0 0/0 .data l_daSetBgObj_Method */
SECTION_DATA static void* l_daSetBgObj_Method[8] = {
(void*)daSetBgObj_Create__FP10fopAc_ac_c,
(void*)daSetBgObj_Delete__FP12daSetBgObj_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daSetBgObj_Method = {
(process_method_func)daSetBgObj_Create,
(process_method_func)daSetBgObj_Delete,
};
/* 80485F3C-80485F6C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SET_BG_OBJ */
SECTION_DATA extern void* g_profile_SET_BG_OBJ[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02DD0000, (void*)&g_fpcLf_Method,
(void*)0x00000580, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02F20000, (void*)&l_daSetBgObj_Method,
(void*)0x00040100, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_SET_BG_OBJ = {
-3,
7,
-3,
PROC_SET_BG_OBJ,
0,
&g_fpcLf_Method.mBase,
sizeof(daSetBgObj_c),
0,
0,
&g_fopAc_Method,
0x02F2,
0,
0,
&l_daSetBgObj_Method,
0x00040100,
0,
14,
0,
0,
};
/* 80485F0C-80485F0C 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp
+1 -1
View File
@@ -419,7 +419,7 @@ extern "C" extern u32 g_blackColor;
extern "C" extern void* calc_mtx[1 + 1 /* padding */];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450C98[4];
extern "C" extern u8 struct_80450C9C[4];
extern "C" extern u8 cDmr_SkipInfo[4];
extern "C" extern u8 data_80450CA0[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __register_global_object();
rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp
+1 -1
View File
@@ -175,7 +175,7 @@ extern "C" u8 mCurrentMtx__6J3DSys[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern void* calc_mtx[1 + 1 /* padding */];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450C9C[4];
extern "C" extern u8 cDmr_SkipInfo[4];
//
// Declarations:
rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp
+293 -388
View File
File diff suppressed because it is too large Load Diff
rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp
+315 -603
View File
File diff suppressed because it is too large Load Diff