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.

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

UI splits and symbols in retail #319

Merged
merged 34 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a8009d5
screenshot symbols
rjkiv Aug 22, 2024
0b4e5e1
paneldir symbols
rjkiv Aug 22, 2024
dad4f50
label shrink wrapper symbols
rjkiv Aug 22, 2024
b05b4c1
labelnumberticker symbols
rjkiv Aug 22, 2024
7935bd7
uibutton symbols
rjkiv Aug 22, 2024
5a835fe
uicolor symbols
rjkiv Aug 22, 2024
e4a6ebd
uicomponent symbols
rjkiv Aug 22, 2024
6f58d75
uilabel symbols
rjkiv Aug 22, 2024
44cedab
uifontimporter symbols
rjkiv Aug 22, 2024
5e785c8
uigridprovider symbols
rjkiv Aug 22, 2024
238c445
uilabeldir symbols
rjkiv Aug 22, 2024
8934870
uilist symbols
rjkiv Aug 22, 2024
4386e4e
add scrollselect split, more uilist work
rjkiv Aug 22, 2024
f469c96
uilistcustom symbols
rjkiv Aug 22, 2024
c3830ee
uilistdir symbols
rjkiv Aug 22, 2024
4de97d6
uilistlabel symbols
rjkiv Aug 22, 2024
0ceb5d7
uilistmesh symbols
rjkiv Aug 22, 2024
21caa0a
uilistprovider symbols
rjkiv Aug 22, 2024
87a4cd0
uilistslot symbols
rjkiv Aug 22, 2024
f6cbfdd
uilistslot symbols
rjkiv Aug 22, 2024
c409402
uilistsublist symbols
rjkiv Aug 22, 2024
f56ca4d
uilistsublist symbols
rjkiv Aug 22, 2024
ac68f52
uilistwidget symbols
rjkiv Aug 22, 2024
7759ac3
uipicture symbols
rjkiv Aug 22, 2024
ae6459c
uiproxy symbols
rjkiv Aug 22, 2024
966e6b4
uiscreen symbols
rjkiv Aug 22, 2024
9eed0ee
uislider symbols
rjkiv Aug 22, 2024
81c24dc
uitransitionhandler symbols
rjkiv Aug 22, 2024
34fc4b5
uitrigger symbols
rjkiv Aug 22, 2024
97e9081
more uitrigger symbols
rjkiv Aug 22, 2024
7b55da5
utl symbols
rjkiv Aug 22, 2024
3b1d47c
unmatch appchild on retail so the elf can build (sorry ieee)
rjkiv Aug 22, 2024
097e3f3
Merge branch 'master' into ui-retail
rjkiv Aug 23, 2024
7bfe001
revert uilistslot clear elements
rjkiv Aug 23, 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
32 changes: 31 additions & 1 deletion config/SZBE69/objects.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"system/obj/TextFile.cpp": "NonMatching",
"system/obj/TypeProps.cpp": "NonMatching",

"system/os/AppChild.cpp": "Matching",
"system/os/AppChild.cpp": "Equivalent",
"system/os/ArkFile.cpp": {"status": "NonMatching", "extra_cflags": ["-ipa function"]},
"system/os/NetStream.cpp": "NonMatching",

Expand Down Expand Up @@ -175,8 +175,38 @@

"system/synth/ADSR.cpp": "NonMatching",

