mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-12 06:57:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renames

Browse Source
This commit is contained in:
robojumper
2024-11-23 19:13:36 +01:00
parent 39ec25ed8a
commit 4bc35a05c5
6 changed files with 80 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+31 -31
View File
@@ -2115,31 +2115,31 @@ fn_800515D0 = .text:0x800515D0; // type:function size:0x60
fn_800051630__13dAcObjRef_unkFv = .text:0x80051630; // type:function size:0x144
fn_80051780__13dAcObjRef_unkFRC8cCcD_Obj = .text:0x80051780; // type:function size:0x464
fn_80051BF0 = .text:0x80051BF0; // type:function size:0x8
postInit__18ColliderLinkedListFR8cCcD_Obj = .text:0x80051C00; // type:function size:0x4C
addCc__18ColliderLinkedListFR17LinkedColliderCylRC11dCcD_SrcCyl = .text:0x80051C50; // type:function size:0x5C
addCc__18ColliderLinkedListFR17LinkedColliderSphRC11dCcD_SrcSph = .text:0x80051CB0; // type:function size:0x5C
addCc__18ColliderLinkedListFR17LinkedColliderCpsRC11dCcD_SrcCps = .text:0x80051D10; // type:function size:0x5C
addCc__18ColliderLinkedListFR17LinkedColliderUnkRC11dCcD_SrcUnk = .text:0x80051D70; // type:function size:0x5C
foreachCc__18ColliderLinkedListCFPFP8cCcD_ObjPv_vPv = .text:0x80051DD0; // type:function size:0x64
foreachCc2__18ColliderLinkedListCFPFP8cCcD_ObjPv_vPv = .text:0x80051E40; // type:function size:0x64
Set__18ColliderLinkedListFP8cCcD_ObjPv = .text:0x80051EB0; // type:function size:0x34
registerColliders__18ColliderLinkedListFv = .text:0x80051EF0; // type:function size:0x10
SetStts__18ColliderLinkedListFP8cCcD_ObjPv = .text:0x80051F00; // type:function size:0x8
SetStts__18ColliderLinkedListFR9cCcD_Stts = .text:0x80051F10; // type:function size:0x10
find__18ColliderLinkedListCFM8cCcD_ObjFPCvPv_b = .text:0x80051F20; // type:function size:0x74
AtSet__18ColliderLinkedListFP8cCcD_ObjPv = .text:0x80051FA0; // type:function size:0x1C
AtSet__18ColliderLinkedListFv = .text:0x80051FC0; // type:function size:0x10
ClrAt__18ColliderLinkedListFP8cCcD_ObjPv = .text:0x80051FD0; // type:function size:0x10
ClrAt__18ColliderLinkedListFv = .text:0x80051FE0; // type:function size:0x10
TgSet__18ColliderLinkedListFP8cCcD_ObjPv = .text:0x80051FF0; // type:function size:0x1C
TgSet__18ColliderLinkedListFv = .text:0x80052010; // type:function size:0x10
ClrTg__18ColliderLinkedListFP8cCcD_ObjPv = .text:0x80052020; // type:function size:0x10
ClrTg__18ColliderLinkedListFv = .text:0x80052030; // type:function size:0x10
CoSet__18ColliderLinkedListFP8cCcD_ObjPv = .text:0x80052040; // type:function size:0x1C
CoSet__18ColliderLinkedListFv = .text:0x80052060; // type:function size:0x10
ClrCo__18ColliderLinkedListFP8cCcD_ObjPv = .text:0x80052070; // type:function size:0x10
ClrCo__18ColliderLinkedListFv = .text:0x80052080; // type:function size:0x10
__dt__18ColliderLinkedListFv = .text:0x80052090; // type:function size:0x60
postInit__19dColliderLinkedListFR8cCcD_Obj = .text:0x80051C00; // type:function size:0x4C
addCc__19dColliderLinkedListFR15dCcD_Linked_CylRC11dCcD_SrcCyl = .text:0x80051C50; // type:function size:0x5C
addCc__19dColliderLinkedListFR15dCcD_Linked_SphRC11dCcD_SrcSph = .text:0x80051CB0; // type:function size:0x5C
addCc__19dColliderLinkedListFR15dCcD_Linked_CpsRC11dCcD_SrcCps = .text:0x80051D10; // type:function size:0x5C
addCc__19dColliderLinkedListFR15dCcD_Linked_UnkRC11dCcD_SrcUnk = .text:0x80051D70; // type:function size:0x5C
foreachCc__19dColliderLinkedListCFPFP8cCcD_ObjPv_vPv = .text:0x80051DD0; // type:function size:0x64
foreachCc2__19dColliderLinkedListCFPFP8cCcD_ObjPv_vPv = .text:0x80051E40; // type:function size:0x64
Set__19dColliderLinkedListFP8cCcD_ObjPv = .text:0x80051EB0; // type:function size:0x34
registerColliders__19dColliderLinkedListFv = .text:0x80051EF0; // type:function size:0x10
SetStts__19dColliderLinkedListFP8cCcD_ObjPv = .text:0x80051F00; // type:function size:0x8
SetStts__19dColliderLinkedListFR9cCcD_Stts = .text:0x80051F10; // type:function size:0x10
find__19dColliderLinkedListCFM8cCcD_ObjFPCvPv_b = .text:0x80051F20; // type:function size:0x74
AtSet__19dColliderLinkedListFP8cCcD_ObjPv = .text:0x80051FA0; // type:function size:0x1C
AtSet__19dColliderLinkedListFv = .text:0x80051FC0; // type:function size:0x10
ClrAt__19dColliderLinkedListFP8cCcD_ObjPv = .text:0x80051FD0; // type:function size:0x10
ClrAt__19dColliderLinkedListFv = .text:0x80051FE0; // type:function size:0x10
TgSet__19dColliderLinkedListFP8cCcD_ObjPv = .text:0x80051FF0; // type:function size:0x1C
TgSet__19dColliderLinkedListFv = .text:0x80052010; // type:function size:0x10
ClrTg__19dColliderLinkedListFP8cCcD_ObjPv = .text:0x80052020; // type:function size:0x10
ClrTg__19dColliderLinkedListFv = .text:0x80052030; // type:function size:0x10
CoSet__19dColliderLinkedListFP8cCcD_ObjPv = .text:0x80052040; // type:function size:0x1C
CoSet__19dColliderLinkedListFv = .text:0x80052060; // type:function size:0x10
ClrCo__19dColliderLinkedListFP8cCcD_ObjPv = .text:0x80052070; // type:function size:0x10
ClrCo__19dColliderLinkedListFv = .text:0x80052080; // type:function size:0x10
__dt__19dColliderLinkedListFv = .text:0x80052090; // type:function size:0x60
create__4dDvdFlPQ23EGG4HeapPQ23EGG4HeapPQ23EGG4Heap = .text:0x800520F0; // type:function size:0x4
__ct__Q24dDvd8loader_cFv = .text:0x80052100; // type:function size:0x28
__dt__Q24dDvd8loader_cFv = .text:0x80052130; // type:function size:0x40
@@ -14245,7 +14245,7 @@ hasCollectedAllTears__9dAcTbox_cFv = .text:0x80268680; // type:function size:0x1
getGroundHeight__9dAcTbox_cFPfRC7mVec3_c = .text:0x802686A0; // type:function size:0x50
isBelowGroundAtPos__9dAcTbox_cFfRC7mVec3_c = .text:0x802686F0; // type:function size:0x5C
__ct__9dAcTbox_cFv = .text:0x80268750; // type:function size:0x2EC
__dt__17LinkedColliderUnkFv = .text:0x80268A40; // type:function size:0x98
__dt__15dCcD_Linked_UnkFv = .text:0x80268A40; // type:function size:0x98
__dt__21sFState_c<9dAcTbox_c>Fv = .text:0x80268AE0; // type:function size:0x58
__dt__24sFStateFct_c<9dAcTbox_c>Fv = .text:0x80268B40; // type:function size:0x6C
__dt__77sStateMgr_c<9dAcTbox_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80268BB0; // type:function size:0xA0
@@ -14341,7 +14341,7 @@ registerKeyPieceDowsing__9dAcTbox_cFv = .text:0x8026D830; // type:function size:
registerRupeeOrTreasureDowsing__9dAcTbox_cFv = .text:0x8026D8A0; // type:function size:0x48
noUnregisterDowsing__9dAcTbox_cFv = .text:0x8026D8F0; // type:function size:0x4
unregisterDowsing__9dAcTbox_cFv = .text:0x8026D900; // type:function size:0x48
fn_8026D950__9dAcTbox_cFv = .text:0x8026D950; // type:function size:0x28
spawnAppearEffect__9dAcTbox_cFv = .text:0x8026D950; // type:function size:0x28
checkIsClear__9dAcTbox_cCFv = .text:0x8026D980; // type:function size:0x140
fn_8026DAC0__9dAcTbox_cFR4mAng = .text:0x8026DAC0; // type:function size:0x10
fn_8026DAD0__9dAcTbox_cCFPC7mVec3_cP7mVec3_c = .text:0x8026DAD0; // type:function size:0x8
@@ -14367,8 +14367,8 @@ initializeState__23sFStateID_c<9dAcTbox_c>CFR9dAcTbox_c = .text:0x8026E8D0; // t
__sinit_\d_a_obj_tbox_cpp = .text:0x8026E900; // type:function size:0xA7C scope:local
__dt__23sFStateID_c<9dAcTbox_c>Fv = .text:0x8026F380; // type:function size:0x58
isSameName__23sFStateID_c<9dAcTbox_c>CFPCc = .text:0x8026F3E0; // type:function size:0x88
@316@__dt__17LinkedColliderUnkFv = .text:0x8026F470; // type:function size:0x8
@272@__dt__17LinkedColliderUnkFv = .text:0x8026F480; // type:function size:0x8
@316@__dt__15dCcD_Linked_UnkFv = .text:0x8026F470; // type:function size:0x8
@272@__dt__15dCcD_Linked_UnkFv = .text:0x8026F480; // type:function size:0x8
AcTimeArea__ctor = .text:0x8026F490; // type:function size:0x1A8
fn_8026F640 = .text:0x8026F640; // type:function size:0x58
fn_8026F6A0 = .text:0x8026F6A0; // type:function size:0x6C
@@ -30060,7 +30060,7 @@ lbl_80503278 = .data:0x80503278; // type:object size:0x9C
lbl_80503314 = .data:0x80503314; // type:object size:0x6C
__vt__7dBase_c = .data:0x80503380; // type:object size:0x4C
__vt__16ActorCarryStruct = .data:0x805033D0; // type:object size:0xC
__vt__18ColliderLinkedList = .data:0x805033E0; // type:object size:0xC
__vt__19dColliderLinkedList = .data:0x805033E0; // type:object size:0xC
__vt__Q24dDvd8loader_c = .data:0x805033F0; // type:object size:0x10
lbl_80503400 = .data:0x80503400; // type:object size:0x40
lbl_80503440 = .data:0x80503440; // type:object size:0x6DF8
@@ -34484,7 +34484,7 @@ __vt__47sFStateMgr_c<9dAcTbox_c,20sStateMethodUsr_FI_c> = .data:0x80535540; // t
__vt__77sStateMgr_c<9dAcTbox_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x80535570; // type:object size:0x30
__vt__24sFStateFct_c<9dAcTbox_c> = .data:0x805355A0; // type:object size:0x14
__vt__21sFState_c<9dAcTbox_c> = .data:0x805355B8; // type:object size:0x18
__vt__17LinkedColliderUnk = .data:0x805355D0; // type:object size:0x7C
__vt__15dCcD_Linked_Unk = .data:0x805355D0; // type:object size:0x7C
__vt__23sFStateID_c<9dAcTbox_c> = .data:0x805359E0; // type:object size:0x34
g_profile_TIME_AREA = .data:0x80535A18; // type:object size:0x10
lbl_80535A28 = .data:0x80535A28; // type:object size:0x68
include/d/a/obj/d_a_obj_base.h
-1
View File
@@ -36,7 +36,6 @@ struct ActorCarryStruct {
ActorCarryStruct();
/* vt 0x9C */
virtual ~ActorCarryStruct();
// Is this actually part of this struct?
/* 0xA0 */ u32 field_0xA0;
/* 0xA4 */ u32 field_0xA4;
include/d/a/obj/d_a_obj_tbox.h
+4 -4
View File
@@ -118,7 +118,7 @@ private:
bool fn_8026D120() const;
void fn_8026D130();
void fn_8026D140();
void fn_8026D950();
void spawnAppearEffect();
void fn_8026D370();
bool checkShouldClose();
@@ -148,9 +148,9 @@ private:
s32 field_0x4F4;
/* 0x04F8 */ dBgW mBgWs[2];
/* 0x0918 */ LinkedColliderUnk mCcD1;
/* 0x0B30 */ LinkedColliderUnk mCcD2;
/* 0x0D48 */ ColliderLinkedList field_0x0D48;
/* 0x0918 */ dCcD_Linked_Unk mCcD1;
/* 0x0B30 */ dCcD_Linked_Unk mCcD2;
/* 0x0D48 */ dColliderLinkedList field_0x0D48;
/* 0x0D54 */ dCcD_Unk mCcD3;
/* 0x0F5C */ dCcD_Cyl mCcD4;
/* 0x10AC */ STATE_MGR_DECLARE(dAcTbox_c);
include/d/d_cc.h
+18 -18
View File
@@ -18,43 +18,43 @@ public:
/* 0x0C */ cListMg_c *mpList;
};
class LinkedColliderUnk : public dCcD_Unk {
class dCcD_Linked_Unk : public dCcD_Unk {
public:
LinkedColliderUnk() : mNode(this) {}
virtual ~LinkedColliderUnk() {
dCcD_Linked_Unk() : mNode(this) {}
virtual ~dCcD_Linked_Unk() {
mNode.remove();
}
/* 0x210 */ LinkedColliderNode mNode;
};
class LinkedColliderCyl : public dCcD_Cyl {
class dCcD_Linked_Cyl : public dCcD_Cyl {
public:
LinkedColliderCyl() : mNode(this) {}
virtual ~LinkedColliderCyl() {
dCcD_Linked_Cyl() : mNode(this) {}
virtual ~dCcD_Linked_Cyl() {
mNode.remove();
}
/* 0x150 */ LinkedColliderNode mNode;
};
class LinkedColliderSph : public dCcD_Sph {
class dCcD_Linked_Sph : public dCcD_Sph {
public:
LinkedColliderSph() : mNode(this) {}
virtual ~LinkedColliderSph() {
dCcD_Linked_Sph() : mNode(this) {}
virtual ~dCcD_Linked_Sph() {
mNode.remove();
}
/* 0x150 */ LinkedColliderNode mNode;
};
class LinkedColliderCps : public dCcD_Cps {
class dCcD_Linked_Cps : public dCcD_Cps {
public:
LinkedColliderCps() : mNode(this) {}
virtual ~LinkedColliderCps() {
dCcD_Linked_Cps() : mNode(this) {}
virtual ~dCcD_Linked_Cps() {
mNode.remove();
}
/* 0x170 */ LinkedColliderNode mNode;
};
class ColliderLinkedList {
class dColliderLinkedList {
private:
cListMg_c mList;
static void Set(cCcD_Obj *obj, void *cbArg);
@@ -67,13 +67,13 @@ private:
static void ClrCo(cCcD_Obj *obj, void *cbArg);
public:
virtual ~ColliderLinkedList();
virtual ~dColliderLinkedList();
void postInit(cCcD_Obj &ccD);
void addCc(LinkedColliderCyl &ccD, const dCcD_SrcCyl &src);
void addCc(LinkedColliderSph &ccD, const dCcD_SrcSph &src);
void addCc(LinkedColliderCps &ccD, const dCcD_SrcCps &src);
void addCc(LinkedColliderUnk &ccD, const dCcD_SrcUnk &src);
void addCc(dCcD_Linked_Cyl &ccD, const dCcD_SrcCyl &src);
void addCc(dCcD_Linked_Sph &ccD, const dCcD_SrcSph &src);
void addCc(dCcD_Linked_Cps &ccD, const dCcD_SrcCps &src);
void addCc(dCcD_Linked_Unk &ccD, const dCcD_SrcUnk &src);
void SetStts(cCcD_Stts &stts);
void registerColliders();
src/d/a/obj/d_a_obj_tbox.cpp
+2 -2
View File
@@ -1762,7 +1762,7 @@ void dAcTbox_c::executeState_DemoAppear() {
if (field_0x11F8 >= 20) {
bool b = val < 20;
if (b) {
fn_8026D950();
spawnAppearEffect();
}
if (b) {
mScale.set(1.0f, 1.0f, 1.0f);
@@ -2372,7 +2372,7 @@ void dAcTbox_c::unregisterDowsing() {
extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_208_;
void dAcTbox_c::fn_8026D950() {
void dAcTbox_c::spawnAppearEffect() {
fn_800298B0(PARTICLE_RESOURCE_ID_MAPPING_208_, &position, &rotation, nullptr, nullptr, nullptr, nullptr, nullptr);
}
src/d/d_cc.cpp
+25 -25
View File
@@ -6,7 +6,7 @@
#include "d/col/cc/d_cc_s.h"
void ColliderLinkedList::postInit(cCcD_Obj &ccD) {
void dColliderLinkedList::postInit(cCcD_Obj &ccD) {
if (ccD.ChkAtSet()) {
ccD.SetAt_0x40000000();
}
@@ -18,35 +18,35 @@ void ColliderLinkedList::postInit(cCcD_Obj &ccD) {
}
}
void ColliderLinkedList::addCc(LinkedColliderCyl &ccD, const dCcD_SrcCyl &src) {
void dColliderLinkedList::addCc(dCcD_Linked_Cyl &ccD, const dCcD_SrcCyl &src) {
ccD.Set(src);
mList.append(&ccD.mNode);
ccD.mNode.mpList = &mList;
postInit(ccD);
}
void ColliderLinkedList::addCc(LinkedColliderSph &ccD, const dCcD_SrcSph &src) {
void dColliderLinkedList::addCc(dCcD_Linked_Sph &ccD, const dCcD_SrcSph &src) {
ccD.Set(src);
mList.append(&ccD.mNode);
ccD.mNode.mpList = &mList;
postInit(ccD);
}
void ColliderLinkedList::addCc(LinkedColliderCps &ccD, const dCcD_SrcCps &src) {
void dColliderLinkedList::addCc(dCcD_Linked_Cps &ccD, const dCcD_SrcCps &src) {
ccD.Set(src);
mList.append(&ccD.mNode);
ccD.mNode.mpList = &mList;
postInit(ccD);
}
void ColliderLinkedList::addCc(LinkedColliderUnk &ccD, const dCcD_SrcUnk &src) {
void dColliderLinkedList::addCc(dCcD_Linked_Unk &ccD, const dCcD_SrcUnk &src) {
ccD.Set(src);
mList.append(&ccD.mNode);
ccD.mNode.mpList = &mList;
postInit(ccD);
}
void ColliderLinkedList::foreachCc(ccCbFunc f, void *cbArg) const {
void dColliderLinkedList::foreachCc(ccCbFunc f, void *cbArg) const {
LinkedColliderNode *nd = static_cast<LinkedColliderNode *>(mList.getFirst());
while (nd != nullptr) {
f(nd->mpCcDObj, cbArg);
@@ -55,7 +55,7 @@ void ColliderLinkedList::foreachCc(ccCbFunc f, void *cbArg) const {
}
// What's the difference between these two?
void ColliderLinkedList::foreachCc2(ccCbFunc f, void *cbArg) const {
void dColliderLinkedList::foreachCc2(ccCbFunc f, void *cbArg) const {
LinkedColliderNode *nd = static_cast<LinkedColliderNode *>(mList.getFirst());
while (nd != nullptr) {
f(nd->mpCcDObj, cbArg);
@@ -63,23 +63,23 @@ void ColliderLinkedList::foreachCc2(ccCbFunc f, void *cbArg) const {
}
}
void ColliderLinkedList::Set(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::Set(cCcD_Obj *obj, void *cbArg) {
dCcS::GetInstance()->Set(obj);
}
void ColliderLinkedList::registerColliders() {
void dColliderLinkedList::registerColliders() {
foreachCc(Set, nullptr);
}
void ColliderLinkedList::SetStts(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::SetStts(cCcD_Obj *obj, void *cbArg) {
obj->SetStts(*static_cast<cCcD_Stts *>(cbArg));
}
void ColliderLinkedList::SetStts(cCcD_Stts &stts) {
void dColliderLinkedList::SetStts(cCcD_Stts &stts) {
foreachCc(SetStts, &stts);
}
cCcD_Obj *ColliderLinkedList::find(ccPtmf f) const {
cCcD_Obj *dColliderLinkedList::find(ccPtmf f) const {
cCcD_Obj *o;
LinkedColliderNode *nd = static_cast<LinkedColliderNode *>(mList.getFirst());
while (nd != nullptr) {
@@ -92,66 +92,66 @@ cCcD_Obj *ColliderLinkedList::find(ccPtmf f) const {
return nullptr;
}
void ColliderLinkedList::AtSet(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::AtSet(cCcD_Obj *obj, void *cbArg) {
if (!obj->ChkAt_0x40000000()) {
return;
}
obj->OnAtSet();
}
void ColliderLinkedList::AtSet() {
void dColliderLinkedList::AtSet() {
foreachCc(AtSet, nullptr);
}
void ColliderLinkedList::ClrAt(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::ClrAt(cCcD_Obj *obj, void *cbArg) {
obj->ClrAtSet();
obj->ClrAtHit();
}
void ColliderLinkedList::ClrAt() {
void dColliderLinkedList::ClrAt() {
foreachCc(ClrAt, nullptr);
}
void ColliderLinkedList::TgSet(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::TgSet(cCcD_Obj *obj, void *cbArg) {
if (!obj->ChkTg_0x40000000()) {
return;
}
obj->OnTgSet();
}
void ColliderLinkedList::TgSet() {
void dColliderLinkedList::TgSet() {
foreachCc(TgSet, nullptr);
}
void ColliderLinkedList::ClrTg(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::ClrTg(cCcD_Obj *obj, void *cbArg) {
obj->ClrTgSet();
obj->ClrTgHit();
}
void ColliderLinkedList::ClrTg() {
void dColliderLinkedList::ClrTg() {
foreachCc(ClrTg, nullptr);
}
void ColliderLinkedList::CoSet(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::CoSet(cCcD_Obj *obj, void *cbArg) {
if (!obj->ChkCo_0x40000000()) {
return;
}
obj->OnCoSet();
}
void ColliderLinkedList::CoSet() {
void dColliderLinkedList::CoSet() {
foreachCc(CoSet, nullptr);
}
void ColliderLinkedList::ClrCo(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::ClrCo(cCcD_Obj *obj, void *cbArg) {
obj->ClrCoSet();
obj->ClrCoHit();
}
void ColliderLinkedList::ClrCo() {
void dColliderLinkedList::ClrCo() {
foreachCc(ClrCo, nullptr);
}
ColliderLinkedList::~ColliderLinkedList() {
dColliderLinkedList::~dColliderLinkedList() {
mList.clear();
}