mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-13 20:24:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some large functions in d_tag_processor (#86)

Browse Source 
* d_tag_processor WIP

* Progress

* Unconst

* Fix switch command (thanks Roeming!)

* Match a random text related file instead

* More progress

* More progress

* No missing breaks

* Some repair

* Some repair and shuffling

* More repair

* a bit better

* a bit better 2

* what a switch order

* Closer unrolling

* Minor cleanup

* Fix accidental cases

* More fixes

* even better

* More fixes

* Down to regswaps

* Some renames

* Review feedback

* cleanup more sdata2 values and eventFlowTextProcessingRelated match

---------

Co-authored-by: elijah-thomas774 <elijahthomas774@gmail.com>
This commit is contained in:
robojumper
2024-11-06 23:19:40 +01:00
committed by GitHub
parent 25f6797ab8
commit d3d4bd253c
13 changed files with 1644 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/splits.txt
+18 -2
View File
@@ -192,9 +192,22 @@ d/lyt/d_window.cpp:
.data start:0x80510820 end:0x805108B0
.sdata2 start:0x805797F0 end:0x805797F8
d/d_text_writer.cpp:
d/d_textunk.cpp:
.text start:0x800B1890 end:0x800B20DC
.ctors start:0x804DB6D0 end:0x804DB6D4
.data start:0x805108C8 end:0x805108D8
.sdata start:0x805722D8 end:0x805722E0
.sbss start:0x805753B0 end:0x805753B8
.sdata2 start:0x805797F8 end:0x80579848
.bss start:0x805A6F70 end:0x805A7730
d/d_tag_processor.cpp:
.text start:0x800B35C0 end:0x800B9274
.ctors start:0x804DB6D4 end:0x804DB6D8
.rodata start:0x804E4C34 end:0x804E4C50
.data start:0x805108E8 end:0x805109A0
.sdata2 start:0x8057986C end:0x805798D0
.bss start:0x805A7730 end:0x805A78B8
toBeSorted/time_area_mgr.cpp:
.text start:0x800B9280 end:0x800BB2A0
@@ -347,8 +360,11 @@ d/lyt/d_lyt_msg_window_select_btn.cpp:
.text start:0x8011C8D0 end:0x80120988
.ctors start:0x804DB73C end:0x804DB740
d/lyt/d_lyt_msg_window_base.cpp:
.text start:0x80120A20 end:0x80120A98
d/lyt/d_lyt_msg_window_talk.cpp:
.text start:0x80120A20 end:0x801223C8
.text start:0x80120AA0 end:0x801223C8
.ctors start:0x804DB740 end:0x804DB744
d/lyt/d_lyt_msg_window_link.cpp:
config/SOUE01/symbols.txt
+72 -72
View File
@@ -3783,7 +3783,7 @@ syncAnmFrame__Q23d2d14AnmGroupBase_cFv = .text:0x800AC910; // type:function size
setForward__Q23d2d14AnmGroupBase_cFv = .text:0x800AC920; // type:function size:0x14
setBackward__Q23d2d14AnmGroupBase_cFv = .text:0x800AC940; // type:function size:0x14
fn_800AC960 = .text:0x800AC960; // type:function size:0x4C
init__Q23d2d9AnmGroupsFPQ23d2d10AnmGroup_cPQ23d2d15LytBrlanMappingUlPQ23m2d10ResAccIf_cPQ23d2d8Layout_c = .text:0x800AC9B0; // type:function size:0x80
init__Q23d2d9AnmGroupsFPQ23d2d10AnmGroup_cPCQ23d2d15LytBrlanMappingUlPQ23m2d10ResAccIf_cPQ23d2d8Layout_c = .text:0x800AC9B0; // type:function size:0x80
remove__Q23d2d9AnmGroupsFv = .text:0x800ACA30; // type:function size:0x64
draw__Q23d2d9LytBase_cFv = .text:0x800ACAA0; // type:function size:0x18
fn_800ACAC0 = .text:0x800ACAC0; // type:function size:0x5C
@@ -3868,25 +3868,25 @@ UpdateSize__9dWindow_cFP10dTextBox_cf = .text:0x800B1670; // type:function size:
GetRuntimeTypeInfo__Q34nw4r3lyt6WindowCFv = .text:0x800B17B0; // type:function size:0x8 scope:weak
__dt__9dWindow_cFv = .text:0x800B17C0; // type:function size:0x58
__dt__Q34nw4r3lyt19ArcResourceAccessorFv = .text:0x800B1820; // type:function size:0x6C scope:weak
fn_800B1890 = .text:0x800B1890; // type:function size:0x40
fn_800B18D0 = .text:0x800B18D0; // type:function size:0x4D4
fn_800B1DB0 = .text:0x800B1DB0; // type:function size:0x15C
fn_800B1F10 = .text:0x800B1F10; // type:function size:0x34
fn_800B1F50 = .text:0x800B1F50; // type:function size:0x8
fn_800B1F60 = .text:0x800B1F60; // type:function size:0x4
fn_800B1F70 = .text:0x800B1F70; // type:function size:0x4C
fn_800B1FC0 = .text:0x800B1FC0; // type:function size:0x8
fn_800B1FD0 = .text:0x800B1FD0; // type:function size:0x8
fn_800B1FE0 = .text:0x800B1FE0; // type:function size:0x8
fn_800B1FF0 = .text:0x800B1FF0; // type:function size:0x8
fn_800B2000 = .text:0x800B2000; // type:function size:0x8
fn_800B2010 = .text:0x800B2010; // type:function size:0x8
fn_800B2020 = .text:0x800B2020; // type:function size:0x8
fn_800B2030 = .text:0x800B2030; // type:function size:0x8
fn_800B2040 = .text:0x800B2040; // type:function size:0x8
fn_800B2050 = .text:0x800B2050; // type:function size:0x40
fn_800B2090 = .text:0x800B2090; // type:function size:0x40
fn_800B20D0 = .text:0x800B20D0; // type:function size:0xC
__dt__12UnkTextThingFv = .text:0x800B1890; // type:function size:0x40
__ct__12UnkTextThingFv = .text:0x800B18D0; // type:function size:0x4D4
destroy__12UnkTextThingFv = .text:0x800B1DB0; // type:function size:0x15C
fn_800B1F10__12UnkTextThingFv = .text:0x800B1F10; // type:function size:0x34
allocUnk__12UnkTextThingFUli = .text:0x800B1F50; // type:function size:0x8
destroyUnk__12UnkTextThingFPv = .text:0x800B1F60; // type:function size:0x4
fn_800B1F70__12UnkTextThingFv = .text:0x800B1F70; // type:function size:0x4C
fn_800B1FC0__12UnkTextThingFv = .text:0x800B1FC0; // type:function size:0x8
fn_800B1FD0__12UnkTextThingFv = .text:0x800B1FD0; // type:function size:0x8
fn_800B1FE0__12UnkTextThingFv = .text:0x800B1FE0; // type:function size:0x8
fn_800B1FF0__12UnkTextThingFv = .text:0x800B1FF0; // type:function size:0x8
fn_800B2000__12UnkTextThingFv = .text:0x800B2000; // type:function size:0x8
fn_800B2010__12UnkTextThingFv = .text:0x800B2010; // type:function size:0x8
fn_800B2020__12UnkTextThingFv = .text:0x800B2020; // type:function size:0x8
fn_800B2030__12UnkTextThingFv = .text:0x800B2030; // type:function size:0x8
fn_800B2040__12UnkTextThingFv = .text:0x800B2040; // type:function size:0x8
destroyMsg__12UnkTextThingFP8MsbtInfo = .text:0x800B2050; // type:function size:0x40
destroyFlow__12UnkTextThingFP8MsbfInfo = .text:0x800B2090; // type:function size:0x40
__sinit_\d_textunk_cpp = .text:0x800B20D0; // type:function size:0xC scope:local
LytMsgWindowUnk__ctor = .text:0x800B20E0; // type:function size:0x48
fn_800B2130 = .text:0x800B2130; // type:function size:0x370
textAdvancingRelated = .text:0x800B24A0; // type:function size:0x5FC
@@ -3900,69 +3900,69 @@ fn_800B32E0 = .text:0x800B32E0; // type:function size:0x84
drawTextBlur = .text:0x800B3370; // type:function size:0x138
fn_800B34B0 = .text:0x800B34B0; // type:function size:0x40
fn_800B34F0 = .text:0x800B34F0; // type:function size:0xD0
TextManager__ctor = .text:0x800B35C0; // type:function size:0x260
fn_800B3820 = .text:0x800B3820; // type:function size:0x58
__ct__15dTagProcessor_cFv = .text:0x800B35C0; // type:function size:0x260
__dt__15dTagProcessor_cFv = .text:0x800B3820; // type:function size:0x58
fn_800B3880 = .text:0x800B3880; // type:function size:0x8C
eventFlowTextProcessingRelated = .text:0x800B3910; // type:function size:0x980
eventFlowTextProcessingRelated__15dTagProcessor_cFP10dTextBox_cPCwPwUlPUl = .text:0x800B3910; // type:function size:0x980
fn_800B4290 = .text:0x800B4290; // type:function size:0x5AC
TextManager__Process = .text:0x800B4840; // type:function size:0x10
TextManager__CalcRect = .text:0x800B4850; // type:function size:0x4
TextManager__ProcessTags = .text:0x800B4860; // type:function size:0x78C
fn_800B4FF0 = .text:0x800B4FF0; // type:function size:0x274
TextManager__setColor = .text:0x800B5270; // type:function size:0x214
TextManager__setScale = .text:0x800B5490; // type:function size:0x5C
TextManager__setFramesLeftOnPause = .text:0x800B54F0; // type:function size:0xC
fn_800B5500 = .text:0x800B5500; // type:function size:0x18
fn_800B5520 = .text:0x800B5520; // type:function size:0x14
fn_800B5540 = .text:0x800B5540; // type:function size:0x28
fn_800B5570 = .text:0x800B5570; // type:function size:0x110
fn_800B5680 = .text:0x800B5680; // type:function size:0x1DC
fn_800B5860 = .text:0x800B5860; // type:function size:0x1C0
fn_800B5A20 = .text:0x800B5A20; // type:function size:0x3AC
fn_800B5DD0 = .text:0x800B5DD0; // type:function size:0x1FC
fn_800B5FD0 = .text:0x800B5FD0; // type:function size:0x10C
fn_800B60E0 = .text:0x800B60E0; // type:function size:0x24
fn_800B6110 = .text:0x800B6110; // type:function size:0x24
fn_800B6140 = .text:0x800B6140; // type:function size:0x14
fn_800B6160 = .text:0x800B6160; // type:function size:0x8
fn_800B6170 = .text:0x800B6170; // type:function size:0x14
fn_800B6190 = .text:0x800B6190; // type:function size:0x1C
fn_800B61B0 = .text:0x800B61B0; // type:function size:0x18
fn_800B61D0 = .text:0x800B61D0; // type:function size:0x64
TextManager__changeScale = .text:0x800B6240; // type:function size:0xDC
fn_800B6320 = .text:0x800B6320; // type:function size:0x12C
fn_800B6450 = .text:0x800B6450; // type:function size:0x340
Process__15dTagProcessor_cFUsPQ34nw4r2ut15PrintContext<w> = .text:0x800B4840; // type:function size:0x10
CalcRect__15dTagProcessor_cFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext<w> = .text:0x800B4850; // type:function size:0x4
ProcessTags__15dTagProcessor_cFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext<w> = .text:0x800B4860; // type:function size:0x78C
fn_800B4FF0__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>UcPw = .text:0x800B4FF0; // type:function size:0x274
setColor__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>UcPw = .text:0x800B5270; // type:function size:0x214
setScale__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>UcPw = .text:0x800B5490; // type:function size:0x5C
setFramesLeftOnPause__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>UcPw = .text:0x800B54F0; // type:function size:0xC
fn_800B5500__15dTagProcessor_cFUcPw = .text:0x800B5500; // type:function size:0x18
fn_800B5520__15dTagProcessor_cFPw = .text:0x800B5520; // type:function size:0x14
fn_800B5540__15dTagProcessor_cFPw = .text:0x800B5540; // type:function size:0x28
writeHeroname__15dTagProcessor_cFPwPll = .text:0x800B5570; // type:function size:0x110
writeItem__15dTagProcessor_cFPwPwPll = .text:0x800B5680; // type:function size:0x1DC
writeStringArg__15dTagProcessor_cFPwPwPll = .text:0x800B5860; // type:function size:0x1C0
writeNumericArg__15dTagProcessor_cFPwPwPll = .text:0x800B5A20; // type:function size:0x3AC
fn_800B5DD0__15dTagProcessor_cFPwPwPll = .text:0x800B5DD0; // type:function size:0x1FC
fn_800B5FD0__15dTagProcessor_cFUlPwPl = .text:0x800B5FD0; // type:function size:0x10C
fn_800B60E0__15dTagProcessor_cFUcPw = .text:0x800B60E0; // type:function size:0x24
fn_800B6110__15dTagProcessor_cFUcPw = .text:0x800B6110; // type:function size:0x24
fn_800B6140__15dTagProcessor_cFUcPw = .text:0x800B6140; // type:function size:0x14
playSound__15dTagProcessor_cFUcPw = .text:0x800B6160; // type:function size:0x8
fn_800B6170__15dTagProcessor_cFUcPw = .text:0x800B6170; // type:function size:0x14
fn_800B6190__15dTagProcessor_cFUcPw = .text:0x800B6190; // type:function size:0x1C
fn_800B61B0__15dTagProcessor_cFUcPw = .text:0x800B61B0; // type:function size:0x18
fn_800B61D0__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>UcPw = .text:0x800B61D0; // type:function size:0x64
changeScale__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>b = .text:0x800B6240; // type:function size:0xDC
writeIcon__15dTagProcessor_cFP10dTextBox_cPwf = .text:0x800B6320; // type:function size:0x12C
fn_800B6450__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>UcPw = .text:0x800B6450; // type:function size:0x340
fn_800B6790 = .text:0x800B6790; // type:function size:0x750
fn_800B6EE0 = .text:0x800B6EE0; // type:function size:0x1E8
makeSpaceForIconMaybe__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>Pw = .text:0x800B6EE0; // type:function size:0x1E8
fn_800B70D0 = .text:0x800B70D0; // type:function size:0x3A4
somethingWithScrapperAndMusic = .text:0x800B7480; // type:function size:0xB8
fn_800B7540 = .text:0x800B7540; // type:function size:0x250
fn_800B7790 = .text:0x800B7790; // type:function size:0xD8
symbolToFontIdx = .text:0x800B7870; // type:function size:0x10
restoreColor__15dTagProcessor_cFPQ34nw4r2ut15PrintContext<w>Uc = .text:0x800B7540; // type:function size:0x250
writeTextNormal__15dTagProcessor_cFPCwPwPlUcl = .text:0x800B7790; // type:function size:0xD8
symbolToFontIdx__15dTagProcessor_cFl = .text:0x800B7870; // type:function size:0x10
fn_800B7880 = .text:0x800B7880; // type:function size:0x210
fn_800B7A90 = .text:0x800B7A90; // type:function size:0x9C
fn_800B7B30 = .text:0x800B7B30; // type:function size:0x46C
TextManager__setStringArg = .text:0x800B7FA0; // type:function size:0xA0
fn_800B8040 = .text:0x800B8040; // type:function size:0x1F0
setStringArg__15dTagProcessor_cFPCwl = .text:0x800B7FA0; // type:function size:0xA0
fn_800B8040__15dTagProcessor_cFScUl = .text:0x800B8040; // type:function size:0x1F0
fn_800B8230 = .text:0x800B8230; // type:function size:0x10C
fn_800B8340 = .text:0x800B8340; // type:function size:0x18C
fn_800B84D0 = .text:0x800B84D0; // type:function size:0x8C
fn_800B8560 = .text:0x800B8560; // type:function size:0x54
fn_800B85C0 = .text:0x800B85C0; // type:function size:0x290
fn_800B8850 = .text:0x800B8850; // type:function size:0x38
TextManager__getTextCommands = .text:0x800B8890; // type:function size:0x38
TextManager__process0xFCommand = .text:0x800B88D0; // type:function size:0xC
fn_800B88E0 = .text:0x800B88E0; // type:function size:0x30
fn_800B8910 = .text:0x800B8910; // type:function size:0x1C
fn_800B8930 = .text:0x800B8930; // type:function size:0x30
fn_800B8960 = .text:0x800B8960; // type:function size:0xD8
fn_800B8A40 = .text:0x800B8A40; // type:function size:0x10
TextManager__setNumericArg0 = .text:0x800B8A50; // type:function size:0xC
TextManager__setNumericArgs = .text:0x800B8A60; // type:function size:0xDC
getNumLines__15dTagProcessor_cFl = .text:0x800B8850; // type:function size:0x38
getTextCommand__15dTagProcessor_cFwPCwPUcPlPPw = .text:0x800B8890; // type:function size:0x38
process0xFCommand__15dTagProcessor_cFwPCwPl = .text:0x800B88D0; // type:function size:0xC
tick0x830__15dTagProcessor_cFv = .text:0x800B88E0; // type:function size:0x30
resetSomething__15dTagProcessor_cFv = .text:0x800B8910; // type:function size:0x1C
tickPauseFrame__15dTagProcessor_cFv = .text:0x800B8930; // type:function size:0x30
resetSomeFloats__15dTagProcessor_cFv = .text:0x800B8960; // type:function size:0xD8
getFloat__15dTagProcessor_cFl = .text:0x800B8A40; // type:function size:0x10
setNumericArg0__15dTagProcessor_cFl = .text:0x800B8A50; // type:function size:0xC
setNumericArgs__15dTagProcessor_cFPCll = .text:0x800B8A60; // type:function size:0xDC
fn_800B8B40 = .text:0x800B8B40; // type:function size:0x4C
fn_800B8B90 = .text:0x800B8B90; // type:function size:0x4C
fn_800B8BE0 = .text:0x800B8BE0; // type:function size:0x34
TextManager__sinit = .text:0x800B8C20; // type:function size:0x654
__sinit_\d_tag_processor_cpp = .text:0x800B8C20; // type:function size:0x654 scope:local
__ct__14dTimeAreaMgr_cFv = .text:0x800B9280; // type:function size:0xF0
__dt__19dTimeAreaMgrProcA_cFv = .text:0x800B9370; // type:function size:0x58
__dt__19dTimeAreaMgrProcB_cFv = .text:0x800B93D0; // type:function size:0x58
@@ -30989,12 +30989,12 @@ lbl_8051078C = .data:0x8051078C; // type:object size:0xC
lbl_80510798 = .data:0x80510798; // type:object size:0x88
__vt__9dWindow_c = .data:0x80510820; // type:object size:0x8C
__vt__Q23d2d10ResAccIf_c = .data:0x805108B0; // type:object size:0x18
lbl_805108C8 = .data:0x805108C8; // type:object size:0x10
__vt__12UnkTextThing = .data:0x805108C8; // type:object size:0xC
lbl_805108D8 = .data:0x805108D8; // type:object size:0x10
lbl_805108E8 = .data:0x805108E8; // type:object size:0x10
lbl_805108F8 = .data:0x805108F8; // type:object size:0x14 data:string
jumptable_8051090C = .data:0x8051090C; // type:object size:0x80 scope:local
lbl_8051098C = .data:0x8051098C; // type:object size:0x14
__vt__15dTagProcessor_c = .data:0x8051098C; // type:object size:0x14
lbl_805109A0 = .data:0x805109A0; // type:object size:0x20
lbl_805109C0 = .data:0x805109C0; // type:object size:0x20
lbl_805109E0 = .data:0x805109E0; // type:object size:0x88
@@ -37965,7 +37965,7 @@ lbl_805722BC = .sdata:0x805722BC; // type:object size:0x4
lbl_805722C0 = .sdata:0x805722C0; // type:object size:0x4 data:wstring
lbl_805722C4 = .sdata:0x805722C4; // type:object size:0x8
lbl_805722CC = .sdata:0x805722CC; // type:object size:0xC
lbl_805722D8 = .sdata:0x805722D8; // type:object size:0x8
lbl_805722D8 = .sdata:0x805722D8; // type:object size:0x1
lbl_805722E0 = .sdata:0x805722E0; // type:object size:0x8
lbl_805722E8 = .sdata:0x805722E8; // type:object size:0x8
lbl_805722F0 = .sdata:0x805722F0; // type:object size:0x4 data:4byte
@@ -39932,7 +39932,7 @@ lbl_80575398 = .sbss:0x80575398; // type:object size:0x8 data:byte
SCRAPPER_PICKUP_TARGET = .sbss:0x805753A0; // type:object size:0x8 data:4byte
lbl_805753A8 = .sbss:0x805753A8; // type:object size:0x1 data:byte
lbl_805753AC = .sbss:0x805753AC; // type:object size:0x4 data:4byte
lbl_805753B0 = .sbss:0x805753B0; // type:object size:0x8 data:4byte
sInstance__12UnkTextThing = .sbss:0x805753B0; // type:object size:0x4 data:4byte
lbl_805753B8 = .sbss:0x805753B8; // type:object size:0x1 data:byte
lbl_805753BC = .sbss:0x805753BC; // type:object size:0x4 data:4byte
sInstance__14dTimeAreaMgr_c = .sbss:0x805753C0; // type:object size:0x4 data:4byte
@@ -48338,7 +48338,7 @@ lbl_805A6340 = .bss:0x805A6340; // type:object size:0x30 data:4byte
eventFlowTextStringMaybe1 = .bss:0x805A6370; // type:object size:0x400
eventFlowTextStringMaybe2 = .bss:0x805A6770; // type:object size:0x400
eventFlowTextStringMaybe3 = .bss:0x805A6B70; // type:object size:0x400
eventFlowTextStringMaybe4 = .bss:0x805A6F70; // type:object size:0x7C0
textThing = .bss:0x805A6F70; // type:object size:0x7C0
FontColors1 = .bss:0x805A7730; // type:object size:0xC4 data:byte
FontColors2 = .bss:0x805A77F4; // type:object size:0xC4 data:byte
lbl_805A78B8 = .bss:0x805A78B8; // type:object size:0xC