"system/ui/LabelNumberTicker.cpp": "NonMatching",
"system/ui/LabelShrinkWrapper.cpp": "NonMatching",
"system/ui/PanelDir.cpp": "NonMatching",
"system/ui/Screenshot.cpp": "NonMatching",
"system/ui/UIButton.cpp": "NonMatching",
"system/ui/UIColor.cpp": "NonMatching",
"system/ui/UIComponent.cpp": "NonMatching",
"system/ui/UIFontImporter.cpp": "NonMatching",
"system/ui/UIGridProvider.cpp": "NonMatching",
"system/ui/UILabel.cpp": "NonMatching",
"system/ui/UILabelDir.cpp": "NonMatching",
"system/ui/UIList.cpp": "NonMatching",
"system/ui/UIListArrow.cpp": "NonMatching",
"system/ui/UIListCustom.cpp": "NonMatching",
"system/ui/UIListDir.cpp": "NonMatching",
"system/ui/UIListHighlight.cpp": "NonMatching",
"system/ui/UIListLabel.cpp": "NonMatching",
"system/ui/UIListMesh.cpp": "NonMatching",
"system/ui/UIListProvider.cpp": "NonMatching",
"system/ui/UIListSlot.cpp": "NonMatching",
"system/ui/UIListState.cpp": "NonMatching",
"system/ui/UIListSubList.cpp": "NonMatching",
"system/ui/UIListWidget.cpp": "NonMatching",
"system/ui/UIPanel.cpp": "NonMatching",
"system/ui/UIPicture.cpp": "NonMatching",
"system/ui/UIProxy.cpp": "NonMatching",
"system/ui/UIResource.cpp": "NonMatching",
"system/ui/UIScreen.cpp": "NonMatching",
"system/ui/UISlider.cpp": "NonMatching",
"system/ui/UITransitionHandler.cpp": "NonMatching",
"system/ui/UITrigger.cpp": "NonMatching",
"system/ui/UIGuide.cpp": "NonMatching",

"system/utl/BinStream.cpp": {"status": "LinkIssues", "comment": "operator<<(int) issues"},
"system/utl/ChunkIDs.cpp": "Matching",
Expand Down
45 changes: 42 additions & 3 deletions config/SZBE69/splits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1254,6 +1254,9 @@ system/ui/PanelDir.cpp:
system/ui/Screenshot.cpp:
.text start:0x8054DBBC end:0x8054E330

system/ui/ScrollSelect.cpp:
.text start:0x8054E330 end:0x8054EB14

system/ui/UI.cpp:
.text start:0x8054EB14 end:0x80552668

Expand All @@ -1273,6 +1276,9 @@ system/ui/UILabel.cpp:
system/ui/UIFontImporter.cpp:
.text start:0x8055A388 end:0x8055F3A8

system/ui/UIGridProvider.cpp:
.text start:0x8055F3A8 end:0x8055FE3C

system/ui/UILabelDir.cpp:
.text start:0x8055FE3C end:0x805618F0

Expand All @@ -1298,8 +1304,17 @@ system/ui/UIListLabel.cpp:
system/ui/UIListMesh.cpp:
.text start:0x8056D844 end:0x8056E024

rb3/unknown/805/unk_80567E84.cpp:
.text start:0x8056E024 end:0x805715CC
system/ui/UIListProvider.cpp:
.text start:0x8056E024 end:0x8056E734

system/ui/UIListSlot.cpp:
.text start:0x8056E734 end:0x8056F2EC

system/ui/UIListState.cpp:
.text start:0x8056F2EC end:0x805708E4

system/ui/UIListSubList.cpp:
.text start:0x805708E4 end:0x805715CC

system/ui/UIListWidget.cpp:
.text start:0x805715CC end:0x805732E0
Expand All @@ -1312,8 +1327,32 @@ system/ui/UIPanel.cpp:
system/ui/UIPicture.cpp:
.text start:0x8057464C end:0x80575698

system/ui/UIProxy.cpp:
.text start:0x80575698 end:0x80576798

system/ui/UIResource.cpp:
.text start:0x80576798 end:0x805768F8

system/ui/UIScreen.cpp:
.text start:0x805768F8 end:0x80578834

system/ui/UISlider.cpp:
.text start:0x80578834 end:0x80579944

system/ui/UITransitionHandler.cpp:
.text start:0x80579944 end:0x80579F10

system/ui/UITrigger.cpp:
.text start:0x80579F10 end:0x8057CDBC

system/ui/UIGuide.cpp:
.text start:0x8057CDBC end:0x8057D224

system/ui/Utl.cpp:
.text start:0x8057D224 end:0x8057D398

rb3/unknown/805/unk_8057464C.cpp:
.text start:0x80575698 end:0x80581A8C
.text start:0x8057D398 end:0x80581A8C

system/world/Crowd.cpp:
.text start:0x8058D868 end:0x80597134
Expand Down
Loading
Loading