Compare commits

..

1 Commits

Author SHA1 Message Date
coah
87a084da31 cleanup(iplSettingButton): rename Unk ring-buffer placeholders
Unk -> CmdEntry; unk_0x64 -> mCmdQueue; capacity/count/read/write
indices. Byte-identical (DOL sha1 unchanged).
2026-10-02 14:06:01 -05:00
668 changed files with 15597 additions and 94013 deletions

View File

@@ -2,8 +2,8 @@ name: README progress
# runs on the self-hosted runner on cole's server so it doesn't use hosted minutes.
# only push/schedule/manual triggers, never pull_request, so fork PRs can't reach this machine.
# it never commits to main: it rebuilds, publishes the numbers to the job summary, and force-pushes
# the README badge JSON as a single commit on the orphan progress-data branch.
# README progress is written inside each landing commit by the orchestrator, so this job never commits;
# it only rebuilds and publishes the current numbers to the job summary.
on:
push:
branches: [main]
@@ -17,7 +17,7 @@ concurrency:
cancel-in-progress: true
permissions:
contents: write
contents: read
jobs:
progress:
@@ -55,17 +55,3 @@ jobs:
python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
sed -n '/progress:start/,/progress:end/p' README.md >> "$GITHUB_STEP_SUMMARY"
git checkout -- README.md
- name: Publish badges
if: github.ref == 'refs/heads/main'
run: |
out="$RUNNER_TEMP/progress-data"
rm -rf "$out"
python3 tools/progress_badges.py build/43U/report.json "$out"
cd "$out"
git init -q -b progress-data
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add .
git commit -q -m "progress for $GITHUB_SHA"
git push -q -f "https://x-access-token:${{ github.token }}@github.com/$GITHUB_REPOSITORY.git" HEAD:refs/heads/progress-data

View File

