mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-09 06:53:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

c_dylink

Browse Source
This commit is contained in:
TakaRikka
2022-02-07 15:27:50 -08:00
parent 3a79e96e8b
commit 92a4cd174e
23 changed files with 1036 additions and 4402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DynamicLink.cpp
+5 -5
View File
@@ -137,7 +137,7 @@ DynamicModuleControlBase::DynamicModuleControlBase() {
/* 802622D0-80262364 25CC10 0094+00 0/0 2/2 0/0 .text link__24DynamicModuleControlBaseFv
*/
bool DynamicModuleControlBase::link() {
BOOL DynamicModuleControlBase::link() {
if (mLinkCount == 0) {
do_load();
if (do_link() == false) {
@@ -154,7 +154,7 @@ bool DynamicModuleControlBase::link() {
}
/* 80262364-802623EC 25CCA4 0088+00 0/0 1/1 0/0 .text unlink__24DynamicModuleControlBaseFv */
bool DynamicModuleControlBase::unlink() {
BOOL DynamicModuleControlBase::unlink() {
if (mLinkCount != 0) {
mLinkCount--;
if (mLinkCount == 0) {
@@ -169,7 +169,7 @@ bool DynamicModuleControlBase::unlink() {
}
/* 802623EC-8026242C 25CD2C 0040+00 0/0 1/1 0/0 .text load_async__24DynamicModuleControlBaseFv */
bool DynamicModuleControlBase::load_async() {
BOOL DynamicModuleControlBase::load_async() {
if (mLinkCount == 0) {
return do_load_async();
}
@@ -458,7 +458,7 @@ asm bool DynamicModuleControl::do_load() {
#endif
/* 80262AFC-80262BC4 25D43C 00C8+00 1/0 0/0 0/0 .text do_load_async__20DynamicModuleControlFv */
bool DynamicModuleControl::do_load_async() {
BOOL DynamicModuleControl::do_load_async() {
if (mAsyncLoadCallback == NULL) {
if (mModule != NULL) {
return true;
@@ -743,7 +743,7 @@ bool DynamicModuleControlBase::do_unlink() {
/* 802631F4-802631FC 25DB34 0008+00 1/0 0/0 0/0 .text do_load_async__24DynamicModuleControlBaseFv
*/
bool DynamicModuleControlBase::do_load_async() {
BOOL DynamicModuleControlBase::do_load_async() {
return true;
}
src/c/c_dylink.cpp
+912 -3936
View File
File diff suppressed because it is too large Load Diff
src/d/cc/d_cc_uty.cpp
+2 -1
View File
@@ -460,7 +460,8 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* enemy, dCcU_AtInfo* info) {
if (info->mpSound != NULL) {
if (info->field_0x18 != 0) {
info->mpSound->startCollisionSE(getHitId(info->mpCollider, uvar8), info->field_0x18);
info->mpSound->startCollisionSE(getHitId(info->mpCollider, uvar8),
info->field_0x18);
} else {
info->mpSound->startCollisionSE(getHitId(info->mpCollider, uvar8),
getMapInfo(info->mHitStatus));
src/d/d_tresure.cpp
+13 -103
View File
@@ -4,6 +4,7 @@
//
#include "d/d_tresure.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@@ -15,49 +16,6 @@ struct mDoMtx_stack_c {
static u8 now[48];
};
struct Vec {};
struct dTres_c {
struct list_class {};
struct data_s {};
struct typeGroupData_c {};
/* 8009BBD8 */ void createWork();
/* 8009BC18 */ void create();
/* 8009BC60 */ void remove();
/* 8009BC6C */ void reset();
/* 8009BCB4 */ void addData(dTres_c::list_class*, s8);
/* 8009BE28 */ void checkTreasureBox(dTres_c::data_s*);
/* 8009C168 */ void onStatus(u8, int, int);
/* 8009C1F0 */ void offStatus(u8, int, int);
/* 8009C27C */ void getBossIconFloorNo(int*);
/* 8009C360 */ void getFirstData(u8);
/* 8009C39C */ void getNextData(dTres_c::typeGroupData_c*);
/* 8009C3B4 */ void getNextData(dTres_c::typeGroupData_c const*);
/* 8009C3CC */ void setPosition(int, u8, Vec const*, int);
/* 8009C49C */ void getTypeGroupNoToType(u8);
/* 8009C4B0 */ void getTypeToTypeGroupNo(u8);
static u8 const typeToTypeGroup[34 + 6 /* padding */];
static u8 mTypeGroupListAll[204 + 4 /* padding */];
static u8 mTypeGroupData[4];
static u8 mNum[2 + 2 /* padding */];
};
struct dSv_memBit_c {
/* 80034934 */ void isDungeonItem(int) const;
};
struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dMapInfo_n {
/* 8003ED60 */ void correctionOriginPos(s8, Vec*);
};
struct dMapInfo_c {
/* 8003F40C */ void calcFloorNo(f32, bool, int);
};
@@ -97,9 +55,6 @@ extern "C" void correctionOriginPos__10dMapInfo_nFScP3Vec();
extern "C" void calcFloorNo__10dMapInfo_cFfbi();
extern "C" void dPath_GetRoomPath__Fii();
extern "C" void* __nwa__FUl();
extern "C" void PSMTXMultVec();
extern "C" void PSVECAdd();
extern "C" void PSVECSquareDistance();
extern "C" void __construct_new_array();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
@@ -108,9 +63,7 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 data_80450680[8];
extern "C" extern u32 __float_nan;
extern "C" extern bool data_80450680;
//
// Declarations:
@@ -118,13 +71,13 @@ extern "C" extern u32 __float_nan;
/* ############################################################################################## */
/* 80450F98-80450F9C 000498 0004+00 2/2 0/0 0/0 .sbss mTypeGroupData__7dTres_c */
u8 dTres_c::mTypeGroupData[4];
dTres_c::typeGroupData_c* dTres_c::mTypeGroupData;
/* 8009BBD8-8009BC18 096518 0040+00 0/0 1/1 0/0 .text createWork__7dTres_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dTres_c::createWork() {
asm int dTres_c::createWork() {
nofralloc
#include "asm/d/d_tresure/createWork__7dTres_cFv.s"
}
@@ -141,21 +94,16 @@ asm void dTres_c::create() {
#pragma pop
/* 8009BC60-8009BC6C 0965A0 000C+00 0/0 1/1 0/0 .text remove__7dTres_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dTres_c::remove() {
nofralloc
#include "asm/d/d_tresure/remove__7dTres_cFv.s"
void dTres_c::remove() {
data_80450680 = true;
}
#pragma pop
/* ############################################################################################## */
/* 80425438-80425508 052158 00CC+04 6/6 3/3 0/0 .bss mTypeGroupListAll__7dTres_c */
u8 dTres_c::mTypeGroupListAll[204 + 4 /* padding */];
dTres_c::list_class dTres_c::mTypeGroupListAll[17];
/* 80450F9C-80450FA0 00049C 0002+02 2/2 0/0 0/0 .sbss mNum__7dTres_c */
u8 dTres_c::mNum[2 + 2 /* padding */];
u16 dTres_c::mNum;
/* 8009BC6C-8009BCB4 0965AC 0048+00 2/2 0/0 0/0 .text reset__7dTres_cFv */
#pragma push
@@ -290,48 +238,10 @@ asm void dTres_c::setPosition(int param_0, u8 param_1, Vec const* param_2, int p
/* ############################################################################################## */
/* 8037B0D8-8037B100 007738 0022+06 2/2 0/0 0/0 .rodata typeToTypeGroup__7dTres_c */
SECTION_RODATA u8 const dTres_c::typeToTypeGroup[34 + 6 /* padding */] = {
0xFF,
0x00,
0x00,
0x01,
0x01,
0x02,
0x02,
0x03,
0x03,
0x04,
0x04,
0x05,
0x05,
0x06,
0x06,
0x07,
0x07,
0x08,
0x80,
0x09,
0x81,
0x0A,
0x82,
0x0B,
0x83,
0x0C,
0x84,
0x0D,
0x85,
0x0E,
0x87,
0x0F,
0x88,
0x10,
/* padding */
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
SECTION_RODATA u8 const dTres_c::typeToTypeGroup[34] = {
0xFF, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05,
0x05, 0x06, 0x06, 0x07, 0x07, 0x08, 0x80, 0x09, 0x81, 0x0A, 0x82, 0x0B,
0x83, 0x0C, 0x84, 0x0D, 0x85, 0x0E, 0x87, 0x0F, 0x88, 0x10,
};
COMPILER_STRIP_GATE(0x8037B0D8, &dTres_c::typeToTypeGroup);
@@ -351,7 +261,7 @@ asm void dTres_c::getTypeGroupNoToType(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dTres_c::getTypeToTypeGroupNo(u8 param_0) {
asm u8 dTres_c::getTypeToTypeGroupNo(u8 param_0) {
nofralloc
#include "asm/d/d_tresure/getTypeToTypeGroupNo__7dTres_cFUc.s"
}