Skip to content

Commit abdc813

Browse files
DeathHound6DeathHound6
committed
Rename functions based on XXL2 dwarf
1 parent 8a47e14 commit abdc813

File tree

12 files changed

+93
-92
lines changed

12 files changed

+93
-92
lines changed

‎config/SALP4Q/symbols.txt‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2336,8 +2336,8 @@ fn_8000C374 = .text:0x8000C374; // type:function size:0x8
23362336
fn_8000C37C = .text:0x8000C37C; // type:function size:0x60
23372337
fn_8000C3DC = .text:0x8000C3DC; // type:function size:0x18
23382338
fn_8000C3F4 = .text:0x8000C3F4; // type:function size:0x18
2339-
isSubclass__14IKSerializableFUl = .text:0x8000C40C; // type:function size:0x18
2340-
isSubclass__11IKBaseClassFv = .text:0x8000C424; // type:function size:0x8
2339+
IsKindOfClass__14IKSerializableFUl = .text:0x8000C40C; // type:function size:0x18
2340+
IsKindOfClass__11IKBaseClassFv = .text:0x8000C424; // type:function size:0x8
23412341
fn_8000C42C = .text:0x8000C42C; // type:function size:0x10
23422342
fn_8000C43C = .text:0x8000C43C; // type:function size:0xE8
23432343
fn_8000C524 = .text:0x8000C524; // type:function size:0xC
@@ -2697,14 +2697,14 @@ fn_80014388 = .text:0x80014388; // type:function size:0x24
26972697
fn_800143AC = .text:0x800143AC; // type:function size:0x1F4
26982698
fn_800145A0 = .text:0x800145A0; // type:function size:0xC
26992699
fn_800145AC = .text:0x800145AC; // type:function size:0x10
2700-
isSubclass__6IKHookFUl = .text:0x800145BC; // type:function size:0x18
2701-
isSubclass__6IKLifeFUl = .text:0x800145D4; // type:function size:0x18
2702-
isSubclass__11IKUpdatableFUl = .text:0x800145EC; // type:function size:0x18
2700+
IsKindOfClass__6IKHookFUl = .text:0x800145BC; // type:function size:0x18
2701+
IsKindOfClass__6IKLifeFUl = .text:0x800145D4; // type:function size:0x18
2702+
IsKindOfClass__11IKUpdatableFUl = .text:0x800145EC; // type:function size:0x18
27032703
fn_80014604 = .text:0x80014604; // type:function size:0xC
27042704
fn_80014610 = .text:0x80014610; // type:function size:0xC
27052705
fn_8001461C = .text:0x8001461C; // type:function size:0xC
27062706
fn_80014628 = .text:0x80014628; // type:function size:0xC
2707-
sendEvent__11IKBaseClassFv = .text:0x80014634; // type:function size:0x8
2707+
MessageProc__11IKBaseClassFv = .text:0x80014634; // type:function size:0x8
27082708
fn_8001463C = .text:0x8001463C; // type:function size:0x8C
27092709
fn_800146C8 = .text:0x800146C8; // type:function size:0x58
27102710
fn_80014720 = .text:0x80014720; // type:function size:0x58
@@ -2891,8 +2891,8 @@ fn_80018774 = .text:0x80018774; // type:function size:0xC0
28912891
fn_80018834 = .text:0x80018834; // type:function size:0x14
28922892
fn_80018848 = .text:0x80018848; // type:function size:0xC0
28932893
fn_80018908 = .text:0x80018908; // type:function size:0x5C
2894-
unk2__11IKBaseClassFv = .text:0x80018964; // type:function size:0x8
2895-
reset__11IKBaseClassFv = .text:0x8001896C; // type:function size:0x4
2894+
FindNonRecreableInstance__11IKBaseClassFv = .text:0x80018964; // type:function size:0x8
2895+
DestroyGame__11IKBaseClassFv = .text:0x8001896C; // type:function size:0x4
28962896
fn_80018970 = .text:0x80018970; // type:function size:0x4
28972897
fn_80018974 = .text:0x80018974; // type:function size:0x10
28982898
fn_80018984 = .text:0x80018984; // type:function size:0x8
@@ -2901,11 +2901,11 @@ fn_80018994 = .text:0x80018994; // type:function size:0x8
29012901
fn_8001899C = .text:0x8001899C; // type:function size:0x4
29022902
fn_800189A0 = .text:0x800189A0; // type:function size:0x8
29032903
fn_800189A8 = .text:0x800189A8; // type:function size:0x8
2904-
deserialize__14IKSerializableFv = .text:0x800189B0; // type:function size:0x8
2905-
serialize__14IKSerializableFv = .text:0x800189B8; // type:function size:0x8
2904+
Load__14IKSerializableFv = .text:0x800189B0; // type:function size:0x8
2905+
Save__14IKSerializableFv = .text:0x800189B8; // type:function size:0x8
29062906
fn_800189C0 = .text:0x800189C0; // type:function size:0x20
29072907
fn_800189E0 = .text:0x800189E0; // type:function size:0x8
2908-
unk__14IKSerializableFv = .text:0x800189E8; // type:function size:0x4
2908+
Destroy__14IKSerializableFv = .text:0x800189E8; // type:function size:0x4
29092909
fn_800189EC = .text:0x800189EC; // type:function size:0x4
29102910
fn_800189F0 = .text:0x800189F0; // type:function size:0x4
29112911
fn_800189F4 = .text:0x800189F4; // type:function size:0x4
@@ -2948,16 +2948,16 @@ fn_80018C18 = .text:0x80018C18; // type:function size:0x18
29482948
fn_80018C30 = .text:0x80018C30; // type:function size:0xC
29492949
fn_80018C3C = .text:0x80018C3C; // type:function size:0x8
29502950
fn_80018C44 = .text:0x80018C44; // type:function size:0x8
2951-
getClassID__13CKHkAliceHeroFv = .text:0x80018C4C; // type:function size:0x8
2952-
getClassGroup__13CKHkAliceHeroFv = .text:0x80018C54; // type:function size:0x8
2953-
isSubclass__13CKHkAliceHeroFUl = .text:0x80018C5C; // type:function size:0x18
2954-
isSubclass__8IKHkHeroFUl = .text:0x80018C74; // type:function size:0x18
2951+
GetClassID__13CKHkAliceHeroFv = .text:0x80018C4C; // type:function size:0x8
2952+
GetClassType__13CKHkAliceHeroFv = .text:0x80018C54; // type:function size:0x8
2953+
IsKindOfClass__13CKHkAliceHeroFUl = .text:0x80018C5C; // type:function size:0x18
2954+
IsKindOfClass__8IKHkHeroFUl = .text:0x80018C74; // type:function size:0x18
29552955
fn_80018C8C = .text:0x80018C8C; // type:function size:0x4
29562956
fn_80018C90 = .text:0x80018C90; // type:function size:0x4
29572957
fn_80018C94 = .text:0x80018C94; // type:function size:0x4
29582958
fn_80018C98 = .text:0x80018C98; // type:function size:0x4
29592959
fn_80018C9C = .text:0x80018C9C; // type:function size:0x4
2960-
unk__11IKBaseClassFv = .text:0x80018CA0; // type:function size:0x4
2960+
Destroy__11IKBaseClassFv = .text:0x80018CA0; // type:function size:0x4
29612961
fn_80018CA4 = .text:0x80018CA4; // type:function size:0x98
29622962
fn_80018D3C = .text:0x80018D3C; // type:function size:0x2C
29632963
fn_80018D68 = .text:0x80018D68; // type:function size:0x28
@@ -48275,6 +48275,7 @@ IpcFdArray = .bss:0x805A4940; // type:object size:0x80 scope:local data:4byte
4827548275
IpcReqPtrArray = .bss:0x805A49C0; // type:object size:0x80 scope:local data:4byte
4827648276
s_homeDir = .bss:0x805A4A40; // type:object size:0x40 scope:local
4827748277
s_message = .bss:0x805A4A80; // type:object size:0x100 scope:local
48278+
...bss.0 = .bss:0x805A4A80; // type:label scope:local
4827848279
@LOCAL@asyncRoutine__FlPv@s_rBuf = .bss:0x805A4B80; // type:object size:0x100 scope:local
4827948280
@LOCAL@asyncRoutine__FlPv@s_wBuf@0 = .bss:0x805A4C80; // type:object size:0x100 scope:local
4828048281
Control = .bss:0x805A4D80; // type:object size:0x190 scope:local data:4byte
@@ -50988,7 +50989,7 @@ __OSLastInterruptSrr0 = .sbss:0x805F5970; // type:object size:0x4 scope:global d
5098850989
__OSLastInterrupt = .sbss:0x805F5974; // type:object size:0x2 scope:global data:2byte
5098950990
__OSLastInterruptTime = .sbss:0x805F5978; // type:object size:0x8 scope:global data:4byte
5099050991
InterruptHandlerTable = .sbss:0x805F5980; // type:object size:0x4 scope:local data:4byte
50991-
@LOCAL@__OSInitMemoryProtection__Fv@initialized = .sbss:0x805F5988; // type:object size:0x4 scope:local data:4byte
50992+
@LOCAL@__OSInitMemoryProtection__Fv@initialized = .sbss:0x805F5988; // type:object size:0x4 scope:weak data:4byte
5099250993
lbl_805F5990 = .sbss:0x805F5990; // type:object size:0x4 data:4byte
5099350994
lbl_805F5994 = .sbss:0x805F5994; // type:object size:0x4 data:4byte
5099450995
lbl_805F5998 = .sbss:0x805F5998; // type:object size:0x4 data:4byte

