Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Virtual states, d_a_npc_rival_lod OK, d_a_npc_saltalk almost #98

Merged
merged 9 commits into from
Nov 15, 2024
Merged

Virtual states, d_a_npc_rival_lod OK, d_a_npc_saltalk almost #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3a45e65
Try to figure out how this virtual state thing works
robojumper Nov 10, 2024
31ddec9
Implement a solution that seemingly works
robojumper Nov 12, 2024
0f1efc9
The Groose is loose (but far away)
robojumper Nov 13, 2024
4a75c5c
Some symbols
robojumper Nov 13, 2024
3a18039
Equivalence fix
robojumper Nov 13, 2024
b32d1e2
More splits
robojumper Nov 14, 2024
0f17d7c
d_a_npc sinit :)
elijah-thomas774 Nov 15, 2024
fea7ebb
fix dAcNpcSltk_c::executeState_Wait regswap
elijah-thomas774 Nov 15, 2024
5c4755e
d_a_npc_saltalk OK
elijah-thomas774 Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/SOUE01/rels/d_a_npc_rival_lodNP/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ REL/global_destructor_chain.c:
REL/d/a/npc/d_a_npc_rival_lod.cpp:
.text start:0x000000F0 end:0x00000EA8
.ctors start:0x00000000 end:0x00000004
.rodata start:0x00000000 end:0x00000028
.data start:0x00000000 end:0x0000037C
.bss start:0x00000008 end:0x00000048
122 changes: 61 additions & 61 deletions config/SOUE01/rels/d_a_npc_rival_lodNP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,59 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global
__register_global_object = .text:0x00000070; // type:function size:0x1C scope:global
__destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global
dAcNpcRivalLOD_c_classInit__Fv = .text:0x000000F0; // type:function size:0x100
fn_22_1F0 = .text:0x000001F0; // type:function size:0x58
__dt__15dShadowCircle_cFv = .text:0x000001F0; // type:function size:0x58
__dt__29sFState_c<16dAcNpcRivalLOD_c>Fv = .text:0x00000250; // type:function size:0x58
__dt__32sFStateFct_c<16dAcNpcRivalLOD_c>Fv = .text:0x000002B0; // type:function size:0x6C
__dt__85sStateMgr_c<16dAcNpcRivalLOD_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000320; // type:function size:0xA0
__dt__55sFStateMgr_c<16dAcNpcRivalLOD_c,20sStateMethodUsr_FI_c>Fv = .text:0x000003C0; // type:function size:0xA4
fn_22_470 = .text:0x00000470; // type:function size:0x7C
fn_22_4F0 = .text:0x000004F0; // type:function size:0xD4
fn_22_5D0 = .text:0x000005D0; // type:function size:0x10
createHeap__16dAcNpcRivalLOD_cFv = .text:0x00000470; // type:function size:0x7C
create__16dAcNpcRivalLOD_cFv = .text:0x000004F0; // type:function size:0xD4
setState__16dAcNpcRivalLOD_cFRC12sStateIDIf_c = .text:0x000005D0; // type:function size:0x10
changeState__85sStateMgr_c<16dAcNpcRivalLOD_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x000005E0; // type:function size:0x10
fn_22_5F0 = .text:0x000005F0; // type:function size:0x8
fn_22_600 = .text:0x00000600; // type:function size:0x50
fn_22_650 = .text:0x00000650; // type:function size:0x10
doDelete__16dAcNpcRivalLOD_cFv = .text:0x000005F0; // type:function size:0x8
actorExecute__16dAcNpcRivalLOD_cFv = .text:0x00000600; // type:function size:0x50
executeState__16dAcNpcRivalLOD_cFv = .text:0x00000650; // type:function size:0x10
executeState__85sStateMgr_c<16dAcNpcRivalLOD_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000660; // type:function size:0x10
fn_22_670 = .text:0x00000670; // type:function size:0x28
fn_22_6A0 = .text:0x000006A0; // type:function size:0x24
fn_22_6D0 = .text:0x000006D0; // type:function size:0x10
fn_22_6E0 = .text:0x000006E0; // type:function size:0x4
fn_22_6F0 = .text:0x000006F0; // type:function size:0x8
fn_22_700 = .text:0x00000700; // type:function size:0x34
fn_22_740 = .text:0x00000740; // type:function size:0x14
fn_22_760 = .text:0x00000760; // type:function size:0x34
fn_22_7A0 = .text:0x000007A0; // type:function size:0x8
fn_22_7B0 = .text:0x000007B0; // type:function size:0x8
fn_22_7C0 = .text:0x000007C0; // type:function size:0x8
fn_22_7D0 = .text:0x000007D0; // type:function size:0x8
fn_22_7E0 = .text:0x000007E0; // type:function size:0x8
fn_22_7F0 = .text:0x000007F0; // type:function size:0x4
fn_22_800 = .text:0x00000800; // type:function size:0x4
fn_22_810 = .text:0x00000810; // type:function size:0x4
fn_22_820 = .text:0x00000820; // type:function size:0x4
fn_22_830 = .text:0x00000830; // type:function size:0x8
fn_22_840 = .text:0x00000840; // type:function size:0x8
fn_22_850 = .text:0x00000850; // type:function size:0x8
fn_22_860 = .text:0x00000860; // type:function size:0x8
fn_22_870 = .text:0x00000870; // type:function size:0x4
fn_22_880 = .text:0x00000880; // type:function size:0x4
fn_22_890 = .text:0x00000890; // type:function size:0x8
fn_22_8A0 = .text:0x000008A0; // type:function size:0x8
fn_22_8B0 = .text:0x000008B0; // type:function size:0x8
fn_22_8C0 = .text:0x000008C0; // type:function size:0x8
fn_22_8D0 = .text:0x000008D0; // type:function size:0x8
fn_22_8E0 = .text:0x000008E0; // type:function size:0x8
fn_22_8F0 = .text:0x000008F0; // type:function size:0x8
fn_22_900 = .text:0x00000900; // type:function size:0x8
fn_22_910 = .text:0x00000910; // type:function size:0x8
fn_22_920 = .text:0x00000920; // type:function size:0x8
fn_22_930 = .text:0x00000930; // type:function size:0x8
fn_22_940 = .text:0x00000940; // type:function size:0x8
fn_22_950 = .text:0x00000950; // type:function size:0x8
fn_22_960 = .text:0x00000960; // type:function size:0x4
fn_22_970 = .text:0x00000970; // type:function size:0x4
fn_22_980 = .text:0x00000980; // type:function size:0x1C
fn_22_9A0 = .text:0x000009A0; // type:function size:0x58
draw__16dAcNpcRivalLOD_cFv = .text:0x00000670; // type:function size:0x28
initializeState_Wait__16dAcNpcRivalLOD_cFv = .text:0x000006A0; // type:function size:0x24
executeState_Wait__16dAcNpcRivalLOD_cFv = .text:0x000006D0; // type:function size:0x10
finalizeState_Wait__16dAcNpcRivalLOD_cFv = .text:0x000006E0; // type:function size:0x4
acNpc_vt_0x204__8dAcNpc_cFv = .text:0x000006F0; // type:function size:0x8
acNpc_vt_0x200__8dAcNpc_cFv = .text:0x00000700; // type:function size:0x34
acNpc_vt_0x1FC__8dAcNpc_cFv = .text:0x00000740; // type:function size:0x14
acNpc_vt_0x1F8__8dAcNpc_cFv = .text:0x00000760; // type:function size:0x34
acNpc_vt_0x1F4__8dAcNpc_cFv = .text:0x000007A0; // type:function size:0x8
acNpc_vt_0x1F0__8dAcNpc_cFv = .text:0x000007B0; // type:function size:0x8
acNpc_vt_0x1EC__8dAcNpc_cFv = .text:0x000007C0; // type:function size:0x8
acNpc_vt_0x1E8__8dAcNpc_cFv = .text:0x000007D0; // type:function size:0x8
acNpc_vt_0x168__8dAcNpc_cFv = .text:0x000007E0; // type:function size:0x8
acNpc_vt_0x160__8dAcNpc_cFv = .text:0x000007F0; // type:function size:0x4
acNpc_vt_0x15C__8dAcNpc_cFv = .text:0x00000800; // type:function size:0x4
acNpc_vt_0x158__8dAcNpc_cFv = .text:0x00000810; // type:function size:0x4
acNpc_vt_0x154__8dAcNpc_cFv = .text:0x00000820; // type:function size:0x4
acNpc_vt_0x150__8dAcNpc_cFv = .text:0x00000830; // type:function size:0x8
acNpc_vt_0x14C__8dAcNpc_cFv = .text:0x00000840; // type:function size:0x8
acNpc_vt_0x12C__8dAcNpc_cFv = .text:0x00000850; // type:function size:0x8
acNpc_vt_0x128__8dAcNpc_cFv = .text:0x00000860; // type:function size:0x8
acNpc_vt_0x124__8dAcNpc_cFv = .text:0x00000870; // type:function size:0x4
acNpc_vt_0x120__8dAcNpc_cFv = .text:0x00000880; // type:function size:0x4
acNpc_vt_0x118__8dAcNpc_cFv = .text:0x00000890; // type:function size:0x8
acNpc_vt_0x114__8dAcNpc_cFv = .text:0x000008A0; // type:function size:0x8
acNpc_vt_0xEC__8dAcNpc_cFv = .text:0x000008B0; // type:function size:0x8
getObjectListEntry__8dAcNpc_cFv = .text:0x000008C0; // type:function size:0x8
acNpc_vt_0xE4__8dAcNpc_cFv = .text:0x000008D0; // type:function size:0x8
acNpc_vt_0xE0__8dAcNpc_cFv = .text:0x000008E0; // type:function size:0x8
acNpc_vt_0xDC__8dAcNpc_cFv = .text:0x000008F0; // type:function size:0x8
eventFlowSwitch4__8dAcNpc_cFv = .text:0x00000900; // type:function size:0x8
eventFlowSwitch3__8dAcNpc_cFv = .text:0x00000910; // type:function size:0x8
eventFlowSwitch2__8dAcNpc_cFv = .text:0x00000920; // type:function size:0x8
acNpc_vt_0x98__8dAcNpc_cFv = .text:0x00000930; // type:function size:0x8
acNpc_vt_0x94__8dAcNpc_cFv = .text:0x00000940; // type:function size:0x8
acNpc_vt_0x90__8dAcNpc_cFv = .text:0x00000950; // type:function size:0x8
acNpc_vt_0x8C__8dAcNpc_cFv = .text:0x00000960; // type:function size:0x4
acNpc_vt_0x88__8dAcNpc_cFv = .text:0x00000970; // type:function size:0x4
getPosCopy3__8dAcNpc_cFR7mVec3_c = .text:0x00000980; // type:function size:0x1C
isInState__16dAcNpcRivalLOD_cCFRC12sStateIDIf_c = .text:0x000009A0; // type:function size:0x58
getStateID__85sStateMgr_c<16dAcNpcRivalLOD_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000A00; // type:function size:0x10
__dt__16dAcNpcRivalLOD_cFv = .text:0x00000A10; // type:function size:0xDC
build__32sFStateFct_c<16dAcNpcRivalLOD_c>FRC12sStateIDIf_c = .text:0x00000AF0; // type:function size:0x60
Expand All @@ -79,18 +79,18 @@ isSameName__31sFStateID_c<16dAcNpcRivalLOD_c>CFPCc = .text:0x00000E20; // type:f
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
__destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global
lbl_22_rodata_0 = .rodata:0x00000000; // type:object size:0x24 data:float
lbl_22_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float
g_profile_NPC_RIVAL_LOD = .data:0x00000000; // type:object size:0x30 data:4byte
lbl_22_data_30 = .data:0x00000030; // type:object size:0x10
lbl_22_data_40 = .data:0x00000040; // type:object size:0x20
lbl_22_data_60 = .data:0x00000060; // type:object size:0x208
lbl_22_data_268 = .data:0x00000268; // type:object size:0x30
lbl_22_data_298 = .data:0x00000298; // type:object size:0x30
lbl_22_data_2C8 = .data:0x000002C8; // type:object size:0x18
lbl_22_data_2E0 = .data:0x000002E0; // type:object size:0x18
lbl_22_data_2F8 = .data:0x000002F8; // type:object size:0x50
lbl_22_data_348 = .data:0x00000348; // type:object size:0x34
lbl_22_rodata_0 = .rodata:0x00000000; // type:object size:0x24 scope:local data:float
lbl_22_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float
g_profile_NPC_RIVAL_LOD = .data:0x00000000; // type:object size:0x10 data:4byte
lbl_22_data_30 = .data:0x00000030; // type:object size:0x10 scope:local
lbl_22_data_40 = .data:0x00000040; // type:object size:0x20 scope:local
__vt__16dAcNpcRivalLOD_c = .data:0x00000060; // type:object size:0x208
__vt__55sFStateMgr_c<16dAcNpcRivalLOD_c,20sStateMethodUsr_FI_c> = .data:0x00000268; // type:object size:0x30
__vt__85sStateMgr_c<16dAcNpcRivalLOD_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000298; // type:object size:0x30
__vt__32sFStateFct_c<16dAcNpcRivalLOD_c> = .data:0x000002C8; // type:object size:0x14
__vt__29sFState_c<16dAcNpcRivalLOD_c> = .data:0x000002E0; // type:object size:0x18
__vt__15dShadowCircle_c = .data:0x000002F8; // type:object size:0xC
__vt__31sFStateID_c<16dAcNpcRivalLOD_c> = .data:0x00000348; // type:object size:0x34
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_22_bss_8 = .bss:0x00000008; // type:object size:0x10
lbl_22_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte
lbl_22_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local
StateID_Wait__16dAcNpcRivalLOD_c = .bss:0x00000018; // type:object size:0x30 data:4byte
3 changes: 3 additions & 0 deletions config/SOUE01/rels/d_a_npc_saltalkNP/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ REL/global_destructor_chain.c:
REL/d/a/npc/d_a_npc_saltalk.cpp:
.text start:0x000000F0 end:0x000011A0
.ctors start:0x00000000 end:0x00000004
.rodata start:0x00000000 end:0x00000018
.data start:0x00000000 end:0x000002D0
.bss start:0x00000008 end:0x00000048
Loading