mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-30 08:56:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix virtual state symbols

Browse Source
This commit is contained in:
robojumper
2025-06-30 22:12:56 +02:00
parent 810f61fe94
commit c944ee7dcf
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/rels/d_a_npc_saltalkNP/symbols.txt
+1 -1
View File
@@ -64,7 +64,7 @@ __dt__12dAcNpcSltk_cFv = .text:0x00000C40; // type:function size:0x78
__sinit_\d_a_npc_saltalk_cpp = .text:0x00000CC0; // type:function size:0x124 scope:local
__dt__27sFStateID_c<12dAcNpcSltk_c>Fv = .text:0x00000DF0; // type:function size:0x58
__dt__34sFStateVirtualID_c<12dAcNpcSltk_c>Fv = .text:0x00000E50; // type:function size:0x5C
baseID_Wait<8dAcNpc_c>__Fv_RC10sStateID_c = .text:0x00000EB0; // type:function size:0xC
baseID_Wait<8dAcNpc_c>__Fv_RC12sStateIDIf_c = .text:0x00000EB0; // type:function size:0xC
number__34sFStateVirtualID_c<12dAcNpcSltk_c>CFv = .text:0x00000EC0; // type:function size:0xDC
superID__34sFStateVirtualID_c<12dAcNpcSltk_c>CFv = .text:0x00000FA0; // type:function size:0xE0
isSameName__27sFStateID_c<12dAcNpcSltk_c>CFPCc = .text:0x00001080; // type:function size:0x88
config/SOUE01/symbols.txt
+14 -14
View File
@@ -1219,8 +1219,8 @@ fn_80032130 = .text:0x80032130; // type:function size:0x48
fn_80032180 = .text:0x80032180; // type:function size:0x2C
fn_800321B0 = .text:0x800321B0; // type:function size:0x1CC
fn_80032380 = .text:0x80032380; // type:function size:0xC0
baseID_Wait<10sStateID_c>__Fv_RC10sStateID_c = .text:0x80032440; // type:function size:0xC
baseID_Demo<10sStateID_c>__Fv_RC10sStateID_c = .text:0x80032450; // type:function size:0xC
baseID_Wait<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x80032440; // type:function size:0xC
baseID_Demo<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x80032450; // type:function size:0xC
fn_80032460 = .text:0x80032460; // type:function size:0x4
fn_80032470 = .text:0x80032470; // type:function size:0x4
npcExecute__8dAcNpc_cFv = .text:0x80032480; // type:function size:0x390
@@ -1820,13 +1820,13 @@ fn_80045D00 = .text:0x80045D00; // type:function size:0x490
fn_80046190 = .text:0x80046190; // type:function size:0x44
fn_800461E0 = .text:0x800461E0; // type:function size:0xAC
fn_80046290 = .text:0x80046290; // type:function size:0x40
baseID_Pain<10sStateID_c>__Fv_RC10sStateID_c = .text:0x800462D0; // type:function size:0xC
baseID_Surprised<10sStateID_c>__Fv_RC10sStateID_c = .text:0x800462E0; // type:function size:0xC
baseID_Withstand<10sStateID_c>__Fv_RC10sStateID_c = .text:0x800462F0; // type:function size:0xC
baseID_Walk<10sStateID_c>__Fv_RC10sStateID_c = .text:0x80046300; // type:function size:0xC
baseID_LookAwaySt<10sStateID_c>__Fv_RC10sStateID_c = .text:0x80046310; // type:function size:0xC
baseID_LookAway<10sStateID_c>__Fv_RC10sStateID_c = .text:0x80046320; // type:function size:0xC
baseID_Turn<10sStateID_c>__Fv_RC10sStateID_c = .text:0x80046330; // type:function size:0xC
baseID_Pain<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x800462D0; // type:function size:0xC
baseID_Surprised<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x800462E0; // type:function size:0xC
baseID_Withstand<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x800462F0; // type:function size:0xC
baseID_Walk<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x80046300; // type:function size:0xC
baseID_LookAwaySt<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x80046310; // type:function size:0xC
baseID_LookAway<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x80046320; // type:function size:0xC
baseID_Turn<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x80046330; // type:function size:0xC
AcOrdinaryNpc__PreInit = .text:0x80046340; // type:function size:0x10C
fn_80046450 = .text:0x80046450; // type:function size:0x9C
fn_800464F0 = .text:0x800464F0; // type:function size:0x13C
@@ -1988,7 +1988,7 @@ fn_8004CC90 = .text:0x8004CC90; // type:function size:0x40
__sinit_\d_a_ordinary_npc_cpp = .text:0x8004CCD0; // type:function size:0x784 scope:local
__dt__31sFStateID_c<16dAcOrdinaryNpc_c>Fv = .text:0x8004D460; // type:function size:0x58
__dt__38sFStateVirtualID_c<16dAcOrdinaryNpc_c>Fv = .text:0x8004D4C0; // type:function size:0x5C
baseID_Wait<8dAcNpc_c>__Fv_RC10sStateID_c = .text:0x8004D520; // type:function size:0xC
baseID_Wait<8dAcNpc_c>__Fv_RC12sStateIDIf_c = .text:0x8004D520; // type:function size:0xC
number__38sFStateVirtualID_c<16dAcOrdinaryNpc_c>CFv = .text:0x8004D530; // type:function size:0xDC
superID__38sFStateVirtualID_c<16dAcOrdinaryNpc_c>CFv = .text:0x8004D610; // type:function size:0xE0
isSameName__31sFStateID_c<16dAcOrdinaryNpc_c>CFPCc = .text:0x8004D6F0; // type:function size:0x88
@@ -11140,8 +11140,8 @@ checkAllSaveFilesEmpty__10dScTitle_cFv = .text:0x801B9D70; // type:function size
__sinit_\d_sc_title_cpp = .text:0x801B9E00; // type:function size:0x1E0 scope:local
__dt__25sFStateID_c<10dScTitle_c>Fv = .text:0x801B9FE0; // type:function size:0x58 scope:weak
__dt__32sFStateVirtualID_c<10dScTitle_c>Fv = .text:0x801BA040; // type:function size:0x5C scope:weak
baseID_Action<9dScGame_c>__Fv_RC10sStateID_c = .text:0x801BA0A0; // type:function size:0xC scope:local
baseID_Stanby<9dScGame_c>__Fv_RC10sStateID_c = .text:0x801BA0B0; // type:function size:0xC scope:local
baseID_Action<9dScGame_c>__Fv_RC12sStateIDIf_c = .text:0x801BA0A0; // type:function size:0xC scope:local
baseID_Stanby<9dScGame_c>__Fv_RC12sStateIDIf_c = .text:0x801BA0B0; // type:function size:0xC scope:local
number__32sFStateVirtualID_c<10dScTitle_c>CFv = .text:0x801BA0C0; // type:function size:0xDC scope:weak
superID__32sFStateVirtualID_c<10dScTitle_c>CFv = .text:0x801BA1A0; // type:function size:0xE0 scope:weak
isSameName__25sFStateID_c<10dScTitle_c>CFPCc = .text:0x801BA280; // type:function size:0x88 scope:weak
@@ -11149,8 +11149,8 @@ initializeState__25sFStateID_c<10dScTitle_c>CFR10dScTitle_c = .text:0x801BA310;
executeState__25sFStateID_c<10dScTitle_c>CFR10dScTitle_c = .text:0x801BA340; // type:function size:0x30 scope:weak
finalizeState__25sFStateID_c<10dScTitle_c>CFR10dScTitle_c = .text:0x801BA370; // type:function size:0x30 scope:weak
dScGame_c_classInit__Fv = .text:0x801BA3A0; // type:function size:0x30
baseID_Stanby<10sStateID_c>__Fv_RC10sStateID_c = .text:0x801BA3D0; // type:function size:0xC
baseID_Action<10sStateID_c>__Fv_RC10sStateID_c = .text:0x801BA3E0; // type:function size:0xC
baseID_Stanby<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x801BA3D0; // type:function size:0xC
baseID_Action<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x801BA3E0; // type:function size:0xC
someGfxThingCallback__9dScGame_cFv = .text:0x801BA3F0; // type:function size:0x38
__ct__9dScGame_cFv = .text:0x801BA430; // type:function size:0x23C
create__9dScGame_cFv = .text:0x801BA670; // type:function size:0x50
include/s/s_FStateVirtualID.hpp
+2 -2
View File
@@ -9,7 +9,7 @@ class sFStateVirtualID_c : public sFStateID_c<T> {
public:
typedef void (T::*stateFunc)();
sFStateVirtualID_c(
const sStateID_c *superState, const char *name, stateFunc initialize, stateFunc execute, stateFunc finalize
const sStateIDIf_c *superState, const char *name, stateFunc initialize, stateFunc execute, stateFunc finalize
)
: sFStateID_c<T>(name, initialize, execute, finalize), mpSuperState(superState) {}
@@ -29,7 +29,7 @@ public:
}
private:
const sStateID_c *mpSuperState;
const sStateIDIf_c *mpSuperState;
};
#endif
include/s/s_State.hpp
+2 -2
View File
@@ -65,11 +65,11 @@
#define STATE_VIRTUAL_DEFINE(class, name) \
template <typename T> \
static const sStateID_c &baseID_##name() { \
static const sStateIDIf_c &baseID_##name() { \
return T::StateID_##name; \
} \
template <> \
const sStateID_c &baseID_##name<sStateID_c>() { \
const sStateIDIf_c &baseID_##name<sStateID_c>() { \
return sStateID::null; \
} \
const sFStateVirtualID_c<class> class ::StateID_##name( \