@@ -7,23 +7,23 @@
<!--- Github Actions Badge -->
[Build Status]: https://github.com/coah80/wii-ipl/actions/workflows/readme-progress.yml/badge.svg?branch=main
[actions]: https://github.com/coah80/wii-ipl/actions/workflows/readme-progress.yml
[Build Status]: https://github.com/coah80/wii-ipl/actions/workflows/build.yml/badge.svg
[actions]: https://github.com/coah80/wii-ipl/actions/workflows/build.yml
<!--- Discord Badge -->
[Discord Badge]: https://img.shields.io/discord/727908905392275526?color=%237289DA&logo=discord&logoColor=%23FFFFFF
[discord]: https://discord.gg/hKx3FJJgrV
<!-- Progress badges: JSON on the progress-data branch, refreshed by the README progress workflow on every push to main -->
<!-- Progress links -->
[progress]: https://github.com/coah80/wii-ipl/actions/workflows/readme-progress.yml
[DecompiledBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Fdecompiled.json
[MatchedBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Fmatched.json
[LinkedBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Flinked.json
[DataBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Fdata.json
[FunctionsBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Ffunctions.json
[UnitsBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Funits.json
[V43U]: https://decomp.dev/koopthekoopa/wii-ipl/43U
<!--- Version 4.3U progress Badge -->
[DecompBadgeV43U]: https://decomp.dev/koopthekoopa/wii-ipl/43U.svg?&measure=code&label=Decompiled&mode=shield&labelColor=%237c7c7c&color=%2333b8ff&style=plastic
[LinkBadgeV43U]: https://decomp.dev/koopthekoopa/wii-ipl/43U.svg?&measure=complete_code&label=Linked&mode=shield&labelColor=%237c7c7c&color=%2333b8ff&style=plastic
[FuncBadgeV43U]: https://decomp.dev/koopthekoopa/wii-ipl/43U.svg?&measure=functions&label=Functions&mode=shield&labelColor=%237c7c7c&color=%2333b8ff&style=plastic
<!--- Header -->
@@ -43,17 +43,28 @@ Live decomp status
[![Build status]][actions]
Every push to `main` rebuilds 4.3U, checks the DOL hash, and refreshes the progress badges below. Open the latest [README progress run][actions] for the full objdiff summary.
Open the latest successful [Build workflow run][actions] and check its summary for the current objdiff metrics. It includes perfect-match/decompiled, fuzzy-match, fully linked, data, function, unit, and category breakdowns. The run also publishes the 43U report artifact and generated decomp-status report.
Supported versions:
- `43U` - Version **4.3U** (USA)
Progress
========
[![DecompiledBadge]][progress] [![MatchedBadge]][progress] [![LinkedBadge]][progress] [![DataBadge]][progress]
[![FunctionsBadge]][progress] [![UnitsBadge]][progress]
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.59% | 90.81% | 71.43% | 99.37% |
units 956/1027 complete, functions 12365/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->
| Version | Progress |
|-----------------------|------------------------------------------------------------------------------|
| [Wii Menu 4.3U][V43U] | [![FuncBadgeV43U]][V43U] [![DecompBadgeV43U]][V43U] [![LinkBadgeV43U]][V43U] |
> You can see the full progress and its history by clicking on one of the versions in the table.
Dependencies
============

View File

@@ -37,9 +37,6 @@ force_active:
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.
block_relocations:
# Run establishes a fixed stack at 0x81600000, not __pformatter + 0x280.
- source: .text:0x8137B468
- source: .text:0x8137B46C
- source: .data:0x8165E15C
- source: .data:0x8165E19C

View File

@@ -95,15 +95,11 @@ AOSS_810BDF18 = .bss:0x810BDF18; // type:object size:0x6A0
AOSS_810BE5B8 = .bss:0x810BE5B8; // type:object size:0x280
AOSS_810BE838 = .bss:0x810BE838; // type:object size:0x68
AOSS_810BE8A0 = .bss:0x810BE8A0; // type:object size:0x400
gAtermIpConfig = .bss:0x810BECA0; // type:object size:0x7C4 data:4byte
gAtermIfConfig = .bss:0x810BF464; // type:object size:0x15E
ATERM_810BECA0 = .bss:0x810BECA0; // type:object size:0x924 data:4byte
ATERM_810BF5C4 = .bss:0x810BF5C4; // type:object size:0x24
ATERM_810BF5E8 = .bss:0x810BF5E8; // type:object size:0x258
gAtermConfigurationResult = .bss:0x810BF840; // type:object size:0xE8
gAtermAssociationRequest = .bss:0x810BF928; // type:object size:0x10
gAtermPacketBuffer = .bss:0x810BF938; // type:object size:0x800
gAtermDecodedResponse = .bss:0x810C0138; // type:object size:0x800 data:2byte
gAtermSession = .bss:0x810C0938; // type:object size:0x20
ATERM_810BF840 = .bss:0x810BF840; // type:object size:0x900
ATERM_810C0140 = .bss:0x810C0140; // type:object size:0x818 data:2byte
AtermThread = .bss:0x810C0958; // type:object size:0x318 scope:local align:32
Voices = .bss:0x810C0C80; // type:object size:0x1800 data:4byte
sZeroMem = .bss:0x810C2480; // type:object size:0x100 data:byte
@@ -118,9 +114,7 @@ ziStringColorRightDestructorRecord = .bss:0x810C65CC; // type:object size:0xC da
underlateColorDestructorRecord = .bss:0x810C65D8; // type:object size:0xC data:4byte
unInputedWCharColorSpaceDestructorRecord = .bss:0x810C65E4; // type:object size:0xC data:4byte
ElementBuffer__Q39textinput8tistring6WithZi = .bss:0x810C65F0; // type:object size:0x200 data:2byte
CandidatesBuffer__Q39textinput8tistring6WithZi = .bss:0x810C67F0; // type:object size:0x200 data:2byte
ElementWorkBuffer__Q39textinput8tistring6WithZi = .bss:0x810C69F0; // type:object size:0x200 data:2byte
PredictionBuffer__Q39textinput8tistring6WithZi = .bss:0x810C6BF0; // type:object size:0x200 data:2byte
CandidatesBuffer__Q39textinput8tistring6WithZi = .bss:0x810C67F0; // type:object size:0x600 data:2byte
CandidatedWord__Q39textinput8tistring6WithZi = .bss:0x810C6DF0; // type:object size:0x1400 data:2byte
LatestWord__Q39textinput8tistring6WithZi = .bss:0x810C81F0; // type:object size:0x80 data:2byte
snWidthTable__Q29textinput10textdrawer = .bss:0x810C8270; // type:object size:0x580 data:4byte
@@ -13910,15 +13904,10 @@ lbl_81610608 = .rodata:0x81610608; // type:object size:0x300
lbl_81610908 = .rodata:0x81610908; // type:object size:0x10
sCaptureSizes__Q23ipl5scene = .rodata:0x81610918; // type:object size:0x10
lbl_81610928 = .rodata:0x81610928; // type:object size:0x20 data:4byte
scAnmTable__Q23ipl5scene = .rodata:0x81610948; // type:object size:0xE8 scope:local
@17203 = .rodata:0x81610A30; // type:object size:0x1C scope:local
@17212 = .rodata:0x81610A4C; // type:object size:0x30 scope:local
@17223 = .rodata:0x81610A7C; // type:object size:0x28 scope:local
@17227 = .rodata:0x81610AA4; // type:object size:0x30 scope:local
@17254 = .rodata:0x81610AD4; // type:object size:0x1C scope:local
@18816 = .rodata:0x81610AF0; // type:object size:0x30 scope:local data:4byte
@18818 = .rodata:0x81610B20; // type:object size:0x60 scope:local data:4byte
@19272 = .rodata:0x81610B80; // type:object size:0x20 scope:local data:wstring
scAnmTable__Q23ipl5scene = .rodata:0x81610948; // type:object size:0x1A8 scope:local
lbl_81610AF0 = .rodata:0x81610AF0; // type:object size:0x30 data:4byte
lbl_81610B20 = .rodata:0x81610B20; // type:object size:0x60 data:4byte
lbl_81610B80 = .rodata:0x81610B80; // type:object size:0x20 data:wstring
scNumber__Q23ipl5scene = .rodata:0x81610BA0; // type:object size:0x14 scope:local data:2byte
scNumber2__Q23ipl5scene = .rodata:0x81610BB4; // type:object size:0x14 scope:local data:2byte
lbl_81610BC8 = .rodata:0x81610BC8; // type:object size:0x1000
@@ -16022,8 +16011,8 @@ mscBasePaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DC18; // type:object
@17309 = .data:0x8164DC42; // type:object size:0xB scope:local data:string
@17310 = .data:0x8164DC4D; // type:object size:0xB scope:local data:string
@17311 = .data:0x8164DC58; // type:object size:0xB scope:local data:string
mscPicturePaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DC64; // type:object size:0x14 data:4byte
mscEdgePaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DC78; // type:object size:0x14 data:4byte
mscUnk0PaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DC64; // type:object size:0x14 data:4byte
mscUnk1PaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DC78; // type:object size:0x14 data:4byte
@17317 = .data:0x8164DC8C; // type:object size:0x9 scope:local data:string
@17318 = .data:0x8164DC95; // type:object size:0x9 scope:local data:string
@17319 = .data:0x8164DC9E; // type:object size:0x9 scope:local data:string
@@ -16049,7 +16038,7 @@ mscClockPaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DCA8; // type:objec
@23740 = .data:0x8164DE49; // type:object size:0x1B scope:local data:string
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
@24295 = .data:0x8164DE80; // type:object size:0x1C scope:local
updateDiskState_jumptable = .data:0x8164DE80; // type:object size:0x1C scope:local
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
@24254 = .data:0x8164DEA7; // type:object size:0x10 scope:local data:string
@24282 = .data:0x8164DEB7; // type:object size:0x12 scope:local data:string
@@ -17176,23 +17165,7 @@ sSettingAPPaneNames__Q23ipl5scene = .data:0x81656978; // type:object size:0x68 d
sSettingAPAnimations__Q23ipl5scene = .data:0x81656B6C; // type:object size:0x4C data:4byte
@25442 = .data:0x81656BB8; // type:object size:0xF scope:local data:string
@25443 = .data:0x81656BC7; // type:object size:0x1C scope:local data:string
@25501 = .data:0x81656BE3; // type:object size:0xF scope:local data:string
@25502 = .data:0x81656BF2; // type:object size:0x14 scope:local data:string
@25503 = .data:0x81656C06; // type:object size:0x18 scope:local data:string
@25505 = .data:0x81656C1E; // type:object size:0x1A scope:local data:string
@25506 = .data:0x81656C38; // type:object size:0x13 scope:local data:string
@25508 = .data:0x81656C4B; // type:object size:0x9 scope:local data:string
@25509 = .data:0x81656C54; // type:object size:0x12 scope:local data:string
@25510 = .data:0x81656C66; // type:object size:0xC scope:local data:string
@25616 = .data:0x81656C72; // type:object size:0xD scope:local data:string
@25618 = .data:0x81656C7F; // type:object size:0xF scope:local data:string
@25620 = .data:0x81656C8E; // type:object size:0x14 scope:local data:string
@25621 = .data:0x81656CA2; // type:object size:0x1A scope:local data:string
@25622 = .data:0x81656CBC; // type:object size:0x19 scope:local data:string
@25623 = .data:0x81656CD5; // type:object size:0xE scope:local data:string
@25624 = .data:0x81656CE3; // type:object size:0x13 scope:local data:string
@25625 = .data:0x81656CF6; // type:object size:0x18 scope:local data:string
@25628 = .data:0x81656D0E; // type:object size:0x19 scope:local data:string
@17193 = .data:0x81656D27; // type:object size:0xC scope:local data:string
@17194 = .data:0x81656D33; // type:object size:0x20 scope:local data:string
@17197 = .data:0x81656D53; // type:object size:0xD scope:local data:string
@@ -17206,32 +17179,10 @@ sSettingAPAnimations__Q23ipl5scene = .data:0x81656B6C; // type:object size:0x4C
@17250 = .data:0x81656DFA; // type:object size:0x11 scope:local data:string
@17251 = .data:0x81656E0B; // type:object size:0x9 scope:local data:string
@17252 = .data:0x81656E14; // type:object size:0xD scope:local data:string
@25720 = .data:0x81656E21; // type:object size:0x23 scope:local data:string
@25721 = .data:0x81656E44; // type:object size:0xD scope:local data:string
@25722 = .data:0x81656E51; // type:object size:0xD scope:local data:string
@25723 = .data:0x81656E5E; // type:object size:0xD scope:local data:string
@25724 = .data:0x81656E6B; // type:object size:0x25 scope:local data:string
@25726 = .data:0x81656E90; // type:object size:0x15 scope:local data:string
@25747 = .data:0x81656EA5; // type:object size:0x1B scope:local data:string
@25766 = .data:0x81656EC0; // type:object size:0x1D scope:local data:string
@25767 = .data:0x81656EDD; // type:object size:0x11 scope:local data:string
@25768 = .data:0x81656EEE; // type:object size:0x1D scope:local data:string
@26292 = .data:0x81656F0B; // type:object size:0xF scope:local data:string
@26293 = .data:0x81656F1A; // type:object size:0xD scope:local data:string
@26294 = .data:0x81656F27; // type:object size:0x11 scope:local data:string
@26295 = .data:0x81656F38; // type:object size:0x11 scope:local data:string
@26296 = .data:0x81656F49; // type:object size:0xA scope:local data:string
@26297 = .data:0x81656F53; // type:object size:0xD scope:local data:string
@26300 = .data:0x81656F60; // type:object size:0x1A0 scope:local
@26299 = .data:0x81657100; // type:object size:0x48 scope:local
@26346 = .data:0x81657148; // type:object size:0x26 scope:local data:string
@26347 = .data:0x8165716E; // type:object size:0xF scope:local data:string
@26348 = .data:0x8165717D; // type:object size:0xE scope:local data:string
@26349 = .data:0x8165718B; // type:object size:0xA scope:local data:string
@26350 = .data:0x81657195; // type:object size:0xB scope:local data:string
@26351 = .data:0x816571A0; // type:object size:0x16 scope:local data:string
@26353 = .data:0x816571B6; // type:object size:0x11 scope:local data:string
@26354 = .data:0x816571C7; // type:object size:0x16 scope:local data:string
@26502 = .data:0x816571DD; // type:object size:0xF scope:local data:string
@26534 = .data:0x816571EC; // type:object size:0x18 scope:local data:string
@26536 = .data:0x81657204; // type:object size:0x44 scope:local
@@ -17265,11 +17216,6 @@ sSettingAPAnimations__Q23ipl5scene = .data:0x81656B6C; // type:object size:0x4C
@28326 = .data:0x81657642; // type:object size:0x2A scope:local data:string
@28370 = .data:0x8165766C; // type:object size:0x10 scope:local data:string
@28383 = .data:0x8165767C; // type:object size:0x14 scope:local data:string
@28436 = .data:0x81657690; // type:object size:0x16 scope:local data:string
@28437 = .data:0x816576A6; // type:object size:0xF scope:local data:string
@28438 = .data:0x816576B5; // type:object size:0x13 scope:local data:string
@28439 = .data:0x816576C8; // type:object size:0x1A scope:local data:string
@28440 = .data:0x816576E2; // type:object size:0x1B scope:local data:string
@28442 = .data:0x81657700; // type:object size:0x84 scope:local
__vt__Q33ipl5scene7APEvent = .data:0x81657784; // type:object size:0x18
__vt__Q33ipl5scene7Setting = .data:0x8165779C; // type:object size:0x68
@@ -18112,7 +18058,7 @@ __vt__Q49textinput6extend4memo15AppearMemoState = .data:0x81667FA0; // type:obje
__vt__Q49textinput6extend4memo13DispMemoState = .data:0x81667FF8; // type:object size:0x58
__vt__Q49textinput6extend4memo5State = .data:0x81668050; // type:object size:0x58
__vt__Q49textinput6extend4memo7Manager = .data:0x816680A8; // type:object size:0x140
lbl_816681E8 = .data:0x816681E8; // type:object size:0x24
lbl_816681E8 = .data:0x816681E8; // type:object size:0x28
lbl_81668210 = .data:0x81668210; // type:object size:0x9 data:string
lbl_8166821C = .data:0x8166821C; // type:object size:0x9 data:string
lbl_81668228 = .data:0x81668228; // type:object size:0x9 data:string
@@ -22427,93 +22373,93 @@ lbl_81696FD0 = .sdata:0x81696FD0; // type:object size:0x6 data:wstring
lbl_81696FD6 = .sdata:0x81696FD6; // type:object size:0x4 data:wstring
lbl_81696FDA = .sdata:0x81696FDA; // type:object size:0x7 data:string
lbl_81696FE1 = .sdata:0x81696FE1; // type:object size:0x7 data:string
@16789 = .sdata:0x81696FE8; // type:object size:0x6 data:string
@16790 = .sdata:0x81696FEE; // type:object size:0x6 data:string
@16791 = .sdata:0x81696FF4; // type:object size:0x6 data:string
@16792 = .sdata:0x81696FFA; // type:object size:0x6 data:string
@16793 = .sdata:0x81697000; // type:object size:0x7 data:string
@16794 = .sdata:0x81697007; // type:object size:0x7 data:string
sSettingArrowNames__Q23ipl5scene = .sdata:0x81697010; // type:object size:0x8 data:4byte
@16795 = .sdata:0x81697018; // type:object size:0x8 data:string
@16796 = .sdata:0x81697020; // type:object size:0x8 data:string
@16797 = .sdata:0x81697028; // type:object size:0x8 data:string
@16798 = .sdata:0x81697030; // type:object size:0x8 data:string
@16799 = .sdata:0x81697038; // type:object size:0x8 data:string
@16800 = .sdata:0x81697040; // type:object size:0x8 data:string
@16801 = .sdata:0x81697048; // type:object size:0x6 data:string
@16802 = .sdata:0x8169704E; // type:object size:0x6 data:string
@16803 = .sdata:0x81697054; // type:object size:0x6 data:string
@16804 = .sdata:0x8169705A; // type:object size:0x6 data:string
@16805 = .sdata:0x81697060; // type:object size:0x6 data:string
@16806 = .sdata:0x81697066; // type:object size:0x6 data:string
@16809 = .sdata:0x8169706C; // type:object size:0x7 data:string
@16810 = .sdata:0x81697073; // type:object size:0x7 data:string
@16811 = .sdata:0x8169707A; // type:object size:0x8 data:string
@16812 = .sdata:0x81697082; // type:object size:0x7 data:string
@16813 = .sdata:0x81697089; // type:object size:0x6 data:string
@16814 = .sdata:0x8169708F; // type:object size:0x6 data:string
@16815 = .sdata:0x81697095; // type:object size:0x6 data:string
@16816 = .sdata:0x8169709B; // type:object size:0x6 data:string
@16817 = .sdata:0x816970A1; // type:object size:0x6 data:string
@16818 = .sdata:0x816970A7; // type:object size:0x6 data:string
@16819 = .sdata:0x816970AD; // type:object size:0x6 data:string
@16820 = .sdata:0x816970B3; // type:object size:0x6 data:string
@16827 = .sdata:0x816970B9; // type:object size:0x8 data:string
@16828 = .sdata:0x816970C1; // type:object size:0x8 data:string
@16829 = .sdata:0x816970C9; // type:object size:0x8 data:string
@16830 = .sdata:0x816970D1; // type:object size:0x8 data:string
@16831 = .sdata:0x816970D9; // type:object size:0x8 data:string
@16832 = .sdata:0x816970E1; // type:object size:0x8 data:string
@25504 = .sdata:0x816970E9; // type:object size:0x4 data:string
@25507 = .sdata:0x816970ED; // type:object size:0x4 data:string
@25617 = .sdata:0x816970F1; // type:object size:0x5 data:string
@25619 = .sdata:0x816970F6; // type:object size:0x4 data:string
@25626 = .sdata:0x816970FA; // type:object size:0x7 data:string
@25627 = .sdata:0x81697101; // type:object size:0x7 data:string
@17202 = .sdata:0x81697108; // type:object size:0x3 data:string
@17205 = .sdata:0x8169710B; // type:object size:0x6 data:string
@17206 = .sdata:0x81697111; // type:object size:0x7 data:string
@17207 = .sdata:0x81697118; // type:object size:0x6 data:string
@17208 = .sdata:0x8169711E; // type:object size:0x1
@17209 = .sdata:0x8169711F; // type:object size:0x6 data:string
@17210 = .sdata:0x81697125; // type:object size:0x6 data:string
@17211 = .sdata:0x8169712B; // type:object size:0x6 data:string
@17214 = .sdata:0x81697131; // type:object size:0x4 data:string
@17215 = .sdata:0x81697135; // type:object size:0x4 data:string
@17216 = .sdata:0x81697139; // type:object size:0x4 data:string
@17217 = .sdata:0x8169713D; // type:object size:0x4 data:string
@17218 = .sdata:0x81697141; // type:object size:0x4 data:string
@17219 = .sdata:0x81697145; // type:object size:0x4 data:string
@17220 = .sdata:0x81697149; // type:object size:0x4 data:string
@17221 = .sdata:0x8169714D; // type:object size:0x4 data:string
@17222 = .sdata:0x81697151; // type:object size:0x4 data:string
@17248 = .sdata:0x81697155; // type:object size:0x8 data:string
@17249 = .sdata:0x8169715D; // type:object size:0x6 data:string
@17253 = .sdata:0x81697163; // type:object size:0x7 data:string
@25725 = .sdata:0x8169716A; // type:object size:0x4 data:string
@26352 = .sdata:0x8169716E; // type:object size:0x5 data:string
@26503 = .sdata:0x81697173; // type:object size:0x7 data:string
@26504 = .sdata:0x8169717A; // type:object size:0x5 data:string
@26505 = .sdata:0x8169717F; // type:object size:0x5 data:string
@26506 = .sdata:0x81697184; // type:object size:0x5 data:string
@26625 = .sdata:0x8169718A; // type:object size:0x2
@26851 = .sdata:0x8169718C; // type:object size:0x3 data:string
@18811 = .sdata:0x8169718F; // type:object size:0x2 data:string
@18812 = .sdata:0x81697191; // type:object size:0x2 data:string
@18813 = .sdata:0x81697193; // type:object size:0x2 data:string
@18814 = .sdata:0x81697195; // type:object size:0x2 data:string
@18815 = .sdata:0x81697197; // type:object size:0x2 data:string
@27404 = .sdata:0x81697199; // type:object size:0x6 data:string
@27405 = .sdata:0x8169719F; // type:object size:0x6 data:string
@27406 = .sdata:0x816971A5; // type:object size:0x6 data:string
@27407 = .sdata:0x816971AB; // type:object size:0x6 data:string
@27556 = .sdata:0x816971B1; // type:object size:0x6 data:string
@27557 = .sdata:0x816971B7; // type:object size:0x6 data:string
@27558 = .sdata:0x816971BD; // type:object size:0x6 data:string
@27559 = .sdata:0x816971C3; // type:object size:0x6 data:string
@27560 = .sdata:0x816971C9; // type:object size:0x7 data:string
@27862 = .sdata:0x816971D0; // type:object size:0x3 data:string
@28152 = .sdata:0x816971D4; // type:object size:0x8 data:wstring
lbl_81696FE8 = .sdata:0x81696FE8; // type:object size:0x6 data:string
lbl_81696FEE = .sdata:0x81696FEE; // type:object size:0x6 data:string
lbl_81696FF4 = .sdata:0x81696FF4; // type:object size:0x6 data:string
lbl_81696FFA = .sdata:0x81696FFA; // type:object size:0x6 data:string
lbl_81697000 = .sdata:0x81697000; // type:object size:0x7 data:string
lbl_81697007 = .sdata:0x81697007; // type:object size:0x7 data:string
lbl_81697010 = .sdata:0x81697010; // type:object size:0x8 data:4byte
lbl_81697018 = .sdata:0x81697018; // type:object size:0x8 data:string
lbl_81697020 = .sdata:0x81697020; // type:object size:0x8 data:string
lbl_81697028 = .sdata:0x81697028; // type:object size:0x8 data:string
lbl_81697030 = .sdata:0x81697030; // type:object size:0x8 data:string
lbl_81697038 = .sdata:0x81697038; // type:object size:0x8 data:string
lbl_81697040 = .sdata:0x81697040; // type:object size:0x8 data:string
lbl_81697048 = .sdata:0x81697048; // type:object size:0x6 data:string
lbl_8169704E = .sdata:0x8169704E; // type:object size:0x6 data:string
lbl_81697054 = .sdata:0x81697054; // type:object size:0x6 data:string
lbl_8169705A = .sdata:0x8169705A; // type:object size:0x6 data:string
lbl_81697060 = .sdata:0x81697060; // type:object size:0x6 data:string
lbl_81697066 = .sdata:0x81697066; // type:object size:0x6 data:string
lbl_8169706C = .sdata:0x8169706C; // type:object size:0x7 data:string
lbl_81697073 = .sdata:0x81697073; // type:object size:0x7 data:string
lbl_8169707A = .sdata:0x8169707A; // type:object size:0x8 data:string
lbl_81697082 = .sdata:0x81697082; // type:object size:0x7 data:string
lbl_81697089 = .sdata:0x81697089; // type:object size:0x6 data:string
lbl_8169708F = .sdata:0x8169708F; // type:object size:0x6 data:string
lbl_81697095 = .sdata:0x81697095; // type:object size:0x6 data:string
lbl_8169709B = .sdata:0x8169709B; // type:object size:0x6 data:string
lbl_816970A1 = .sdata:0x816970A1; // type:object size:0x6 data:string
lbl_816970A7 = .sdata:0x816970A7; // type:object size:0x6 data:string
lbl_816970AD = .sdata:0x816970AD; // type:object size:0x6 data:string
lbl_816970B3 = .sdata:0x816970B3; // type:object size:0x6 data:string
lbl_816970B9 = .sdata:0x816970B9; // type:object size:0x8 data:string
lbl_816970C1 = .sdata:0x816970C1; // type:object size:0x8 data:string
lbl_816970C9 = .sdata:0x816970C9; // type:object size:0x8 data:string
lbl_816970D1 = .sdata:0x816970D1; // type:object size:0x8 data:string
lbl_816970D9 = .sdata:0x816970D9; // type:object size:0x8 data:string
lbl_816970E1 = .sdata:0x816970E1; // type:object size:0x8 data:string
lbl_816970E9 = .sdata:0x816970E9; // type:object size:0x4 data:string
lbl_816970ED = .sdata:0x816970ED; // type:object size:0x4 data:string
lbl_816970F1 = .sdata:0x816970F1; // type:object size:0x5 data:string
lbl_816970F6 = .sdata:0x816970F6; // type:object size:0x4 data:string
lbl_816970FA = .sdata:0x816970FA; // type:object size:0x7 data:string
lbl_81697101 = .sdata:0x81697101; // type:object size:0x7 data:string
lbl_81697108 = .sdata:0x81697108; // type:object size:0x3 data:string
lbl_8169710B = .sdata:0x8169710B; // type:object size:0x6 data:string
lbl_81697111 = .sdata:0x81697111; // type:object size:0x7 data:string
lbl_81697118 = .sdata:0x81697118; // type:object size:0x6 data:string
lbl_8169711E = .sdata:0x8169711E; // type:object size:0x1
lbl_8169711F = .sdata:0x8169711F; // type:object size:0x6 data:string
lbl_81697125 = .sdata:0x81697125; // type:object size:0x6 data:string
lbl_8169712B = .sdata:0x8169712B; // type:object size:0x6 data:string
lbl_81697131 = .sdata:0x81697131; // type:object size:0x4 data:string
lbl_81697135 = .sdata:0x81697135; // type:object size:0x4 data:string
lbl_81697139 = .sdata:0x81697139; // type:object size:0x4 data:string
lbl_8169713D = .sdata:0x8169713D; // type:object size:0x4 data:string
lbl_81697141 = .sdata:0x81697141; // type:object size:0x4 data:string
lbl_81697145 = .sdata:0x81697145; // type:object size:0x4 data:string
lbl_81697149 = .sdata:0x81697149; // type:object size:0x4 data:string
lbl_8169714D = .sdata:0x8169714D; // type:object size:0x4 data:string
lbl_81697151 = .sdata:0x81697151; // type:object size:0x4 data:string
lbl_81697155 = .sdata:0x81697155; // type:object size:0x8 data:string
lbl_8169715D = .sdata:0x8169715D; // type:object size:0x6 data:string
lbl_81697163 = .sdata:0x81697163; // type:object size:0x7 data:string
lbl_8169716A = .sdata:0x8169716A; // type:object size:0x4 data:string
lbl_8169716E = .sdata:0x8169716E; // type:object size:0x5 data:string
lbl_81697173 = .sdata:0x81697173; // type:object size:0x7 data:string
lbl_8169717A = .sdata:0x8169717A; // type:object size:0x5 data:string
lbl_8169717F = .sdata:0x8169717F; // type:object size:0x5 data:string
lbl_81697184 = .sdata:0x81697184; // type:object size:0x5 data:string
lbl_8169718A = .sdata:0x8169718A; // type:object size:0x2
lbl_8169718C = .sdata:0x8169718C; // type:object size:0x3 data:string
lbl_8169718F = .sdata:0x8169718F; // type:object size:0x2 data:string
lbl_81697191 = .sdata:0x81697191; // type:object size:0x2 data:string
lbl_81697193 = .sdata:0x81697193; // type:object size:0x2 data:string
lbl_81697195 = .sdata:0x81697195; // type:object size:0x2 data:string
lbl_81697197 = .sdata:0x81697197; // type:object size:0x2 data:string
lbl_81697199 = .sdata:0x81697199; // type:object size:0x6 data:string
lbl_8169719F = .sdata:0x8169719F; // type:object size:0x6 data:string
lbl_816971A5 = .sdata:0x816971A5; // type:object size:0x6 data:string
lbl_816971AB = .sdata:0x816971AB; // type:object size:0x6 data:string
lbl_816971B1 = .sdata:0x816971B1; // type:object size:0x6 data:string
lbl_816971B7 = .sdata:0x816971B7; // type:object size:0x6 data:string
lbl_816971BD = .sdata:0x816971BD; // type:object size:0x6 data:string
lbl_816971C3 = .sdata:0x816971C3; // type:object size:0x6 data:string
lbl_816971C9 = .sdata:0x816971C9; // type:object size:0x7 data:string
lbl_816971D0 = .sdata:0x816971D0; // type:object size:0x3 data:string
lbl_816971D4 = .sdata:0x816971D4; // type:object size:0x8 data:wstring
@12299 = .sdata:0x816971E0; // type:object size:0x5 scope:local data:string
@12302 = .sdata:0x816971E5; // type:object size:0x5 scope:local data:string
lbl_816971F0 = .sdata:0x816971F0; // type:object size:0x4 data:string
@@ -23281,7 +23227,7 @@ lbl_81698388 = .sdata:0x81698388; // type:object size:0x2 data:string
lbl_8169838C = .sdata:0x8169838C; // type:object size:0x4 data:string
lbl_81698390 = .sdata:0x81698390; // type:object size:0x1 data:byte
lbl_81698391 = .sdata:0x81698391; // type:object size:0x1 data:byte
lbl_81698394 = .sdata:0x81698394; // type:object size:0x4 data:string
lbl_81698394 = .sdata:0x81698394; // type:object size:0x2 data:string
lbl_81698398 = .sdata:0x81698398; // type:object size:0x2 data:string
lbl_8169839C = .sdata:0x8169839C; // type:object size:0x4
drvInitFunc = .sdata:0x816983A0; // type:object size:0x8 scope:local data:4byte

View File

@@ -648,7 +648,7 @@ config.libs = [
Object(Matching, "system/iplDialogWindow.cpp"),
Object(Matching, "system/iplHomeButtonMenu.cpp"),
Object(Matching, "system/iplNandSDWorker.cpp"),
Object(Matching, "system/iplKeyboard.cpp"),
Object(Equivalent, "system/iplKeyboard.cpp"),
Object(Matching, "system/iplErrorHandler.cpp"),
Object(Matching, "system/iplResetHandler.cpp"),
Object(Matching, "system/iplWarningHandler.cpp"),
@@ -727,7 +727,7 @@ config.libs = [
]
),
IPLSection("address", [
Object(Matching, "scene/address/iplAddress.cpp"),
Object(NonMatching, "scene/address/iplAddress.cpp"),
Object(Matching, "scene/address/iplAddressAddSel.cpp"),
Object(NonMatching, "scene/address/iplAddressEdit.cpp"),
]
@@ -766,9 +766,9 @@ config.libs = [
]
),
IPLSection("channelSelect", [
Object(Matching, "scene/channelSelect/iplChannelSelect.cpp"),
Object(Equivalent, "scene/channelSelect/iplChannelSelect.cpp"),
Object(Matching, "scene/channelSelect/iplClock.cpp"),
Object(Matching, "scene/channelSelect/iplChannelObj.cpp"),
Object(Equivalent, "scene/channelSelect/iplChannelObj.cpp"),
]
),
IPLSection("channelTitle", [
@@ -879,7 +879,7 @@ config.libs = [
Object(NonMatching, "scene/setting/AOSSLink.c"),
Object(Matching, "scene/setting/iplRakuRakuThread.cpp"),
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline on"]),
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
]
),
IPLSection("settingSelect", [
@@ -908,13 +908,13 @@ config.libs = [
),
# it decides to do fast optimization for this one
IPLSection("keyboard", [
Object(Matching, "keyboard/tiPcKeyboard.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiCellPhone.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiPcKeyboard.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiCellPhone.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiInputForm.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiCandidateBox.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiToolBar.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiPredictLang.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiSignWindow.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiSignWindow.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
@@ -982,7 +982,7 @@ config.libs = [
),
ZI8Lib("zi8clib", [
Object(Matching, "clib/zaddress.c"),
Object(Matching, "clib/zconvert.c"),
Object(NonMatching, "clib/zconvert.c"),
Object(NonMatching, "clib/zi81key.c"),
Object(NonMatching, "clib/zi8alpha.c"),
Object(Matching, "clib/zi8alts.c"),
@@ -997,7 +997,7 @@ config.libs = [
Object(Matching, "clib/zi8is.c"),
Object(NonMatching, "clib/zi8match.c"),
Object(Matching, "clib/zi8misc.c"),
Object(Matching, "clib/zi8pud2.c"),
Object(NonMatching, "clib/zi8pud2.c"),
Object(Matching, "clib/Zi8punct.c"),
Object(Matching, "clib/zi8space.c"),
Object(NonMatching, "clib/zi8uwd.c"),
@@ -1022,7 +1022,7 @@ config.libs = [
Object(Matching, "cdb/CDBFileSystem.c"),
Object(Matching, "cdb/CDBFileSystemVF.c"),
Object(Matching, "cdb/CDBFileSystemSD.c"),
Object(Matching, "cdb/CDBRecord.c"),
Object(NonMatching, "cdb/CDBRecord.c"),
Object(Matching, "cdb/CDBRecordFile.c"),
Object(Matching, "cdb/CDBRecordKey.c"),
Object(Matching, "cdb/CDBIntArray.c"),
@@ -1043,7 +1043,7 @@ config.libs = [
RevoEXLib("net", [
Object(Matching, "net/nettime.c"),
Object(Matching, "net/crc.c"),
Object(Matching, "net/md5.c"),
Object(NonMatching, "net/md5.c"),
Object(Matching, "net/sha1.c"),
Object(Matching, "net/hmac.c"),
Object(Matching, "net/neterrorcode.c"),
@@ -1081,15 +1081,15 @@ config.libs = [
Object(Matching, "nwc24/NWC24Parser.c"),
Object(Matching, "nwc24/NWC24MsgCommit.c"),
Object(Matching, "nwc24/NWC24MsgRead.c"),
Object(Matching, "nwc24/NWC24MsgSubject.c"),
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
Object(Matching, "nwc24/NWC24Schedule.c"),
Object(Matching, "nwc24/NWC24DateParser.c"),
Object(NonMatching, "nwc24/NWC24DateParser.c"),
Object(Matching, "nwc24/NWC24FriendList.c"),
Object(Matching, "nwc24/NWC24SecretFList.c"),
Object(Matching, "nwc24/NWC24UserId.c"),
Object(Matching, "nwc24/NWC24Time.c"),
Object(Matching, "nwc24/NWC24Ipc.c"),
Object(Matching, "nwc24/NWC24Download.c"),
Object(Equivalent, "nwc24/NWC24Download.c"),
Object(Matching, "nwc24/NWC24CHJump.c"),
Object(Matching, "nwc24/NWC24System.c"),
]
@@ -1218,7 +1218,7 @@ config.libs = [
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
Object(NonMatching, "texturecvtr/Texture_MCUtoRGBA8.c"),
Object(Matching, "b65/iqdec_b65_frv32.c"),
Object(NonMatching, "b65/iqdec_b65_frv32.c"),
]
),
# NW4R
@@ -1299,7 +1299,7 @@ config.libs = [
Object(Matching, "ut/ut_RomFont.cpp"),
Object(Matching, "ut/ut_ResFontBase.cpp"),
Object(Matching, "ut/ut_ResFont.cpp"),
Object(Matching, "ut/ut_ArchiveFontBase.cpp"),
Object(NonMatching, "ut/ut_ArchiveFontBase.cpp"),
Object(Matching, "ut/ut_ArchiveFont.cpp"),
Object(Matching, "ut/ut_CharWriter.cpp"),
Object(Matching, "ut/ut_TextWriterBase.cpp"),
@@ -1388,7 +1388,7 @@ config.libs = [
]
),
RVLSDKLib("vi", [
Object(Matching, "vi/vi.c"),
Object(NonMatching, "vi/vi.c"),
Object(Matching, "vi/i2c.c"),
Object(Matching, "vi/vi3in1.c"),
]
@@ -1559,7 +1559,7 @@ config.libs = [
]
),
RVLSDKLib("kpad", [
Object(Matching, "kpad/KPAD.c"),
Object(NonMatching, "kpad/KPAD.c"),
]
),
RVLSDKLib("euart", [
@@ -1674,7 +1674,7 @@ config.libs = [
),
RVLSDKLib("wad", [
Object(Matching, "wad/certs.c"),
Object(Matching, "wad/wad.c"),
Object(NonMatching, "wad/wad.c"),
]
),
RVLSDKLib("cnt", [
@@ -1691,7 +1691,7 @@ config.libs = [
Object(Matching, "fa/pdm_bpb.c"),
Object(Matching, "fa/pdm_disk.c"),
Object(NonMatching, "fa/pdm_partition.c"),
Object(Matching, "fa/pf_cache.c"),
Object(NonMatching, "fa/pf_cache.c"),
Object(Matching, "fa/pf_cluster.c"),
Object(Matching, "fa/pf_dir.c"),
Object(Matching, "fa/pf_entry.c"),
@@ -1826,7 +1826,7 @@ config.libs = [
Object(Matching, "fa/pfs_unmount.c"),
Object(Matching, "fa/pf_stub_unicode.c"),
Object(Matching, "fa/api/FAAttach.c"),
Object(NonMatching, "fa/api/FAAttach.c"),
Object(Matching, "fa/api/FABuffering.c"),
Object(Matching, "fa/api/FACreate.c"),
Object(Matching, "fa/api/FACreatedir.c"),
@@ -1908,7 +1908,7 @@ config.libs = [
[
Object(Matching, "core/eggAllocator.cpp"),
Object(Matching, "core/eggAudioArcPlayerMgr.cpp"),
Object(Matching, "core/eggAudioExpMgr.cpp"),
Object(Equivalent, "core/eggAudioExpMgr.cpp"),
Object(Matching, "core/eggAudioFxMgr.cpp"),
Object(Matching, "core/eggAudioMgr.cpp"),
Object(Matching, "core/eggAudioHeapMgr.cpp"),
@@ -1970,7 +1970,7 @@ config.libs = [
Object(Matching, "MSL_Common/time.c", extra_cflags=["-Cpp_exceptions on"]),
Object(Matching, "MSL_Common/wctype.c"),
Object(Matching, "MSL_Common/wmem.c"),
Object(Matching, "MSL_Common/wprintf.c", extra_cflags=["-Cpp_exceptions on"]),
Object(NonMatching, "MSL_Common/wprintf.c", extra_cflags=["-Cpp_exceptions on"]),
Object(Matching, "MSL_Common/wstring.c"),
Object(Matching, "MSL_Common/wchar_io.c"),
Object(Matching, "PPC_EABI/time.dolphin.c"),

View File

@@ -24,7 +24,7 @@ typedef struct BS2UpdateHeader {
typedef struct BS2UpdateEntry {
// Update Meta Data
vu32 type; // 0x00
u32 type; // 0x00
u32 attr; // 0x04
u32 size; // 0x08
u32 depend; // 0x0C

View File

@@ -38,12 +38,12 @@ private:
private:
SetupParam mSetupParam; // 0x9C
bool mReserved; // 0xB0
bool unk_0xB0; // 0xB0
bool mIsSetData; // 0xB1
bool mIsPlaying; // 0xB2
bool mIsSetBuf; // 0xB3
bool mThreadRunning; // 0xB4
bool mbFillInCallback; // 0xB5
bool unk_0xB5; // 0xB5
WaveFileAiff mAiff; // 0xB8
WaveFileWav mWav; // 0xE8

View File

@@ -24,7 +24,7 @@ public:
virtual void setDataCur(u32 sampleOffset) = 0;
private:
undefined4 mReserved; // 0x04
undefined4 unk_0x04; // 0x04
};
class WaveFileAiff : public WaveFile {

View File

@@ -15,13 +15,13 @@ public:
AXVPB* getAXVPB() { return mpVPB; }
u32 getState() { return mState; }
u32 getUnk_0x08() { return mStopResetState; }
int getUpdateFlag() { return mUpdateFlag; }
u32 getUnk_0x08() { return unk_0x08; }
int getUnk_0x0C() { return unk_0x0C; }
void setAXVPB(AXVPB* newVal) { mpVPB = newVal; }
void setState(u32 newVal) { mState = newVal; }
void setUnk_0x08(u32 newVal) { mStopResetState = newVal; }
void setUpdateFlag(u32 newVal) { mUpdateFlag = newVal; }
void setUnk_0x08(u32 newVal) { unk_0x08 = newVal; }
void setUnk_0x0C(u32 newVal) { unk_0x0C = newVal; }
AXPBMIX* getMix() { return &mMix; }
@@ -30,8 +30,8 @@ public:
private:
AXVPB* mpVPB; // 0x00
u32 mState; // 0x04
u32 mStopResetState; // 0x08
int mUpdateFlag; // 0x0c
u32 unk_0x08; // 0x08
int unk_0x0C; // 0x0c
AXPBMIX mMix; // 0x10
};

View File

@@ -64,7 +64,7 @@ private:
SimpleWavePlayer mWavePlayer; // 0x18
AxAdpcmSimplePlayer mAdpcmPlayer; // 0x500
AxAdpcmHandle mAdpcmHandle; // 0x508
u8 mReserved; // 0x510
u8 unk_0x510; // 0x510
f32 mMasterVolume; // 0x514
};

View File

@@ -72,7 +72,7 @@ typedef struct CHANSVmObjHdr CHANSVmObjHdr;
typedef struct CHANSVmNativeClass CHANSVmNativeClass;
typedef struct {
vmU8 reserved; // 0x00
vmU8 unk_0x00; // 0x00
vmS32 val; // 0x01
} vmInt32ObjVal;
@@ -168,7 +168,7 @@ typedef struct CHANSVmNativeMethod {
u8 hasStar; // 0x06
u8 pad_0x07; // 0x07
CHANSVmFunction func; // 0x08
undefined reserved[0x14]; // 0x0C
undefined unk_0x0C[0x14]; // 0x0C
} CHANSVmNativeMethod;
typedef struct CHANSVmPropertyList {
@@ -184,7 +184,7 @@ typedef struct CHANSVmNativeProperty {
u8 pad_0x07; // 0x07
CHANSVmFunction getter; // 0x08
CHANSVmFunction setter; // 0x0C
undefined reserved[0x10]; // 0x10
undefined unk_0x10[0x10]; // 0x10
} CHANSVmNativeProperty;
struct CHANSVmNativeClass {
@@ -200,7 +200,7 @@ struct CHANSVmNativeClass {
vmSize nameLength; // 0x18
char sName[4]; // 0x1C
undefined classNameStorage[0x1C];
undefined unk_0x20[0x1C];
};
#ifdef __cplusplus

View File

@@ -131,7 +131,7 @@ typedef struct CHANSVmPrivate {
vmU32 exeStart; // 0x08
vmU32 exeSize; // 0x0C
vmS32 depth; // 0x10
vmU8 reserved[4]; // 0x14
vmU8 unk_0x14[4]; // 0x14
CHANSVmExecutionCtx* pContextListHead; // 0x18
vmU32 minFreeHeapSize; // 0x1C
vmU8* pHeapStart; // 0x20

View File

@@ -7,7 +7,7 @@ namespace ipl {
namespace memorycard {
typedef struct FileInfo {
u16 fileNo; // 0x00
volatile u16 size; // 0x02
u16 size; // 0x02
u8 canCopy; // 0x04
u8 canMove; // 0x05
u16 unk_0x06; // 0x06
@@ -15,11 +15,11 @@ namespace ipl {
} FileInfo; // 0x0C
typedef struct CardState {
vu8 reservedState; // 0x00
vu8 unk_0x00; // 0x00
vu8 changed; // 0x01
vs16 state; // 0x02
vu16 reservedSlot; // 0x04
vu16 reservedCommand; // 0x06
vu16 unk_0x04; // 0x04
vu16 unk_0x06; // 0x06
vu32 key; // 0x08
vu16 unk_0x0C; // 0x0C
vu16 unk_0x0E; // 0x0E
@@ -28,7 +28,7 @@ namespace ipl {
} CardState; // 0x14
typedef struct IconState {
volatile u8 bannerEnable; // 0x00
u8 bannerEnable; // 0x00
u8 unk_0x01; // 0x01
u8 unk_0x02; // 0x02
u8 bannerType; // 0x03

View File

@@ -139,13 +139,13 @@ namespace www {
namespace ext_ead {
namespace www {
typedef struct ImeData {
u32 eventType; // 0x00
u32 unk_0x00; // 0x00
u32 imeID; // 0x04
char* text; // 0x08
u32 creationDataA; // 0x0c
u32 creationDataB; // 0x10
u32 creationDataC; // 0x14
u32 creationDataD; // 0x18
u32 unk_0x0C; // 0x0c
u32 unk_0x10; // 0x10
u32 unk_0x14; // 0x14
u32 unk_0x18; // 0x18
u32 maxLength; // 0x1c
ImeData& operator=(const ImeData&);
@@ -177,7 +177,7 @@ namespace ext_ead {
struct {
u32 imeID;
char* str;
u32 updateData;
u32 unk_0x0C;
} updateIme; // ID 4
u32 raw[6];
} data;
@@ -203,12 +203,12 @@ namespace ext_ead {
void CreateImeData(ImeData* data, const WWWIMEData* wwwData);
void DisposeImeData(ImeData* data);
void CommitIme(ImeData* data, const char* text);
void CommitIme(ImeData* data, const char* something);
void CommitImeCmdPacket(const CmdPacket* data);
void UpdateImeCmdPacket(const CmdPacket* data);
static void FlushCallback(WWWRect* rect, int callbackData);
static void FlushCallback(WWWRect* rect, int unk);
u32* GetRaster() { return mpRaster; }
WWWHandle* GetHandle() { return mpBrowserHandle; }
@@ -222,7 +222,7 @@ namespace ext_ead {
bool CheckThreadExit_();
void InitSurface_();
void InitFonts_(const char* fontDirectory);
void InitFonts_(const char* unk);
void SendKeyboardEvent_(u32 btnMask, u32 triggerFlag, u32 releaseFlag, WWWKeySym sym);
WWWKeySym GetKeyboardSym_(u32 input);

View File

@@ -70,7 +70,7 @@ namespace ext_ead {
u32 mWidth; // 0x04
u32 mHeight; // 0x08
u32 mReserved; // 0x0C
u32 unk_0x0C; // 0x0C
OSMutex mMutex; // 0x10
BrowserThread* mpBrowserThread; // 0x28

View File

@@ -23,7 +23,7 @@ namespace ext_ead {
void SendNotifyEvent(WWWEvent event, WWWHandleEventData* dataHandle);
void ExecuteEvent();
void UpdateTexture();
void* GetTextureBuffer(int pageOffset, bool forUpdate, WWWRect** rectPtrOut);
void* GetTextureBuffer(int a, bool b, WWWRect** rectPtrOut);
void SetWindowSize(int w, int h);
WWWHandlewindow* GetHandleWindow() { return mpWwwWindow; };
@@ -55,11 +55,11 @@ namespace ext_ead {
u32 mRenderingMode; // 0x2AC
public:
int mDisplayPageIndex; // 0x2B0
u32 mDisplayBufferIndices[2]; // 0x2B4
u32 mUpdateBufferIndex; // 0x2BC
u32 mUpdatePageIndex; // 0x2C0
u8 mPageLoadStatus[6]; // 0x2C4
int unk_0x2B0; // 0x2B0
u32 unk_0x2B4[2]; // 0x2B4
u32 unk_0x2BC; // 0x2BC
u32 unk_0x2C0; // 0x2C0
u8 unk_0x2C4[6]; // 0x2C4
};
} // namespace www
} // namespace ext_ead

View File

@@ -38,7 +38,7 @@ namespace textinput {
InputForm(textinput::Manager* manager, nw4r::lyt::MultiArcResourceAccessor* multiArc,
const char* layoutName, EventObserver* event, const char* fontName)
: textinput::InputForm(manager, multiArc, layoutName, event, fontName),
mpMemoPane(NULL), mpMemoRootPane(NULL), mpBoundPane(NULL), mpDrawPane(NULL),
unk_0x308(NULL), unk_0x30C(NULL), unk_0x310(NULL), unk_0x314(NULL),
mfScroll(0.0f), mfScrollFrom(0.0f), mfScrollTo(0.0f), mnLine(0),
mDrawRect(), mDefaultDrawSize(), mDefaultBoundSize(), mExScrollAnm(),
mpNigaoeObserver(NULL), mpDefaultNigaoe(NULL), mpSendString(NULL),
@@ -159,11 +159,11 @@ namespace textinput {
nw4r::lyt::Pane* mpDrawPane;
#else
#ifdef MYTIMANAGER_IMPLEMENTATION
undefined4* mpMemoPane;
undefined4* unk_0x308;
#endif
undefined4* mpMemoRootPane;
undefined4* mpBoundPane;
undefined4* mpDrawPane;
undefined4* unk_0x30C;
undefined4* unk_0x310;
undefined4* unk_0x314;
#endif
f32 mfScroll; // 0x318
f32 mfScrollFrom; // 0x31C

View File

@@ -20,7 +20,7 @@ namespace textinput {
InputForm(textinput::Manager* manager, nw4r::lyt::MultiArcResourceAccessor* multiArc,
const char* layoutName, EventObserver* event, const char* fontName)
: textinput::MemoInputForm(manager, multiArc, layoutName, event, fontName),
mbPhotoScaledUp(0), mbPhotoDraw(false), meType(T_MailAddressSel) {}
unk_0x400(0), mbPhotoDraw(false), meType(T_MailAddressSel) {}
#endif
#ifdef MYTILETTERFORM_IMPLEMENTATION
@@ -50,7 +50,7 @@ namespace textinput {
#ifdef MYTILETTERFORM_IMPLEMENTATION
bool mbPhotoScaledUp;
#else
u8 mbPhotoScaledUp;
u8 unk_0x400;
#endif
bool mbPhotoDraw; // 0x401
Type meType; // 0x404

View File

@@ -142,6 +142,9 @@ namespace textinput {
// TODO enum?
int getInputType() const;
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
void resetHoldingButton();
#endif
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_IMPLEMENTATION)

View File

@@ -69,9 +69,6 @@
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) override;
virtual bool updateInput(input::HKBManager& hkbManager) override;
#endif
#if defined(TI_CELLPHONE_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
void resetHoldingButton();
#endif
#ifdef TI_CELLPHONE_IMPLEMENTATION
virtual ~LayoutByNW4R();
virtual void create(MEMAllocator* allocator) override;
@@ -98,6 +95,7 @@
virtual void changeSpaceKeyTop(const PaneNameToCharCode* keys);
void setUpperCaseJP(bool enabled);
void setLangKeyActive(bool enabled);
void resetHoldingButton();
private:
bool mbLineFeedButton;

View File

@@ -74,16 +74,8 @@ namespace textinput {
virtual void onEvent(GUIComponent& comp, u32 event, void* data) {} // 0x0C
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void setLatestEventCtrlNo(int ctrlNo);
#else
virtual void setLatestEventCtrlNo(int ctrlNo) { muLatestEventCtrlNo = ctrlNo; } // 0x10
#endif
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual int getLatestEventCtrlNo();
#else
virtual int getLatestEventCtrlNo() { return muLatestEventCtrlNo; } // 0x14
#endif
protected:
int muLatestEventCtrlNo; // 0x04
@@ -117,11 +109,7 @@ namespace textinput {
: GUIInterface(), mbInitialize(false), mDraggingButton(0xFFFF), mID(id), mbTriggerTarget(false), mpManager(NULL), mpListener(NULL) {
init();
}
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual ~GUIComponent();
#else
virtual ~GUIComponent() {} // 0x08
#endif
virtual u32 getID() { return mID; } // 0x20
@@ -158,11 +146,7 @@ namespace textinput {
}
virtual bool isTriggerTarget() { return mbTriggerTarget; } // 0x48
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void setTriggerTarget(bool bEnable);
#else
virtual void setTriggerTarget(bool bEnable) { mbTriggerTarget = bEnable; } // 0x4C
#endif
void setParentManager(GUIManager* manager) { mpManager = manager; }
GUIManager* getParentManager() { return mpManager; }

View File

@@ -241,7 +241,7 @@ namespace textinput {
#endif
#endif
private:
u8 mKeyboardStateStorage[0xFC];
u8 unk_0x00[0xFC];
static HKBManager sInstance;
};

View File

@@ -52,17 +52,17 @@ namespace textinput {
const Manager *mgr() const { return mpManager; }
Manager* mpManager; // 0x10
u8 mbShiftTapPending; // 0x14
u8 field_0x14; // 0x14
#ifdef TIINPUTFORM_IMPLEMENTATION
u8 mbSingleQuoteClosing;
u8 mbDoubleQuoteClosing;
#else
#ifdef TIHWKEYBOARD_IMPLEMENTATION
bool mbSingleQuoteClosing;
bool mbDoubleQuoteClosing;
bool field_0x15;
bool field_0x16;
#else
u8 mbSingleQuoteClosing; // 0x15
u8 mbDoubleQuoteClosing; // 0x16
u8 field_0x15; // 0x15
u8 field_0x16; // 0x16
#endif
#endif
};

View File

@@ -414,9 +414,9 @@ namespace textinput {
#else
private:
#ifdef MYTIMANAGER_IMPLEMENTATION
u8 mInputStateStorage[0x48];
u8 unk_0x2C0[0x48];
#else
u8 mInputStateStorage[0x4C];
u8 unk_0x2C0[0x4C];
#endif
#endif
};

View File

@@ -47,11 +47,7 @@ namespace textinput {
#else
virtual Language getLanguage() const { return meLanguage; }
#endif
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void update();
#else
virtual void update() {}
#endif
#else
virtual Language getLanguage() const;
virtual void update();

View File

@@ -64,11 +64,7 @@ namespace textinput {
virtual void setWCString(const wchar_t* string);
virtual void setLanguage(Language language);
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual Language getLanguage() const;
#else
virtual Language getLanguage() const { return meLanguage; }
#endif
#ifdef MYTIMANAGER_IMPLEMENTATION
Language getLanguageForMemo() const { return meLanguage; }
#endif
@@ -129,26 +125,14 @@ namespace textinput {
#ifdef TIHWKEYBOARD_IMPLEMENTATION
EventObserver* getEventObserverForHardware() const { return mpEventObserver; }
#endif
#ifdef TISIGNWINDOW_IMPLEMENTATION
virtual InputForm* getInputForm();
#else
virtual InputForm* getInputForm() { return mpInputForm; }
#endif
virtual const InputForm* getInputForm() const { return mpInputForm; }
virtual keyboard::hwkey::HWKeyboard* getHWKeyboard() { return mpHWKeyboard; }
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const;
#else
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const { return mpHWKeyboard; }
#endif
virtual keyboard::pctype::LayoutByNW4R* getPCKeyboard() { return mpPCKeyboard; }
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const;
#else
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const { return mpPCKeyboard; }
#endif
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
@@ -165,11 +149,7 @@ namespace textinput {
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual const toolbar::LayoutByNW4R* getToolBar() const;
#else
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
#endif
#ifdef TIMANAGER_IMPLEMENTATION
virtual void* getPredictLanguageSelectDialog();

View File

@@ -24,10 +24,10 @@ namespace textinput {
u8 remaining[8];
#else
// todo
u32 controller; // 0x00
u32 field_0x00; // 0x00
u8 dummy[8];
u32 trigger; // 0x0C
u32 hold; // 0x10
u32 field_0x0C; // 0x0C
u32 field_0x10; // 0x10
u8 dummy2[12];
#endif
} Input;
@@ -36,11 +36,7 @@ namespace textinput {
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, Input* input) = 0; // 0x18
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void setEventObserver(EventObserver *event);
#else
virtual void setEventObserver(EventObserver *event) { mpEventObserver = event; } // 0x1C
#endif
protected:
EventObserver* mpEventObserver; // 0x08
@@ -101,19 +97,25 @@ namespace textinput {
virtual void calc(); // 0x0C
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void onAnmEvent(AnmPaneEvent);
virtual void onAnmEvent(AnmPaneEvent) {}
#else
virtual void onAnmEvent(AnmPaneEvent paneEvent);
#endif // 0x10
virtual void changeAnimation(u32 id); // 0x14
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual bool isInAnimation();
virtual bool isInAnimation() { return mpCurrentAnim != NULL; }
#else
virtual bool isInAnimation();
#endif // 0x18
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual Anim* searchAnimation(u32 id);
virtual Anim* searchAnimation(u32 id) {
for (Anim* animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, NULL)); animation != NULL;
animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, animation))) {
if (animation->muID == id) return animation;
}
return NULL;
}
#else
virtual Anim* searchAnimation(u32 id);
#endif // 0x1C
@@ -245,22 +247,14 @@ namespace textinput {
virtual bool updateInput(int point, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0x20
virtual bool updateInput(input::HKBManager& hkbManager); // 0x24
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual TiLayout* getLayout();
#else
virtual TiLayout* getLayout() { return mpLayout; } // 0x28
#endif
virtual nw4r::lyt::Pane* getPane(const char* paneName); // 0x2C
virtual const nw4r::lyt::Pane* getPane(const char* paneName) const; // 0x30
virtual u32 getFlightDuration(int point, const char* paneName); // 0x34
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void setAnimOn(bool flag);
#else
virtual void setAnimOn(bool flag) { mbAnimOn = flag; } // 0x38
#endif
virtual void drawPane(const char* paneName); // 0x3C
@@ -288,16 +282,8 @@ namespace textinput {
virtual AnmPane* searchAnmPane(const char* paneName); // 0x60
virtual AnmPane* searchAnmPane(wchar_t ch); // 0x64
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual nw4r::ut::List& getAnmPaneList();
#else
virtual nw4r::ut::List& getAnmPaneList() { return mAnmPanes; } // 0x68
#endif
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual gui::PaneManager* getPaneManager();
#else
virtual gui::PaneManager* getPaneManager() { return mpPaneManager; } // 0x6C
#endif
virtual void AdjustPaneMtx(Mtx& mtx, const nw4r::lyt::DrawInfo& drawInfo, const nw4r::math::MTX34& mGlobalMtx); // 0x70

View File

@@ -191,11 +191,7 @@ namespace textinput {
#endif
virtual ~Base();
virtual void create(MEMAllocator* allocator);
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void init();
#else
virtual inline void init();
#endif
virtual void updateFromReceiver(u32 command, void* data);
virtual void onKey(u32 event, void* data);
virtual int getType();
@@ -227,9 +223,6 @@ namespace textinput {
virtual void updateFixMode();
protected:
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
inline void initializeKeyState();
#endif
State mState;
const LanguageData* mpInitialLanguageData;
KeyState mKeyState;
@@ -308,8 +301,6 @@ namespace textinput {
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mpKeyboardEventHandler(NULL),
mShiftButton(1, this, this), mCapsButton(0, this, this), mModePanel(2, this, this) {}
#elif defined(TI_PC_KEYBOARD_IMPLEMENTATION)
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName);
#endif
virtual ~LayoutByNW4R();
virtual void create(MEMAllocator* allocator);
@@ -361,15 +352,6 @@ namespace textinput {
UIModePanel mModePanel;
};
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
class Sample : public LayoutByNW4R {
public:
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
: LayoutByNW4R(manager, accessor, observer, layoutName) {}
virtual ~Sample() {}
};
#endif
class AnmPane : public nw4rmanager::AnmPane {
public:
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer), mAnimation(0) {}

View File

@@ -18,7 +18,6 @@ struct LanguageDependency {
class Base : public KeyboardBase {
public:
Base(Manager* manager) : mpAllocator(NULL), mpManager(manager) {}
virtual ~Base();
virtual void create(MEMAllocator*) override;
virtual void init() override;
@@ -46,8 +45,6 @@ class EventHandler;
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
public:
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mbActive(false), mbInput(false), mpEventHandler(NULL), mpKeyboard(NULL) {}
virtual ~LayoutByNW4R();
virtual void create(MEMAllocator*) override;
virtual void init() override;
@@ -78,9 +75,7 @@ public:
class Sample : public LayoutByNW4R {
public:
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
: LayoutByNW4R(manager, accessor, observer, layoutName) {}
virtual ~Sample() {}
virtual ~Sample();
};
class EventHandler : public nw4rmanager::TiEventHandler {

View File

@@ -72,7 +72,7 @@ namespace textinput {
wchar_t mOutput[5];
#else
private:
u8 mKanaStateStorage[0x24];
u8 field_0x00[0x24];
#endif
};
@@ -81,7 +81,7 @@ namespace textinput {
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
Decolated(u16 maxLen) : StringBase(maxLen), mCursorStart(0), mCursorEnd(0), mbSustain(false), mTranslateMode(0) { initKanaConverter(); }
#else
Decolated(u16 maxLen) : StringBase(maxLen), mCursorStart(0), mCursorEnd(0), mbSustain(0), mTranslateMode(0) { initKanaConverter(); }
Decolated(u16 maxLen) : StringBase(maxLen), field_0x18(0), field_0x1C(0), field_0x20(0), field_0x24(0) { initKanaConverter(); }
#endif
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
@@ -181,10 +181,10 @@ namespace textinput {
u32 mTranslateMode;
#endif
#else
u32 mCursorStart; // 0x18
u32 mCursorEnd; // 0x1C
u8 mbSustain; // 0x20
u32 mTranslateMode; // 0x24
u32 field_0x18; // 0x18
u32 field_0x1C; // 0x1C
u8 field_0x20; // 0x20
u32 field_0x24; // 0x24
#endif
KanaStream mKanaStream; // 0x28
};

View File

@@ -38,7 +38,7 @@ namespace textinput {
nw4r::ut::Rect rect;
wchar_t character;
#else
u8 rectangleAndCharacterStorage[32];
u8 unk_0x00[32];
#endif
} DrawInfo;
@@ -177,7 +177,7 @@ namespace textinput {
u32 muDrawCacheStartPos;
#else
private:
u8 mDrawStateStorage[0x78];
u8 unk_0x50[0x78];
#endif
bool mbSecretMode; // 0xC8
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
@@ -202,7 +202,7 @@ namespace textinput {
f32 mfDrawScrollY;
u8 mDrawCacheState[0x14];
#else
u8 mCacheStateStorage[0x3C];
u8 unk_0xCC[0x3C];
#endif
#endif
};

View File

@@ -14,17 +14,9 @@ namespace textinput {
Base(Manager* manager) : mQwerty(true), meLanguage(USA), mpAllocator(NULL), mpManager(manager) {}
#endif
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void create(MEMAllocator* allocator);
#else
virtual void create(MEMAllocator* allocator) { mpAllocator = allocator; }
#endif
virtual void init() {}
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual bool isQwerty() const;
#else
virtual bool isQwerty() const { return mQwerty; }
#endif
virtual void setQwerty(bool qwerty);
virtual void setLanguage(Language language) { meLanguage = language; }
virtual Language getLanguage() const { return meLanguage; }

View File

@@ -34,7 +34,7 @@ namespace textinput {
void replaceChar(char* dest, u32 destLen, const char* src, int replaceIdx, char newCh);
bool isAlphabet(wchar_t ch);
f32 hermiteInterporation(f32 time, f32 startTime, f32 startValue, f32 startTangent, f32 endTime, f32 endValue, f32 endTangent);
f32 hermiteInterporation(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6);
void getProjectionRect4x3(nw4r::ut::Rect* rect);
void getProjectionRect16x9(nw4r::ut::Rect* rect);

View File

@@ -39,9 +39,7 @@ public:
};
static u16 ElementBuffer[0x100];
static u16 CandidatesBuffer[0x100];
static u16 ElementWorkBuffer[0x100];
static u16 PredictionBuffer[0x100];
static u16 CandidatesBuffer[0x300];
static u16 CandidatedWord[0xa00];
static u16 LatestWord[0x40];

View File

@@ -41,7 +41,7 @@ namespace ipl {
}
private:
u32 mReserved;
u32 unk_0x28;
EGG::Heap* mpHeap;
bool mbDisableCon; // 0x30

View File

@@ -113,37 +113,37 @@ namespace ipl {
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
T get() const {
f32 frame = mFrame;
f32 inverseDuration = 1.0f / mMaxFrame;
f32 var_f27 = mFrame;
f32 var_f28 = 1.0f / mMaxFrame;
T r =
(mStart *
(1.0f + ((inverseDuration * (inverseDuration * (inverseDuration * (frame * (2.0f * frame * frame))))) -
(inverseDuration * (inverseDuration * (3.0f * frame * frame)))))) -
(mEnd * ((inverseDuration * (inverseDuration * (inverseDuration * (frame * (2.0f * frame * frame))))) -
(inverseDuration * (inverseDuration * (3.0f * frame * frame)))));
(1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r +=
(mStartTangent *
(frame +
((inverseDuration * (inverseDuration * (frame * (frame * frame)))) -
(inverseDuration * (2.0f * frame * frame))))) +
(mEndTangent * ((inverseDuration * (inverseDuration * (frame * (frame * frame)))) -
(inverseDuration * (frame * frame))));
(var_f27 +
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
/*f32 maxFrame = mMaxFrame;
f32 inverseDuration = 1.0f / mMaxFrame;
T weightedEnd = mEnd * ((inverseDuration * (inverseDuration * (inverseDuration * (maxFrame * (2.0f * maxFrame * maxFrame))))) -
(inverseDuration * (inverseDuration * (3.0f * maxFrame * maxFrame))));
T weightedStart = mStart * (1.0f + ((inverseDuration * (inverseDuration * (inverseDuration * (maxFrame * (2.0f * maxFrame * maxFrame))))) -
(inverseDuration * (inverseDuration * (3.0f * maxFrame * maxFrame)))));
T r = weightedStart - weightedEnd;
/*f32 var_f27 = mMaxFrame;
f32 var_f28 = 1.0f / mMaxFrame;
T sp28 = mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))));
T sp1C = mStart * (1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
T r = sp1C - sp28;
f32 frameSquared = maxFrame * maxFrame;
f32 scaledCubic = inverseDuration * (inverseDuration * (maxFrame * frameSquared));
f32 tangentContribution =
(mStartTangent * (maxFrame + (scaledCubic - (inverseDuration * (2.0f * maxFrame * maxFrame))))) + (mEndTangent * (scaledCubic - (inverseDuration * frameSquared)));
r = r + tangentContribution;
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
return r;*/
}
@@ -163,28 +163,24 @@ namespace ipl {
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
f32 speed = 1.0f);
#ifdef IPL_SD_CHANNEL_TITLE_CPP
f32 get() const;
#else
f32 get() const {
f32 frame = mFrame;
f32 inverseDuration = 1.0f / mMaxFrame;
f32 var_f27 = mFrame;
f32 var_f28 = 1.0f / mMaxFrame;
f32 r =
(mStart *
(1.0f + ((inverseDuration * (inverseDuration * (inverseDuration * (frame * (2.0f * frame * frame))))) -
(inverseDuration * (inverseDuration * (3.0f * frame * frame)))))) -
(mEnd * ((inverseDuration * (inverseDuration * (inverseDuration * (frame * (2.0f * frame * frame))))) -
(inverseDuration * (inverseDuration * (3.0f * frame * frame)))));
(1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r +=
(mStartTangent *
(frame + ((inverseDuration * (inverseDuration * (frame * (frame * frame)))) -
(inverseDuration * (2.0f * frame * frame))))) +
(mEndTangent * ((inverseDuration * (inverseDuration * (frame * (frame * frame)))) -
(inverseDuration * (frame * frame))));
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
}
#endif
protected:
f32 mStart;
@@ -231,35 +227,35 @@ namespace ipl {
}
#else
T get() const {
f32 frame = mFrame;
f32 inverseDuration = 1.0f / mMaxFrame;
f32 var_f27 = mFrame;
f32 var_f28 = 1.0f / mMaxFrame;
f32 t1t2 =
(inverseDuration * (inverseDuration * (inverseDuration * (frame * (2.0f * frame * frame))))) - (inverseDuration * (inverseDuration * (3.0f * frame * frame)));
(var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) - (var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)));
T r = (mStart * (1.0f + t1t2)) - (mEnd * t1t2);
f32 frameSquared = frame * frame;
f32 scaledCubic = inverseDuration * (inverseDuration * (frame * frameSquared));
f32 tangentContribution =
(mStartTangent * (frame + (scaledCubic - (inverseDuration * (2.0f * frame * frame))))) + (mEndTangent * (scaledCubic - (inverseDuration * frameSquared)));
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
r = r + tangentContribution;
r = r + temp_f3;
return r;
/*f32 maxFrame = mMaxFrame;
f32 inverseDuration = 1.0f / mMaxFrame;
T weightedEnd = mEnd * ((inverseDuration * (inverseDuration * (inverseDuration * (maxFrame * (2.0f * maxFrame * maxFrame))))) -
(inverseDuration * (inverseDuration * (3.0f * maxFrame * maxFrame))));
T weightedStart = mStart * (1.0f + ((inverseDuration * (inverseDuration * (inverseDuration * (maxFrame * (2.0f * maxFrame * maxFrame))))) -
(inverseDuration * (inverseDuration * (3.0f * maxFrame * maxFrame)))));
T r = weightedStart - weightedEnd;
/*f32 var_f27 = mMaxFrame;
f32 var_f28 = 1.0f / mMaxFrame;
T sp28 = mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))));
T sp1C = mStart * (1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
T r = sp1C - sp28;
f32 frameSquared = maxFrame * maxFrame;
f32 scaledCubic = inverseDuration * (inverseDuration * (maxFrame * frameSquared));
f32 tangentContribution =
(mStartTangent * (maxFrame + (scaledCubic - (inverseDuration * (2.0f * maxFrame * maxFrame))))) + (mEndTangent * (scaledCubic - (inverseDuration * frameSquared)));
r = r + tangentContribution;
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
return r;*/
}
#endif
@@ -270,32 +266,6 @@ namespace ipl {
};
#endif
#ifdef IPL_CHANNEL_SELECT_CPP
template <>
class HermiteIntp<f32> : public utility::FrameController {
public:
HermiteIntp() {}
virtual ~HermiteIntp() {}
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent,
f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
mStart = start;
mEnd = end;
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
mStartTangent = startTangent;
mEndTangent = endTangent;
}
inline f32 get() const;
protected:
f32 mStart;
f32 mEnd;
f32 mStartTangent;
f32 mEndTangent;
};
#endif
#ifdef IPL_SD_CHANNEL_SELECT_CPP
} // namespace math
} // namespace ipl

View File

@@ -103,7 +103,7 @@ namespace ipl {
y = r.y;
z = 0.0f;
}
#if defined(IPL_ADDRESS_EDIT_CPP) || defined(IPL_SD_CHANNEL_SELECT_CPP) || defined(IPL_GC_WINDOW_CPP) || defined(IPL_SD_CHANNEL_TITLE_CPP)
#if defined(IPL_ADDRESS_EDIT_CPP) || defined(IPL_SD_CHANNEL_SELECT_CPP) || defined(IPL_GC_WINDOW_CPP)
VEC3(f32 fx, f32 fy, f32 fz);
#else
VEC3(f32 fx, f32 fy, f32 fz) {

View File

@@ -141,9 +141,6 @@ namespace ipl {
void init(nw4r::lyt::Pane* pane);
void set(u64 fdId);
void reset();
#ifdef IPL_ADDRESS_MATCHING
nigaoe::Object* getPortrait() const { return mpNigaoe; }
#endif
static void create_callback(nigaoe::Object* object, void* work);
@@ -159,7 +156,7 @@ namespace ipl {
int mButton; // 0x10
int mNextCount; // 0x14
int mPrevCount; // 0x18
int mResetState; // 0x1C
int unk_0x1C; // 0x1C
bool mbDragging; // 0x20
};
@@ -234,7 +231,7 @@ namespace ipl {
DragInfo mDrag; // 0x64
int mMode; // 0x88
layout::Object* mpLayout; // 0x8C
int mReserved; // 0x90
int unk_0x90; // 0x90
AddressEvent* mpEvent; // 0x94
gui::PaneManager* mpGui; // 0x98
layout::Object* mpBackLayout; // 0x9C

View File

@@ -369,8 +369,8 @@ namespace ipl {
BoardSD mBoardSD; // 0xFAC
bool mbExitRequest; // 0xFB4
int mNewMailAnimationPending;
u8 mReserved[4];
int unk_0xFB8;
u8 unk_0xFBC[4];
};
} // namespace scene
} // namespace ipl

View File

@@ -139,7 +139,7 @@ namespace ipl {
math::LinearIntp<math::VEC2> mMoveAnim; // 0x44
CDBId mCDBId; // 0x74
u8 mReservedBeforeRecordKey[4];
u8 unk_0x7C[4];
CDBRecordKey mCDBRecordKey; // 0x80
u32 mCDBGameCode; // 0xB0
@@ -179,7 +179,7 @@ namespace ipl {
int mState; // 0x12C
math::VEC2 mConPos; // 0x130
int mConChan; // 0x138
u8 mReserved[4];
u8 unk_0x13C[4];
static const char* mAnimNames[TYPE_MAX][1 + ANIM_MAX];

View File

@@ -332,12 +332,12 @@ namespace ipl {
scroller mScroller; // 0x58
picture mPicture; // 0xC8
int mReservedWord;
u8 mReservedByte;
int unk_0xF8;
u8 unk_0xFC;
EGG::Allocator mGUIAlloc; // 0x100
wchar_t mUrlTerminators[6];
wchar_t unk_0x114[6];
u8* mpCmpArcData; // 0x120
u8* mpArcData; // 0x124

View File

@@ -18,11 +18,11 @@ namespace ipl {
class line_collision {
public:
line_collision() : mLeft(0.0f), mRight(0.0f), mY(0.0f) {}
line_collision() : unk_0x00(0.0f), unk_0x04(0.0f), unk_0x08(0.0f) {}
f32 mLeft;
f32 mRight;
f32 mY;
f32 unk_0x00;
f32 unk_0x04;
f32 unk_0x08;
nw4r::ut::Link mLinkList; // 0x0C
};
@@ -31,9 +31,9 @@ namespace ipl {
url_collision();
~url_collision();
int mTagNo;
wchar_t* mpStart;
wchar_t* mpEnd;
int unk_0x00;
wchar_t* unk_0x04;
wchar_t* unk_0x08;
nw4r::ut::Link mLinkList; // 0x0C
nw4r::ut::List mLineCollisions; // 0x14
};
@@ -53,19 +53,19 @@ namespace ipl {
void parse(nw4r::ut::PrintContext<wchar_t>* context);
BOOL is_focused() const;
void select(int tagNo);
void select(int unk);
int get_focused_tagno(int chan) const;
url_collision* get_selected_col();
void get_url(char* urlOut, u32 urlLen);
void setHitYOffset(f32 val) { mHitYOffset = val; }
void setMemoTranslateY(f32 val) { mMemoTranslateY = val; }
void setFocusEnabled(bool val) { mbFocusEnabled = val; }
void setUnk_0x40(f32 val) { unk_0x40 = val; }
void setUnk_0x44(f32 val) { unk_0x44 = val; }
void setUnk_0x53(bool val) { unk_0x53 = val; }
u8 getColorPass() const { return mbColorPass; }
void setColorPass(u8 val) { mbColorPass = val; }
u8 getUnk_0x50() const { return unk_0x50; }
void setUnk_0x50(u8 val) { unk_0x50 = val; }
private:
typedef struct {
@@ -75,14 +75,14 @@ namespace ipl {
con_data mConData[WPAD_MAX_CONTROLLERS]; // 0x00
nw4r::ut::List mUrlCollisions; // 0x34
f32 mHitYOffset;
f32 mMemoTranslateY;
int mCurTagNo;
int mSelectedTagNo;
u8 mbColorPass;
u8 mbInTag;
u8 mbHoverOffset;
u8 mbFocusEnabled;
f32 unk_0x40;
f32 unk_0x44;
int unk_0x48;
int unk_0x4C;
u8 unk_0x50;
u8 unk_0x51;
u8 unk_0x52;
u8 unk_0x53;
};
} // namespace scene
} // namespace ipl

View File

@@ -12,7 +12,6 @@
namespace ipl {
namespace scene {
extern "C" BOOL push_button_queue(void*, const void*);
class ButtonEventHandlerBase;
class OptOutButtonEventHandlerBase;
class SDMenuEventHandlerBase;
@@ -315,7 +314,6 @@ namespace ipl {
}
protected:
friend BOOL push_button_queue(void*, const void*);
typedef struct Command {
enum {
TYPE_ANIM = 0,

View File

@@ -75,9 +75,9 @@ namespace ipl {
void set_textbox_day();
void set_textbox_month();
void set_textbox_month(const char* paneName, const utility::Date& date);
void set_textbox_date(int calendarIndex, const utility::Date& date);
void set_textbox_date(int unk, const utility::Date& date);
void set_date_pos(int calendarIndex);
void set_date_pos(int unk);
void exec_search_task();

View File

@@ -35,7 +35,7 @@ namespace ipl {
Date(EGG::Heap* heap, nand::LayoutFile* file, const char* layoutFolder, const char* layoutFileName);
void calc();
void draw(bool focusedPass);
void draw(bool unk);
layout::PaneAnimator* doAnim(int animId);

View File

@@ -225,7 +225,7 @@ namespace ipl {
nw4r::ut::List mNandListingList; // 0x1C
nw4r::ut::List mSDListingList; // 0x28
undefined4 mReserved; // 0x34
undefined4 unk_0x34; // 0x34
Thumbnail mThumbnails[15]; // 0x38
WiiBannerFileInfo mBanners[15]; // 0x5C90
@@ -243,7 +243,7 @@ namespace ipl {
bool mbDisableThumbFetch; // 0xE8790
ESTitleId mTmpTitleId; // 0xE8798
bool mbDeleteSDAppAfterRestore; // 0xE87a0
bool unk_0xE87A0; // 0xE87a0
};
} // namespace scene
} // namespace ipl

View File

@@ -40,7 +40,7 @@ namespace ipl {
void initExtModule(EGG::Heap* workHeap, channel::RsoThread* thread);
int calcExtModule(EGG::ExpHeap* expHeap, bool canStartModule, bool onSceneChange);
int calcExtModule(EGG::ExpHeap* expHeap, bool unk0, bool unk1);
void drawThumbnail();
void drawCursor();
@@ -57,14 +57,14 @@ namespace ipl {
BOOL isDiskChannel() const;
BOOL isValid() const;
void onPoint(int eventFlags);
void onLeft(int eventFlags);
void onPinch(bool pinched);
void onPoint(int unk);
void onLeft(int unk);
void onPinch(bool unk);
void setCursorDecideAnim();
void initCursorAnim(bool resetPointCount);
void initBalloonAnim(bool resetPointCount);
void initCursorAnim(bool unk);
void initBalloonAnim(bool unk);
void FillModuleCount();
@@ -83,15 +83,15 @@ namespace ipl {
void initCursor();
void calcCursor(const nw4r::math::VEC3& vec);
void setCursorAnim(int state) NO_INLINE;
void setCursorAnim(int unk) NO_INLINE;
void calcCursorAnim();
void startCursorAnim(int animationIndex);
void startCursorAnim(int unk);
void initBalloon();
void setBalloonText(const wchar_t* text);
void calcBalloon(const nw4r::math::VEC3& vec);
void setBalloonAnim(int state) NO_INLINE;
void setBalloonAnim(int unk) NO_INLINE;
void calcBalloonAnim();
void clearModuleParam();
@@ -107,7 +107,7 @@ namespace ipl {
}
private:
u8 mListLinkStorage[8];
u8 unk_0x00[8];
EGG::Heap* mpCursorHeap; // 0x08
EGG::Heap* mpBalloonHeap; // 0x0C
@@ -149,22 +149,22 @@ namespace ipl {
layout::Object* mpCursorLayout; // 0x48
layout::Animator* mpCursorAnims[ANIM_CURSOR_MAX]; // 0x4C
int mCursorState;
int mPendingCursorState;
int unk_0x58;
int unk_0x5C;
layout::Object* mpBalloonLayout; // 0x60
layout::Animator* mpBalloonAnim; // 0x64
int mBalloonState;
int mPendingBalloonState;
int mBalloonWaitFrame;
int unk_0x68;
int unk_0x6C;
int unk_0x70;
int mPointCount;
int unk_0x74;
nw4r::lyt::Group* mpNwc24NewGroup; // 0x78
layout::GroupAnimator* mpNwc24NewAnim; // 0x7C
bool mpNwc24NewPlayAnim; // 0x80
int mNewMessageState;
u32 mNewMessageFrame;
int unk_0x84;
u32 unk_0x88;
f32 mThumbWidth; // 0x8C
f32 mThumbHeight; // 0x90
@@ -188,7 +188,7 @@ namespace ipl {
channel::RsoThread* mpModuleThread; // 0xE8
int mExtModuleState; // 0xEC
nand::SharedFile* mpModuleFile; // 0xF0
bool mbModuleFlag;
bool unk_0xF4;
u32 mModuleCount; // 0xF8
u32 mMaxModuleCount; // 0xFC

View File

@@ -76,7 +76,7 @@ namespace ipl {
void appendToChannelList(int page, int index);
void destroyChannelObj(ChannelObj * channelObj);
void sortChannelList(int page);
void sortChannelListByPage(int page, int edgeDirection);
void sortChannelListByPage(int page, int unk);
ChannelObj* searchList(int page, int index) const;
void setupDiskChanObj();
@@ -87,7 +87,7 @@ namespace ipl {
void setChanFrameVisibility();
BOOL isChannelInView(int page, int index) const;
BOOL isChannelInCalc(int page, int index, int currentPage) const;
BOOL isChannelInCalc(int page, int index, int unk2) const;
BOOL isPageCreated(int page) const;
BOOL isPageCreatedAllDone(int page) const;
@@ -108,14 +108,14 @@ namespace ipl {
BOOL prepareRestarting(int page);
void restart(int page, int index);
nw4r::lyt::Pane* getChannelBasePane(int page, int index, int currentPage) const;
nw4r::lyt::Pane* getChannelBasePane(int page, int index, int unk3) const;
const nw4r::lyt::Pane* getChannelBasePane(int index) const;
nw4r::lyt::Pane* getChannelBasePane(int index);
nw4r::math::VEC3 getDispChanTrans(int index) const;
void setChannelScissor(const ChannelObj* channelObj) const;
void initChanZoomParam(const math::VEC3& pos, BOOL zoomOut);
void initChanZoomParam(const math::VEC3& pos, BOOL unk);
void calcChanZoomParam();
void setChanZoomOrtho();
@@ -148,11 +148,11 @@ namespace ipl {
void startResetting();
bool unkBool() {
return !mbWaitForModuleStop || mModuleState == 3;
return !unk_0x185 || unk_0x180 == 3;
}
void setSomething() {
mbModuleSceneChange = true;
mbWaitForModuleStop = 1;
unk_0x185 = 1;
}
enum {
@@ -259,8 +259,8 @@ namespace ipl {
f32 mChanThumbOff_X; // 0xD0
f32 mChanThumbOff_Y; // 0xD4
math::VEC3 mOrthoTrans;
math::VEC2 mOrthoScale;
math::VEC3 unk_0xD8;
math::VEC2 unk_0xE4;
f32 mScaleAdjust; // 0xEC
int mDiskState; // 0xF0
@@ -274,25 +274,25 @@ namespace ipl {
clock mClock; // 0x108
s32 mPrevSDState; // 0x168
EGG::Heap* mpThumbnailHeap;
EGG::Heap* unk_0x16C;
EGG::Heap* mpDiskHeap; // 0x170
EGG::Heap* mpCursorHeap; // 0x174
EGG::Heap* mpBalloonHeap; // 0x178
EGG::Heap* mpChannelObjHeap;
EGG::Heap* unk_0x17C;
int mModuleState;
int unk_0x180;
bool mbModuleSceneChange; // 0x184
bool mbWaitForModuleStop;
bool unk_0x185;
ChannelObj* mpCurrentRsoChanObj; // 0x188
ChannelObj* mpPriorityModuleChanObj;
ChannelObj* unk_0x18C;
EGG::Heap* mpModuleWorkHeap; // 0x190
channel::RsoThread* mpModuleThread; // 0x194
EGG::ExpHeap* mpModuleHeaps[49]; // 0x198
bool mbModuleHeapInUse[49];
bool unk_0x25C[49];
nw4r::math::VEC2 mDragPos; // 0x290
int mConChan; // 0x298
@@ -300,21 +300,21 @@ namespace ipl {
int mMoveOldIndex; // 0x2A0
int mMoveNewPage; // 0x2A4
int mMoveNewIndex; // 0x2A8
int mDragRightScrollFrame;
int mDragLeftScrollFrame;
int mReleaseWaitFrame;
bool mbDragReleased;
int unk_0x2AC;
int unk_0x2B0;
int unk_0x2B4;
bool unk_0x2B8;
nand::File* mpSaveDataFile; // 0x2BC
ChannelObj* mpMovedChanObj;
layout::Object* mpMoveThumbnailLayout;
layout::Animator* mpMoveThumbnailAnim;
ChannelObj* unk_0x2C0;
layout::Object* unk_0x2C4;
layout::Animator* unk_0x2C8;
u32 unused_0x2CC;
static BOOL msInitFlag;
static const char* mscChanPaneNames[CHAN_SCROLL_MAX][MAX_CHANNEL_INDEX];
static const char* mscBasePaneNames[CHAN_SCROLL_MAX];
static const char* mscPicturePaneNames[CHAN_SCROLL_MAX];
static const char* mscEdgePaneNames[CHAN_SCROLL_MAX];
static const char* mscUnk0PaneNames[CHAN_SCROLL_MAX];
static const char* mscUnk1PaneNames[CHAN_SCROLL_MAX];
static const char* mscClockPaneNames[3];
static const char* mscMaskPaneName;

View File

@@ -112,7 +112,7 @@ namespace ipl {
void startChangeChannel(int page, int index);
void reserveNextScene();
void reserveSettingScene(bool skipConfirmation);
void reserveSettingScene(bool unk);
void prepareForBoot1(int sceneID);
void prepareForBoot2(int sceneID);
@@ -318,9 +318,9 @@ namespace ipl {
int mDiskState2; // 0x78
nw4r::math::VEC3 mDispTrans; // 0x7C
u32 mBootWaitFrame;
int mStartButtonState;
bool mbBannerStartPending;
u32 unk_0x88;
int unk_0x8C;
bool unk_0x90;
layout::GroupAnimator* mpGrpAnims[ANIM_GRP_MAX][ANIM_MAX]; // 0x94
layout::Animator* mpChangeAnims[ANIM_MAX]; // 0x1D4
@@ -352,8 +352,8 @@ namespace ipl {
layout::Object* mpDiskBnrLayout; // 0x254
layout::Animator* mpDiskBnrAnims[DISK_ANIM_GRP_MAX][DISK_ANIM_MAX]; // 0x258
undefined reservedAfterDiskAnims[4];
undefined mWiiDiskReady;
undefined unk_0x320[4];
undefined unk_0x324;
nand::LayoutFile* mpGCBannerFile; // 0x328
layout::Object* mpGCBannerLyt; // 0x32C
@@ -371,24 +371,24 @@ namespace ipl {
CsChanTtlButtonEventHandler* mpButtonEvent; // 0x354
utility::Capture* mpCapture; // 0x358
ESTmdView* mpCurTicket; // 0x35C
bool mbTmdReady;
bool unk_0x360;
u16 mCurGameCode; // 0x362
ESTitleId mTmpTitleID; // 0x368
bool mbTmpTitleCleanupDone;
bool mbTicketLimitReady;
bool unk_0x370;
bool unk_0x371;
u32 mLimitType; // 0x374
u32 mTimeLimitRemain; // 0x378
bool mbStartButtonFocusPlayed;
bool unk_0x37C;
int mModuleState; // 0x380
int mModuleType; // 0x384
volatile bool mbModuleSceneChange; // 0x388
bool mbRSODoneCalc; // 0x389
u32 mModuleFrame;
u32 mModuleInterval;
u32 unk_0x38C;
u32 unk_0x390;
nand::SharedFile* mpModuleFile; // 0x394
EGG::ExpHeap* mpRsoExpHeaps[2]; // 0x398
int mCurRsoExpHeap; // 0x39C

View File

@@ -31,12 +31,8 @@ namespace ipl {
virtual void calc();
#ifdef IPL_SD_CHANNEL_TITLE_CPP
virtual void initCalcNormal();
#else
virtual void initCalcNormal() {
} // 0x4C
#endif
virtual void initCalcFadeout() {
} // 0x50
@@ -53,12 +49,8 @@ namespace ipl {
return FADER_SCN_NEXT;
} // 0x60
#ifdef IPL_SD_CHANNEL_TITLE_CPP
virtual void calcCommonAfter();
#else
virtual void calcCommonAfter() {
} // 0x64
#endif
int getSceneFadeState() {
return mScnFadeState;

View File

@@ -62,11 +62,7 @@ namespace ipl {
virtual ~Base();
/** @brief If the scene is ready */
#ifdef IPL_SD_CHANNEL_TITLE_CPP
virtual BOOL isReady() const;
#else
virtual BOOL isReady() const { return FALSE; }
#endif
/** @brief If the user can power off/reset the system */
#ifdef IPL_SD_CHANNEL_TITLE_CPP
@@ -77,11 +73,7 @@ namespace ipl {
/** @brief The scene running code when powering off/resetting the system */
virtual void startResetting() {}
/** @brief If the scene has finished its powering off/resetting task */
#ifdef IPL_SD_CHANNEL_TITLE_CPP
virtual BOOL isResetProcessDone();
#else
virtual BOOL isResetProcessDone() { return TRUE; }
#endif
/** @brief Prepare to create scene */
virtual void prepare() {}
@@ -94,17 +86,10 @@ namespace ipl {
/** @brief Destroy the scene and clear from memory */
virtual void destroy() {}
#ifdef IPL_SD_CHANNEL_TITLE_CPP
virtual Base* getParent();
virtual Base* getChild();
virtual Base* getNext();
virtual Base* getPrev();
#else
virtual Base* getParent() { return (Base*)mpParent; }
virtual Base* getChild() { return (Base*)mpChild; }
virtual Base* getNext() { return (Base*)mpNext; }
virtual Base* getPrev() { return (Base*)mpPrev; }
#endif
/** @brief Check if scene has been created.*/
bool isSceneCreated() const { return (mScnState & SCN_STATE_CREATED); }

View File

@@ -57,8 +57,8 @@ namespace ipl {
kitayama::NandSDWorker_AutoTest* mpAutoTest; // 0x64
void* mpWorkerBuf; // 0x68
void* mpWorkerCacheBuf; // 0x6C
u32 mReservedWorkerState; // 0x70 (unused)
u32 mReservedCacheState; // 0x74 (unused)
u32 unk_0x70; // 0x70 (unused)
u32 unk_0x74; // 0x74 (unused)
};
} // namespace scene
} // namespace ipl

View File

@@ -74,13 +74,13 @@ namespace ipl {
s32 mState; // 0x88
s32 mPrevState; // 0x8C
u8 mSlot; // 0x90
u8 mReservedSlot[3]; // 0x91
u8 unk_0x91[3]; // 0x91
s32 mSlotState[2]; // 0x94
s16 mIconIndex; // 0x9C
s16 mIconCount; // 0x9E
u8 mShowArwR; // 0xA0
u8 mShowArwL; // 0xA1
u8 mReservedArrows[2]; // 0xA2
u8 unk_0xA2[2]; // 0xA2
MemoryCardManager* mpManager; // 0xA4
MemoryBaseEvent* mpEvent; // 0xA8
nw4r::ut::List mSaveDataList; // 0xAC

View File

@@ -71,7 +71,7 @@ namespace ipl {
typedef struct MCFile {
u32 fileNo; // 0x00
u32 reserved; // 0x04
u32 unk_0x04; // 0x04
u32 unk_0x08; // 0x08
s32 sortKey; // 0x0C
} MCFile; // 0x10
@@ -79,7 +79,7 @@ namespace ipl {
typedef struct MCFileCell {
wchar_t comment[2][0x40]; // 0x000
s16 iconAnmCounter; // 0x100
u16 reserved; // 0x102
u16 unk_0x102; // 0x102
GXTexObj icon; // 0x104
GXTexObj banner; // 0x124
GXTlutObj iconTlut; // 0x144
@@ -187,28 +187,12 @@ namespace ipl {
}
private:
GXTexObj* initBannerTexture(u8 slot, s32 file, void* data) {
GXInitTexObj(&mFileCell[slot][file].banner, data, 0x60, 0x20,
GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE);
return &mFileCell[slot][file].banner;
}
void initBannerTextureCI(u8 slot, s32 file, void* data) {
GXInitTexObjCI(&mFileCell[slot][file].banner, data, 0x60, 0x20,
GX_TF_C8, GX_CLAMP, GX_CLAMP, GX_FALSE, GX_TLUT0);
}
GXTlutObj* initBannerPalette(u8 slot, s32 file, void* data) {
GXInitTlutObj(&mFileCell[slot][file].bannerTlut, data, GX_TL_RGB5A3, 0x100);
return &mFileCell[slot][file].bannerTlut;
}
u32 reserved; // 0x00004
u32 unk_0x04; // 0x00004
MCFile mFile[2][0x7F]; // 0x00008
MCFileCell mFileCell[2][0x7F]; // 0x00FE8
s32 mLastResult; // 0x16930
s32 mLastCmd; // 0x16934
u32 mReservedResult; // 0x16938
u32 unk_0x16938; // 0x16938
MemCardEventListener* mpEventHandler; // 0x1693C
};
} // namespace scene

View File

@@ -54,9 +54,9 @@ namespace ipl {
u64 mAmtTotal; // 0x2B70
u16 mCurrVersion; // 0x2B78
void* mpNUPInstance; // 0x2B7C
u32 mReserved0; // 0x2B80
u32 mReserved1; // 0x2B84
u32 mReserved2; // 0x2B88
u32 unk_0x2B80; // 0x2B80
u32 unk_0x2B84; // 0x2B84
u32 unk_0x2B88; // 0x2B88
static EGG::Heap* spHeap;
static BOOL sNHTTPFinished;

View File

@@ -15,7 +15,7 @@ namespace ipl {
NET_SETUP_REQUESTED_STARTUP,
NET_SETUP_RUNNING,
NET_SETUP_SUCCESS,
NET_SETUP_ALTERNATE_ERROR,
NET_SETUP_UNK_4,
NET_SETUP_ERROR,
};

View File

@@ -44,7 +44,7 @@ namespace ipl {
#endif
struct SettingAPScanList {
u8 reservedHeader[0x14];
u8 unknown[0x14];
union {
struct {
u16 count;
@@ -180,33 +180,33 @@ namespace ipl {
ARG_SETUP,
ARG_UPDATE,
ARG_INTERNET_PAGE,
ARG_RESUME_SETUP,
ARG_DIRECT_PAGE,
ARG_UNK_5,
ARG_UNK_6,
};
private:
#ifdef IPL_SETTING_IMPLEMENTATION
int mUpdateTiming;
u8 mBrowserStopRequested;
u8 reservedAfterBrowserStop[3];
u8 unk_0x5C;
u8 unk_0x5D[3];
nand::Base* mpWWWLibraryFile;
nand::Base* mpSettingHTMLFile;
nand::Base* mpWWWArchiveFile;
nand::Base* mpFontFile;
nand::Base* mpBackgroundTPLFile;
int mDialogState;
int mAPScanState;
int mEULAState;
int unk_0x74;
int unk_0x78;
int unk_0x7C;
int mProfileIDMode;
int mUSBAPState;
int unk_0x84;
int mAOSSState;
int mRakuState;
int mFuncMsgPending;
int mSafeModeDialogState;
int unk_0x94;
ESTitleId mUpdateTitleId;
u32 mPrepareTick;
u8 mSettingData[0x16];
u8 reservedAfterSettingData[2];
u8 unk_0xBA[2];
nand::LayoutFile* mpSettingLayoutFile;
layout::Object* mpChangeLayout;
layout::Object* mpMainLayout;
@@ -221,25 +221,25 @@ namespace ipl {
APScanThread* mpAPScanThread;
SettingAPScanList mAPScanList;
void* mpMem1BrowserBuffer;
u32 reservedBrowserWord;
u32 unk_0x908;
void* mpMem2BrowserBuffer;
void* mpBrowserStringBuffer;
int mAPScrollOffset;
int mAPAnimationIndex;
u8 mUiStatus[4];
int unk_0x914;
int unk_0x918;
u8 unk_0x91C[4];
ext_ead::www::ImeData* mpBrowserData;
www::wiisetting::WiiData* mpWiiSettingData;
www::wiisetting::WiiFlag* mpWiiSettingFlag;
u8 mActionFrame;
u8 reservedAfterActionFrame[3];
int mSupportCode;
u8 unk_0x92C;
u8 unk_0x92D[3];
int unk_0x930;
www::wiisetting::SetStringBuf* mpStringBuffer;
#ifdef IPL_SETTING_IMPLEMENTATION
wchar_t mInputText[0x101];
wchar_t unk_0x938[0x101];
#else
u8 mInputText[0x202];
u8 unk_0x938[0x202];
#endif
u8 reservedAfterInputText;
u8 unk_0xB3A;
u8 mBrowserCreated;
keyboard::Manager::State mKeyboardState;
int mInitialArgument;
@@ -247,21 +247,21 @@ namespace ipl {
int mProgressiveMode;
int mEuRgb60Mode;
u8 mIsResetAcceptable;
u8 reservedAfterResetFlag[3];
u8 unk_0xB5D[3];
OSMessageQueue mFuncMessageQueue;
OSMessage mFuncMessages[5];
int mScreenModeChangeState;
int unk_0xB94;
int mState;
int mInputDelayFrame;
int unk_0xB9C;
OSTime mCreatePageTime;
u32 mConnectedControllerMask;
u8 mNetSettingResultSent;
u8 reservedAfterNetSettingResult[3];
u8 reservedTail[0x10];
u32 unk_0xBA8;
u8 unk_0xBAC;
u8 unk_0xBAD[3];
u8 unk_0xBB0[0x10];
static void* mem1Buffer_;
static void* mem2Buffer_;
#else
u8 mSettingStorage[0xB68];
u8 unk_0x58[0xB68];
#endif
};

View File

@@ -185,8 +185,8 @@ namespace ipl {
gui::PaneManager* mpGui; // 0x74
BOOL mbHovered[BTN_MAX]; // 0x78
u32 mPendingSceneId;
u32 mExitSeqStep;
u32 unk_0x90;
u32 unk_0x94;
static const char* smButtonName[BTN_MAX];
};

View File

@@ -48,8 +48,8 @@ namespace ipl {
void set_size(const char* paneName, const nw4r::lyt::Size& size);
const nw4r::lyt::Size* get_size(const char* paneName);
undefined4 mReserved;
undefined4 mReservedState;
undefined4 unk_0x00;
undefined4 unk_0x04;
BOOL mbWaitingFadeIn; // 0x08
layout::Object* mpLayout; // 0x0C

View File

@@ -39,13 +39,13 @@ namespace ipl {
int holdSEwithPosDis(const char* sndName, f32 x, f32 y);
#ifdef IPL_SOUND_MATCHING
void stopBGM(int fadeFrames = 0);
void stopBGM(int unk = 0);
#else
int stopBGM(int fadeFrames = 0);
int stopBGM(int unk = 0);
#endif
int stopBGM(nw4r::snd::SoundHandle* handle, int fadeFrames = 0);
void stopSE(nw4r::snd::SoundHandle* handle, int fadeFrames = 0);
void stopAllSound(int fadeFrames = 0);
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
void stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
void stopAllSound(int unk = 0);
int resetAllSound();
@@ -92,14 +92,14 @@ namespace ipl {
tagSSeInfo* getFreeSEBlock(bool force);
BOOL startBannerSound(void*, u32, bool ignoreSize = false);
void stopBannerSound(int fadeFrames = 0);
void stopBannerSound(int unk = 0);
BOOL checkTmpSoundFile(void*, u32);
long clipGELT_S32(long value, long lo, long hi);
private:
u32 mSoundWork[3];
u32 unk_0x620[3];
};
// use getSystem() and getBannerPlayer() instead

View File

@@ -209,9 +209,9 @@
#define MESG_DATA_SD_CARD_LOCKED 62
#define MESG_DATA_SD_PROCESS_FAILED 151
#define MESG_DATA_FILE_CANT_BE_MOVED 205
#define MESG_DATA_MOVE_FAILED 215
#define MESG_DATA_COPY_FAILED 227
#define MESG_DATA_DELETE_FAILED 229
#define MESG_DATA_MOVE_UNK_ERROR 215
#define MESG_DATA_COPY_UNK_ERROR 227
#define MESG_DATA_DEL_UNK_ERROR 229
#define MESG_DATA_ERASE_DIALOG 247
#define MESG_DATA_ERASED 248
#define MESG_DATA_ERASING 251

View File

@@ -63,7 +63,7 @@ typedef union RBRRecordFlags {
u32 data;
struct {
u8 optOut; // 0x00
u8 reserved[2];
u8 unk_0x01[2];
u8 type; // 0x03
};
} RBRRecordFlags;

View File

@@ -40,8 +40,8 @@ enum {
typedef struct tagSTVRCSettings {
u32 magic; // 0x00
u32 formatVersion;
u32 configurationValid;
u32 unk_0x04;
u32 unk_0x08;
u32 modelMakerID; // 0x0C
u32 modelType; // 0x10
u8 commandMap[TVRC_COMMAND_MAP_MAX]; // 0x14

View File

@@ -65,7 +65,7 @@ namespace ipl {
STATE_FINISHED,
};
volatile bool mbDoneProcess; // 0x00
bool mbDoneProcess; // 0x00
int mCDBResult; // 0x04
int mPrevFreeSize; // 0x08

View File

@@ -52,7 +52,7 @@ namespace ipl {
BOOL isUnderFlow() const;
BOOL findByKey(CDBRecord* record, CDBRecordKey* recordKey);
BOOL search(const CDBDate& begin, const CDBDate& end, CDBSearchDirection searchDirection, CDBRecordLocation recordLocation, int openRecord,
BOOL search(const CDBDate& begin, const CDBDate& end, CDBSearchDirection searchDirection, CDBRecordLocation recordLocation, int unk2,
CDBSearchRecordCB searchRecordCB, void* searchRecordWork);
BOOL getDataSize(CDBRecord* record, u32* recordDataSize);
@@ -113,8 +113,8 @@ namespace ipl {
u8* mpSDVFWork; // 0x1C
OSMutex mMutex; // 0x20
u8 mReserved0;
u8 mReserved1;
u8 unk_0x38;
u8 unk_0x39;
};
class auto_closer {

View File

@@ -127,22 +127,22 @@ namespace ipl {
u32 bannerRSOIdx : 4; // 0x00:00001111000000000000000000000000
u32 iconCSIdx : 4; // 0x01:00000000111100000000000000000000
u32 bannerCSIdx : 4; // 0x01:00000000000011110000000000000000
u32 reservedBit15 : 1; // 0x02:00000000000000001000000000000000
u32 unk_15 : 1; // 0x02:00000000000000001000000000000000
u32 useAltSound : 1; // 0x02:00000000000000000100000000000000
u32 reservedBit13 : 1; // 0x02:00000000000000000010000000000000
u32 reservedBit12 : 1; // 0x02:00000000000000000001000000000000
u32 reservedBit11 : 1; // 0x02:00000000000000000000100000000000
u32 reservedBit10 : 1; // 0x02:00000000000000000000010000000000
u32 reservedBit09 : 1; // 0x02:00000000000000000000001000000000
u32 unk_13 : 1; // 0x02:00000000000000000010000000000000
u32 unk_12 : 1; // 0x02:00000000000000000001000000000000
u32 unk_11 : 1; // 0x02:00000000000000000000100000000000
u32 unk_10 : 1; // 0x02:00000000000000000000010000000000
u32 unk_09 : 1; // 0x02:00000000000000000000001000000000
u32 netSetting : 1; // 0x02:00000000000000000000000100000000
u32 reservedBit07 : 1; // 0x03:00000000000000000000000010000000
u32 reservedBit06 : 1; // 0x03:00000000000000000000000001000000
u32 reservedBit05 : 1; // 0x03:00000000000000000000000000100000
u32 reservedBit04 : 1; // 0x03:00000000000000000000000000010000
u32 reservedBit03 : 1; // 0x03:00000000000000000000000000001000
u32 reservedBit02 : 1; // 0x03:00000000000000000000000000000100
u32 reservedBit01 : 1; // 0x03:00000000000000000000000000000010
u32 isDisk : 1; // 0x03:00000000000000000000000000000001
u32 unk_07 : 1; // 0x03:00000000000000000000000010000000
u32 unk_06 : 1; // 0x03:00000000000000000000000001000000
u32 unk_05 : 1; // 0x03:00000000000000000000000000100000
u32 unk_04 : 1; // 0x03:00000000000000000000000000010000
u32 unk_03 : 1; // 0x03:00000000000000000000000000001000
u32 unk_02 : 1; // 0x03:00000000000000000000000000000100
u32 unk_01 : 1; // 0x03:00000000000000000000000000000010
u32 unk_00 : 1; // 0x03:00000000000000000000000000000001
};
}; // 0x18
} SMetaBlockHeader;
@@ -226,9 +226,9 @@ namespace ipl {
BOOL setupUrlJump(const char* url);
BOOL setupChannelJump(ESTitleId titleId, const char* data);
void* getDiskThumbnail(bool invalidateReady);
void* getDiskBanner(bool invalidateReady);
void* getDiskSound(bool invalidateReady);
void* getDiskThumbnail(bool unk);
void* getDiskBanner(bool unk);
void* getDiskSound(bool unk);
nand::MetaFile* loadThumbnailAsync(EGG::Heap* heap, int page, int index);
nand::MetaFile* loadBannerAsync(EGG::Heap* heap, int page, int index);
@@ -322,7 +322,7 @@ namespace ipl {
int updateWaitSCFlush();
void updateDiskState();
void* getDiskBannerData(int index, bool invalidateReady);
void* getDiskBannerData(int index, bool unk);
int searchMetaHeader(const u8* buffer);
@@ -365,8 +365,8 @@ namespace ipl {
int getChJumpChanPage() { return mChJumpPage; }
int getChJumpChanIndex() { return mChJumpIndex; }
void setDiskChannelReady(bool flag) { mbDiskChannelReady = flag; }
bool isDiskChannelReady() { return mbDiskChannelReady; }
void setUnk_0x1B81(bool flag) { unk_0x1B81 = flag; }
bool isUnk_0x1B81() { return unk_0x1B81; }
void resetChJumpLoad() { mbLoadedChJump = false; }
bool hasLoadedChJump() { return mbLoadedChJump; }
@@ -399,7 +399,7 @@ namespace ipl {
int mBS2State; // 0x1B7C
bool mbCanRefresh; // 0x1B80
bool mbDiskChannelReady;
bool unk_0x1B81;
u8* mpDiskIconBuf; // 0x1B84
u8* mpDiskBannerBuf; // 0x1B88

View File

@@ -20,7 +20,7 @@ namespace ipl {
// here to avoid typing in long namespaces constantly :P
enum {
CHANS_VM_ALT_SND_STATE_UNAVAILABLE = 0,
CHANS_VM_ALT_SND_STATE_FALLBACK,
CHANS_VM_ALT_SND_STATE_UNK1,
CHANS_VM_ALT_SND_STATE_PLAY,
};
@@ -32,8 +32,8 @@ namespace ipl {
layout::Animator** anims; // 0x08
u64 titleId; // 0x10
bool threadTerminated; // 0x18
bool isThumbnail;
bool mbHasNewMessage; // 0x1A
bool unk_0x19;
bool unk_0x1A;
EGG::ExpHeap* getHeap() { return heap; }
} CSData;
@@ -64,19 +64,19 @@ namespace ipl {
private:
enum {
CHANS_VM_STATE_IDLE = 0,
CHANS_VM_STATE_STARTING,
CHANS_VM_STATE_WAIT_BEGIN_RENDER,
CHANS_VM_STATE_RUNNING,
CHANS_VM_STATE_EXITING,
CHANS_VM_STATE_UNK0 = 0,
CHANS_VM_STATE_UNK1,
CHANS_VM_STATE_UNK2,
CHANS_VM_STATE_UNK3,
CHANS_VM_STATE_UNK4,
};
enum {
CHANS_VM_MSG_STATE_NONE = 0,
CHANS_VM_MSG_STATE_BEGIN_RENDER,
CHANS_VM_MSG_STATE_WAIT_RETRACE,
CHANS_VM_MSG_STATE_RESERVED,
CHANS_VM_MSG_STATE_EXIT,
CHANS_VM_MSG_STATE_UNK0 = 0,
CHANS_VM_MSG_STATE_UNK1,
CHANS_VM_MSG_STATE_UNK2,
CHANS_VM_MSG_STATE_UNK3,
CHANS_VM_MSG_STATE_UNK4,
};
u8* mpChansWork; // 0x00

View File

@@ -118,26 +118,26 @@ namespace ipl {
public:
Base(int chan, KPADStatus& status) {
mButton = 0;
mDecideHoldCount = 0;
unk_0x08 = 0;
mLastRumbleTime = 0;
mRumbleType = -1;
mChan = chan;
mType = 2;
mbForceInvalid = 0;
unk_0x1C = 0;
KPADEnableDPD(chan);
mbPinching = 0;
mbWasPinching = 0;
mpKpadStatus = &status;
unk_0x1D = 0;
unk_0x1E = 0;
unk_0x20 = &status;
}
Base(int chan, int type, KPADStatus& status) {
mButton = 0;
mDecideHoldCount = 0;
unk_0x08 = 0;
mLastRumbleTime = 0;
mRumbleType = -1;
mChan = chan;
mType = type;
mbForceInvalid = 0;
unk_0x1C = 0;
KPADEnableDPD(chan);
}
@@ -152,15 +152,15 @@ namespace ipl {
protected:
u8 mButton;
u32 mDecideHoldCount;
u32 unk_0x08;
OSTick mLastRumbleTime;
s32 mRumbleType;
u32 mChan;
u32 mType;
u8 mbForceInvalid;
u8 mbPinching;
u8 mbWasPinching;
KPADStatus* mpKpadStatus;
u8 unk_0x1C;
u8 unk_0x1D;
u8 unk_0x1E;
KPADStatus* unk_0x20;
};
class Revolution : public Base {
@@ -206,8 +206,8 @@ namespace ipl {
virtual BOOL isValidDpdClassic() const;
private:
math::VEC2 mClassicCursorPos;
int mClassicCursorTimer;
math::VEC2 unk_0x24;
int unk_0x2C;
};
class Master : public Interface {
@@ -264,18 +264,18 @@ namespace ipl {
public:
Base(int chan, KPADStatus& arg1) {
mButton = 0;
mDecideHoldCount = 0;
unk_0x08 = 0;
mLastRumbleTime = 0;
mRumbleType = -1;
mChan = chan;
mType = 2;
mbForceInvalid = 0;
unk_0x1C = 0;
KPADEnableDPD(chan);
mbPinching = 0;
mbWasPinching = 0;
mpKpadStatus = &arg1;
unk_0x1D = 0;
unk_0x1E = 0;
unk_0x20 = &arg1;
}
virtual ~Base(); // 0x08
@@ -326,15 +326,15 @@ namespace ipl {
// protected:
u8 mButton; // 0x4
u32 mDecideHoldCount; // 0x8
u32 unk_0x08; // 0x8
OSTick mLastRumbleTime; // 0xC
s32 mRumbleType; // 0x10
u32 mChan; // 0x14
u32 mType; // 0x18
u8 mbForceInvalid;
u8 mbPinching; // 0x1D
u8 mbWasPinching; // 0x1E
KPADStatus* mpKpadStatus; // 0x20
u8 unk_0x1C;
u8 unk_0x1D; // 0x1D
u8 unk_0x1E; // 0x1E
KPADStatus* unk_0x20; // 0x20
};
class Interface : public Base {
@@ -446,8 +446,8 @@ namespace ipl {
virtual BOOL isValidDpdClassic() const; // 0x8C
private:
math::VEC2 mClassicCursorPos;
int mClassicCursorTimer;
math::VEC2 unk_0x24;
int unk_0x2C;
};
class Manager {

View File

@@ -60,9 +60,9 @@ namespace ipl {
int mMessageID; // 0x08
int mArg2;
int mArg3;
char mArg1[4];
int unk_0x0C;
int unk_0x10;
char unk_0x14[4];
u8* mpArcData; // 0x18
u32 mArcSize; // 0x1C

View File

@@ -144,7 +144,7 @@ namespace ipl {
u32 mCurrentConChan; // 0x20
Vec2 projCenter; // 0x24
bool mbActivated; // 0x2C
u8 mReserved;
u8 unk_0x2D;
textinput::extend::savedata::MemoSetting mSaveData; // 0x2E
nand::File* mpSaveFile; // 0x38
};

View File

@@ -45,7 +45,7 @@ namespace ipl {
typedef struct MESGInfoBlock {
u32 offset; // 0x00
u32 flags; // 0x04
u32 reserved; // 0x08
u32 unk_0x08; // 0x08
} MESGInfoBlock;
typedef struct MESGDataHeader {

View File

@@ -65,13 +65,8 @@ namespace ipl {
/** @brief Writes the file contents. */
virtual void write(); // 0x10
#ifdef IPL_SD_CHANNEL_TITLE_CPP
virtual bool isFinished();
virtual int checkData();
#else
virtual bool isFinished() { return mbDoneTask; } // 0x14
virtual int checkData() { return mResult; } // 0x18
#endif
virtual bool isFatalError(); // 0x1C
u8* getBuffer() const { return mpBuffer; }

View File

@@ -47,13 +47,13 @@ namespace ipl {
RESULT_BROKEN_MEDIA = -9,
RESULT_ILLEGAL_MEDIA = -10,
RESULT_WRITE_PROTECTED = -11,
RESULT_FILENAME_CONFLICT = -12,
RESULT_UNK_N12 = -12,
RESULT_NOCOPY = -13,
RESULT_ES_ERROR = -14,
RESULT_NOT_TRANSFERRABLE = -15,
RESULT_VERSION_ERR = -16,
RESULT_SD_APP_LOC_NOT_FOUND = -17,
RESULT_CANCELLED = -18,
RESULT_UNK_18 = -18,
};
typedef struct SDAppMetaEntry {
@@ -211,8 +211,8 @@ namespace ipl {
MEMHeapHandle mainHeap; // 0x1E690
MEMHeapHandle saveCacheHeap; // 0x1E694
MEMHeapHandle appCacheHeap; // 0x1E698
MEMHeapHandle scratchHeap; // 0x1E69C
MEMAllocator scratchAllocator; // 0x1E6A0
MEMHeapHandle unkHeap; // 0x1E69C
MEMAllocator unkAllocator; // 0x1E6A0
u8 threadStack[STACK_SIZE]; // 0x1E6B0
OSThread thread; // 0x3e6B0
OSMutex mutex; // 0x3e9C8
@@ -240,7 +240,7 @@ namespace ipl {
nw4r::ut::Link link; // 0x10
u8 thumbnail[100 * 1024]; // 0x18
channel::SChanMgrMetaHeader metaHdr; // 0x19018
u8 reserved[8]; // 0x19618
u8 unk_0x19018[8]; // 0x19618
} AppCacheEntry;
typedef struct SaveCacheEntry {
@@ -248,7 +248,7 @@ namespace ipl {
ESTitleId titleId; // 0xF0A0
s32 size; // 0xF0A8
nw4r::ut::Link link; // 0xF0AC
u8 reserved[12]; // 0xF0B4
u8 unk_0xf0b4[12]; // 0xF0B4
} SaveCacheEntry;
typedef struct SDSaveBanner {
@@ -265,8 +265,8 @@ namespace ipl {
u32 thumbSize; // 0x08
NETMD5Sum headerMD5; // 0x0C
NETMD5Sum iconMD5; // 0x1C
u64 reservedBeforeMeta;
u64 reservedBeforeMetaEnd;
u64 unk_0x30;
u64 unk_0x38;
channel::SChanMgrMetaHeader metaHdr; // 0x40
} SDAppBanner;
@@ -332,7 +332,7 @@ namespace ipl {
MESSAGE_CHECK_BACKUP_FITS,
MESSAGE_COPY_SD_APP_TO_NAND,
MESSAGE_DEL_NAND_APP_HIDDEN,
MESSAGE_CHECK_SD_APP_TITLES,
MESSAGE_UNK_49,
MESSAGE_CHANGE_NAND_APP_COUNT,
MESSAGE_CHECK_SD_TITLE_RESTORABLE
} WorkMessage;

View File

@@ -133,13 +133,13 @@ namespace ipl {
void addDlTask();
BOOL getNewTitleTbl(u32* titleTbl) const;
BOOL isNewMessageThere(u32 appId) const;
BOOL isNewMessageThere(u32 unk) const;
int getErrCode();
bool received() { return mbReviecedMsg; }
void prepNextReceive() { mbReviecedMsg = false; }
volatile bool isReceivingIdle() { return mbReceiving == false; }
volatile bool isUnk0xA31() { return unk_0xA31 == false; }
BOOL isAppDlEnableLock(u32 appId) {
utility::autoMutexLock lock(mAutoLock);
@@ -175,9 +175,9 @@ namespace ipl {
OSMutex mAutoLock; // 0xA18
bool mbReviecedMsg;
bool mbReceiving;
bool unk_0xA31;
bool mbReceivePaused; // 0xA32
bool mbNewTitleTblReady;
bool unk_0xA33;
static Arg smArg;

View File

@@ -83,7 +83,7 @@ namespace ipl {
enum {
TYPE_POINT = 0,
TYPE_GRAB,
TYPE_RESERVED,
TYPE_UNK2,
TYPE_MAX, /* ??? */
};

View File

@@ -12,7 +12,7 @@ namespace ipl {
namespace postman {
class Manager : public utility::ut_thread {
public:
enum { STATE_NONE = 0, STATE_RUN_RECEIVE, STATE_STOP_RUN, STATE_USBETHER_MAC, STATE_DL_TASK, STATE_INITIALIZING };
enum { STATE_NONE = 0, STATE_RUN_RECEIVE, STATE_STOP_RUN, STATE_USBETHER_MAC, STATE_DL_TASK, STATE_UNKNOWN };
Manager(EGG::Heap* heap);
virtual ~Manager() {}
@@ -28,7 +28,7 @@ namespace ipl {
virtual void* Run();
int Get_CurrentState() const { return mState; }
BOOL IsUnknown() { return mState != STATE_INITIALIZING; }
BOOL IsUnknown() { return mState != STATE_UNKNOWN; }
BOOL NotRunning() { return mState == STATE_STOP_RUN; }
void Start_RegistTask(EGG::TaskThread* task) { task->request(register_nwc24, NULL, NULL); }

View File

@@ -21,8 +21,8 @@ namespace ipl {
static bool checkLANMacAddrAvailable();
private:
static void* allocfunc(u32 allocationName, s32 size);
static void freefunc(u32 allocationName, void* buffer, s32 size);
static void* allocfunc(u32 unk, s32 size);
static void freefunc(u32 unk, void* buffer, s32 size);
static char mMac[64];

View File

@@ -210,7 +210,7 @@ namespace ipl {
u32 mBS2BootType; // 0x21C
u32 mBS2LaunchCode; // 0x220
u32 mReservedSceneState;
u32 unk_0x224;
char* mspNetSettingArg; // 0x228
char* mspDataManageArg; // 0x22C
char msBS2FirstArgv[128]; // 0x230
@@ -241,7 +241,7 @@ namespace ipl {
vs32 mRegistState; // 0x2C0
vs32 mRegistErrCode; // 0x2C4
volatile bool mbGoingToDataManager; // 0x2C8
u8 mReserved[0x2D0 - 0x2CC];
u8 unk_0x2CC[0x2D0 - 0x2CC];
ESTitleId mBS2LaunchTitle; // 0x2B0
friend class System;

View File

@@ -55,27 +55,27 @@ namespace ipl {
STATE_12,
};
u32 mbDisabledTriggerEnabled;
u32 unk_0x04;
BOOL mbInitialized; // 0x08
nand::SharedFile* mpDBFile; // 0x0C
BOOL mbResetting; // 0x10
s32 mCurrentCommand; // 0x14
u32 mRepeatCount;
u32 mbRepeatCommand;
u32 unk_0x18;
u32 unk_0x1C;
u32 mModelMakerID; // 0x20
u32 mModelType; // 0x24
BOOL mbPrepTVRC; // 0x28
void* mpDatabaseArc; // 0x2C
OSTime mCommandTransitionTime;
OSTime mMuteStartTime;
OSTime mSoundShutupTime;
OSTime mLastCommandTime;
OSTime unk_0x30;
OSTime unk_0x38;
OSTime unk_0x40;
OSTime unk_0x48;
int mCmdMaps[TVRC_COMMAND_MAP_MAX]; // 0x50
u32 mState; // 0x70
OSTick mDisabledTriggerTick;
OSTick unk_0x74;
BOOL mbDisabled; // 0x78
BOOL mbDisabledTriggerPending;
u8 mDisabledTriggerState;
BOOL unk_0x7C;
u8 unk_0x80;
undefined unused_0x81[7];
};
} // namespace ipl

View File

@@ -18,7 +18,7 @@
#define TITLE_TYPE_DISC_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0004) /* 0x00010004 */
#define TITLE_TYPE_SHARED ((TITLE_HITYPE_USER << 16) | 0x0005) /* 0x00010005 */
#define TITLE_TYPE_UNK6 ((TITLE_HITYPE_USER << 16) | 0x0006) /* 0x00010006 */
#define TITLE_TYPE_USER_APP7 ((TITLE_HITYPE_USER << 16) | 0x0007) /* 0x00010007 */
#define TITLE_TYPE_UNK7 ((TITLE_HITYPE_USER << 16) | 0x0007) /* 0x00010007 */
#define TITLE_TYPE_HIDDEN_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0008) /* 0x00010008 */
#define TITLE_REGION_ALL 'A'

View File

@@ -6,9 +6,9 @@
namespace ipl {
namespace utility {
typedef struct CSFlagsData {
u8 reservedHeader[0x04 - 0x00];
u8 unk_0x00[0x04 - 0x00];
u32 flags; // 0x04
u8 reserved[0x20 - 0x08];
u8 unk_0x08[0x20 - 0x08];
enum {
FLAG_SYSCONF_EULA = 0,

View File

@@ -50,7 +50,7 @@ namespace ipl {
static BOOL IsLastTicketExpired(ESTitleId* titleId);
static void DeleteExpiredFlagFile();
static s32 DeleteUnauthorizedData(EGG::Heap* heap);
static void DeleteUnauthorizedData(EGG::Heap* heap);
static u32 CheckTmdCountryCode(ESTmdView* tmdView);
static u32 CheckTmdParentalControl(ESTmdView* tmdView);

View File

@@ -27,11 +27,7 @@ namespace ipl {
void init(int type, f32 maxFrame, f32 minFrame, f32 speed = 1.0f);
void initFrame();
#ifdef IPL_CHANNEL_SELECT_CPP
virtual inline void calc();
#else
virtual void calc(); // 0x0C
#endif
void setMaxFrame(f32 value) { mMaxFrame = value; }
f32 getMaxFrame() const { return mMaxFrame; }

View File

@@ -51,17 +51,12 @@ namespace ipl {
mArg.mOrthoScale = scale;
}
#ifdef IPL_SD_CHANNEL_TITLE_CPP
static void setOrthoTrans(const math::VEC3& translate);
static void setOrthoScale(const math::VEC2& scale);
#else
static void setOrthoTrans(const math::VEC3& translate) { mArg.mOrthoTrans = translate; }
static void setOrthoScale(const math::VEC2& scale) NO_INLINE {
mArg.mOrthoScale.x = scale.x;
mArg.mOrthoScale.y = scale.y;
}
#endif
private:
static Arg mArg;

View File

@@ -27,7 +27,7 @@ namespace ipl {
private:
OSMessage mMessages[count]; // 0x24
u32 mReserved; // (sizeof(mMessages) * count) + 0x00
u32 unk_0x00; // (sizeof(mMessages) * count) + 0x00
};
} // namespace utility
} // namespace ipl

View File

@@ -32,8 +32,8 @@ namespace ipl {
void set_arw_param();
int mState; // 0x04
math::VEC2 mPointerPosition;
math::VEC2 mScrollOrigin;
math::VEC2 unk_0x08;
math::VEC2 unk_0x10;
f32 mSpeed; // 0x18
f32 mSoundFreq; // 0x1C
};
@@ -94,9 +94,9 @@ namespace ipl {
f32 mUpLimit; // 0x38
f32 unk_0x3C;
f32 mScroll; // 0x40
f32 mButtonScrollOrigin;
f32 mVelocityDecay;
f32 mScrollAcceleration;
f32 unk_0x44;
f32 unk_0x48;
f32 unk_0x4C;
};
} // namespace utility
} // namespace ipl

View File

@@ -21,12 +21,6 @@ namespace EGG {
virtual void initialize(IAudioMgr::Arg* arg);
};
class ExpAudioMgr : public SimpleAudioMgr, public AudioFxMgr {
public:
ExpAudioMgr();
virtual ~ExpAudioMgr();
};
} // namespace EGG
#endif // EGG_AUDIO_EXP_MGR_H

View File

@@ -13,7 +13,7 @@ namespace EGG {
public:
struct Arg {
Heap* pHeap; // 0x00
undefined4 reserved;
undefined4 unk_0x04;
s32 soundThreadPrio; // 0x08
s32 dvdThreadPrio; // 0x0C
@@ -31,7 +31,7 @@ namespace EGG {
static const u32 DEFAULT_SOUND_HEAP_SIZE = 0x8CA000;
u32 soundHeapSize; // 0x10
u32 reservedSoundHeap;
u32 unk_0x14;
SimpleAudioMgrArg();
};

View File

@@ -44,7 +44,7 @@ namespace EGG {
u16 mFadeFrame; // 0x0A
u16 mFrame; // 0x0C
u8 mReserved[2];
u8 unk_0x0E[2];
nw4r::ut::Color mColor; // 0x10
nw4r::ut::Rect mSpace; // 0x14

View File

@@ -29,10 +29,4 @@ namespace EGG {
mHeap.SaveState();
}
ExpAudioMgr::ExpAudioMgr() {
}
ExpAudioMgr::~ExpAudioMgr() {
}
} // namespace EGG

View File

@@ -13,7 +13,7 @@ namespace EGG {
soundThreadPrio = nw4r::snd::SoundSystem::DEFAULT_SOUND_THREAD_PRIORITY;
dvdThreadPrio = nw4r::snd::SoundSystem::DEFAULT_DVD_THREAD_PRIORITY;
reserved = 0;
unk_0x04 = 0;
}
SimpleAudioMgr::SimpleAudioMgrArg::SimpleAudioMgrArg() {

View File

@@ -103,7 +103,7 @@ namespace EGG {
}
namespace {
void free_all_visitor(void* ptr, MEMiHeapHead* heapHandle, u32 userData) {
void free_all_visitor(void* ptr, MEMiHeapHead* heapHandle, u32 unk) {
MEMFreeToExpHeap(heapHandle, ptr);
}
} // namespace

View File

@@ -9,12 +9,12 @@ extern "C" {
#define SIGNAL_ACTION_IGNORE ((__signal_func_ptr)1)
#define SIGNAL_ABORT 1
#define SIGNAL_HANDLER_2 2
#define SIGNAL_HANDLER_3 3
#define SIGNAL_HANDLER_4 4
#define SIGNAL_HANDLER_5 5
#define SIGNAL_HANDLER_6 6
#define SIGNAL_HANDLER_7 7
#define SIGNAL_UNK2 2
#define SIGNAL_UNK3 3
#define SIGNAL_UNK4 4
#define SIGNAL_UNK5 5
#define SIGNAL_UNK6 6
#define SIGNAL_UNK7 7
typedef void (*__signal_func_ptr)(int);

View File

@@ -7,7 +7,7 @@ __signal_func_ptr signal_funcs[8];
int raise(int sig) {
__signal_func_ptr signal_func;
if (sig < SIGNAL_ABORT || sig > SIGNAL_HANDLER_7) {
if (sig < SIGNAL_ABORT || sig > SIGNAL_UNK7) {
return -1;
}

View File

@@ -1120,28 +1120,32 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
case 's':
if (format.argument_options == wchar_argument) {
wchar_t* wcs_ptr = va_arg(args, wchar_t*);
int wideLength;
if (wcs_ptr == NULL) {
wcs_ptr = L"";
}
if (format.alternate_form) {
num_chars = (unsigned char)*wcs_ptr++;
wchar_t first = *wcs_ptr++;
wideLength = (unsigned char)first;
if (format.precision_specified && num_chars > format.precision) {
num_chars = format.precision;
if (format.precision_specified && wideLength > format.precision) {
wideLength = format.precision;
}
} else if (format.precision_specified) {
num_chars = format.precision;
wideLength = format.precision;
if ((string_end = wmemchr(wcs_ptr, 0, num_chars)) != 0) {
num_chars = string_end - wcs_ptr;
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, wideLength)) != 0) {
wideLength = string_end - wcs_ptr;
}
} else {
num_chars = wcslen(wcs_ptr);
wideLength = wcslen(wcs_ptr);
}
num_chars = wideLength;
buff_ptr = wcs_ptr;
break;
} else {
@@ -1152,7 +1156,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
}
if (format.alternate_form) {
num_chars = (unsigned char)*buff_ptr;
num_chars = (unsigned char)*(const wchar_t*)wcs_ptr;
if (format.precision_specified && num_chars > format.precision) {
num_chars = format.precision;

View File

@@ -68,10 +68,10 @@ static void __dorounddecup(decimal* d, int digits) {
static void __rounddec(decimal* d, int digits) {
if (digits > 0 && digits < d->sig.length) {
int roundDirection = __must_round(d, digits);
int unkBool = __must_round(d, digits);
d->sig.length = digits;
if (roundDirection >= 0) {
if (unkBool >= 0) {
__dorounddecup(d, digits);
}
}

View File

@@ -88,7 +88,7 @@ namespace nw4r {
PaneList& GetChildList() { return mChildList; }
const math::VEC3& GetTranslate() { return mTranslate; }
#if defined(IPL_SDMEMORY_SET_TRANSLATE_OUT_OF_LINE) || defined(IPL_ADDRESS_MATCHING)
#ifdef IPL_SDMEMORY_SET_TRANSLATE_OUT_OF_LINE
void SetTranslate(const math::VEC3& translate);
#else
void SetTranslate(const math::VEC3& translate) { mTranslate = translate; }

View File

@@ -100,7 +100,7 @@ namespace nw4r {
u8* pCachedBase; // 0x0C
u8* pCachedStart; // 0x10
u8* pCachedEnd; // 0x14
u32 cacheWorkspaceOffset; // 0x18
u32 unk_0x18; // 0x18
};
class ConstructContext {

View File

@@ -9,7 +9,7 @@ namespace nw4r {
namespace ut {
class Rect {
public:
#if defined(IPL_SOUND_RECT_OUT_OF_LINE) || defined(IPL_SD_CHANNEL_TITLE_CPP)
#ifdef IPL_SOUND_RECT_OUT_OF_LINE
Rect();
#else
Rect() : left(), top(), right(), bottom() {}
@@ -20,7 +20,7 @@ namespace nw4r {
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
#endif
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP) && !defined(IPL_SD_CHANNEL_TITLE_CPP)
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP)
~Rect() {}
#endif

View File

@@ -37,7 +37,7 @@ namespace nw4r {
} // namespace detail
template <typename TDerived, typename TBase>
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP) || defined(IPL_SD_CHANNEL_TITLE_CPP)
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
TDerived DynamicCast(TBase* pPtr);
#else
inline TDerived DynamicCast(TBase* pPtr) {

Some files were not shown because too many files have changed in this diff Show More