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

Small fixes

Browse Source
This commit is contained in:
robojumper
2024-10-25 22:57:11 +02:00
parent 10cda76020
commit 38db6c087d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+1 -1
View File
@@ -34304,7 +34304,7 @@ __vt__58sFState_c<Q39dCsGame_c15lytItemCursor_c16lytCrawShotCsr_c> = .data:0x805
__vt__Q39dCsGame_c15lytItemCursor_c16lytPachinkoCsr_c = .data:0x8052F0A8; // type:object size:0x10
__vt__84sFStateMgr_c<Q39dCsGame_c15lytItemCursor_c16lytPachinkoCsr_c,20sStateMethodUsr_FI_c> = .data:0x8052F0B8; // type:object size:0x30
__vt__114sStateMgr_c<Q39dCsGame_c15lytItemCursor_c16lytPachinkoCsr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x8052F0E8; // type:object size:0x30
__vt__61sFStateFct_c<Q39init__Q39dCsGame_c15lytItemCursor_c14lytVacuumCsr_cFvdCsGame_c15lytItemCursor_c16lytPachinkoCsr_c> = .data:0x8052F118; // type:object size:0x18
__vt__61sFStateFct_c<Q39dCsGame_c15lytItemCursor_c16lytPachinkoCsr_c> = .data:0x8052F118; // type:object size:0x18
__vt__58sFState_c<Q39dCsGame_c15lytItemCursor_c16lytPachinkoCsr_c> = .data:0x8052F130; // type:object size:0x18
__vt__Q39dCsGame_c15lytItemCursor_c15lytDowsingCsr_c = .data:0x8052F148; // type:object size:0x10
__vt__83sFStateMgr_c<Q39dCsGame_c15lytItemCursor_c15lytDowsingCsr_c,20sStateMethodUsr_FI_c> = .data:0x8052F158; // type:object size:0x30
tools/ghidra_scripts/DecompMapToGhidra.py
+1 -1
View File
@@ -233,7 +233,7 @@ def update_addr(addr, mangled_name, create_function=False):
createLabel(addr, symbol_str, namespace, True, IMPORTED)
if create_function:
createFunction(addr, postprocessed)
createFunction(addr, name_list[-1])
if symbol_needs_history(mangled_name):
unit.setComment(PLATE_COMMENT, complete_plate_comment)
tools/ghidra_scripts/demangle.py
+4 -2
View File
@@ -363,7 +363,8 @@ def resolve_templates(s, remangle_add_length):
break
elif re.match(r'[-\d]+[>,]', s[i:]) != None:
# Integer literal
literal = re.match(r'[-\d]+', s[i:])[0]
# ss/robojumper: fix [0] -> .group(0)
literal = re.match(r'[-\d]+', s[i:]).group(0)
template_str += literal if is_demangle() else 'XLi%sEE' % literal.replace('-', 'n')
i += len(literal)
else:
@@ -518,7 +519,8 @@ def demangle_try(s):
try:
return demangle(s)
except Exception as e:
sys.stderr.write('Demangler error: ' + str(e) + '\n')
# ss/robojumper: more context
sys.stderr.write('Demangler error: ' + str(e) + ' trying to demangle ' + s + '\n')
raise e
def main():