‎configure.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,9 @@ def MatchingFor(*versions):
341341
"progress_category": "game", # str | List[str]
342342
"objects": [
343343
# 2- Hooks
344-
Object(MatchingFor(), "Alice/K/KHero/CKHkAliceHero.cpp"),
344+
Object(MatchingFor(), "Alice/K/KAliceHero/CKHkAliceHero.cpp"),
345345
# 4 - Groups
346-
Object(MatchingFor(), "Alice/K/KHero/CKGrpAliceHero.cpp")
346+
Object(MatchingFor(), "Alice/K/KAliceHero/CKGrpAliceHero.cpp")
347347
]
348348
}
349349
]

‎src/Alice/K/KAliceHero/CKGrpAliceHero.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
CKGrpAliceHero::CKGrpAliceHero(): IKGrpHero::IKGrpHero() {};
66
CKGrpAliceHero::~CKGrpAliceHero() {};
7-
BOOL CKGrpAliceHero::isSubclass(u32 classID)
7+
BOOL CKGrpAliceHero::IsKindOfClass(u32 classID)
88
{
99
if (classID == 3524)
1010
return TRUE;
11-
return IKGrpHero::isSubclass(classID);
11+
return IKGrpHero::IsKindOfClass(classID);
1212
};
13-
s32 CKGrpAliceHero::getClassGroup()
13+
s32 CKGrpAliceHero::GetClassType()
1414
{
1515
return 4;
1616
};
17-
s32 CKGrpAliceHero::getClassID()
17+
s32 CKGrpAliceHero::GetClassID()
1818
{
1919
return 55;
2020
};

