Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into bomb
Browse files Browse the repository at this point in the history
  • Loading branch information
@elijah-thomas774
elijah-thomas774 committed Oct 26, 2024
2 parents 337874e + 361fed8 commit 7cf0b89
Show file tree
Hide file tree
Showing 69 changed files with 1,473 additions and 824 deletions.
5 changes: 5 additions & 0 deletions .clangd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# https://clangd.llvm.org/config
CompileFlags:
Add: [
"-Wno-c++11-compat-deprecated-writable-strings"
]
2 changes: 1 addition & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.associations": {
"*.inc": "c",
"*.inc": "cpp",
".clangd": "yaml"
},
// Disable C/C++ IntelliSense, use clangd instead
Expand Down
3 changes: 3 additions & 0 deletions config/SOUE01/rels/d_a_obj_island_nusiNP/splits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ REL/global_destructor_chain.c:
REL/d/a/obj/d_a_obj_island_nusi.cpp:
.text start:0x000000F0 end:0x00000FC8
.ctors start:0x00000000 end:0x00000004
.rodata start:0x00000000 end:0x0000002C
.data start:0x00000000 end:0x00000248
.bss start:0x00000008 end:0x00000088
44 changes: 22 additions & 22 deletions config/SOUE01/rels/d_a_obj_island_nusiNP/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ __dt__29sFState_c<16dAcOislandNusi_c>Fv = .text:0x000001D0; // type:function siz
__dt__32sFStateFct_c<16dAcOislandNusi_c>Fv = .text:0x00000230; // type:function size:0x6C
__dt__85sStateMgr_c<16dAcOislandNusi_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002A0; // type:function size:0xA0
__dt__55sFStateMgr_c<16dAcOislandNusi_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000340; // type:function size:0xA4
AcOislandNusi__initModels = .text:0x000003F0; // type:function size:0x15C
AcOislandNusi__init = .text:0x00000550; // type:function size:0x13C
createHeap__16dAcOislandNusi_cFv = .text:0x000003F0; // type:function size:0x15C
create__16dAcOislandNusi_cFv = .text:0x00000550; // type:function size:0x13C
changeState__85sStateMgr_c<16dAcOislandNusi_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000690; // type:function size:0x10
AcOislandNusi__destroy = .text:0x000006A0; // type:function size:0x38
AcOislandNusi__update = .text:0x000006E0; // type:function size:0x30
doDelete__16dAcOislandNusi_cFv = .text:0x000006A0; // type:function size:0x38
actorExecute__16dAcOislandNusi_cFv = .text:0x000006E0; // type:function size:0x30
executeState__85sStateMgr_c<16dAcOislandNusi_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000710; // type:function size:0x10
AcOislandNusi__draw = .text:0x00000720; // type:function size:0x60
draw__16dAcOislandNusi_cFv = .text:0x00000720; // type:function size:0x60
initializeState_Wait__16dAcOislandNusi_cFv = .text:0x00000780; // type:function size:0xD0
executeState_Wait__16dAcOislandNusi_cFv = .text:0x00000850; // type:function size:0x50
finalizeState_Wait__16dAcOislandNusi_cFv = .text:0x000008A0; // type:function size:0x4
initializeState_NusiFight__16dAcOislandNusi_cFv = .text:0x000008B0; // type:function size:0xD0
executeState_NusiFight__16dAcOislandNusi_cFv = .text:0x00000980; // type:function size:0x50
finalizeState_NusiFight__16dAcOislandNusi_cFv = .text:0x000009D0; // type:function size:0x4
isInLeviasFight = .text:0x000009E0; // type:function size:0x7C
isInLeviasFight__16dAcOislandNusi_cCFv = .text:0x000009E0; // type:function size:0x7C
__dt__16dAcOislandNusi_cFv = .text:0x00000A60; // type:function size:0xE4
getStateID__85sStateMgr_c<16dAcOislandNusi_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000B50; // type:function size:0x10
build__32sFStateFct_c<16dAcOislandNusi_c>FRC12sStateIDIf_c = .text:0x00000B60; // type:function size:0x60
Expand All @@ -44,20 +44,20 @@ isSameName__31sFStateID_c<16dAcOislandNusi_c>CFPCc = .text:0x00000F40; // 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_413_rodata_0 = .rodata:0x00000000; // type:object size:0x8 data:float
lbl_413_rodata_8 = .rodata:0x00000008; // type:object size:0x24 data:4byte
lbl_413_data_0 = .data:0x00000000; // type:object size:0x8 data:4byte
lbl_413_data_8 = .data:0x00000008; // type:object size:0x10
g_profile_OBJ_ISLAND_NUSI = .data:0x00000018; // type:object size:0x38
lbl_413_data_50 = .data:0x00000050; // type:object size:0x20
lbl_413_data_70 = .data:0x00000070; // type:object size:0x8
lbl_413_data_78 = .data:0x00000078; // type:object size:0x80
lbl_413_data_F8 = .data:0x000000F8; // type:object size:0x30
lbl_413_data_128 = .data:0x00000128; // type:object size:0x30
lbl_413_data_158 = .data:0x00000158; // type:object size:0x18
lbl_413_data_170 = .data:0x00000170; // type:object size:0xA4
lbl_413_data_214 = .data:0x00000214; // type:object size:0x34
lbl_413_rodata_0 = .rodata:0x00000000; // type:object size:0x8 scope:local data:float
lbl_413_rodata_8 = .rodata:0x00000008; // type:object size:0x24 scope:local data:4byte
lbl_413_data_0 = .data:0x00000000; // type:object size:0x8 scope:local data:4byte
lbl_413_data_8 = .data:0x00000008; // type:object size:0x10 scope:local
g_profile_OBJ_ISLAND_NUSI = .data:0x00000018; // type:object size:0x10
lbl_413_data_50 = .data:0x00000050; // type:object size:0x20 scope:local
lbl_413_data_70 = .data:0x00000070; // type:object size:0x8 scope:local
__vt__16dAcOislandNusi_c = .data:0x00000078; // type:object size:0x80
__vt__55sFStateMgr_c<16dAcOislandNusi_c,20sStateMethodUsr_FI_c> = .data:0x000000F8; // type:object size:0x30
__vt__85sStateMgr_c<16dAcOislandNusi_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000128; // type:object size:0x30
__vt__32sFStateFct_c<16dAcOislandNusi_c> = .data:0x00000158; // type:object size:0x14
__vt__29sFState_c<16dAcOislandNusi_c> = .data:0x00000170; // type:object size:0x18
__vt__31sFStateID_c<16dAcOislandNusi_c> = .data:0x00000214; // type:object size:0x34
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_413_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte
lbl_413_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte
lbl_413_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte
lbl_413_bss_8 = .bss:0x00000008; // type:object size:0xC scope:local data:4byte
StateID_Wait__16dAcOislandNusi_c = .bss:0x00000018; // type:object size:0x30 data:4byte
StateID_NusiFight__16dAcOislandNusi_c = .bss:0x00000058; // type:object size:0x30 data:4byte
34 changes: 5 additions & 29 deletions config/SOUE01/splits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,35 +199,11 @@ d/d_text_writer.cpp:
toBeSorted/time_area_mgr.cpp:
.text start:0x800B9280 end:0x800BB2A0

toBeSorted/sceneflag_manager.cpp:
.text start:0x800BD8C0 end:0x800BE7A8
.sbss start:0x805753E0 end:0x805753F0
.bss start:0x805A78D0 end:0x805A7AD8

toBeSorted/misc_flag_managers.cpp:
.text start:0x800BE7B0 end:0x800BEE00
.data start:0x80510CDC end:0x80510D04
.sbss start:0x805753F0 end:0x805753FC
.bss start:0x805A7AD8 end:0x805A9AD8

toBeSorted/flag_space.cpp:
.text start:0x800BEE00 end:0x800BEF90
.data start:0x80510D04 end:0x80510D10

toBeSorted/unk_flag_stuff.cpp:
.text start:0x800BEF90 end:0x800BF200

toBeSorted/bitwise_flag_helper.cpp:
.text start:0x800BF200 end:0x800BF264

toBeSorted/dungeonflag_manager.cpp:
.text start:0x800BF8D0 end:0x800BFB9C
.bss start:0x805A9C58 end:0x805A9C68

toBeSorted/skipflag_manager.cpp:
.text start:0x800BFBA0 end:0x800BFE00
.sbss start:0x80575408 end:0x8057540C
.bss start:0x805A9C68 end:0x805A9C88
d/flag/flag_managers.cpp:
.text start:0x800BD8C0 end:0x800C0650
.data start:0x80510B88 end:0x80510D10
.sbss start:0x805753E0 end:0x80575410
.bss start:0x805A78D0 end:0x805A9C88

toBeSorted/special_item_drop_mgr.cpp:
.text start:0x800C7B60 end:0x800C82B0
Expand Down
Loading

0 comments on commit 7cf0b89

Please sign in to comment.