‎src/Alice/K/KAliceHero/CKGrpAliceHero.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
public:
99
CKGrpAliceHero();
1010
virtual ~CKGrpAliceHero();
11-
virtual BOOL isSubclass(u32);
12-
virtual s32 getClassGroup();
13-
virtual s32 getClassID();
11+
virtual BOOL IsKindOfClass(u32);
12+
virtual s32 GetClassType();
13+
virtual s32 GetClassID();
1414
};
1515

1616
#endif

‎src/Alice/K/KAliceHero/CKHkAliceHero.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ void operator delete(void* ptr) { fn_801A56EC(ptr); }
88

99
CKHkAliceHero::CKHkAliceHero(): IKHkHero::IKHkHero() {};
1010
CKHkAliceHero::~CKHkAliceHero() {};
11-
BOOL CKHkAliceHero::isSubclass(u32 classID)
11+
BOOL CKHkAliceHero::IsKindOfClass(u32 classID)
1212
{
1313
if (classID == 9666)
1414
return TRUE;
15-
return IKHkHero::isSubclass(classID);
15+
return IKHkHero::IsKindOfClass(classID);
1616
};
17-
s32 CKHkAliceHero::getClassGroup()
17+
s32 CKHkAliceHero::GetClassType()
1818
{
1919
return 2;
2020
};
21-
s32 CKHkAliceHero::getClassID()
21+
s32 CKHkAliceHero::GetClassID()
2222
{
2323
return 151;
2424
};

‎src/Alice/K/KAliceHero/CKHkAliceHero.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
public:
99
CKHkAliceHero();
1010
virtual ~CKHkAliceHero();
11-
virtual BOOL isSubclass(u32);
12-
// reset() func in this vtable is for IKBaseClass
13-
// unk() func in this vtable is for IKHkHero
14-
virtual s32 getClassGroup();
15-
virtual s32 getClassID();
16-
virtual s32 sendEvent();
17-
// unk2() func in this vtable is for IKBaseClass
11+
virtual BOOL IsKindOfClass(u32);
12+
// DestroyGame() func in this vtable is for IKBaseClass
13+
// Destroy() func in this vtable is for IKHkHero
14+
virtual s32 GetClassType();
15+
virtual s32 GetClassID();
16+
virtual s32 MessageProc();
17+
// FindNonRecreableInstances() func in this vtable is for IKBaseClass
1818
};
1919

2020
#endif

‎src/Commun/K/KHero/IKHkHero.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
public:
99
IKHkHero(): IKHook::IKHook() {};
1010
virtual ~IKHkHero() {};
11-
virtual BOOL isSubclass(u32 classID)
11+
virtual BOOL IsKindOfClass(u32 classID)
1212
{
1313
if (classID == 13890)
1414
return TRUE;
15-
return IKHook::isSubclass(classID);
15+
return IKHook::IsKindOfClass(classID);
1616
};
17-
// reset() func in this vtable is for IKBaseClass
18-
virtual void unk() { return; };
19-
virtual s32 getClassGroup() { return 2; };
20-
virtual s32 getClassID() { return 217; };
21-
virtual s32 sendEvent() { return 1; };
22-
// unk2() func in this vtable is for IKBaseClass
17+
// DestroyGame() func in this vtable is for IKBaseClass
18+
virtual void Destroy() { return; };
19+
virtual s32 GetClassType() { return 2; };
20+
virtual s32 GetClassID() { return 217; };
21+
virtual s32 MessageProc() { return 1; };
22+
// FindNonRecreableInstances() func in this vtable is for IKBaseClass
2323
};
2424

2525
#endif

‎src/K/KCore/Interfaces/IKBaseClass.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
class IKBaseClass
77
{
88
public:
9-
IKBaseClass() {};
10-
virtual ~IKBaseClass() {};
11-
virtual BOOL isSubclass() { return FALSE; };
12-
virtual void reset() { return; };
13-
virtual void unk() { return; };
14-
virtual s32 getClassGroup() = 0;
15-
virtual s32 getClassID() = 0;
16-
virtual s32 sendEvent() { return 1; };
17-
virtual s32 unk2() { return 0; };
9+
inline IKBaseClass() {};
10+
virtual inline ~IKBaseClass() {};
11+
virtual inline BOOL IsKindOfClass() { return FALSE; };
12+
virtual inline void DestroyGame() { return; };
13+
virtual inline void Destroy() { return; };
14+
virtual inline s32 GetClassType() = 0;
15+
virtual inline s32 GetClassID() = 0;
16+
virtual inline s32 MessageProc() { return 1; };
17+
virtual inline s32 FindNonRecreableInstance() { return 0; };
1818
};
1919
#endif

‎src/K/KCore/Interfaces/IKHook.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
public:
1010
IKHook(): IKLife::IKLife() {};
1111
virtual ~IKHook() {};
12-
virtual BOOL isSubclass(u32 classID)
12+
virtual BOOL IsKindOfClass(u32 classID)
1313
{
1414
if (classID == 2)
1515
return TRUE;
16-
return IKLife::isSubclass(classID);
16+
return IKLife::IsKindOfClass(classID);
1717
};
18-
// reset() func in this vtable is for IKBaseClass
19-
// unk() func in this vtable is for IKSerializable
20-
// getClassGroup() func in this vtable is for IKBaseClass
21-
// getClassID() func in this vtable is for IKBaseClass
22-
// sendEvent() func in this vtable is for IKBaseClass
23-
// unk2() func in this vtable is for IKBaseClass
18+
// DestroyGame() func in this vtable is for IKBaseClass
19+
// Destroy() func in this vtable is for IKSerializable
20+
// GetClassType() func in this vtable is for IKBaseClass
21+
// GetClassID() func in this vtable is for IKBaseClass
22+
// MessageProc() func in this vtable is for IKBaseClass
23+
// FindNonRecreableInstances() func in this vtable is for IKBaseClass
2424
};
2525

2626
#endif

‎src/K/KCore/Interfaces/IKLife.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@
1616
fn_8000E7F4((s32)this + 0xC, -1);
1717
fn_8000F4AC((s32)this + 0x4, 0);
1818
};
19-
virtual BOOL isSubclass(u32 classID)
19+
virtual BOOL IsKindOfClass(u32 classID)
2020
{
2121
if (classID == 766)
2222
return TRUE;
23-
return IKUpdatable::isSubclass(classID);
23+
return IKUpdatable::IsKindOfClass(classID);
2424
};
25-
// reset() is inherited from IKBaseClass
26-
// unk() is inherited from IKSerializable
27-
// getClassGroup() is inherited from IKBaseClass
28-
// getClassID() is inherited from IKBaseClass
29-
// sendEvent() is inherited from IKBaseClass
30-
// unk2() is inherited from IKBaseClass
25+
// DestroyGame() is inherited from IKBaseClass
26+
// Destroy() is inherited from IKSerializable
27+
// GetClassType() is inherited from IKBaseClass
28+
// GetClassID() is inherited from IKBaseClass
29+
// MessageProc() is inherited from IKBaseClass
30+
// FindNonRecreableInstances() is inherited from IKBaseClass
3131
// unk3() is inherited from IKSerializable
3232
// unk4() is inherited from IKSerializable
33-
// serialize() is inherited from IKSerializable
34-
// deserialize() is inherited from IKSerializable
33+
// Save() is inherited from IKSerializable
34+
// Load() is inherited from IKSerializable
3535
// unk5() is inherited from IKSerializable
3636
// unk6() is inherited from IKSerializable
3737
// unk7() is inherited from IKSerializable

0 commit comments

Comments
 (0)