Compare commits
28 Commits
agent/work
...
agent/cont
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
96d9867915 | ||
|
|
e648cfd25b | ||
|
|
d387e2b42c | ||
|
|
e65e9d06cd | ||
|
|
1f3dbb0ff0 | ||
|
|
041460fc6b | ||
|
|
287f88ae75 | ||
|
|
c3e50612b2 | ||
|
|
99d70b31f7 | ||
|
|
27844c37b3 | ||
|
|
abf047bc3b | ||
|
|
52977bb782 | ||
|
|
b1fd404137 | ||
|
|
9a9f937e9e | ||
|
|
0792087bf1 | ||
|
|
1542f73080 | ||
|
|
d51e34beb2 | ||
|
|
5ffea56c30 | ||
|
|
3dfeacd4f6 | ||
|
|
36f3716be7 | ||
|
|
784a463f27 | ||
|
|
fadf50ce43 | ||
|
|
a824e02a30 | ||
|
|
75c7a24c2f | ||
|
|
12c7a67d2c | ||
|
|
e2c26aad07 | ||
|
|
622b7e678e | ||
|
|
ddbb9b1ab9 |
21
AGENTS.md
21
AGENTS.md
@@ -170,6 +170,12 @@ disjoint tasks. Never duplicate a source file or function
|
||||
range. Workers return changed paths, exact objdiff measurements, and validation
|
||||
results. Fuzzy-only results are not accepted.
|
||||
|
||||
Workers must do the work through tool calls and avoid conversational messages.
|
||||
Send findings to the parent only through the collaboration tool, with concise
|
||||
paths, measurements, and validation evidence. Put PR discussion on the PR when
|
||||
needed. Do not send user-facing status chatter; the orchestrator follows the
|
||||
reporting rule below.
|
||||
|
||||
### Worker loop
|
||||
|
||||
Workers iterate until exact-name `objdiff` reports `100.0%`. They must not stop
|
||||
@@ -299,6 +305,21 @@ After a successful merge:
|
||||
worktree and local branch. A failed or conflicted leaf keeps its worktree
|
||||
and worker alive.
|
||||
|
||||
### User-facing progress reports
|
||||
|
||||
Keep user-facing messages to a minimum and use as few tokens as possible.
|
||||
Do not send routine status updates or commentary while workers are running or
|
||||
PRs are open. After each matching-work PR is merged and the live progress
|
||||
report has been regenerated, send only the current linked, fuzzy, and data
|
||||
percentages in this format:
|
||||
|
||||
```
|
||||
Linked: <percent> | Fuzzy: <percent> | Data: <percent>
|
||||
```
|
||||
|
||||
Do not report stale values, unmerged PR results, or add other text to that
|
||||
update. Continue all required verification and coordination silently.
|
||||
|
||||
## Goal completion contract
|
||||
|
||||
The decompilation loop does not stop after a successful wave, a convenient
|
||||
|
||||
@@ -10,6 +10,33 @@ splits: 'config/43U/splits.txt'
|
||||
|
||||
ldscript_template: 'config/ldscript_ipl2.lcf'
|
||||
|
||||
force_active:
|
||||
- labs
|
||||
- itoa
|
||||
- strpbrk
|
||||
- strspn
|
||||
- strcspn
|
||||
- atol
|
||||
- padding__Q23ipl5scene
|
||||
- lbl_81695063
|
||||
- lbl_81695067
|
||||
- __vt__Q49textinput6extend4memo19NigaoeEventObserver
|
||||
|
||||
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.
|
||||
block_relocations:
|
||||
- source: .data:0x8165E15C
|
||||
- source: .data:0x8165E19C
|
||||
|
||||
add_relocations:
|
||||
- source: .data:0x8165E15C
|
||||
type: abs
|
||||
target: csAninationFile__Q29textinput7toolbar
|
||||
addend: 0x1DC
|
||||
- source: .data:0x8165E19C
|
||||
type: abs
|
||||
target: csAninationFile__Q29textinput7toolbar
|
||||
addend: 0x1DC
|
||||
|
||||
quick_analysis: true
|
||||
fill_gaps: false
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ mMac__Q33ipl6socket13SocketSetting = .bss:0x81089720; // type:object size:0x40
|
||||
_database__7LibTVRC = .bss:0x81089760; // type:object size:0x20 data:4byte
|
||||
_alarm__7LibTVRC = .bss:0x81089780; // type:object size:0x30
|
||||
_tickWait__7LibTVRC = .bss:0x810897B0; // type:object size:0x10 data:4byte
|
||||
mArg__Q33ipl7utility8Graphics = .bss:0x810897C0; // type:object size:0x88
|
||||
mArg__Q33ipl7utility8Graphics = .bss:0x810897C0; // type:object size:0x84
|
||||
unk__Q23ipl3snd = .bss:0x81089848; // type:object size:0xC
|
||||
_seBlk__Q23ipl3snd = .bss:0x81089854; // type:object size:0xD8 data:4byte
|
||||
sSystem__Q23ipl3snd = .bss:0x8108992C; // type:object size:0x63C data:4byte
|
||||
@@ -123,7 +123,7 @@ CDB_SD_ROOT_PATH_LS = .bss:0x810C8A08; // type:object size:0x20
|
||||
CDB_SD_VFF_FILE_NAME = .bss:0x810C8A28; // type:object size:0x48
|
||||
lbl_810C8A80 = .bss:0x810C8A80; // type:object size:0x40 align:32
|
||||
lbl_810C8AC0 = .bss:0x810C8AC0; // type:object size:0x40 align:32
|
||||
s_mutex = .bss:0x810C8B00; // type:object size:0x20 scope:local
|
||||
s_mutex = .bss:0x810C8B00; // type:object size:0x18 scope:local
|
||||
s_cdbWiiId = .bss:0x810C8B20; // type:object size:0x40 scope:local
|
||||
ncdMutex = .bss:0x810C8B60; // type:object size:0x20
|
||||
ncdCommonResult = .bss:0x810C8B80; // type:object size:0x20 align:32 data:4byte
|
||||
@@ -161,7 +161,7 @@ l_dev_init_info_table = .bss:0x810F55C0; // type:object size:0xD0 scope:local
|
||||
l_tmpWName = .bss:0x810F5690; // type:object size:0x10 scope:local data:2byte
|
||||
hashTable = .bss:0x810F56A0; // type:object size:0x22E scope:local data:byte
|
||||
l_driveInfo = .bss:0x810F58D0; // type:object size:0x208 scope:local data:4byte
|
||||
l_nandFunc = .bss:0x810F5AD8; // type:object size:0x1A8 scope:local
|
||||
l_nandFunc = .bss:0x810F5AD8; // type:object size:0x1A0 scope:local
|
||||
l_event = .bss:0x810F5C80; // type:object size:0x340 scope:local
|
||||
l_sddrv_info = .bss:0x810F5FC0; // type:object size:0x80 scope:local
|
||||
sZeroBuffer__Q44nw4r3snd6detail9AxManager = .bss:0x810F6040; // type:object size:0x100
|
||||
@@ -13938,7 +13938,7 @@ pppURLCheck = .rodata:0x816152A8; // type:object size:0x28 scope:local
|
||||
lbl_816152D0 = .rodata:0x816152D0; // type:object size:0x10 scope:local data:4byte
|
||||
csAninationFile__Q29textinput12candidatebox = .rodata:0x816152E0; // type:object size:0x378 scope:local
|
||||
lbl_81615658 = .rodata:0x81615658; // type:object size:0xA0 scope:local data:4byte
|
||||
csAninationFile__Q29textinput7toolbar = .rodata:0x816156F8; // type:object size:0x1E0 scope:local data:4byte
|
||||
csAninationFile__Q29textinput7toolbar = .rodata:0x816156F8; // type:object size:0x1DC scope:local data:4byte
|
||||
csAninationFile__Q29textinput11predictlang = .rodata:0x816158D8; // type:object size:0x268 scope:local
|
||||
csAninationFileForSign__Q39textinput8keyboard10signwindow = .rodata:0x81615B40; // type:object size:0x268 scope:local
|
||||
csPaneNameToControlKey__Q39textinput8keyboard10signwindow = .rodata:0x81615DA8; // type:object size:0x48 scope:local
|
||||
@@ -15733,47 +15733,47 @@ panes__Q23ipl5scene = .data:0x8164C8A4; // type:object size:0xB4 scope:local
|
||||
@16662 = .data:0x8164CBF4; // type:object size:0xC scope:local data:string
|
||||
@16898 = .data:0x8164CC00; // type:object size:0x1A scope:local data:string
|
||||
__vt__Q33ipl5scene11ChannelEdit = .data:0x8164CC1C; // type:object size:0x4C
|
||||
lbl_8164CC68 = .data:0x8164CC68; // type:object size:0x21 data:string
|
||||
lbl_8164CC89 = .data:0x8164CC89; // type:object size:0xA data:string
|
||||
lbl_8164CC93 = .data:0x8164CC93; // type:object size:0x22 data:string
|
||||
lbl_8164CCB5 = .data:0x8164CCB5; // type:object size:0x23 data:string
|
||||
lbl_8164CCD8 = .data:0x8164CCD8; // type:object size:0x9 data:string
|
||||
lbl_8164CCE1 = .data:0x8164CCE1; // type:object size:0x2C data:string
|
||||
lbl_8164CD0D = .data:0x8164CD0D; // type:object size:0xC data:string
|
||||
lbl_8164CD19 = .data:0x8164CD19; // type:object size:0x2D data:string
|
||||
lbl_8164CD46 = .data:0x8164CD46; // type:object size:0x29 data:string
|
||||
lbl_8164CD6F = .data:0x8164CD6F; // type:object size:0x25 data:string
|
||||
lbl_8164CD94 = .data:0x8164CD94; // type:object size:0xB data:string
|
||||
lbl_8164CD9F = .data:0x8164CD9F; // type:object size:0x26 data:string
|
||||
lbl_8164CDC5 = .data:0x8164CDC5; // type:object size:0x28 data:string
|
||||
lbl_8164CDED = .data:0x8164CDED; // type:object size:0x20 data:string
|
||||
lbl_8164CE0D = .data:0x8164CE0D; // type:object size:0x20 data:string
|
||||
lbl_8164CE2D = .data:0x8164CE2D; // type:object size:0x21 data:string
|
||||
lbl_8164CE4E = .data:0x8164CE4E; // type:object size:0xA data:string
|
||||
lbl_8164CE58 = .data:0x8164CE58; // type:object size:0xA data:string
|
||||
lbl_8164CE62 = .data:0x8164CE62; // type:object size:0x22 data:string
|
||||
lbl_8164CE84 = .data:0x8164CE84; // type:object size:0xD data:string
|
||||
lbl_8164CE91 = .data:0x8164CE91; // type:object size:0xD data:string
|
||||
lbl_8164CE9E = .data:0x8164CE9E; // type:object size:0x23 data:string
|
||||
lbl_8164CEC1 = .data:0x8164CEC1; // type:object size:0x1F data:string
|
||||
lbl_8164CEE0 = .data:0x8164CEE0; // type:object size:0xA data:string
|
||||
lbl_8164CEEA = .data:0x8164CEEA; // type:object size:0x21 data:string
|
||||
lbl_8164CF0B = .data:0x8164CF0B; // type:object size:0xB data:string
|
||||
lbl_8164CF16 = .data:0x8164CF16; // type:object size:0xB data:string
|
||||
lbl_8164CF21 = .data:0x8164CF21; // type:object size:0x1F data:string
|
||||
lbl_8164CF40 = .data:0x8164CF40; // type:object size:0x25 data:string
|
||||
lbl_8164CF65 = .data:0x8164CF65; // type:object size:0xB data:string
|
||||
lbl_8164CF70 = .data:0x8164CF70; // type:object size:0x26 data:string
|
||||
lbl_8164CF96 = .data:0x8164CF96; // type:object size:0xF data:string
|
||||
lbl_8164CFA5 = .data:0x8164CFA5; // type:object size:0xF data:string
|
||||
lbl_8164CFB4 = .data:0x8164CFB4; // type:object size:0xE data:string
|
||||
lbl_8164CFC2 = .data:0x8164CFC2; // type:object size:0xE data:string
|
||||
lbl_8164CFD0 = .data:0x8164CFD0; // type:object size:0xB data:string
|
||||
lbl_8164CFDB = .data:0x8164CFDB; // type:object size:0xA data:string
|
||||
lbl_8164CFE5 = .data:0x8164CFE5; // type:object size:0xA data:string
|
||||
lbl_8164CFEF = .data:0x8164CFEF; // type:object size:0xF data:string
|
||||
lbl_8164CFFE = .data:0x8164CFFE; // type:object size:0xE data:string
|
||||
jumptable_8164D00C = .data:0x8164D00C; // type:object size:0x30 scope:local
|
||||
@17285 = .data:0x8164CC68; // type:object size:0x21 scope:local data:string
|
||||
@17286 = .data:0x8164CC89; // type:object size:0xA scope:local data:string
|
||||
@17287 = .data:0x8164CC93; // type:object size:0x22 scope:local data:string
|
||||
@17288 = .data:0x8164CCB5; // type:object size:0x23 scope:local data:string
|
||||
@17289 = .data:0x8164CCD8; // type:object size:0x9 scope:local data:string
|
||||
@17290 = .data:0x8164CCE1; // type:object size:0x2C scope:local data:string
|
||||
@17291 = .data:0x8164CD0D; // type:object size:0xC scope:local data:string
|
||||
@17292 = .data:0x8164CD19; // type:object size:0x2D scope:local data:string
|
||||
@17293 = .data:0x8164CD46; // type:object size:0x29 scope:local data:string
|
||||
@17294 = .data:0x8164CD6F; // type:object size:0x25 scope:local data:string
|
||||
@17295 = .data:0x8164CD94; // type:object size:0xB scope:local data:string
|
||||
@17296 = .data:0x8164CD9F; // type:object size:0x26 scope:local data:string
|
||||
@17297 = .data:0x8164CDC5; // type:object size:0x28 scope:local data:string
|
||||
@17298 = .data:0x8164CDED; // type:object size:0x20 scope:local data:string
|
||||
@17300 = .data:0x8164CE0D; // type:object size:0x20 scope:local data:string
|
||||
@17301 = .data:0x8164CE2D; // type:object size:0x21 scope:local data:string
|
||||
@17302 = .data:0x8164CE4E; // type:object size:0xA scope:local data:string
|
||||
@17303 = .data:0x8164CE58; // type:object size:0xA scope:local data:string
|
||||
@17304 = .data:0x8164CE62; // type:object size:0x22 scope:local data:string
|
||||
@17305 = .data:0x8164CE84; // type:object size:0xD scope:local data:string
|
||||
@17306 = .data:0x8164CE91; // type:object size:0xD scope:local data:string
|
||||
@17307 = .data:0x8164CE9E; // type:object size:0x23 scope:local data:string
|
||||
@17308 = .data:0x8164CEC1; // type:object size:0x1F scope:local data:string
|
||||
@17309 = .data:0x8164CEE0; // type:object size:0xA scope:local data:string
|
||||
@17310 = .data:0x8164CEEA; // type:object size:0x21 scope:local data:string
|
||||
@17311 = .data:0x8164CF0B; // type:object size:0xB scope:local data:string
|
||||
@17312 = .data:0x8164CF16; // type:object size:0xB scope:local data:string
|
||||
@17313 = .data:0x8164CF21; // type:object size:0x1F scope:local data:string
|
||||
@17314 = .data:0x8164CF40; // type:object size:0x25 scope:local data:string
|
||||
@17315 = .data:0x8164CF65; // type:object size:0xB scope:local data:string
|
||||
@17316 = .data:0x8164CF70; // type:object size:0x26 scope:local data:string
|
||||
@17317 = .data:0x8164CF96; // type:object size:0xF scope:local data:string
|
||||
@17318 = .data:0x8164CFA5; // type:object size:0xF scope:local data:string
|
||||
@17319 = .data:0x8164CFB4; // type:object size:0xE scope:local data:string
|
||||
@17320 = .data:0x8164CFC2; // type:object size:0xE scope:local data:string
|
||||
@17321 = .data:0x8164CFD0; // type:object size:0xB scope:local data:string
|
||||
@17325 = .data:0x8164CFDB; // type:object size:0xA scope:local data:string
|
||||
@17326 = .data:0x8164CFE5; // type:object size:0xA scope:local data:string
|
||||
@17329 = .data:0x8164CFEF; // type:object size:0xF scope:local data:string
|
||||
@17330 = .data:0x8164CFFE; // type:object size:0xE scope:local data:string
|
||||
@17390 = .data:0x8164D00C; // type:object size:0x30 scope:local
|
||||
__vt__Q33ipl5scene11ChanAppBase = .data:0x8164D03C; // type:object size:0x28
|
||||
__vt__Q33ipl5scene13AnmController = .data:0x8164D0F8; // type:object size:0xC scope:weak
|
||||
lbl_8164D108 = .data:0x8164D108; // type:object size:0x25 data:string
|
||||
@@ -15791,56 +15791,56 @@ lbl_8164D1F4 = .data:0x8164D1F4; // type:object size:0xA data:string
|
||||
lbl_8164D1FE = .data:0x8164D1FE; // type:object size:0x11 data:string
|
||||
lbl_8164D20F = .data:0x8164D20F; // type:object size:0x11 data:string
|
||||
__vt__Q33ipl5scene10ChanAppBox = .data:0x8164D220; // type:object size:0x28
|
||||
lbl_8164D2E8 = .data:0x8164D2E8; // type:object size:0x20 data:string
|
||||
lbl_8164D308 = .data:0x8164D308; // type:object size:0x21 data:string
|
||||
lbl_8164D329 = .data:0x8164D329; // type:object size:0x26 data:string
|
||||
lbl_8164D34F = .data:0x8164D34F; // type:object size:0x27 data:string
|
||||
lbl_8164D376 = .data:0x8164D376; // type:object size:0x23 data:string
|
||||
lbl_8164D399 = .data:0x8164D399; // type:object size:0xC data:string
|
||||
lbl_8164D3A5 = .data:0x8164D3A5; // type:object size:0x25 data:string
|
||||
lbl_8164D3CA = .data:0x8164D3CA; // type:object size:0x26 data:string
|
||||
lbl_8164D3F0 = .data:0x8164D3F0; // type:object size:0x22 data:string
|
||||
lbl_8164D412 = .data:0x8164D412; // type:object size:0xB data:string
|
||||
lbl_8164D41D = .data:0x8164D41D; // type:object size:0x23 data:string
|
||||
lbl_8164D440 = .data:0x8164D440; // type:object size:0x9 data:string
|
||||
lbl_8164D449 = .data:0x8164D449; // type:object size:0x24 data:string
|
||||
lbl_8164D46D = .data:0x8164D46D; // type:object size:0x26 data:string
|
||||
lbl_8164D493 = .data:0x8164D493; // type:object size:0x1E data:string
|
||||
lbl_8164D4B1 = .data:0x8164D4B1; // type:object size:0x26 data:string
|
||||
lbl_8164D4D7 = .data:0x8164D4D7; // type:object size:0x26 data:string
|
||||
lbl_8164D4FD = .data:0x8164D4FD; // type:object size:0x27 data:string
|
||||
lbl_8164D524 = .data:0x8164D524; // type:object size:0x23 data:string
|
||||
lbl_8164D547 = .data:0x8164D547; // type:object size:0xC data:string
|
||||
lbl_8164D553 = .data:0x8164D553; // type:object size:0xA data:string
|
||||
lbl_8164D55D = .data:0x8164D55D; // type:object size:0xA data:string
|
||||
lbl_8164D567 = .data:0x8164D567; // type:object size:0x9 data:string
|
||||
lbl_8164D570 = .data:0x8164D570; // type:object size:0xB data:string
|
||||
lbl_8164D57B = .data:0x8164D57B; // type:object size:0xB data:string
|
||||
lbl_8164D586 = .data:0x8164D586; // type:object size:0xD data:string
|
||||
lbl_8164D593 = .data:0x8164D593; // type:object size:0xB data:string
|
||||
lbl_8164D59E = .data:0x8164D59E; // type:object size:0xB data:string
|
||||
lbl_8164D5A9 = .data:0x8164D5A9; // type:object size:0xB data:string
|
||||
lbl_8164D5B4 = .data:0x8164D5B4; // type:object size:0xB data:string
|
||||
lbl_8164D5BF = .data:0x8164D5BF; // type:object size:0x9 data:string
|
||||
lbl_8164D5C8 = .data:0x8164D5C8; // type:object size:0xB data:string
|
||||
lbl_8164D5D3 = .data:0x8164D5D3; // type:object size:0xB data:string
|
||||
lbl_8164D5DE = .data:0x8164D5DE; // type:object size:0xA data:string
|
||||
lbl_8164D5E8 = .data:0x8164D5E8; // type:object size:0xB data:string
|
||||
lbl_8164D5F3 = .data:0x8164D5F3; // type:object size:0xD data:string
|
||||
lbl_8164D600 = .data:0x8164D600; // type:object size:0x10 data:string
|
||||
lbl_8164D610 = .data:0x8164D610; // type:object size:0xB data:string
|
||||
lbl_8164D61B = .data:0x8164D61B; // type:object size:0xE data:string
|
||||
lbl_8164D629 = .data:0x8164D629; // type:object size:0xA data:string
|
||||
lbl_8164D633 = .data:0x8164D633; // type:object size:0xA data:string
|
||||
lbl_8164D63D = .data:0x8164D63D; // type:object size:0x9 data:string
|
||||
jumptable_8164D648 = .data:0x8164D648; // type:object size:0x34 scope:local
|
||||
lbl_8164D67C = .data:0x8164D67C; // type:object size:0xF data:string
|
||||
lbl_8164D68B = .data:0x8164D68B; // type:object size:0xE data:string
|
||||
lbl_8164D699 = .data:0x8164D699; // type:object size:0xA data:string
|
||||
lbl_8164D6A3 = .data:0x8164D6A3; // type:object size:0xC data:string
|
||||
lbl_8164D6AF = .data:0x8164D6AF; // type:object size:0xC data:string
|
||||
lbl_8164D6BB = .data:0x8164D6BB; // type:object size:0xB data:string
|
||||
lbl_8164D6C6 = .data:0x8164D6C6; // type:object size:0xF data:string
|
||||
@18429 = .data:0x8164D2E8; // type:object size:0x20 scope:local data:string
|
||||
@18431 = .data:0x8164D308; // type:object size:0x21 scope:local data:string
|
||||
@18432 = .data:0x8164D329; // type:object size:0x26 scope:local data:string
|
||||
@18434 = .data:0x8164D34F; // type:object size:0x27 scope:local data:string
|
||||
@18435 = .data:0x8164D376; // type:object size:0x23 scope:local data:string
|
||||
@18436 = .data:0x8164D399; // type:object size:0xC scope:local data:string
|
||||
@18437 = .data:0x8164D3A5; // type:object size:0x25 scope:local data:string
|
||||
@18439 = .data:0x8164D3CA; // type:object size:0x26 scope:local data:string
|
||||
@18440 = .data:0x8164D3F0; // type:object size:0x22 scope:local data:string
|
||||
@18441 = .data:0x8164D412; // type:object size:0xB scope:local data:string
|
||||
@18442 = .data:0x8164D41D; // type:object size:0x23 scope:local data:string
|
||||
@18443 = .data:0x8164D440; // type:object size:0x9 scope:local data:string
|
||||
@18444 = .data:0x8164D449; // type:object size:0x24 scope:local data:string
|
||||
@18445 = .data:0x8164D46D; // type:object size:0x26 scope:local data:string
|
||||
@18446 = .data:0x8164D493; // type:object size:0x1E scope:local data:string
|
||||
@18448 = .data:0x8164D4B1; // type:object size:0x26 scope:local data:string
|
||||
@18450 = .data:0x8164D4D7; // type:object size:0x26 scope:local data:string
|
||||
@18452 = .data:0x8164D4FD; // type:object size:0x27 scope:local data:string
|
||||
@18453 = .data:0x8164D524; // type:object size:0x23 scope:local data:string
|
||||
@18454 = .data:0x8164D547; // type:object size:0xC scope:local data:string
|
||||
@18455 = .data:0x8164D553; // type:object size:0xA scope:local data:string
|
||||
@18456 = .data:0x8164D55D; // type:object size:0xA scope:local data:string
|
||||
@18457 = .data:0x8164D567; // type:object size:0x9 scope:local data:string
|
||||
@18458 = .data:0x8164D570; // type:object size:0xB scope:local data:string
|
||||
@18460 = .data:0x8164D57B; // type:object size:0xB scope:local data:string
|
||||
@18461 = .data:0x8164D586; // type:object size:0xD scope:local data:string
|
||||
@18462 = .data:0x8164D593; // type:object size:0xB scope:local data:string
|
||||
@18463 = .data:0x8164D59E; // type:object size:0xB scope:local data:string
|
||||
@18464 = .data:0x8164D5A9; // type:object size:0xB scope:local data:string
|
||||
@18465 = .data:0x8164D5B4; // type:object size:0xB scope:local data:string
|
||||
@18467 = .data:0x8164D5BF; // type:object size:0x9 scope:local data:string
|
||||
@18469 = .data:0x8164D5C8; // type:object size:0xB scope:local data:string
|
||||
@18470 = .data:0x8164D5D3; // type:object size:0xB scope:local data:string
|
||||
@18471 = .data:0x8164D5DE; // type:object size:0xA scope:local data:string
|
||||
@18472 = .data:0x8164D5E8; // type:object size:0xB scope:local data:string
|
||||
@18473 = .data:0x8164D5F3; // type:object size:0xD scope:local data:string
|
||||
@18474 = .data:0x8164D600; // type:object size:0x10 scope:local data:string
|
||||
@18475 = .data:0x8164D610; // type:object size:0xB scope:local data:string
|
||||
@18476 = .data:0x8164D61B; // type:object size:0xE scope:local data:string
|
||||
@18477 = .data:0x8164D629; // type:object size:0xA scope:local data:string
|
||||
@18478 = .data:0x8164D633; // type:object size:0xA scope:local data:string
|
||||
@18479 = .data:0x8164D63D; // type:object size:0x9 scope:local data:string
|
||||
@18554 = .data:0x8164D648; // type:object size:0x34 scope:local
|
||||
@18692 = .data:0x8164D67C; // type:object size:0xF scope:local data:string
|
||||
@18693 = .data:0x8164D68B; // type:object size:0xE scope:local data:string
|
||||
@18695 = .data:0x8164D699; // type:object size:0xA scope:local data:string
|
||||
@18696 = .data:0x8164D6A3; // type:object size:0xC scope:local data:string
|
||||
@18697 = .data:0x8164D6AF; // type:object size:0xC scope:local data:string
|
||||
@18698 = .data:0x8164D6BB; // type:object size:0xB scope:local data:string
|
||||
@18826 = .data:0x8164D6C6; // type:object size:0xF scope:local data:string
|
||||
__vt__Q33ipl5scene11ChanAppEdit = .data:0x8164D6D8; // type:object size:0x28
|
||||
@15167 = .data:0x8164D7C0; // type:object size:0x7C scope:local
|
||||
...data.0 = .data:0x8164D7C0; // type:label scope:local
|
||||
@@ -17535,20 +17535,20 @@ __vt__Q39textinput12candidatebox4Base = .data:0x8165DFA8; // type:object size:0x
|
||||
__vt__Q39textinput12candidatebox18CandidateBoxCaller = .data:0x8165DFFC; // type:object size:0x1C
|
||||
__vt__Q39textinput11nw4rmanager11AnmObserver = .data:0x8165E018; // type:object size:0x4C
|
||||
__vt__Q39textinput4util12AnimObserver = .data:0x8165E064; // type:object size:0xC
|
||||
lbl_8165E070 = .data:0x8165E070; // type:object size:0xC data:string
|
||||
lbl_8165E080 = .data:0x8165E080; // type:object size:0x10 data:string
|
||||
lbl_8165E090 = .data:0x8165E090; // type:object size:0xD data:string
|
||||
lbl_8165E0A0 = .data:0x8165E0A0; // type:object size:0xC data:string
|
||||
@6142 = .data:0x8165E070; // type:object size:0xC scope:local data:string
|
||||
@6143 = .data:0x8165E080; // type:object size:0x10 scope:local data:string
|
||||
@6144 = .data:0x8165E090; // type:object size:0xD scope:local data:string
|
||||
@6145 = .data:0x8165E0A0; // type:object size:0xC scope:local data:string
|
||||
csPaneToAnimation__Q29textinput7toolbar = .data:0x8165E0B0; // type:object size:0x100
|
||||
lbl_8165E1B0 = .data:0x8165E1B0; // type:object size:0xD data:string
|
||||
lbl_8165E1C0 = .data:0x8165E1C0; // type:object size:0xC data:string
|
||||
lbl_8165E1CC = .data:0x8165E1CC; // type:object size:0xD data:string
|
||||
lbl_8165E1DC = .data:0x8165E1DC; // type:object size:0xC data:string
|
||||
lbl_8165E1E8 = .data:0x8165E1E8; // type:object size:0xC data:string
|
||||
lbl_8165E1F8 = .data:0x8165E1F8; // type:object size:0x10 data:string
|
||||
jumptable_8165E208 = .data:0x8165E208; // type:object size:0x30 scope:local
|
||||
lbl_8165E238 = .data:0x8165E238; // type:object size:0xC data:string
|
||||
jumptable_8165E244 = .data:0x8165E244; // type:object size:0x1C scope:local
|
||||
@6802 = .data:0x8165E1B0; // type:object size:0xD scope:local data:string
|
||||
@6805 = .data:0x8165E1C0; // type:object size:0xC scope:local data:string
|
||||
@6808 = .data:0x8165E1CC; // type:object size:0xD scope:local data:string
|
||||
@6812 = .data:0x8165E1DC; // type:object size:0xC scope:local data:string
|
||||
@6816 = .data:0x8165E1E8; // type:object size:0xC scope:local data:string
|
||||
@6817 = .data:0x8165E1F8; // type:object size:0x10 scope:local data:string
|
||||
@6837 = .data:0x8165E208; // type:object size:0x30 scope:local
|
||||
@6894 = .data:0x8165E238; // type:object size:0xC scope:local data:string
|
||||
@6937 = .data:0x8165E244; // type:object size:0x1C scope:local
|
||||
__vt__Q39textinput7toolbar19ToggleButtonAnmPane = .data:0x8165E260; // type:object size:0x2C
|
||||
__vt__Q39textinput7toolbar19NormalButtonAnmPane = .data:0x8165E28C; // type:object size:0x2C
|
||||
__vt__Q39textinput7toolbar7AnmPane = .data:0x8165E2B8; // type:object size:0x2C
|
||||
@@ -22266,10 +22266,10 @@ lbl_816973C4 = .sdata:0x816973C4; // type:object size:0x4 data:4byte
|
||||
lbl_816973C8 = .sdata:0x816973C8; // type:object size:0x8
|
||||
lbl_816973D0 = .sdata:0x816973D0; // type:object size:0x8 data:string
|
||||
lbl_816973D8 = .sdata:0x816973D8; // type:object size:0x8 data:string
|
||||
lbl_816973E0 = .sdata:0x816973E0; // type:object size:0x4 data:4byte
|
||||
lbl_816973E4 = .sdata:0x816973E4; // type:object size:0x4 data:4byte
|
||||
lbl_816973E8 = .sdata:0x816973E8; // type:object size:0x5 data:string
|
||||
lbl_816973F0 = .sdata:0x816973F0; // type:object size:0x7 data:string
|
||||
COMMON_BUTTON_ANIM__Q29textinput7toolbar = .sdata:0x816973E0; // type:object size:0x4 scope:local data:4byte
|
||||
COMMON_CHG_ANIM__Q29textinput7toolbar = .sdata:0x816973E4; // type:object size:0x4 scope:local data:4byte
|
||||
@6901 = .sdata:0x816973E8; // type:object size:0x5 scope:local data:string
|
||||
@6908 = .sdata:0x816973F0; // type:object size:0x7 scope:local data:string
|
||||
lbl_816973F8 = .sdata:0x816973F8; // type:object size:0x4 data:4byte
|
||||
lbl_81697400 = .sdata:0x81697400; // type:object size:0x4 data:4byte
|
||||
lbl_81697404 = .sdata:0x81697404; // type:object size:0x4 data:4byte
|
||||
@@ -23523,7 +23523,7 @@ s_fatalVFFlag = .sbss:0x81698D7C; // type:object size:0x4 scope:local data:4byte
|
||||
CDBPrintDebugLevel = .sbss:0x81698D80; // type:object size:0x4 data:4byte
|
||||
s_lastNANDError = .sbss:0x81698D84; // type:object size:0x4 scope:local data:4byte
|
||||
s_lastVFError = .sbss:0x81698D88; // type:object size:0x4 scope:local data:4byte
|
||||
lbl_81698D8C = .sbss:0x81698D8C; // type:object size:0x4 scope:local data:4byte
|
||||
CDBDatabaseWorkBuf = .sbss:0x81698D8C; // type:object size:0x4 data:4byte
|
||||
s_recordPool = .sbss:0x81698D90; // type:object size:0x4 scope:local data:4byte
|
||||
s_databasePool = .sbss:0x81698D94; // type:object size:0x4 scope:local data:4byte
|
||||
lbl_81698D98 = .sbss:0x81698D98; // type:object size:0x4 data:4byte
|
||||
|
||||
@@ -36,3 +36,7 @@ SECTIONS {
|
||||
__ArenaLo = (_db_stack_addr + 0x1F) & ~0x1F;
|
||||
__ArenaHi = $ARENAHI;
|
||||
}
|
||||
|
||||
FORCEACTIVE {
|
||||
$FORCEACTIVE
|
||||
}
|
||||
|
||||
44
configure.py
44
configure.py
@@ -671,7 +671,7 @@ config.libs = [
|
||||
Object(Matching, "utility/iplTVRCUtils.cpp"),
|
||||
Object(Matching, "utility/iplTree.cpp"),
|
||||
Object(Matching, "utility/iplFrameController.cpp"),
|
||||
Object(Equivalent, "utility/iplGraphics.cpp"),
|
||||
Object(Matching, "utility/iplGraphics.cpp"),
|
||||
Object(Matching, "utility/iplCapture.cpp"),
|
||||
Object(Matching, "utility/iplUtility.cpp"),
|
||||
Object(Matching, "utility/iplThread.cpp"),
|
||||
@@ -704,7 +704,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("homebutton", [
|
||||
Object(Equivalent, "homebutton/HBMBase.cpp"),
|
||||
Object(Matching, "homebutton/HBMBase.cpp"),
|
||||
Object(Matching, "homebutton/HBMAnmController.cpp"),
|
||||
Object(Matching, "homebutton/HBMController.cpp"),
|
||||
Object(Matching, "homebutton/HBMFrameController.cpp"),
|
||||
@@ -750,15 +750,15 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("calendar", [
|
||||
Object(Equivalent, "scene/calendar/iplCalendar.cpp"),
|
||||
Object(Matching, "scene/calendar/iplCalendar.cpp"),
|
||||
Object(Matching, "scene/calendar/iplDate.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("channelEdit", [
|
||||
Object(Matching, "scene/channelEdit/iplChannelEdit.cpp"),
|
||||
Object(Equivalent, "scene/channelEdit/iplChanAppBase.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplChanAppBase.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplChanAppBox.cpp"),
|
||||
Object(Equivalent, "scene/channelEdit/iplChanAppEdit.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplChanAppEdit.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplAnmController.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplNandSDCardManager.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplThumbnail.cpp"),
|
||||
@@ -788,7 +788,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("letterWriter", [
|
||||
Object(Equivalent, "scene/letterWriter/iplLetterWriter.cpp"),
|
||||
Object(Matching, "scene/letterWriter/iplLetterWriter.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("limitOver", [
|
||||
@@ -911,8 +911,8 @@ config.libs = [
|
||||
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(NonMatching, "keyboard/tiToolBar.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiPredictLang.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiToolBar.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiPredictLang.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
|
||||
@@ -1015,7 +1015,7 @@ config.libs = [
|
||||
# RevoEX
|
||||
RevoEXLib("cdb", [
|
||||
Object(Matching, "cdb/cdb.c"),
|
||||
Object(Equivalent, "cdb/CDBConv.c"), # hmm
|
||||
Object(Matching, "cdb/CDBConv.c"), # hmm
|
||||
Object(Matching, "cdb/CDBDatabase.c"),
|
||||
Object(Matching, "cdb/CDBFileSystemUtils.c"),
|
||||
Object(Matching, "cdb/CDBFileSystem.c"),
|
||||
@@ -1025,8 +1025,8 @@ config.libs = [
|
||||
Object(Matching, "cdb/CDBRecordFile.c"),
|
||||
Object(Matching, "cdb/CDBRecordKey.c"),
|
||||
Object(NonMatching, "cdb/CDBIntArray.c"),
|
||||
Object(NonMatching, "cdb/CDBSystem.c"),
|
||||
Object(Equivalent, "cdb/CDBAttr.c"),
|
||||
Object(Matching, "cdb/CDBSystem.c"),
|
||||
Object(Matching, "cdb/CDBAttr.c"),
|
||||
Object(Matching, "cdb/CDBFBridge.c"),
|
||||
Object(Matching, "cdb/CDBFBridgeVF.c"),
|
||||
Object(Matching, "cdb/CDBFBridgeSD.c"),
|
||||
@@ -1035,7 +1035,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RevoEXLib("ncd", [
|
||||
Object(NonMatching, "ncd/ncdsystem.c"),
|
||||
Object(Matching, "ncd/ncdsystem.c"),
|
||||
Object(NonMatching, "ncd/ncdsleep.c"),
|
||||
]
|
||||
),
|
||||
@@ -1163,7 +1163,7 @@ config.libs = [
|
||||
Object(Matching, "vf/develop/d_hash.c"),
|
||||
Object(Matching, "vf/develop/d_time.c"),
|
||||
Object(Matching, "vf/develop/d_common.c"),
|
||||
Object(NonMatching, "vf/develop/nand_drv.c"),
|
||||
Object(Matching, "vf/develop/nand_drv.c"),
|
||||
Object(Matching, "vf/develop/sd_drv.c"),
|
||||
]
|
||||
),
|
||||
@@ -1550,7 +1550,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RVLSDKLib("wpad", [
|
||||
Object(Equivalent, "wpad/WPAD.c"),
|
||||
Object(Matching, "wpad/WPAD.c"),
|
||||
Object(NonMatching, "wpad/WPADHIDParser.c"),
|
||||
Object(Matching, "wpad/WPADMem.c"),
|
||||
Object(Matching, "wpad/WPADEncrypt.c"),
|
||||
@@ -1899,7 +1899,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RVLSDKLib("cntcache", [
|
||||
Object(NonMatching, "cntcache/cntcache.c"),
|
||||
Object(Matching, "cntcache/cntcache.c"),
|
||||
]
|
||||
),
|
||||
# EGG library (for Nintendo EAD software)
|
||||
@@ -1907,7 +1907,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"),
|
||||
@@ -1946,13 +1946,13 @@ config.libs = [
|
||||
Object(NonMatching, "MSL_Common_Embedded/ansi_fp.c"),
|
||||
Object(Matching, "MSL_Common/ctype.c"),
|
||||
Object(NonMatching, "MSL_Common/locale.c"),
|
||||
Object(Matching, "MSL_Common/arith.c"),
|
||||
Object(Matching, "MSL_Common/bsearch.c"),
|
||||
Object(Matching, "MSL_Common/buffer_io.c"),
|
||||
Object(Matching, "MSL_Common/arith.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/bsearch.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/buffer_io.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/direct_io.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common/file_io.c"),
|
||||
Object(Matching, "MSL_Common/FILE_POS.c"),
|
||||
Object(Matching, "MSL_Common/mbstring.c"),
|
||||
Object(Matching, "MSL_Common/FILE_POS.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/mbstring.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/mem.c"),
|
||||
Object(Matching, "MSL_Common/mem_funcs.c"),
|
||||
Object(Matching, "MSL_Common/math_api.c"),
|
||||
@@ -1965,7 +1965,7 @@ config.libs = [
|
||||
Object(Matching, "MSL_Common/string.c"),
|
||||
Object(Matching, "MSL_Common/float.c"),
|
||||
Object(NonMatching, "MSL_Common/strtold.c"),
|
||||
Object(NonMatching, "MSL_Common/strtoul.c"),
|
||||
Object(Matching, "MSL_Common/strtoul.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common/time.c"),
|
||||
Object(Matching, "MSL_Common/wctype.c"),
|
||||
Object(Matching, "MSL_Common/wmem.c"),
|
||||
|
||||
@@ -30,9 +30,9 @@ private:
|
||||
class WaveFileAiff : public WaveFile {
|
||||
public:
|
||||
WaveFileAiff();
|
||||
virtual ~WaveFileAiff() {}
|
||||
|
||||
virtual u32 getBit() const override;
|
||||
virtual ~WaveFileAiff();
|
||||
virtual int getChannels() const override { return mNumChans; }
|
||||
virtual f64 getSamplingRate() const override { return mSamplingRate; }
|
||||
virtual s32 getFrames() const override;
|
||||
@@ -67,9 +67,9 @@ private:
|
||||
class WaveFileWav : public WaveFile {
|
||||
public:
|
||||
WaveFileWav();
|
||||
virtual ~WaveFileWav() {}
|
||||
|
||||
virtual u32 getBit() const override;
|
||||
virtual ~WaveFileWav();
|
||||
virtual int getChannels() const override { return mNumChans; }
|
||||
virtual f64 getSamplingRate() const override { return mSamplingRate; }
|
||||
virtual s32 getFrames() const override;
|
||||
|
||||
@@ -272,20 +272,20 @@ namespace homebutton {
|
||||
f32 mFadeOutSeTime; // 0x798
|
||||
|
||||
private:
|
||||
static const int scSoundHeapSize_but2;
|
||||
static const int scSoundHeapSize_but3;
|
||||
static const int scSoundThreadPrio;
|
||||
static const int scDvdThreadPrio;
|
||||
static const int scSoundHeapSize_but2 = 0x60000;
|
||||
static const int scSoundHeapSize_but3 = 0x6f800;
|
||||
static const int scSoundThreadPrio = 4;
|
||||
static const int scDvdThreadPrio = 3;
|
||||
|
||||
static const int scReConnectTime;
|
||||
static const int scReConnectTime2;
|
||||
static const int scPadDrawWaitTime;
|
||||
static const int scGetPadInfoTime;
|
||||
static const int scForcusSEWaitTime;
|
||||
static const int scReConnectTime = 3600;
|
||||
static const int scReConnectTime2 = 3570;
|
||||
static const int scPadDrawWaitTime = 5;
|
||||
static const int scGetPadInfoTime = 100;
|
||||
static const int scForcusSEWaitTime = 2;
|
||||
static const f32 scOnPaneVibTime;
|
||||
static const f32 scOnPaneVibWaitTime;
|
||||
static const int scWaitStopMotorTime;
|
||||
static const int scWaitDisConnectTime;
|
||||
static const int scWaitStopMotorTime = 30;
|
||||
static const int scWaitDisConnectTime = 180;
|
||||
|
||||
static const char* scCursorLytName[res::eCursorLyt_Max];
|
||||
static const char* scCursorPaneName;
|
||||
|
||||
@@ -139,6 +139,9 @@ namespace ext_ead {
|
||||
u32 unk_0x14; // 0x14
|
||||
u32 unk_0x18; // 0x18
|
||||
u32 maxLength; // 0x1c
|
||||
|
||||
ImeData& operator=(const ImeData&);
|
||||
|
||||
} ImeData;
|
||||
|
||||
class BrowserThread : public ut_thread {
|
||||
@@ -170,6 +173,9 @@ namespace ext_ead {
|
||||
} updateIme; // ID 4
|
||||
u32 raw[6];
|
||||
} data;
|
||||
|
||||
CmdPacket& operator=(const CmdPacket&);
|
||||
|
||||
};
|
||||
|
||||
BrowserThread();
|
||||
|
||||
@@ -14,6 +14,10 @@ namespace textinput {
|
||||
|
||||
class Base : public CommandSender {
|
||||
public:
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
Base(Manager* manager) : mePredictMode(inputform::Base::PM_USEn), mpAllocator(NULL), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
virtual void create(MEMAllocator* allocator) override { mpAllocator = allocator; }
|
||||
virtual void setPredictMode(inputform::Base::PredictMode mode) { mePredictMode = mode; }
|
||||
|
||||
@@ -28,6 +32,12 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
|
||||
public:
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_prdicSelWidw_a.brlyt", observer), mbActive(false), mbInput(false),
|
||||
mpEventHandler(NULL), meDestination(DST_US), mpCaller(NULL) {}
|
||||
#endif
|
||||
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
@@ -58,6 +68,15 @@ namespace textinput {
|
||||
keyboard::KeyboardBase* mpCaller; // 0xD4
|
||||
};
|
||||
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
virtual ~Sample() {}
|
||||
};
|
||||
#endif
|
||||
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
|
||||
@@ -10,6 +10,10 @@ namespace textinput {
|
||||
namespace toolbar {
|
||||
class Base {
|
||||
public:
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
Base(Manager* manager) : mQwerty(true), meLanguage(USA), mpAllocator(NULL), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
virtual void create(MEMAllocator* allocator) { mpAllocator = allocator; }
|
||||
virtual void init() {}
|
||||
virtual bool isQwerty() const { return mQwerty; }
|
||||
@@ -31,6 +35,12 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_VK_toolbar_a.brlyt", observer), mpEventHandler(NULL),
|
||||
mbIsEnableQwertyChg(false) {}
|
||||
#endif
|
||||
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
@@ -107,7 +117,16 @@ namespace textinput {
|
||||
KeyType meKeyType; // 0x30
|
||||
};
|
||||
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
virtual ~Sample() {}
|
||||
};
|
||||
#else
|
||||
class Sample {};
|
||||
#endif
|
||||
|
||||
class NormalButtonAnmPane : public AnmPane {
|
||||
public:
|
||||
|
||||
@@ -37,7 +37,11 @@ namespace gui {
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
#endif
|
||||
public:
|
||||
enum {
|
||||
ON_TRIG = 0,
|
||||
|
||||
@@ -44,6 +44,7 @@ namespace ipl {
|
||||
T get2() const { return (((mStart * (mMaxFrame - mFrame)) + (mEnd * mFrame)) / mMaxFrame); }
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
template <typename T>
|
||||
class __declspec(novtable) HermiteIntp : public utility::FrameController {
|
||||
public:
|
||||
@@ -130,6 +131,58 @@ namespace ipl {
|
||||
};
|
||||
|
||||
#pragma dont_instantiate HermiteIntp<float>
|
||||
#else
|
||||
template <typename T>
|
||||
class HermiteIntp : public Interporation<T> {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
|
||||
unkVal0 = param_5;
|
||||
unkVal1 = param_6;
|
||||
}
|
||||
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
f32 t1t2 =
|
||||
(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 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
|
||||
r = r + temp_f3;
|
||||
|
||||
return r;
|
||||
|
||||
/*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 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
|
||||
protected:
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
#endif
|
||||
|
||||
} // namespace math
|
||||
} // namespace ipl
|
||||
|
||||
@@ -1,44 +1,274 @@
|
||||
#ifndef IPL_SCENE_ADDRESS_H
|
||||
#define IPL_SCENE_ADDRESS_H
|
||||
|
||||
#include "iplSceneHeader.h"
|
||||
#include "iplSceneUIHeader.h"
|
||||
|
||||
#include "scene/button/iplButton.h"
|
||||
|
||||
#include <revolution/nwc24.h>
|
||||
|
||||
namespace ipl {
|
||||
namespace nigaoe {
|
||||
class Object;
|
||||
}
|
||||
|
||||
namespace scene {
|
||||
class AddressEvent;
|
||||
|
||||
class FriendListCache {
|
||||
public:
|
||||
enum {
|
||||
FRIEND_MAX = 100,
|
||||
};
|
||||
|
||||
FriendListCache() : mbOpened(false) {}
|
||||
|
||||
BOOL init();
|
||||
void fin();
|
||||
|
||||
void add(u32 index, const NWC24FriendInfo& info);
|
||||
void update(u32 index, const wchar_t* name, u64 fdId);
|
||||
void del(u32 index);
|
||||
void swap(u32 index1, u32 index2);
|
||||
|
||||
BOOL isValidId(const NWC24UserId& userId);
|
||||
BOOL isDupId(const NWC24UserId& userId);
|
||||
BOOL isDupMail(const char* mailAddr);
|
||||
|
||||
void sendRegisterMail(u32 index);
|
||||
|
||||
s32 check();
|
||||
s32 getErrCode() const;
|
||||
|
||||
const NWC24FriendInfo& getInfo(int index) const { return mInfos[index]; }
|
||||
BOOL isThere(u32 index) const { return mbThere[index]; }
|
||||
u32 getRegFriendNum() const { return mRegFriendNum; }
|
||||
NWC24UserId getMyUserId() const { return mMyUserId; }
|
||||
s32 getLastErr() const { return mErrCode; }
|
||||
|
||||
private:
|
||||
NWC24FriendInfo mInfos[100];
|
||||
NWC24FriendInfo mInfos[FRIEND_MAX]; // 0x0000
|
||||
u8 mbThere[FRIEND_MAX]; // 0x7D00
|
||||
NWC24UserId mMyUserId; // 0x7D68
|
||||
u32 mRegFriendNum; // 0x7D70
|
||||
u8 mSendWork[0x2000]; // 0x7D74
|
||||
s32 mErrCode; // 0x9D74
|
||||
bool mbOpened; // 0x9D78
|
||||
};
|
||||
|
||||
FADER_SCENE_CLASS(Address) {
|
||||
FADER_SCENE_CLASS(Address), public ButtonEventHandlerBase {
|
||||
public:
|
||||
Address(EGG::Heap * heap, int);
|
||||
virtual void destroy() override;
|
||||
Address(EGG::Heap * heap, int mode);
|
||||
virtual ~Address();
|
||||
|
||||
virtual void prepare();
|
||||
virtual void create();
|
||||
virtual void draw();
|
||||
virtual void destroy();
|
||||
|
||||
virtual FaderSceneCommand calcFadein();
|
||||
|
||||
virtual void initCalcNormal();
|
||||
virtual FaderSceneCommand calcNormal();
|
||||
|
||||
virtual void initCalcFadeout();
|
||||
virtual FaderSceneCommand calcFadeout();
|
||||
|
||||
virtual void calcCommonAfter();
|
||||
|
||||
virtual void onEventDerived(u32 compId, u32 event, const controller::Interface* con);
|
||||
|
||||
enum {
|
||||
SCENE_ADD_WII = 1,
|
||||
SCENE_ADD_EMAIL,
|
||||
};
|
||||
|
||||
enum {
|
||||
BTN_MAX = 5,
|
||||
BTN_SPACE_MAX = BTN_MAX - 1,
|
||||
PAGE_MAX = 20,
|
||||
};
|
||||
|
||||
int getChosenFriendIndex() {
|
||||
return unk_0xC0;
|
||||
return mChosenFriend;
|
||||
}
|
||||
FriendListCache* getFriendCache() {
|
||||
return unk_0x274;
|
||||
return mpFriendCache;
|
||||
}
|
||||
|
||||
private:
|
||||
u8 unk_0x58[0x68];
|
||||
int unk_0xC0;
|
||||
u8 unk_0xC4[0x1B0];
|
||||
FriendListCache* unk_0x274;
|
||||
u8 unk_0x278[0x28];
|
||||
enum {
|
||||
FADEIN_STATE_WAIT_OPEN = 0,
|
||||
FADEIN_STATE_FADEIN,
|
||||
FADEIN_STATE_DONE,
|
||||
};
|
||||
|
||||
enum {
|
||||
STATE_INIT = 0,
|
||||
STATE_COVER_NORMAL,
|
||||
STATE_COVER_FORWARD,
|
||||
STATE_COVER_BACKWARD,
|
||||
STATE_NORMAL,
|
||||
STATE_FORWARD,
|
||||
STATE_BACKWARD,
|
||||
STATE_LOOP_FORWARD,
|
||||
STATE_LOOP_BACKWARD,
|
||||
STATE_DECIDE,
|
||||
STATE_DRAG,
|
||||
STATE_RELEASE,
|
||||
STATE_WAIT_CHILD_CST,
|
||||
STATE_WAIT_CHILD_DST,
|
||||
STATE_WAIT_CHILD_FADEOUT,
|
||||
STATE_MSG_NET,
|
||||
STATE_WAIT_PARENTAL,
|
||||
STATE_WAIT_PARENTAL_DST,
|
||||
STATE_MSG_WC,
|
||||
STATE_WAIT_PARENTAL_WC,
|
||||
STATE_WAIT_PARENTAL_DST_WC,
|
||||
STATE_MSG_NWC24_ERROR,
|
||||
STATE_MSG_FI_FULL,
|
||||
STATE_MSG_PARENTAL,
|
||||
STATE_MSG_OPEN_FAILURE,
|
||||
STATE_WAIT_DIALOG,
|
||||
STATE_DONE,
|
||||
};
|
||||
|
||||
class MiiObj {
|
||||
public:
|
||||
MiiObj();
|
||||
~MiiObj();
|
||||
|
||||
void init(nw4r::lyt::Pane* pane);
|
||||
void set(u64 fdId);
|
||||
void reset();
|
||||
|
||||
static void create_callback(nigaoe::Object* object, void* work);
|
||||
|
||||
GXTexObj mTexObj; // 0x00
|
||||
nigaoe::Object* mpNigaoe; // 0x20
|
||||
nw4r::lyt::Material* mpMaterial; // 0x24
|
||||
};
|
||||
|
||||
struct DragInfo {
|
||||
nw4r::math::VEC2 mPos; // 0x00
|
||||
int mChan; // 0x08
|
||||
int mPage; // 0x0C
|
||||
int mButton; // 0x10
|
||||
int mNextCount; // 0x14
|
||||
int mPrevCount; // 0x18
|
||||
int unk_0x1C; // 0x1C
|
||||
bool mbDragging; // 0x20
|
||||
};
|
||||
|
||||
void fistt_wait_open();
|
||||
void fistt_fadein();
|
||||
|
||||
void onInitFriendList();
|
||||
|
||||
void stt_cover_normal();
|
||||
void stt_cover_forward();
|
||||
void stt_cover_backward();
|
||||
void stt_normal();
|
||||
void stt_forward();
|
||||
void stt_backward();
|
||||
void stt_loop_forward();
|
||||
void stt_loop_backward();
|
||||
void stt_decide();
|
||||
void stt_drag();
|
||||
void stt_release();
|
||||
void stt_wait_child_cst();
|
||||
void stt_wait_child_dst();
|
||||
void stt_wait_child_fadeout();
|
||||
void stt_msg_net();
|
||||
void stt_wait_parental();
|
||||
void stt_wait_parental_dst();
|
||||
void stt_msg_wc();
|
||||
void stt_wait_parental_wc();
|
||||
void stt_wait_parental_dst_wc();
|
||||
void stt_msg_nwc24_error();
|
||||
void stt_msg_fi_full();
|
||||
void stt_msg_parental();
|
||||
void stt_msg_open_failure();
|
||||
void stt_wait_dialog();
|
||||
|
||||
void add_translate(nw4r::lyt::Pane* pane, const math::VEC2& offset);
|
||||
void set_friend(const char* paneName, u32 friendNo, u32 buttonNo, MiiObj& miiObj, bool bDrag);
|
||||
void set_page_text(const char* paneName, int page);
|
||||
void set_textbox(const char* paneName, const wchar_t* text);
|
||||
void set_textbox(const char* paneName, u32 msgId);
|
||||
void reset_friend();
|
||||
|
||||
void start_point_event(const char* paneName, controller::Interface* con);
|
||||
void start_left_event(const char* paneName);
|
||||
void start_trig_event(const char* paneName);
|
||||
void start_drag_event(const char* paneName, const controller::Interface* con);
|
||||
void start_drag_point_event(const char* paneName, controller::Interface* con);
|
||||
void start_drag_left_event(const char* paneName);
|
||||
void start_release_event(const char* paneName);
|
||||
|
||||
void on_point_event(int buttonNo, controller::Interface* con);
|
||||
void left_point_event(int buttonNo);
|
||||
|
||||
int get_button_no(const char* paneName);
|
||||
int get_button_space_no(const char* paneName);
|
||||
|
||||
void reset_gui(bool bKeepPointed);
|
||||
|
||||
BOOL is_selectable(u32 friendNo);
|
||||
|
||||
void onNextPage();
|
||||
void onPreviousPage();
|
||||
|
||||
void set_err_msg(wchar_t* errMsg, u32 errMsgLen, NWC24Err err);
|
||||
|
||||
void entry_friend();
|
||||
|
||||
bool isReleasableArea(int page, int buttonNo);
|
||||
|
||||
void changePage_onDrag();
|
||||
void movePane_onDrag();
|
||||
|
||||
DragInfo mDrag; // 0x64
|
||||
int mMode; // 0x88
|
||||
layout::Object* mpLayout; // 0x8C
|
||||
int unk_0x90; // 0x90
|
||||
AddressEvent* mpEvent; // 0x94
|
||||
gui::PaneManager* mpGui; // 0x98
|
||||
layout::Object* mpBackLayout; // 0x9C
|
||||
layout::Object* mpDialogLayout; // 0xA0
|
||||
int mFadeinState; // 0xA4
|
||||
int mWaitOpenCount; // 0xA8
|
||||
int mState; // 0xAC
|
||||
int mPage; // 0xB0
|
||||
int mNextPageNum; // 0xB4
|
||||
int mPrevPageNum; // 0xB8
|
||||
int mSelectedButton; // 0xBC
|
||||
u32 mChosenFriend; // 0xC0
|
||||
bool mbFaceValid[BTN_MAX]; // 0xC4
|
||||
int mPointCount[BTN_MAX]; // 0xCC
|
||||
bool mbParentalOK; // 0xE0
|
||||
bool mbCover; // 0xE1
|
||||
MiiObj mMiiObj[BTN_MAX]; // 0xE4
|
||||
MiiObj mNextMiiObj[BTN_MAX]; // 0x1AC
|
||||
FriendListCache* mpFriendCache; // 0x274
|
||||
GXTexObj mDragTexObj; // 0x278
|
||||
u8* mpWork; // 0x298
|
||||
f32 mDragOffsetX; // 0x29C
|
||||
|
||||
static const math::VEC2 smcPageOffset;
|
||||
|
||||
friend class AddressEvent;
|
||||
};
|
||||
|
||||
class AddressEvent : public ::gui::EventHandler {
|
||||
public:
|
||||
AddressEvent(Address* instance) : ::gui::EventHandler(), mpInstance(instance) {}
|
||||
|
||||
virtual void onEvent(u32 compId, u32 event, void* data);
|
||||
|
||||
private:
|
||||
Address* mpInstance; // 0x0C
|
||||
int mTrigChan; // 0x10
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -7,12 +7,6 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class MaxDate : public utility::Date {
|
||||
public:
|
||||
u8 padding[0x10];
|
||||
MaxDate(int year, int month, int day) : utility::Date(year, month, day) {}
|
||||
};
|
||||
|
||||
class Date : ::gui::EventHandler {
|
||||
public:
|
||||
typedef struct AnmFrame {
|
||||
@@ -88,7 +82,7 @@ namespace ipl {
|
||||
static const char* mscAnimPanes[ANIM_PANE_MAX];
|
||||
|
||||
static utility::Date mscMinDate;
|
||||
static MaxDate mscMaxDate;
|
||||
static utility::Date mscMaxDate;
|
||||
|
||||
nw4r::ut::Link mNode1; // 0x40
|
||||
nw4r::ut::Link mNode2; // 0x48
|
||||
|
||||
@@ -3,7 +3,15 @@
|
||||
|
||||
#include <revolution/types.h>
|
||||
|
||||
#ifdef IPL_ANM_CONTROLLER_FORWARD_GUI
|
||||
namespace ipl {
|
||||
namespace gui {
|
||||
class PaneManager;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#include "layout/iplGuiManager.h"
|
||||
#endif
|
||||
#include "layout/iplLayout.h"
|
||||
|
||||
namespace ipl {
|
||||
|
||||
@@ -35,7 +35,14 @@ namespace ipl {
|
||||
virtual void onSend();
|
||||
virtual int sendMessageByNWC24(NWC24UserId userId, const wchar_t* wcString);
|
||||
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
virtual void setFriendInfo(const NWC24FriendInfo& info) {
|
||||
mbToFriend = true;
|
||||
mFriendInfo = info;
|
||||
}
|
||||
#else
|
||||
virtual void setFriendInfo(const NWC24FriendInfo& info);
|
||||
#endif
|
||||
virtual void setPhoto(const GXTexObj& texObj);
|
||||
|
||||
virtual int sendToWii(NWC24UserId userId, const wchar_t* wcString);
|
||||
|
||||
@@ -25,7 +25,7 @@ namespace ipl {
|
||||
void closeDatabase();
|
||||
|
||||
BOOL createNewRecord(const char* recordName, const char* recordFileType, const OSCalendarTime* dateTime, u32* gameCode, u16* makerCode,
|
||||
const math::VEC2& recordPos, u32 recordFlags, const NWC24FriendAddr& addr, NWC24FriendType addrType, u16 noReplyFlag,
|
||||
const math::VEC2& recordPos, u32 recordFlags, const NWC24FriendAddr& addr, u16 addrType, u16 noReplyFlag,
|
||||
const wchar_t* titleText, const wchar_t* bodyText, const void* faceData, const void** attachData, u32* attachSize,
|
||||
RBRAttachmentType* attachType);
|
||||
|
||||
|
||||
@@ -38,6 +38,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
const GXTexObj& getIconTexture() const { return mFaceTexObj; }
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
u8* getIconImage() const { return mpIconTex; }
|
||||
#endif
|
||||
u32 getIndex() const { return mFaceId; }
|
||||
|
||||
BOOL created() const { return mbCreated; }
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace EGG {
|
||||
|
||||
class SoundHeapMgr {
|
||||
public:
|
||||
SoundHeapMgr() NO_INLINE {}
|
||||
SoundHeapMgr();
|
||||
|
||||
~SoundHeapMgr() { destroySoundHeap(); }
|
||||
|
||||
|
||||
@@ -17,14 +17,7 @@ namespace EGG {
|
||||
s32 soundThreadPrio; // 0x08
|
||||
s32 dvdThreadPrio; // 0x0C
|
||||
|
||||
Arg() NO_INLINE {
|
||||
pHeap = NULL;
|
||||
|
||||
soundThreadPrio = nw4r::snd::SoundSystem::DEFAULT_SOUND_THREAD_PRIORITY;
|
||||
dvdThreadPrio = nw4r::snd::SoundSystem::DEFAULT_DVD_THREAD_PRIORITY;
|
||||
|
||||
unk_0x04 = 0;
|
||||
}
|
||||
Arg();
|
||||
};
|
||||
|
||||
public:
|
||||
|
||||
@@ -7,6 +7,15 @@
|
||||
#include <revolution/ax.h>
|
||||
|
||||
namespace EGG {
|
||||
IAudioMgr::Arg::Arg() {
|
||||
pHeap = NULL;
|
||||
|
||||
soundThreadPrio = nw4r::snd::SoundSystem::DEFAULT_SOUND_THREAD_PRIORITY;
|
||||
dvdThreadPrio = nw4r::snd::SoundSystem::DEFAULT_DVD_THREAD_PRIORITY;
|
||||
|
||||
unk_0x04 = 0;
|
||||
}
|
||||
|
||||
SimpleAudioMgr::SimpleAudioMgrArg::SimpleAudioMgrArg() {
|
||||
soundHeapSize = DEFAULT_SOUND_HEAP_SIZE;
|
||||
}
|
||||
@@ -14,6 +23,8 @@ namespace EGG {
|
||||
SimpleAudioMgr::SimpleAudioMgr() : ArcPlayer(&getSoundHeap()) {
|
||||
}
|
||||
|
||||
SoundHeapMgr::SoundHeapMgr() {}
|
||||
|
||||
SimpleAudioMgr::~SimpleAudioMgr() {
|
||||
}
|
||||
|
||||
|
||||
382
libs/MSL/src/MSL_Common/strtoul.c
Normal file
382
libs/MSL/src/MSL_Common/strtoul.c
Normal file
@@ -0,0 +1,382 @@
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
enum __ReadProcActions {
|
||||
__GetAChar,
|
||||
__UngetAChar,
|
||||
__TestForError
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
char* spNextChar;
|
||||
int nullCharDetected;
|
||||
} __InStrCtrl;
|
||||
|
||||
int __StringRead(void* ptr, int ch, int act);
|
||||
#include <limits.h>
|
||||
#include <stddef.h>
|
||||
|
||||
enum scan_states {
|
||||
start = 0x01,
|
||||
check_for_zero = 0x02,
|
||||
leading_zero = 0x04,
|
||||
need_digit = 0x08,
|
||||
digit_loop = 0x10,
|
||||
finished = 0x20,
|
||||
failure = 0x40
|
||||
};
|
||||
|
||||
#define final_state(scan_state) (scan_state & (finished | failure))
|
||||
#define success(scan_state) (scan_state & (leading_zero | digit_loop | finished))
|
||||
#define fetch() (count++, (*ReadProc)(ReadProcArg, 0, __GetAChar))
|
||||
#define unfetch(c) (*ReadProc)(ReadProcArg, c, __UngetAChar)
|
||||
|
||||
unsigned long __strtoul(int base, int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned, int* negative,
|
||||
int* overflow) {
|
||||
int scan_state = start;
|
||||
int count = 0;
|
||||
int spaces = 0;
|
||||
unsigned long value = 0;
|
||||
unsigned long value_max = 0;
|
||||
int c;
|
||||
|
||||
*negative = *overflow = 0;
|
||||
|
||||
if (base < 0 || base == 1 || base > 36 || max_width < 1) {
|
||||
scan_state = failure;
|
||||
} else {
|
||||
c = fetch();
|
||||
}
|
||||
|
||||
if (base != 0) {
|
||||
value_max = ULONG_MAX / base;
|
||||
}
|
||||
|
||||
while (count <= max_width && c != -1 && !final_state(scan_state)) {
|
||||
switch (scan_state) {
|
||||
case start: {
|
||||
if (isspace(c)) {
|
||||
c = fetch();
|
||||
count--;
|
||||
spaces++;
|
||||
break;
|
||||
}
|
||||
|
||||
if (c == '+') {
|
||||
c = fetch();
|
||||
} else if (c == '-') {
|
||||
c = fetch();
|
||||
*negative = 1;
|
||||
}
|
||||
|
||||
scan_state = check_for_zero;
|
||||
break;
|
||||
}
|
||||
|
||||
case check_for_zero: {
|
||||
if (base == 0 || base == 16) {
|
||||
if (c == '0') {
|
||||
scan_state = leading_zero;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
scan_state = need_digit;
|
||||
break;
|
||||
}
|
||||
|
||||
case leading_zero: {
|
||||
if (c == 'X' || c == 'x') {
|
||||
base = 16;
|
||||
scan_state = need_digit;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
|
||||
if (base == 0) {
|
||||
base = 8;
|
||||
}
|
||||
|
||||
scan_state = digit_loop;
|
||||
break;
|
||||
}
|
||||
|
||||
case need_digit:
|
||||
case digit_loop: {
|
||||
if (base == 0) {
|
||||
base = 10;
|
||||
}
|
||||
|
||||
if (!value_max) {
|
||||
value_max = ULONG_MAX / base;
|
||||
}
|
||||
|
||||
if (isdigit(c)) {
|
||||
if ((c -= '0') >= base) {
|
||||
if (scan_state == digit_loop) {
|
||||
scan_state = finished;
|
||||
} else {
|
||||
scan_state = failure;
|
||||
}
|
||||
|
||||
c += '0';
|
||||
break;
|
||||
}
|
||||
} else if (!isalpha(c) || (toupper(c) - 'A' + 10) >= base) {
|
||||
if (scan_state == digit_loop) {
|
||||
scan_state = finished;
|
||||
} else {
|
||||
scan_state = failure;
|
||||
}
|
||||
|
||||
break;
|
||||
} else {
|
||||
c = toupper(c) - 'A' + 10;
|
||||
}
|
||||
|
||||
if (value > value_max) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
value *= base;
|
||||
|
||||
if (c > (ULONG_MAX - value)) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
value += c;
|
||||
scan_state = digit_loop;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!success(scan_state)) {
|
||||
count = 0;
|
||||
value = 0;
|
||||
*chars_scanned = 0;
|
||||
} else {
|
||||
count--;
|
||||
*chars_scanned = count + spaces;
|
||||
}
|
||||
|
||||
unfetch(c);
|
||||
return value;
|
||||
}
|
||||
|
||||
unsigned long long __strtoull(int base, int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned, int* negative,
|
||||
int* overflow) {
|
||||
int scan_state = start;
|
||||
int count = 0;
|
||||
int spaces = 0;
|
||||
unsigned long long value = 0;
|
||||
unsigned long long value_max = 0;
|
||||
int c;
|
||||
|
||||
*negative = *overflow = 0;
|
||||
|
||||
if (base < 0 || base == 1 || base > 36 || max_width < 1) {
|
||||
scan_state = failure;
|
||||
} else {
|
||||
c = fetch();
|
||||
}
|
||||
|
||||
if (base != 0) {
|
||||
value_max = ULLONG_MAX / base;
|
||||
}
|
||||
|
||||
while (count <= max_width && c != -1 && !final_state(scan_state)) {
|
||||
switch (scan_state) {
|
||||
case start: {
|
||||
if (isspace(c)) {
|
||||
c = fetch();
|
||||
count--;
|
||||
spaces++;
|
||||
break;
|
||||
}
|
||||
|
||||
if (c == '+') {
|
||||
c = fetch();
|
||||
} else if (c == '-') {
|
||||
c = fetch();
|
||||
*negative = 1;
|
||||
}
|
||||
|
||||
scan_state = check_for_zero;
|
||||
break;
|
||||
}
|
||||
|
||||
case check_for_zero: {
|
||||
if (base == 0 || base == 16) {
|
||||
if (c == '0') {
|
||||
scan_state = leading_zero;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
scan_state = need_digit;
|
||||
break;
|
||||
}
|
||||
|
||||
case leading_zero: {
|
||||
if (c == 'X' || c == 'x') {
|
||||
base = 16;
|
||||
scan_state = need_digit;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
|
||||
if (base == 0) {
|
||||
base = 8;
|
||||
}
|
||||
|
||||
scan_state = digit_loop;
|
||||
break;
|
||||
}
|
||||
|
||||
case need_digit:
|
||||
case digit_loop: {
|
||||
if (base == 0) {
|
||||
base = 10;
|
||||
}
|
||||
|
||||
if (!value_max) {
|
||||
value_max = ULLONG_MAX / base;
|
||||
}
|
||||
|
||||
if (isdigit(c)) {
|
||||
if ((c -= '0') >= base) {
|
||||
if (scan_state == digit_loop) {
|
||||
scan_state = finished;
|
||||
} else {
|
||||
scan_state = failure;
|
||||
}
|
||||
|
||||
c += '0';
|
||||
break;
|
||||
}
|
||||
} else if (!isalpha(c) || (toupper(c) - 'A' + 10) >= base) {
|
||||
if (scan_state == digit_loop) {
|
||||
scan_state = finished;
|
||||
} else {
|
||||
scan_state = failure;
|
||||
}
|
||||
|
||||
break;
|
||||
} else {
|
||||
c = toupper(c) - 'A' + 10;
|
||||
}
|
||||
|
||||
if (value > value_max) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
value *= base;
|
||||
|
||||
if (c > (ULLONG_MAX - value)) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
value += c;
|
||||
scan_state = digit_loop;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!success(scan_state)) {
|
||||
count = 0;
|
||||
value = 0;
|
||||
*chars_scanned = 0;
|
||||
} else {
|
||||
count--;
|
||||
*chars_scanned = count + spaces;
|
||||
}
|
||||
|
||||
unfetch(c);
|
||||
return value;
|
||||
}
|
||||
|
||||
unsigned long strtoul(const char* str, char** end, int base) {
|
||||
unsigned long value;
|
||||
int count, negative, overflow;
|
||||
__InStrCtrl isc;
|
||||
|
||||
isc.spNextChar = (char*)str;
|
||||
isc.nullCharDetected = 0;
|
||||
|
||||
value = __strtoul(base, INT_MAX, &__StringRead, &isc, &count, &negative, &overflow);
|
||||
|
||||
if (end) {
|
||||
*end = (char*)str + count;
|
||||
}
|
||||
|
||||
if (overflow) {
|
||||
value = ULONG_MAX;
|
||||
errno = ERANGE;
|
||||
} else if (negative) {
|
||||
value = -value;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
unsigned long long strtoull(const char* str, char** end, int base) {
|
||||
unsigned long long value;
|
||||
int count, negative, overflow;
|
||||
__InStrCtrl isc;
|
||||
|
||||
isc.spNextChar = (char*)str;
|
||||
isc.nullCharDetected = 0;
|
||||
|
||||
value = __strtoull(base, INT_MAX, &__StringRead, &isc, &count, &negative, &overflow);
|
||||
|
||||
if (end) {
|
||||
*end = (char*)str + count;
|
||||
}
|
||||
|
||||
if (overflow) {
|
||||
value = ULLONG_MAX;
|
||||
errno = ERANGE;
|
||||
} else if (negative) {
|
||||
value = -value;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
long strtol(const char* str, char** end, int base) {
|
||||
unsigned long uvalue;
|
||||
long svalue;
|
||||
int count, negative, overflow;
|
||||
__InStrCtrl isc;
|
||||
|
||||
isc.spNextChar = (char*)str;
|
||||
isc.nullCharDetected = 0;
|
||||
|
||||
uvalue = __strtoul(base, INT_MAX, &__StringRead, &isc, &count, &negative, &overflow);
|
||||
|
||||
if (end) {
|
||||
*end = (char*)str + count;
|
||||
}
|
||||
|
||||
if (overflow || (!negative && uvalue > LONG_MAX) || (negative && uvalue > -(unsigned long)LONG_MIN)) {
|
||||
svalue = (negative ? -(unsigned long)LONG_MIN : LONG_MAX);
|
||||
errno = ERANGE;
|
||||
} else {
|
||||
svalue = (negative ? -(long)uvalue : (long)uvalue);
|
||||
}
|
||||
|
||||
return svalue;
|
||||
}
|
||||
|
||||
int atoi(const char* str) {
|
||||
return (int)strtol(str, NULL, 10);
|
||||
}
|
||||
|
||||
long atol(const char* str) {
|
||||
return strtol(str, NULL, 10);
|
||||
}
|
||||
@@ -50,6 +50,10 @@ namespace nw4r {
|
||||
|
||||
f32 FrSqrt(f32 x);
|
||||
u32 CntBit1(u32 x);
|
||||
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
inline f32 FSqrt(f32 x) { return (x <= 0.0f) ? 0.0f : x * FrSqrt(x); }
|
||||
#endif
|
||||
} // namespace math
|
||||
} // namespace nw4r
|
||||
|
||||
|
||||
@@ -118,6 +118,10 @@ namespace nw4r {
|
||||
return *this;
|
||||
}
|
||||
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
VEC2 operator-() const { return VEC2(-x, -y); }
|
||||
#endif
|
||||
|
||||
VEC2 operator+(const VEC2& rhs) const { return VEC2(x + rhs.x, y + rhs.y); }
|
||||
VEC2 operator-(const VEC2& rhs) const { return VEC2(x - rhs.x, y - rhs.y); }
|
||||
VEC2 operator*(f32 val) const { return VEC2(val * x, val * y); }
|
||||
@@ -130,6 +134,10 @@ namespace nw4r {
|
||||
bool operator!=(const VEC2& rhs) const { return x != rhs.x || y != rhs.y; }
|
||||
} VEC2;
|
||||
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
inline f32 VEC2LenSq(const VEC2* p) { return p->x * p->x + p->y * p->y; }
|
||||
#endif
|
||||
|
||||
typedef struct VEC3 VEC3;
|
||||
|
||||
inline VEC3* VEC3Transform(VEC3* pOut, const MTX34* pMtx, const VEC3* pVec);
|
||||
|
||||
@@ -133,7 +133,7 @@ void RFLiEndWorking(RFLErrcode errcode) {
|
||||
RFLiEndWorkingReason(errcode, 0);
|
||||
}
|
||||
|
||||
NANDCommandBlock* RFLiSetCommandBlock(RFLiFileType type, RFLiAsyncTag tag) {
|
||||
inline NANDCommandBlock* RFLiSetCommandBlock(RFLiFileType type, RFLiAsyncTag tag) {
|
||||
NANDCommandBlock* block = &RFLiGetAccInfo(type)->commandBlock;
|
||||
RFLiCallbackTag* store = &RFLiGetAccInfo(type)->callbackTag;
|
||||
|
||||
@@ -147,7 +147,7 @@ NANDCommandBlock* RFLiSetCommandBlock(RFLiFileType type, RFLiAsyncTag tag) {
|
||||
return block;
|
||||
}
|
||||
|
||||
RFLiAsyncTag RFLiGetTag(NANDCommandBlock* block) {
|
||||
inline RFLiAsyncTag RFLiGetTag(NANDCommandBlock* block) {
|
||||
RFLiCallbackTag* stored;
|
||||
|
||||
RFLi_ASSERTLINE_NULL(block, 312);
|
||||
@@ -159,7 +159,7 @@ RFLiAsyncTag RFLiGetTag(NANDCommandBlock* block) {
|
||||
return stored->tag;
|
||||
}
|
||||
|
||||
RFLiFileType RFLiGetType(NANDCommandBlock* block) {
|
||||
inline RFLiFileType RFLiGetType(NANDCommandBlock* block) {
|
||||
RFLiCallbackTag* stored;
|
||||
|
||||
RFLi_ASSERTLINE_NULL(block, 335);
|
||||
@@ -171,7 +171,7 @@ RFLiFileType RFLiGetType(NANDCommandBlock* block) {
|
||||
return stored->type;
|
||||
}
|
||||
|
||||
NANDFileInfo* RFLiGetWorkingFile(RFLiFileType type) {
|
||||
inline NANDFileInfo* RFLiGetWorkingFile(RFLiFileType type) {
|
||||
RFLi_ASSERTLINE_RANGE(type, RFLiFileType_Database, RFLiFileType_Max, 356);
|
||||
|
||||
if (!RFLAvailable()) {
|
||||
|
||||
534
libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c
Normal file
534
libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c
Normal file
@@ -0,0 +1,534 @@
|
||||
#include <zi8clib/zierror.h>
|
||||
|
||||
extern ziU16 Zi8GetTableCount(ziU8 lang, ziU8 tableIdx ZI_NEED_WORK);
|
||||
extern ziU32 Zi8GetTableAddress(ziU8 lang, ziU8 tableIdx ZI_NEED_WORK);
|
||||
|
||||
ziU32 Zi8_8148302C(ziU16 key, ziU8* table ZI_NEED_WORK) {
|
||||
ziU32 value;
|
||||
ziU16 count;
|
||||
ziU32 i;
|
||||
|
||||
count = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
for (i = 0; (ziU16)i < count; i++) {
|
||||
value = (ziU16)(((ziU16)table[((i & 0xFFFF) << 3) + (i & 0xFFFF) + 7] << 8) |
|
||||
table[((i & 0xFFFF) << 3) + (i & 0xFFFF) + 8]);
|
||||
if (key == value) {
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
Zi8LogError(0x96A, ZI_WORK);
|
||||
return 0xFFFF;
|
||||
}
|
||||
|
||||
void Zi8_81483118(ziGetParam* param, ziU8* output) {
|
||||
ziU8 i;
|
||||
|
||||
for (i = 0; i < 5; i++) {
|
||||
output[i] = 0;
|
||||
}
|
||||
|
||||
switch (param->elementCount) {
|
||||
case 9:
|
||||
output[4] |= (ziU8)((param->elements[8] & 0xF) << 4);
|
||||
case 8:
|
||||
output[3] = param->elements[7] & 0xF;
|
||||
case 7:
|
||||
output[3] |= (ziU8)((param->elements[6] & 0xF) << 4);
|
||||
case 6:
|
||||
output[2] = param->elements[5] & 0xF;
|
||||
case 5:
|
||||
output[2] |= (ziU8)((param->elements[4] & 0xF) << 4);
|
||||
case 4:
|
||||
output[1] = param->elements[3] & 0xF;
|
||||
case 3:
|
||||
output[1] |= (ziU8)((param->elements[2] & 0xF) << 4);
|
||||
case 2:
|
||||
output[0] = param->elements[1] & 0xF;
|
||||
case 1:
|
||||
output[0] |= (ziU8)((param->elements[0] & 0xF) << 4);
|
||||
case 0:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ziU32 Zi8_81483264(const ziGetParam* param ZI_NEED_WORK) {
|
||||
ziU8 i;
|
||||
|
||||
if (param->scratch == ZI8_NULL) {
|
||||
Zi8LogError(0x164, ZI_WORK);
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (i = 0; i < param->maxCandidates; i++) {
|
||||
((ziU16*)param->scratch)[i] = 0;
|
||||
}
|
||||
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU32 Zi8_81483308(ziGetParam* param, ziU16 key, ziU8* count ZI_NEED_WORK) {
|
||||
ziU8 i;
|
||||
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
if (param->scratch == ZI8_NULL) {
|
||||
Zi8ReplaceLastError(0x164, ZI_WORK);
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (i = 0; i < param->maxCandidates; i++) {
|
||||
if (key == ((ziU16*)param->scratch)[i]) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
((ziU16*)param->scratch)[*count] = key;
|
||||
if (++*count >= param->maxCandidates) {
|
||||
*count = 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziBool Zi8_814833F0(const ziGetParam* param, ziU16 key ZI_NEED_WORK) {
|
||||
ziU8 i;
|
||||
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
if (param->scratch == ZI8_NULL) {
|
||||
Zi8ReplaceLastError(0x164, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < param->maxCandidates; i++) {
|
||||
if (key == ((ziU16*)param->scratch)[i]) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU32 Zi8_814834AC(ziGetParam* param, ziU16* remaining, ziU8* count,
|
||||
ziU8* inserted ZI_NEED_WORK) {
|
||||
ziBool matches;
|
||||
ziS32 entry;
|
||||
ziS32 tableA;
|
||||
ziS32 tableB;
|
||||
ziU16 tableCount;
|
||||
ziU8 matched;
|
||||
ziU32 j;
|
||||
ziS32 i;
|
||||
ziU8 candidateIndex;
|
||||
union {
|
||||
ziU32 words[13];
|
||||
ziU8 bytes[52];
|
||||
} local;
|
||||
|
||||
matched = 0;
|
||||
local.words[0] = 0;
|
||||
local.bytes[4] = 0;
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
if (param->elementCount == 0) {
|
||||
if (*remaining >= *count) {
|
||||
for (i = 0; i < *count; i++) {
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
*remaining = *remaining - *count;
|
||||
*count = 0;
|
||||
} else {
|
||||
for (i = 0; i < *remaining; i++) {
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
for (i = 0; i < ((ziS32)*count - (ziS32)*remaining); i++) {
|
||||
param->candidates[i] = param->candidates[(ziU32)*remaining + i];
|
||||
}
|
||||
*count = *count - (ziU8)*remaining;
|
||||
*remaining = 0;
|
||||
}
|
||||
return 1;
|
||||
} else if (param->elementCount <= 9) {
|
||||
tableA = Zi8GetTableAddress(param->language, 9, ZI_WORK);
|
||||
tableB = Zi8GetTableAddress(param->language, 10, ZI_WORK);
|
||||
if (tableA == 0) {
|
||||
Zi8ReplaceLastError(0x76C, ZI_WORK);
|
||||
return 0;
|
||||
} else if (tableB == 0) {
|
||||
Zi8ReplaceLastError(0x776, ZI_WORK);
|
||||
return 0;
|
||||
} else {
|
||||
tableCount = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, local.bytes);
|
||||
i = 0;
|
||||
while (i < tableCount && matched < *count) {
|
||||
matches = ZI8_TRUE;
|
||||
entry = (i << 3) + tableA + i;
|
||||
j = 0;
|
||||
if (param->elementCount > 1) {
|
||||
for (j = 0; (j & 0xFF) < (ziU32)(param->elementCount >> 1); j++) {
|
||||
if (local.bytes[j & 0xFF] != *((ziU8*)entry + (j & 0xFF))) {
|
||||
matches = ZI8_FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (matches && (param->elementCount & 1) != 0 &&
|
||||
((local.bytes[j & 0xFF] & 0xF0) != (*((ziU8*)entry + (j & 0xFF)) & 0xF0))) {
|
||||
matches = ZI8_FALSE;
|
||||
}
|
||||
if (matches) {
|
||||
for (candidateIndex = 0; candidateIndex < *count; candidateIndex++) {
|
||||
if (param->candidates[candidateIndex] ==
|
||||
(ziU16)((*((ziU8*)entry + 7) << 8) | *((ziU8*)entry + 8))) {
|
||||
matched++;
|
||||
param->candidates[candidateIndex] =
|
||||
param->candidates[candidateIndex] & 0x7FFF;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
if ((ziU16)matched >= *remaining) {
|
||||
matched = *count;
|
||||
*count = 0;
|
||||
for (i = 0; i < matched; i++) {
|
||||
if ((param->candidates[i] & 0x8000) == 0) {
|
||||
param->candidates[i] = param->candidates[i] | 0x8000;
|
||||
if (*remaining == 0) {
|
||||
if (*count != i) {
|
||||
param->candidates[*count] = param->candidates[i];
|
||||
}
|
||||
*count = *count + 1;
|
||||
} else {
|
||||
*remaining = *remaining - 1;
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
}
|
||||
}
|
||||
*remaining = 0;
|
||||
} else {
|
||||
for (i = 0; i < *count; i++) {
|
||||
if ((param->candidates[i] & 0x8000) == 0) {
|
||||
param->candidates[i] = param->candidates[i] | 0x8000;
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
}
|
||||
*remaining = *remaining - (ziU16)matched;
|
||||
*count = 0;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
*count = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU32 Zi8GetKOcandidates(ziGetParam* param, ziU8* options ZI_NEED_WORK) {
|
||||
ziBool bVar1;
|
||||
ziU8 bVar2;
|
||||
ziS32 iVar4;
|
||||
ziU32 uVar6;
|
||||
ziU8* pbVar7;
|
||||
union {
|
||||
ziU32 words[10];
|
||||
ziU8 bytes[40];
|
||||
} local_28;
|
||||
ziU8 local_57;
|
||||
ziU8 local_56;
|
||||
ziU8 local_55;
|
||||
ziU8 local_54;
|
||||
ziU8 local_53;
|
||||
ziS8 local_52;
|
||||
ziU16 local_50;
|
||||
ziU16 local_4E;
|
||||
ziU16 local_4C;
|
||||
ziU16 local_4A;
|
||||
ziU16 local_48;
|
||||
ziS32 local_44;
|
||||
ziS32 local_2C;
|
||||
ziS32 local_30;
|
||||
ziU32 local_34;
|
||||
ziU32 local_38;
|
||||
ziU32 local_3C;
|
||||
ziU32 local_40;
|
||||
|
||||
local_4E = 0xFFFF;
|
||||
local_34 = 0;
|
||||
local_28.words[0] = 0;
|
||||
local_28.bytes[4] = 0;
|
||||
local_52 = 0;
|
||||
local_53 = 0;
|
||||
local_54 = 0;
|
||||
local_55 = 0;
|
||||
local_50 = param->firstCandidate;
|
||||
local_3C = 0;
|
||||
local_40 = 0;
|
||||
local_57 = 0;
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
Zi8_81483264(param, ZI_WORK);
|
||||
iVar4 = Zi8GetTableAddress(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
local_2C = Zi8GetTableAddress(ZI8_LANG_KO, 10, ZI_WORK);
|
||||
if (iVar4 == 0) {
|
||||
Zi8ReplaceLastError(0x76C, ZI_WORK);
|
||||
uVar6 = 0;
|
||||
} else {
|
||||
if (local_2C == 0) {
|
||||
Zi8ReplaceLastError(0x776, ZI_WORK);
|
||||
uVar6 = 0;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
if (*options == 0) {
|
||||
param->letters = 0;
|
||||
param->count = 0;
|
||||
param->candidates[0] = 0;
|
||||
}
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
if (param->wordCharCount != 0) {
|
||||
local_48 = Zi8_8148302C(param->currentWord[0], (ziU8*)iVar4, ZI_WORK);
|
||||
if ((local_48 != 0xFFFF) &&
|
||||
((((ziU8*)iVar4)[((ziU32)local_48 * 9) + 4] & 8) != 0)) {
|
||||
local_38 = (ziU32)((ziU8*)iVar4)[((ziU32)local_48 * 9) + 6] |
|
||||
((ziU32)((ziU8*)iVar4)[((ziU32)local_48 * 9) + 4] & 3) << 16 |
|
||||
(ziU32)((ziU8*)iVar4)[((ziU32)local_48 * 9) + 5] << 8;
|
||||
local_52 = param->wordCharCount - 1;
|
||||
local_53 = 1;
|
||||
pbVar7 = (ziU8*)(local_2C + local_38);
|
||||
LAB_00010D44:
|
||||
if (local_52 != 0) {
|
||||
local_48 = Zi8_8148302C(param->currentWord[local_53], (ziU8*)iVar4, ZI_WORK);
|
||||
if (local_48 == (ziU16)((*pbVar7 & 0x1F) << 8 | pbVar7[1])) {
|
||||
local_52 = local_52 - 1;
|
||||
local_53 = local_53 + 1;
|
||||
if ((*pbVar7 & 0x40) == 0) {
|
||||
pbVar7 = pbVar7 + 2;
|
||||
goto LAB_00010D44;
|
||||
}
|
||||
local_52 = param->wordCharCount - 1;
|
||||
local_53 = 1;
|
||||
} else {
|
||||
local_53 = 1;
|
||||
local_52 = param->wordCharCount - 1;
|
||||
}
|
||||
}
|
||||
if (local_52 == 0) {
|
||||
local_48 = (*pbVar7 & 0x1F) << 8 | pbVar7[1];
|
||||
local_4C = (ziU16)(((ziU8*)((ziU32)local_48 * 9 + (ziU32)local_48 + (ziU32)iVar4))[7] << 8 |
|
||||
((ziU8*)((ziU32)local_48 * 9 + (ziU32)local_48 + (ziU32)iVar4))[8]);
|
||||
if (param->wordCharCount == 1) {
|
||||
if (local_48 == local_4E) {
|
||||
for (; (*pbVar7 & 0x40) == 0; pbVar7 = pbVar7 + 2) {
|
||||
}
|
||||
local_52 = param->wordCharCount;
|
||||
goto LAB_00011114;
|
||||
}
|
||||
local_4E = local_48;
|
||||
if (param->elementCount == 0) {
|
||||
if (local_50 == 0) {
|
||||
if (*options != 0) {
|
||||
local_3C = local_3C + 1;
|
||||
if ((ziS32)local_3C < *(ziS32*)(options + 0xC)) {
|
||||
goto LAB_000110E8;
|
||||
}
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
param->candidates[local_54] = local_4C;
|
||||
local_54 = local_54 + 1;
|
||||
param->count = param->count + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (param->maxCandidates <= bVar2) {
|
||||
uVar6 = param->letters;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
} else {
|
||||
local_50 = local_50 + -1;
|
||||
}
|
||||
} else {
|
||||
param->candidates[local_54] = local_4C;
|
||||
local_54 = local_54 + 1;
|
||||
param->count = param->count + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (param->maxCandidates <= bVar2) {
|
||||
Zi8_814834AC(param, &local_50, &local_54, &local_57, ZI_WORK);
|
||||
param->count = local_54;
|
||||
param->letters = local_54;
|
||||
if (param->maxCandidates <= local_54) {
|
||||
if (*options == 0) {
|
||||
uVar6 = local_54;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
local_3C = local_3C + local_54;
|
||||
if (*(ziS32*)(options + 0xC) <= (ziS32)local_3C) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
param->count = 0;
|
||||
param->letters = 0;
|
||||
local_54 = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (local_40 = 0;
|
||||
(local_40 < local_54 &&
|
||||
(local_4C != param->candidates[local_40]));
|
||||
local_40 = local_40 + 1) {
|
||||
}
|
||||
if ((local_40 == local_54) &&
|
||||
(Zi8_814833F0(param, local_4C, ZI_WORK) == 0)) {
|
||||
param->candidates[local_54] = local_4C;
|
||||
local_54 = local_54 + 1;
|
||||
param->count = param->count + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (bVar2 < param->maxCandidates) {
|
||||
goto LAB_000110E8;
|
||||
}
|
||||
Zi8_814834AC(param, &local_50, &local_54, &local_57, ZI_WORK);
|
||||
param->count = local_54;
|
||||
param->letters = local_54;
|
||||
if (param->maxCandidates <= local_54) {
|
||||
if (*options == 0) {
|
||||
uVar6 = local_54;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
local_3C = local_3C + local_54;
|
||||
if (*(ziS32*)(options + 0xC) <= (ziS32)local_3C) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
param->count = 0;
|
||||
param->letters = 0;
|
||||
local_54 = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
LAB_000110E8:
|
||||
for (; (*pbVar7 & 0x40) == 0; pbVar7 = pbVar7 + 2) {
|
||||
}
|
||||
local_52 = param->wordCharCount;
|
||||
LAB_00011114:
|
||||
local_52 = local_52 + -1;
|
||||
local_53 = 1;
|
||||
pbVar7 = pbVar7 + 2;
|
||||
if ((*pbVar7 & 0x80) != 0) {
|
||||
goto LAB_00011124;
|
||||
}
|
||||
goto LAB_00010D44;
|
||||
}
|
||||
}
|
||||
LAB_00011124:
|
||||
local_34 = local_3C;
|
||||
if (local_54 != 0) {
|
||||
Zi8_814834AC(param, &local_50, &local_54, &local_57, ZI_WORK);
|
||||
uVar6 = local_34;
|
||||
if ((*options != 0) &&
|
||||
(local_3C = local_3C + local_54, uVar6 = local_3C,
|
||||
*(ziS32*)(options + 0xC) <= (ziS32)local_3C)) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
local_34 = uVar6;
|
||||
param->count = local_54;
|
||||
param->letters = local_54;
|
||||
}
|
||||
if (param->elementCount < 10) {
|
||||
if ((param->elementCount == 0) || (*options != 0)) {
|
||||
local_56 = 1;
|
||||
} else {
|
||||
local_56 = 0;
|
||||
}
|
||||
local_4A = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, local_28.bytes);
|
||||
do {
|
||||
for (local_30 = 0; local_30 < (ziS32)(ziU32)local_4A; local_30 = local_30 + 1) {
|
||||
bVar1 = ZI8_TRUE;
|
||||
local_44 = iVar4 + local_30 * 9;
|
||||
local_55 = 0;
|
||||
if (1 < param->elementCount) {
|
||||
for (local_55 = 0;
|
||||
(ziU32)local_55 < (ziU32)((ziS32)(ziU32)param->elementCount >> 1);
|
||||
local_55 = local_55 + 1) {
|
||||
if (local_28.bytes[local_55] != *(ziU8*)(local_44 + local_55)) {
|
||||
bVar1 = ZI8_FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((bVar1 && ((param->elementCount & 1) != 0)) &&
|
||||
((local_28.bytes[local_55] & 0xF0) !=
|
||||
(*(ziU8*)(local_44 + local_55) & 0xF0))) {
|
||||
bVar1 = ZI8_FALSE;
|
||||
}
|
||||
if (bVar1) {
|
||||
bVar2 = local_56;
|
||||
if ((param->elementCount & 1) == 0) {
|
||||
if ((*(ziU8*)(local_44 + local_55) & 0xF0) == 0) {
|
||||
if (local_56 == 0) {
|
||||
goto LAB_000113B0;
|
||||
}
|
||||
bVar2 = *options;
|
||||
}
|
||||
if (bVar2 == 0) {
|
||||
goto LAB_00011478;
|
||||
}
|
||||
} else {
|
||||
if ((*(ziU8*)(local_44 + local_55) & 0xF) != 0) {
|
||||
goto LAB_000113AC;
|
||||
}
|
||||
if (local_56 != 0) {
|
||||
bVar2 = *options;
|
||||
goto LAB_000113AC;
|
||||
}
|
||||
}
|
||||
LAB_000113AC:
|
||||
if (bVar2 == 0) {
|
||||
goto LAB_00011478;
|
||||
}
|
||||
LAB_000113B0:
|
||||
if (local_50 == 0) {
|
||||
if (*options == 0) {
|
||||
param->candidates[local_54] =
|
||||
(ziU16)((*(ziU8*)(local_30 * 9 + iVar4 + 7) << 8) |
|
||||
*(ziU8*)(local_30 * 9 + iVar4 + 8));
|
||||
local_54 = local_54 + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (param->maxCandidates <= bVar2) {
|
||||
uVar6 = param->letters;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
} else {
|
||||
local_34 = local_34 + 1;
|
||||
if (*(ziS32*)(options + 0xC) <= (ziS32)local_34) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
local_50 = local_50 + -1;
|
||||
}
|
||||
}
|
||||
LAB_00011478:
|
||||
;
|
||||
}
|
||||
local_56 = local_56 + 1;
|
||||
} while (local_56 < 2);
|
||||
uVar6 = local_34;
|
||||
if (*options == 0) {
|
||||
uVar6 = param->letters;
|
||||
}
|
||||
} else {
|
||||
param->letters = 0;
|
||||
uVar6 = 0;
|
||||
}
|
||||
}
|
||||
LAB_000114C4:
|
||||
return uVar6;
|
||||
}
|
||||
@@ -11,9 +11,7 @@ static char CDB_ATTR_MAGIC[] = "CDBFILE";
|
||||
static const u32 CDB_ATTR_VERSION = 0x02000000;
|
||||
static const u32 CDB_ATTR_VERSION_PADDING = 0;
|
||||
|
||||
static u32 s_seed = 0;
|
||||
|
||||
u32 CDBAttrGetDescOffset(CDBAttr* attr) {
|
||||
static u32 CDBAttrGetDescOffset(CDBAttr* attr) {
|
||||
return attr->buf.version == 1 ? 0x0D : offsetof(CDBAttrBuf, descLength);
|
||||
}
|
||||
|
||||
@@ -171,28 +169,18 @@ void CDBAttrGetKeyStr(CDBAttr* attr, char* keyString) {
|
||||
memcpy(keyString, attr->buf.keyString, CDB_ATTR_BUF_KEY_STRING_LEN);
|
||||
}
|
||||
|
||||
u32 CDBAttrSetIV(CDBAttr* attr, u32 seed);
|
||||
|
||||
void CDBAttrInitIV(CDBAttr* attr) {
|
||||
int i, j;
|
||||
u32 seed;
|
||||
static u32 s_seed = 0;
|
||||
int i;
|
||||
|
||||
if (s_seed == 0) {
|
||||
s_seed = OSGetTick();
|
||||
}
|
||||
|
||||
s_seed = CDBAttrSetIV(attr, s_seed);
|
||||
}
|
||||
|
||||
u32 CDBAttrSetIV(CDBAttr* attr, u32 seed) {
|
||||
int i, j;
|
||||
for (i = 0; i < 2; i++) {
|
||||
for (j = 0; j < 8; j++) {
|
||||
seed = 1566083941 * seed + 2531011;
|
||||
attr->buf.iv[(i * 8) + j] = (s8)(seed >> 16);
|
||||
}
|
||||
for (i = 0; i < CDB_ATTR_BUF_KEY_IV_LEN; i++) {
|
||||
s_seed = 1566083941 * s_seed + 2531011;
|
||||
attr->buf.iv[i] = (s8)(s_seed >> 16);
|
||||
}
|
||||
return seed;
|
||||
}
|
||||
|
||||
void CDBAttrGetIV(CDBAttr* attr, u8* iv) {
|
||||
|
||||
@@ -62,7 +62,7 @@ extern void _restgpr_25();
|
||||
extern void _restgpr_26();
|
||||
extern int atoi();
|
||||
#pragma section sdata_type ".sdata"
|
||||
extern u32 lbl_81698D8C;
|
||||
extern u32 CDBDatabaseWorkBuf;
|
||||
extern char lbl_8166B528[];
|
||||
extern char lbl_8166B550[];
|
||||
extern char lbl_8166B57C[];
|
||||
@@ -834,7 +834,7 @@ asm CDBErr CDBDatabaseSearchRecordLayer() {
|
||||
stw r0, 0x124(r1)
|
||||
addi r11, r1, 0x120
|
||||
bl _savegpr_14
|
||||
lwz r11, lbl_81698D8C(r0)
|
||||
lwz r11, CDBDatabaseWorkBuf(r0)
|
||||
mr r20, r5
|
||||
mr r22, r7
|
||||
mr r24, r9
|
||||
@@ -855,7 +855,7 @@ asm CDBErr CDBDatabaseSearchRecordLayer() {
|
||||
bl CDBConvDirStrToCDBDate
|
||||
lwz r0, 0x18(r19)
|
||||
mr r31, r3
|
||||
lwz r25, lbl_81698D8C(r0)
|
||||
lwz r25, CDBDatabaseWorkBuf(r0)
|
||||
addi r26, r3, 0x3b
|
||||
cmpwi r0, 0x0
|
||||
addi r0, r25, 0x994
|
||||
@@ -1327,7 +1327,7 @@ asm CDBErr CDBDatabaseSearchMinuteLayer() {
|
||||
stw r0, 0x174(r1)
|
||||
addi r11, r1, 0x170
|
||||
bl _savegpr_17
|
||||
lwz r10, lbl_81698D8C(r0)
|
||||
lwz r10, CDBDatabaseWorkBuf(r0)
|
||||
mr r21, r5
|
||||
mr r19, r3
|
||||
mr r20, r4
|
||||
@@ -1589,7 +1589,7 @@ asm CDBErr CDBDatabaseSearchHourLayer() {
|
||||
stw r0, 0xb4(r1)
|
||||
addi r11, r1, 0xb0
|
||||
bl _savegpr_18
|
||||
lwz r9, lbl_81698D8C(r0)
|
||||
lwz r9, CDBDatabaseWorkBuf(r0)
|
||||
mr r22, r5
|
||||
mr r20, r3
|
||||
mr r21, r4
|
||||
@@ -1846,7 +1846,7 @@ asm CDBErr CDBDatabaseSearchDayLayer() {
|
||||
stw r0, 0x104(r1)
|
||||
addi r11, r1, 0x100
|
||||
bl _savegpr_17
|
||||
lwz r8, lbl_81698D8C(r0)
|
||||
lwz r8, CDBDatabaseWorkBuf(r0)
|
||||
mr r19, r5
|
||||
mr r17, r3
|
||||
mr r18, r4
|
||||
@@ -2128,7 +2128,7 @@ asm CDBErr CDBDatabaseSearchMonthLayer() {
|
||||
stw r0, 0xb4(r1)
|
||||
addi r11, r1, 0xb0
|
||||
bl _savegpr_19
|
||||
lwz r7, lbl_81698D8C(r0)
|
||||
lwz r7, CDBDatabaseWorkBuf(r0)
|
||||
mr r23, r5
|
||||
mr r21, r3
|
||||
mr r22, r4
|
||||
@@ -2398,7 +2398,7 @@ asm CDBErr CDBDatabaseSearchYearLayer() {
|
||||
stw r0, 0x94(r1)
|
||||
addi r11, r1, 0x90
|
||||
bl _savegpr_22
|
||||
lwz r6, lbl_81698D8C(r0)
|
||||
lwz r6, CDBDatabaseWorkBuf(r0)
|
||||
and. r0, r3, r4
|
||||
mr r24, r3
|
||||
mr r25, r4
|
||||
@@ -2832,7 +2832,7 @@ asm CDBErr CDBDatabaseCleanUpEmptyDirectoriesRecord() {
|
||||
stw r0, 0x134(r1)
|
||||
addi r11, r1, 0x130
|
||||
bl _savegpr_25
|
||||
lwz r11, lbl_81698D8C(r0)
|
||||
lwz r11, CDBDatabaseWorkBuf(r0)
|
||||
mr r25, r4
|
||||
lwz r29, 0x138(r1)
|
||||
mr r26, r5
|
||||
@@ -2912,7 +2912,7 @@ asm CDBErr CDBDatabaseCleanUpEmptyDirectoriesType() {
|
||||
addi r11, r1, 0x140
|
||||
bl _savegpr_22
|
||||
li r0, 0x0
|
||||
lwz r11, lbl_81698D8C(r0)
|
||||
lwz r11, CDBDatabaseWorkBuf(r0)
|
||||
stw r0, 0x10(r1)
|
||||
mr r22, r3
|
||||
lwz r30, 0x148(r1)
|
||||
@@ -3010,7 +3010,7 @@ asm CDBErr CDBDatabaseCleanUpEmptyDirectoriesCode() {
|
||||
stw r0, 0x144(r1)
|
||||
addi r11, r1, 0x140
|
||||
bl _savegpr_23
|
||||
lwz r11, lbl_81698D8C(r0)
|
||||
lwz r11, CDBDatabaseWorkBuf(r0)
|
||||
li r0, 0x0
|
||||
mr r23, r3
|
||||
mr r24, r4
|
||||
@@ -3105,7 +3105,7 @@ asm CDBErr CDBDatabaseCleanUpEmptyDirectoriesMinute() {
|
||||
stw r0, 0x134(r1)
|
||||
addi r11, r1, 0x130
|
||||
bl _savegpr_24
|
||||
lwz r10, lbl_81698D8C(r0)
|
||||
lwz r10, CDBDatabaseWorkBuf(r0)
|
||||
li r0, 0x0
|
||||
mr r24, r3
|
||||
mr r25, r4
|
||||
@@ -3197,7 +3197,7 @@ asm CDBErr CDBDatabaseCleanUpEmptyDirectoriesHour() {
|
||||
stw r0, 0x134(r1)
|
||||
addi r11, r1, 0x130
|
||||
bl _savegpr_25
|
||||
lwz r9, lbl_81698D8C(r0)
|
||||
lwz r9, CDBDatabaseWorkBuf(r0)
|
||||
li r0, 0x0
|
||||
mr r25, r3
|
||||
mr r26, r4
|
||||
@@ -3286,7 +3286,7 @@ asm CDBErr CDBDatabaseCleanUpEmptyDirectoriesDay() {
|
||||
stw r0, 0x134(r1)
|
||||
addi r11, r1, 0x130
|
||||
bl _savegpr_26
|
||||
lwz r8, lbl_81698D8C(r0)
|
||||
lwz r8, CDBDatabaseWorkBuf(r0)
|
||||
li r0, 0x0
|
||||
mr r26, r3
|
||||
mr r27, r4
|
||||
@@ -3382,7 +3382,7 @@ asm CDBErr CDBDatabaseCleanUpEmptyDirectoriesMonth() {
|
||||
mr r28, r3
|
||||
mr r4, r28
|
||||
addi r3, r1, 0x10
|
||||
lwz r7, lbl_81698D8C(r0)
|
||||
lwz r7, CDBDatabaseWorkBuf(r0)
|
||||
stw r0, 0x8(r1)
|
||||
addi r31, r7, 0x3a78
|
||||
bl CDBConvYearStrToFullPath
|
||||
@@ -3460,7 +3460,7 @@ asm CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLo
|
||||
stw r30, 0x18(r1)
|
||||
stw r29, 0x14(r1)
|
||||
mr r29, r4
|
||||
lwz r5, lbl_81698D8C(r0)
|
||||
lwz r5, CDBDatabaseWorkBuf(r0)
|
||||
addi r30, r5, 0x430c
|
||||
bne L_8148A13C
|
||||
li r3, 0x1
|
||||
|
||||
@@ -9,19 +9,32 @@
|
||||
#include <revolution/dvd.h>
|
||||
#include <revolution/os.h>
|
||||
|
||||
typedef struct {
|
||||
u32 used;
|
||||
u8 padding[0xC00C];
|
||||
u32 flags;
|
||||
u32 unk;
|
||||
} CDBDatabaseInstanceWork;
|
||||
|
||||
static OSMutex s_mutex;
|
||||
static BOOL s_mutexInitialized = FALSE;
|
||||
|
||||
static BOOL s_fatalVFFlag = FALSE;
|
||||
|
||||
// This was likely a local originally, but oh well!
|
||||
s32 CDBPrintDebugLevel = CDB_VERBOSE_LEVEL_NONE;
|
||||
|
||||
static u8 s_cdbWiiId[OSRoundUp32B(CDB_WIIID_DAT_SIZE)] ALIGN32;
|
||||
static CDBDatabaseInstanceWork* s_databasePool;
|
||||
static u8* s_recordPool;
|
||||
u8* CDBDatabaseWorkBuf;
|
||||
static VFErr s_lastVFError;
|
||||
static s32 s_lastNANDError;
|
||||
|
||||
static u8 s_cdbWiiId[OSRoundUp32B(CDB_WIIID_DAT_SIZE)] ALIGN32;
|
||||
static u8* s_recordPool;
|
||||
extern void CDBDatabaseInstanceInit(void* instance, int flag, CDBDatabase* database);
|
||||
extern BOOL CDBDatabaseInstanceIsUsed(void* instance);
|
||||
extern void CDBRecordInstanceInit(void* instance, CDBRecord* record, int flag);
|
||||
extern BOOL CDBRecordInstanceIsUsed(void* instance);
|
||||
extern BOOL CDBRecordKeyCompare(CDBRecordKey* recordKey1, CDBRecordKey* recordKey2);
|
||||
|
||||
void MutexInitialized() {
|
||||
s_mutexInitialized = TRUE;
|
||||
@@ -35,6 +48,216 @@ void CDBUnlock() {
|
||||
OSUnlockMutex(&s_mutex);
|
||||
}
|
||||
|
||||
void CDBDatabaseInstancePoolInit(void* work) {
|
||||
u32* workPointer = (u32*)work;
|
||||
|
||||
s_databasePool = (CDBDatabaseInstanceWork*)workPointer;
|
||||
s_databasePool[0].used = 0;
|
||||
s_databasePool[1].used = 0;
|
||||
if (((u32)(workPointer + 0x7880) & 0x3f) != 0) {
|
||||
CDBReportWarn("割り当てられた領域が64バイトアライメントされていません(%d)\n", (u64)((u32)(workPointer + 0x7880) & 0x3f));
|
||||
}
|
||||
CDBCryptBufSysInit((CDBCryptBuf*)(workPointer + 0x7880));
|
||||
if (!s_mutexInitialized) {
|
||||
OSInitMutex(&s_mutex);
|
||||
}
|
||||
CDBDatabaseWorkBuf = (u8*)workPointer + 0x19660;
|
||||
}
|
||||
|
||||
void CDBRecordPoolInit(void* work) {
|
||||
int i;
|
||||
|
||||
s_recordPool = (u8*)work + 0x18030;
|
||||
for (i = 0; i < 5; i++) {
|
||||
*(u32*)(s_recordPool + i * 0x470 + 0x18) = 0;
|
||||
if (!s_mutexInitialized) {
|
||||
OSInitMutex((OSMutex*)(s_recordPool + i * 0x470));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flag) {
|
||||
CDBDatabaseInstanceWork* databaseInstance;
|
||||
CDBDatabaseInstanceWork* requestedInstance;
|
||||
u32 writeFlag;
|
||||
int i;
|
||||
|
||||
if (s_recordPool == NULL) {
|
||||
OSPanic(__FILE__, 0x185, "(CDB) error : CDBInit() is not called\n");
|
||||
}
|
||||
|
||||
OSLockMutex(&s_mutex);
|
||||
requestedInstance = database->instance;
|
||||
if (requestedInstance != NULL) {
|
||||
for (i = 0, databaseInstance = s_databasePool; i < 2; i++, databaseInstance++) {
|
||||
if (requestedInstance == databaseInstance) {
|
||||
if (requestedInstance->flags == 0) {
|
||||
CDBReportFatal("CDBDatabaseAllocate system error\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_FATAL_ERROR;
|
||||
}
|
||||
CDBReportError("database descripter has opened already\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x1c;
|
||||
}
|
||||
}
|
||||
|
||||
CDBReportError("database descripter is not initialized\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x18;
|
||||
}
|
||||
|
||||
writeFlag = flag & CDB_RECORD_ALLOC_WRITE;
|
||||
for (i = 0, databaseInstance = s_databasePool; i < 2; i++, databaseInstance++) {
|
||||
if (databaseInstance->used != 0) {
|
||||
if ((databaseInstance->flags & CDB_RECORD_ALLOC_WRITE) != 0) {
|
||||
CDBReportError("can't open the database as WRITE mode; another database discripter opened the database as WRITE mode\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x19;
|
||||
}
|
||||
if (writeFlag != 0) {
|
||||
CDBReportError("can't open the database as WRITE mode; other database discripter(s) opened the database as READ mode\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x19;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (s_databasePool[i].used == 0) {
|
||||
CDBDatabaseInstanceInit(s_databasePool + i, flag, database);
|
||||
database->instance = s_databasePool + i;
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
}
|
||||
|
||||
CDBReportError("can't open databases any more\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_CRYPT_ALLOC_FAIL;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseFree(CDBDatabase* database) {
|
||||
int offset;
|
||||
int i;
|
||||
u32* databaseInstance = database->instance;
|
||||
BOOL hasOpenRecord = FALSE;
|
||||
|
||||
if (databaseInstance == NULL) {
|
||||
return 0x1b;
|
||||
}
|
||||
|
||||
OSLockMutex(&s_mutex);
|
||||
for (i = 0, offset = 0; i < 5; i++, offset += 0x470) {
|
||||
if (CDBRecordInstanceIsUsed(s_recordPool + offset) &&
|
||||
*(CDBDatabase**)(s_recordPool + offset + 0x468) == database) {
|
||||
CDBReportError("can't close database; record %s is opened\n", s_recordPool + offset + 0x438);
|
||||
hasOpenRecord = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if (hasOpenRecord) {
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x21;
|
||||
}
|
||||
|
||||
databaseInstance[0] = 0;
|
||||
database->instance = NULL;
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseCheckOpenDatabase() {
|
||||
int i;
|
||||
BOOL hasOpenDatabase = FALSE;
|
||||
|
||||
OSLockMutex(&s_mutex);
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (CDBDatabaseInstanceIsUsed(s_databasePool + i)) {
|
||||
CDBReportError("database is opened\n");
|
||||
hasOpenDatabase = TRUE;
|
||||
}
|
||||
}
|
||||
OSUnlockMutex(&s_mutex);
|
||||
if (hasOpenDatabase) {
|
||||
return 0x22;
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseCheckOpenRecord() {
|
||||
int offset;
|
||||
int i;
|
||||
BOOL hasOpenRecord = FALSE;
|
||||
|
||||
OSLockMutex(&s_mutex);
|
||||
for (i = 0, offset = 0; i < 5; i++, offset += 0x470) {
|
||||
if (CDBRecordInstanceIsUsed(s_recordPool + offset)) {
|
||||
CDBReportError("record %s is opened\n", s_recordPool + offset + 0x438);
|
||||
hasOpenRecord = TRUE;
|
||||
}
|
||||
}
|
||||
OSUnlockMutex(&s_mutex);
|
||||
if (hasOpenRecord) {
|
||||
return 0x21;
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
char s_recordOnSDMessage[] = "record %s on SD is opened\n";
|
||||
|
||||
CDBErr CDBRecordAllocate(CDBRecord* record, int flag) {
|
||||
int writeFlag;
|
||||
int offset;
|
||||
int i;
|
||||
CDBDatabaseInstanceWork* databaseInstance = ((CDBDatabase*)*(CDBDatabase**)record)->instance;
|
||||
|
||||
OSLockMutex(&s_mutex);
|
||||
if (databaseInstance == NULL) {
|
||||
CDBReportError("can't open the record; database is closed\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x1b;
|
||||
}
|
||||
|
||||
if ((databaseInstance->flags & CDB_RECORD_ALLOC_WRITE) == 0 && (flag & CDB_RECORD_ALLOC_WRITE) != 0) {
|
||||
CDBReportError("can't open the record as WRITE mode; database is readonly mode\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x1a;
|
||||
}
|
||||
|
||||
writeFlag = flag & CDB_RECORD_ALLOC_WRITE;
|
||||
for (i = 0, offset = 0; i < 5; i++, offset += 0x470) {
|
||||
if (CDBRecordInstanceIsUsed(s_recordPool + offset) &&
|
||||
CDBRecordKeyCompare(&record->key, (CDBRecordKey*)(s_recordPool + offset + 0x438)) == FALSE &&
|
||||
*(s32*)((u8*)record + 0x30) == *(s32*)(s_recordPool + offset + 0x460)) {
|
||||
if ((*(u32*)(s_recordPool + offset + 0x1c) & CDB_RECORD_ALLOC_WRITE) != 0) {
|
||||
CDBReportError("can't open the record as WRITE mode; another record discripter opened the record as WRITE mode\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x19;
|
||||
}
|
||||
if (writeFlag != 0) {
|
||||
CDBReportError("can't open the record as WRITE mode; other record discripter(s) opened the record as READ mode \n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x19;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 5; i++) {
|
||||
if (!CDBRecordInstanceIsUsed(s_recordPool + i * 0x470)) {
|
||||
offset = i * 0x470;
|
||||
CDBRecordInstanceInit(s_recordPool + offset, record, flag);
|
||||
record->file = s_recordPool + offset;
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
}
|
||||
|
||||
CDBReportError("can't open record any more\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_CRYPT_ALLOC_FAIL;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordFree(CDBRecord* record) {
|
||||
CDBRecordFile* recordFile = record->file;
|
||||
|
||||
@@ -73,18 +296,6 @@ void CDBSetFatalVFErrorFlag() {
|
||||
s_fatalVFFlag = TRUE;
|
||||
}
|
||||
|
||||
void CDBRecordPoolInit(void* work) {
|
||||
int i;
|
||||
|
||||
s_recordPool = (u8*)work + 0x18030;
|
||||
for (i = 0; i < 5; i++) {
|
||||
*(u32*)(s_recordPool + i * 0x470 + 0x18) = 0;
|
||||
if (!s_mutexInitialized) {
|
||||
OSInitMutex((OSMutex*)(s_recordPool + i * 0x470));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CDBTryToCreate_wiiiddat(u8* data) {
|
||||
NANDFileInfo fileInfo;
|
||||
u32 nandCheck;
|
||||
@@ -92,7 +303,7 @@ void CDBTryToCreate_wiiiddat(u8* data) {
|
||||
// Requires 1 NAND block and 1 NAND node
|
||||
s32 ret = NANDCheck(1, 1, &nandCheck);
|
||||
if (ret != NAND_RESULT_OK) {
|
||||
CDBReportError("failed NANDCheck\n");
|
||||
CDBReportFatal("failed NANDCheck\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -327,6 +538,29 @@ void CDBCheckMakerCodeStr(char* makerCodeStr) {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL CDBRecordBelongedDBOpenedAsRW(CDBRecord* record) {
|
||||
int i;
|
||||
CDBDatabaseInstanceWork* databaseInstance = NULL;
|
||||
CDBDatabaseInstanceWork* databasePool;
|
||||
|
||||
if (record == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
databasePool = s_databasePool;
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (databasePool[i].used != 0 && (databasePool[i].flags & CDB_RECORD_ALLOC_WRITE) != 0) {
|
||||
databaseInstance = databasePool + i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (databaseInstance == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static int s_vfSync = 1;
|
||||
|
||||
CDBErr CDBSetVFSyncMode(int sync) {
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
#define NCD_IPC_HEAP_SIZE 0x1B60
|
||||
#define NCD_MAX_PROFILE 3
|
||||
|
||||
static u32 ncdInitialized;
|
||||
static NCDConfig* ncdCommonBuffer;
|
||||
static u32 ncdInitialized;
|
||||
|
||||
struct NCDMutex {
|
||||
OSMutex mutex;
|
||||
@@ -24,7 +24,7 @@ const char* __NCDUnofficialVersion = "<< RVL_SDK - NCD \trelease build: Dec 12 2
|
||||
|
||||
static void LockRight(void);
|
||||
static NCDErr ExecConfigCommand(const char* name, NCDConfig* config, u32 command);
|
||||
static NCDErr NCDiGetWirelessMacAddress(u8* macAddr);
|
||||
NCDErr NCDiGetWirelessMacAddress(u8* macAddr);
|
||||
|
||||
NCDErr NCDReadConfig(NCDConfig* config) {
|
||||
if (config == NULL) {
|
||||
@@ -323,7 +323,7 @@ NCDErr NCDGetWirelessMacAddress(u8* macAddr) {
|
||||
return NCDiGetWirelessMacAddress(macAddr);
|
||||
}
|
||||
|
||||
static NCDErr NCDiGetWirelessMacAddress(u8* macAddr) {
|
||||
NCDErr NCDiGetWirelessMacAddress(u8* macAddr) {
|
||||
NCDErr err = 0;
|
||||
s32 fd;
|
||||
|
||||
|
||||
@@ -53,8 +53,8 @@ static struct {
|
||||
VFi_NANDDelete delete; // 0x0C
|
||||
} l_nandFunc[PF_DRIVE_COUNT];
|
||||
|
||||
int VF_nand_retry_max;
|
||||
int VF_nand_sleep_msec;
|
||||
int VF_nand_retry_max;
|
||||
|
||||
#ifdef DEBUG
|
||||
#define VFi_NANDPrint(...) printf(__VA_ARGS__)
|
||||
@@ -130,7 +130,7 @@ s32 VFi_NandPrivateOpen(const char* path, NANDFileInfo* info, u8 accType) {
|
||||
VFi_NANDFunction(NANDPrivateOpen(path, info, accType));
|
||||
}
|
||||
|
||||
s32 VFi_NandWrite(NANDFileInfo* info, void* buf, u32 length) {
|
||||
inline s32 VFi_NandWrite(NANDFileInfo* info, void* buf, u32 length) {
|
||||
VFi_NANDFunction(NANDWrite(info, buf, length));
|
||||
}
|
||||
|
||||
@@ -146,7 +146,7 @@ s32 VFi_NandPrivateCreateDir(const char* path, u8 perm, u8 attr) {
|
||||
VFi_NANDFunction(NANDPrivateCreateDir(path, perm, attr));
|
||||
}
|
||||
|
||||
s32 VFi_NandSeek(NANDFileInfo* info, s32 offset, s32 whence) {
|
||||
inline s32 VFi_NandSeek(NANDFileInfo* info, s32 offset, s32 whence) {
|
||||
VFi_NANDFunction(NANDSeek(info, offset, whence));
|
||||
}
|
||||
|
||||
@@ -177,12 +177,12 @@ static u8 _MakePermitForRVL(u8 i_perm) {
|
||||
return perm;
|
||||
}
|
||||
|
||||
s32 VFi_NandCreateSp(const char* path, u8 i_perm, u8 attr, u32 i_handleIdx) {
|
||||
inline s32 VFi_NandCreateSp(const char* path, u8 i_perm, u8 attr, u32 i_handleIdx) {
|
||||
u8 perm = _MakePermitForRVL(i_perm);
|
||||
if (i_handleIdx < PF_DRIVE_COUNT) {
|
||||
VFi_NANDCreate tmpCreate;
|
||||
tmpCreate = l_nandFunc[i_handleIdx].create;
|
||||
if (tmpCreate != NULL) {
|
||||
if (tmpCreate) {
|
||||
return tmpCreate(path, perm, attr);
|
||||
}
|
||||
return VFi_NandCreate(path, perm, attr);
|
||||
@@ -197,7 +197,7 @@ s32 VFi_NandOpenSp(const char* path, void* info, u8 accType, u32 i_handleIdx) {
|
||||
NANDFileInfo* info_p = info;
|
||||
if (i_handleIdx < PF_DRIVE_COUNT) {
|
||||
VFi_NANDOpen tmpOpen = l_nandFunc[i_handleIdx].open;
|
||||
if (tmpOpen != NULL) {
|
||||
if (tmpOpen) {
|
||||
return tmpOpen(path, info_p, accType);
|
||||
}
|
||||
return VFi_NandOpen(path, info_p, accType);
|
||||
@@ -208,10 +208,10 @@ s32 VFi_NandOpenSp(const char* path, void* info, u8 accType, u32 i_handleIdx) {
|
||||
return VFi_NandPrivateOpen(path, info_p, accType);
|
||||
}
|
||||
|
||||
s32 VFi_NandDeleteSp(const char* path, u32 i_handleIdx) {
|
||||
inline s32 VFi_NandDeleteSp(const char* path, u32 i_handleIdx) {
|
||||
if (i_handleIdx < PF_DRIVE_COUNT) {
|
||||
VFi_NANDDelete tmpDelete = l_nandFunc[i_handleIdx].delete;
|
||||
if (tmpDelete != NULL) {
|
||||
if (tmpDelete) {
|
||||
return tmpDelete(path);
|
||||
}
|
||||
return VFi_NandDelete(path);
|
||||
|
||||
@@ -80,6 +80,10 @@ SimpleWavePlayer::SimpleWavePlayer() : mSetupParam(1, nw4r::snd::SAMPLE_FORMAT_P
|
||||
mThreadRunning = false;
|
||||
}
|
||||
|
||||
WaveFileAiff::~WaveFileAiff() {}
|
||||
|
||||
WaveFileWav::~WaveFileWav() {}
|
||||
|
||||
SimpleWavePlayer::~SimpleWavePlayer() {
|
||||
}
|
||||
|
||||
|
||||
@@ -8,8 +8,6 @@ namespace ipl {
|
||||
// used but pooled first
|
||||
DECOMP_FORCE_ACTIVE(iplCSMtx_cpp, "MTX34");
|
||||
|
||||
static const char mtx34_name[] = "MTX34";
|
||||
|
||||
#define PROPERTY_COUNT 13
|
||||
extern const CHANSVmPropertyList cPropertyList[PROPERTY_COUNT];
|
||||
|
||||
@@ -153,7 +151,7 @@ namespace ipl {
|
||||
BOOL init(CHANSVm* vm) {
|
||||
BOOL result = FALSE;
|
||||
// Create class
|
||||
CHANSVmNativeClass* cls = CHANSVmAddNativeClass(vm, mtx34_name, ctor, NULL);
|
||||
CHANSVmNativeClass* cls = CHANSVmAddNativeClass(vm, "MTX34", ctor, NULL);
|
||||
if (cls != NULL) {
|
||||
// Add properties
|
||||
result = CHANSVmAddNativePropertyAccessorsList(vm, cls, cPropertyList, PROPERTY_COUNT) == CHANS_VM_OK;
|
||||
|
||||
@@ -34,7 +34,9 @@ static MEMAllocator sAllocator;
|
||||
static MEMAllocator* spAllocator = &sAllocator;
|
||||
|
||||
void* HBMAllocMem(u32 size) {
|
||||
return MEMAllocFromAllocator(spAllocator, size);
|
||||
void* addr = MEMAllocFromAllocator(spAllocator, size);
|
||||
|
||||
return addr;
|
||||
}
|
||||
|
||||
void HBMFreeMem(void* pBlock) {
|
||||
@@ -124,17 +126,6 @@ BOOL HBMIsReassignedControllers() {
|
||||
|
||||
/* THE LOGIC */
|
||||
|
||||
extern const f32 lbl_816946D8;
|
||||
extern const f32 lbl_81694748;
|
||||
extern const f32 lbl_81694744;
|
||||
extern const f32 lbl_816946DC;
|
||||
extern const f32 lbl_81694754;
|
||||
extern volatile const f32 lbl_8169474C;
|
||||
extern volatile const f32 lbl_81694750;
|
||||
|
||||
extern const f32 lbl_81694714;
|
||||
extern const f32 lbl_81694710;
|
||||
|
||||
namespace homebutton {
|
||||
static void SimpleSyncCallback(s32 result, s32 num);
|
||||
|
||||
@@ -156,16 +147,6 @@ namespace homebutton {
|
||||
|
||||
HomeButton* HomeButton::spHomeButtonObj = NULL;
|
||||
|
||||
const int HomeButton::scReConnectTime = 3600;
|
||||
const int HomeButton::scReConnectTime2 = 3570;
|
||||
const int HomeButton::scPadDrawWaitTime = 5;
|
||||
const int HomeButton::scGetPadInfoTime = 100;
|
||||
const int HomeButton::scForcusSEWaitTime = 2;
|
||||
const f32 HomeButton::scOnPaneVibTime = 3.0f;
|
||||
const f32 HomeButton::scOnPaneVibWaitTime = 9.0f;
|
||||
const int HomeButton::scWaitStopMotorTime = 30;
|
||||
const int HomeButton::scWaitDisConnectTime = 180;
|
||||
|
||||
const char* HomeButton::scCursorLytName[res::eCursorLyt_Max] = {
|
||||
"P1_Def.brlyt",
|
||||
"P2_Def.brlyt",
|
||||
@@ -616,8 +597,8 @@ namespace homebutton {
|
||||
mpController[i]->initCallback();
|
||||
mpController[i]->initSound();
|
||||
|
||||
mOnPaneVibFrame[i] = ::lbl_816946D8;
|
||||
mOnPaneVibWaitFrame[i] = ::lbl_816946D8;
|
||||
mOnPaneVibFrame[i] = 0.0f;
|
||||
mOnPaneVibWaitFrame[i] = 0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -638,7 +619,7 @@ namespace homebutton {
|
||||
|
||||
if (mpSoundArchivePlayer != NULL) {
|
||||
for (i = 0; i < mpSoundArchivePlayer->GetSoundPlayerCount(); i++) {
|
||||
mpSoundArchivePlayer->GetSoundPlayer(i).SetVolume(::lbl_816946DC);
|
||||
mpSoundArchivePlayer->GetSoundPlayer(i).SetVolume(1.0f);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -798,7 +779,7 @@ namespace homebutton {
|
||||
if (mOnPaneVibFrame[i] <= 0.0f || mState == 17) {
|
||||
getController(i)->stopMotor();
|
||||
mOnPaneVibFrame[i] = 0.0f;
|
||||
mOnPaneVibWaitFrame[i] = scOnPaneVibWaitTime;
|
||||
mOnPaneVibWaitFrame[i] = 9.0f;
|
||||
}
|
||||
}
|
||||
} else if (mOnPaneVibWaitFrame[i] > 0.0f) {
|
||||
@@ -1271,20 +1252,6 @@ namespace homebutton {
|
||||
}
|
||||
}
|
||||
|
||||
void HomeButton::calc_letter() {
|
||||
if (mLetterFlag && !mpPairGroupAnmController[res::ePairAnm_ltrIcn_on]->isPlaying()) {
|
||||
mpLayout->GetRootPane()->FindPaneByName(scFuncPaneName[res::eFuncPane_let_icn_00], true)->SetVisible(true);
|
||||
|
||||
mpPairGroupAnmController[res::ePairAnm_ltrIcn_on]->setAnmType(ANIM_TYPE_LOOP);
|
||||
|
||||
mpPairGroupAnmController[res::ePairAnm_ltrIcn_on]->play();
|
||||
} else if (!mLetterFlag) {
|
||||
mpLayout->GetRootPane()->FindPaneByName(scFuncPaneName[res::eFuncPane_let_icn_00], true)->SetVisible(false);
|
||||
|
||||
mpPairGroupAnmController[res::ePairAnm_ltrIcn_on]->stop();
|
||||
}
|
||||
}
|
||||
|
||||
void HomeButton::calc_battery(int chan) {
|
||||
for (int i = 0; i < res::eBatteryPane_Max; i++) {
|
||||
if (i < mWpadInfo[chan].battery) {
|
||||
@@ -1311,6 +1278,20 @@ namespace homebutton {
|
||||
getController(chan)->clrBatteryFlag();
|
||||
}
|
||||
|
||||
void HomeButton::calc_letter() {
|
||||
if (mLetterFlag && !mpPairGroupAnmController[res::ePairAnm_ltrIcn_on]->isPlaying()) {
|
||||
mpLayout->GetRootPane()->FindPaneByName(scFuncPaneName[res::eFuncPane_let_icn_00], true)->SetVisible(true);
|
||||
|
||||
mpPairGroupAnmController[res::ePairAnm_ltrIcn_on]->setAnmType(ANIM_TYPE_LOOP);
|
||||
|
||||
mpPairGroupAnmController[res::ePairAnm_ltrIcn_on]->play();
|
||||
} else if (!mLetterFlag) {
|
||||
mpLayout->GetRootPane()->FindPaneByName(scFuncPaneName[res::eFuncPane_let_icn_00], true)->SetVisible(false);
|
||||
|
||||
mpPairGroupAnmController[res::ePairAnm_ltrIcn_on]->stop();
|
||||
}
|
||||
}
|
||||
|
||||
void HomeButton::draw() {
|
||||
mpLayout->Draw(mDrawInfo);
|
||||
|
||||
@@ -1475,13 +1456,12 @@ namespace homebutton {
|
||||
nw4r::math::VEC3 vec;
|
||||
|
||||
if (pController->wiiCon[i].use_devtype == WPAD_DEV_CLASSIC && pController->wiiCon[i].kpad->dev_type == WPAD_DEV_CLASSIC) {
|
||||
vec = nw4r::math::VEC3(lbl_816946D8, lbl_816946D8,
|
||||
*((volatile const f32*)&lbl_81694710));
|
||||
vec = nw4r::math::VEC3(0.0f, 0.0f, 15.0f);
|
||||
} else {
|
||||
Vec2 v = pController->wiiCon[i].kpad->horizon;
|
||||
f32 rad = nw4r::math::Atan2FIdx(-v.y, v.x) * lbl_81694714;
|
||||
f32 rad = nw4r::math::Atan2FIdx(-v.y, v.x) * 1.40625f;
|
||||
|
||||
vec = nw4r::math::VEC3(lbl_816946D8, lbl_816946D8, rad);
|
||||
vec = nw4r::math::VEC3(0.0f, 0.0f, rad);
|
||||
}
|
||||
|
||||
if (!mpHBInfo->cursor) {
|
||||
@@ -1933,8 +1913,8 @@ namespace homebutton {
|
||||
}
|
||||
|
||||
if (onFlag && pController != NULL) {
|
||||
if (!getController(pController->chan)->isRumbling() && mOnPaneVibWaitFrame[pController->chan] <= ::lbl_816946D8) {
|
||||
mOnPaneVibFrame[pController->chan] = ::lbl_81694744;
|
||||
if (!getController(pController->chan)->isRumbling() && mOnPaneVibWaitFrame[pController->chan] <= 0.0f) {
|
||||
mOnPaneVibFrame[pController->chan] = 3.0f;
|
||||
getController(pController->chan)->startMotor();
|
||||
}
|
||||
}
|
||||
@@ -2388,10 +2368,10 @@ namespace homebutton {
|
||||
void HomeButton::reset_guiManager(int num) {
|
||||
if (num < 0) {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
mpPaneManager->update(i, ::lbl_81694748, ::lbl_81694748, 0, 0, 0, NULL);
|
||||
mpPaneManager->update(i, -10000.0f, -10000.0f, 0, 0, 0, NULL);
|
||||
}
|
||||
} else {
|
||||
mpPaneManager->update(num, ::lbl_81694748, ::lbl_81694748, 0, 0, 0, NULL);
|
||||
mpPaneManager->update(num, -10000.0f, -10000.0f, 0, 0, 0, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2500,7 +2480,7 @@ namespace homebutton {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
scale = nw4r::math::VEC2(::lbl_816946DC, ::lbl_816946DC);
|
||||
scale = nw4r::math::VEC2(1.0f, 1.0f);
|
||||
mpLayout->GetRootPane()->SetScale(scale);
|
||||
|
||||
if (!mpHBInfo->cursor) {
|
||||
@@ -2645,14 +2625,9 @@ namespace homebutton {
|
||||
|
||||
initgx();
|
||||
GXColor clr = {red_, green_, blue_, alpha};
|
||||
drawBlackPlate(::lbl_8169474C, ::lbl_8169474C, ::lbl_81694750, ::lbl_81694750, clr);
|
||||
drawBlackPlate(-1000.0f, -1000.0f, 1000.0f, 1000.0f, clr);
|
||||
}
|
||||
|
||||
const int HomeButton::scSoundHeapSize_but2 = 0x60000;
|
||||
const int HomeButton::scSoundHeapSize_but3 = 0x6f800;
|
||||
const int HomeButton::scSoundThreadPrio = 4;
|
||||
const int HomeButton::scDvdThreadPrio = 3;
|
||||
|
||||
void HomeButton::update_sound() {
|
||||
if (mpSoundArchivePlayer != NULL) {
|
||||
mpSoundArchivePlayer->Update();
|
||||
@@ -2684,7 +2659,7 @@ namespace homebutton {
|
||||
}
|
||||
|
||||
if (mEndInitSoundFlag) {
|
||||
AXSetAuxAReturnVolume(lbl_81694754 * gain);
|
||||
AXSetAuxAReturnVolume(32768.0f * gain);
|
||||
}
|
||||
|
||||
if (mpSoundArchivePlayer != NULL) {
|
||||
|
||||
@@ -595,5 +595,23 @@ namespace ext_ead {
|
||||
}
|
||||
}
|
||||
|
||||
BrowserThread::CmdPacket& BrowserThread::CmdPacket::operator=(const BrowserThread::CmdPacket& other) {
|
||||
type = other.type;
|
||||
data = other.data;
|
||||
return *this;
|
||||
}
|
||||
|
||||
ImeData& ImeData::operator=(const ImeData& other) {
|
||||
unk_0x00 = other.unk_0x00;
|
||||
imeID = other.imeID;
|
||||
text = other.text;
|
||||
unk_0x0C = other.unk_0x0C;
|
||||
unk_0x10 = other.unk_0x10;
|
||||
unk_0x14 = other.unk_0x14;
|
||||
unk_0x18 = other.unk_0x18;
|
||||
maxLength = other.maxLength;
|
||||
return *this;
|
||||
}
|
||||
|
||||
} // namespace www
|
||||
} // namespace ext_ead
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
namespace textinput {
|
||||
namespace gui {
|
||||
extern "C" void drawLine___Q29textinput3guiFfffffUcR8_GXColor();
|
||||
extern "C" const f32 lbl_81694EE8;
|
||||
|
||||
void drawLine_(f32 x0, f32 y0, f32 x1, f32 y1, f32 z, u8 width, GXColor& color) {
|
||||
GXClearVtxDesc();
|
||||
@@ -30,7 +31,7 @@ namespace textinput {
|
||||
GXSetBlendMode(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_NOOP);
|
||||
|
||||
Mtx mtx;
|
||||
MTXTrans(mtx, 0.0f, 0.0f, 0.0f);
|
||||
MTXTrans(mtx, lbl_81694EE8, lbl_81694EE8, lbl_81694EE8);
|
||||
GXLoadPosMtxImm(mtx, 0);
|
||||
|
||||
GXSetLineWidth(width, GX_TO_ZERO);
|
||||
@@ -46,16 +47,6 @@ namespace textinput {
|
||||
GXEnd();
|
||||
}
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata2"
|
||||
extern "C" const f32 lbl_81694EE8 = 0.0f;
|
||||
extern "C" const u8 lbl_81694EEC = 0xFF;
|
||||
extern "C" const u8 lbl_81694EED = 0x00;
|
||||
extern "C" const u8 lbl_81694EEE = 0x00;
|
||||
extern "C" const u8 lbl_81694EEF = 0xFF;
|
||||
extern "C" const f32 lbl_81694EF0 = 0.5f;
|
||||
#pragma pop
|
||||
|
||||
u32 GUIComponent::updatePointerImpl(const GUIPointer& pointer) {
|
||||
int point = pointer.getCtrlNo();
|
||||
u32 event = EVENT_NONE;
|
||||
@@ -250,6 +241,8 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
PaneComponent::~PaneComponent() {}
|
||||
|
||||
void PaneManager::createLayoutScene(const nw4r::lyt::Layout& layout) {
|
||||
mIDCounter = 0;
|
||||
walkInChildren(layout.GetRootPane()->GetChildList());
|
||||
@@ -315,8 +308,6 @@ namespace textinput {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
PaneComponent::~PaneComponent() {}
|
||||
|
||||
void PaneManager::setAllBoundingBoxComponentTriggerTarget(bool bEnable) {
|
||||
const volatile u16& numObjects = mPaneComponents.numObjects;
|
||||
for (u32 i = 0; i < numObjects; i++) {
|
||||
@@ -343,7 +334,7 @@ namespace textinput {
|
||||
MTXInverse(mpPane->GetGlobalMtx(), globalMtx);
|
||||
|
||||
nw4r::math::VEC3 pos;
|
||||
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, 0), pos);
|
||||
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, lbl_81694EE8), pos);
|
||||
|
||||
nw4r::ut::Rect rect = mpPane->GetPaneRect(*drawInfo);
|
||||
|
||||
@@ -355,6 +346,16 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata2"
|
||||
extern "C" const f32 lbl_81694EE8 = 0.0f;
|
||||
extern "C" const u8 lbl_81694EEC = 0xFF;
|
||||
extern "C" const u8 lbl_81694EED = 0x00;
|
||||
extern "C" const u8 lbl_81694EEE = 0x00;
|
||||
extern "C" const u8 lbl_81694EEF = 0xFF;
|
||||
extern "C" const f32 lbl_81694EF0 = 0.5f;
|
||||
#pragma pop
|
||||
|
||||
extern "C" asm void draw__Q39textinput3gui13PaneComponentFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x40(r1)
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
#define TI_PREDICTLANG_SAMPLE_CLASS
|
||||
#include "keyboard/tiPredictLang.h"
|
||||
#undef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
|
||||
#include "keyboard/tiLanguageIndependentData.h"
|
||||
#include "keyboard/tiManager.h"
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
#define TI_TOOLBAR_SAMPLE_CLASS
|
||||
#include "keyboard/tiToolBar.h"
|
||||
#undef TI_TOOLBAR_SAMPLE_CLASS
|
||||
|
||||
#include "keyboard/tiHKBManager.h"
|
||||
#include "keyboard/tiLanguageIndependentData.h"
|
||||
@@ -182,7 +184,7 @@ namespace textinput {
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ANM_07:
|
||||
case ANM_08:
|
||||
case ANM_11: {
|
||||
pane->changeAnimation(ANM_09);
|
||||
break;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -197,55 +197,53 @@ namespace ipl {
|
||||
mpLayoutBg->calc();
|
||||
mpLayoutFocusBg->calc();
|
||||
|
||||
if (mState != STATE_TO_SETTINGS && mState != STATE_TERMINATE) {
|
||||
if (mState == STATE_DONE) {
|
||||
return;
|
||||
if (mState == STATE_TO_SETTINGS || mState == STATE_TERMINATE || mState == STATE_DONE) {
|
||||
return;
|
||||
}
|
||||
|
||||
calc_board_object();
|
||||
|
||||
Button* button = get_button();
|
||||
|
||||
if (mbNewMsgAnimCount && button != NULL) {
|
||||
/* Message count on button icon */
|
||||
|
||||
wchar_t numStr[3] = L"";
|
||||
int index = 0;
|
||||
|
||||
int mailCount;
|
||||
|
||||
if (mMsgCount >= 0) {
|
||||
mailCount = 99;
|
||||
if (mMsgCount <= 99) {
|
||||
mailCount = mMsgCount;
|
||||
}
|
||||
} else {
|
||||
mailCount = 0;
|
||||
}
|
||||
|
||||
calc_board_object();
|
||||
if (mailCount >= 10) {
|
||||
index = 1;
|
||||
numStr[0] = scNumber[(mailCount / 10) % 10];
|
||||
}
|
||||
numStr[index++] = scNumber[mailCount % 10];
|
||||
|
||||
Button* button = get_button();
|
||||
button->setText("T_BbsMark1", numStr);
|
||||
|
||||
if (mbNewMsgAnimCount && button != NULL) {
|
||||
/* Message count on button icon */
|
||||
// New mail animation
|
||||
|
||||
int index = 0;
|
||||
wchar_t numStr[3] = L"";
|
||||
|
||||
int mailCount;
|
||||
|
||||
if (mMsgCount >= 0) {
|
||||
mailCount = 99;
|
||||
if (mMsgCount <= 99) {
|
||||
mailCount = mMsgCount;
|
||||
}
|
||||
} else {
|
||||
mailCount = 0;
|
||||
}
|
||||
|
||||
if (mailCount >= 10) {
|
||||
index = 1;
|
||||
numStr[0] = scNumber[(mailCount / 10) % 10];
|
||||
}
|
||||
numStr[index++] = scNumber[mailCount % 10];
|
||||
|
||||
button->setText("T_BbsMark1", numStr);
|
||||
|
||||
// New mail animation
|
||||
|
||||
if (mailCount != 0) {
|
||||
button->startMailNumAnm();
|
||||
} else {
|
||||
button->stopMailNumAnm();
|
||||
}
|
||||
|
||||
mbNewMsgAnimCount = false;
|
||||
if (mailCount != 0) {
|
||||
button->startMailNumAnm();
|
||||
} else {
|
||||
button->stopMailNumAnm();
|
||||
}
|
||||
|
||||
// Do SD process
|
||||
if (System::getCdbManager() != NULL && mState != STATE_WAIT_INIT) {
|
||||
mBoardSD.update();
|
||||
}
|
||||
mbNewMsgAnimCount = false;
|
||||
}
|
||||
|
||||
// Do SD process
|
||||
if (System::getCdbManager() != NULL && mState != STATE_WAIT_INIT) {
|
||||
mBoardSD.update();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -907,14 +905,16 @@ namespace ipl {
|
||||
if (mState == STATE_NORMAL) {
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
BoardObject* object = NULL;
|
||||
FOREACH_OBJ_IN_LIST(object) {
|
||||
BoardObject* nextObject = NULL;
|
||||
while ((nextObject = mObjList.getNext(object)) != NULL) {
|
||||
object = nextObject;
|
||||
if ((mHoveredObjs[i] == NULL || mHoveredObjs[i] == object) && mState == STATE_NORMAL) {
|
||||
object->update(i);
|
||||
}
|
||||
}
|
||||
|
||||
if (System::getController(i) == NULL && mHoveredObjs[i] != NULL) {
|
||||
object->start_left_event(i);
|
||||
mHoveredObjs[i]->start_left_event(i);
|
||||
mHoveredObjs[i] = NULL;
|
||||
}
|
||||
}
|
||||
@@ -1134,9 +1134,11 @@ namespace ipl {
|
||||
bool result = mbDoReadTask == false;
|
||||
BoardObject* object = NULL;
|
||||
FOREACH_OBJ_IN_LIST(object) {
|
||||
result = (result & (!object->mbRightWay && !object->mbLeftWay && !object->mMoveAnim.isPlaying() && object->mpLayout != NULL &&
|
||||
!object->mpLayout->getAnim(BoardObject::ANIM_NEXT_PAGE)->isPlaying())) != false &&
|
||||
object->mbModifiedPos == false;
|
||||
bool stillMoving = (result & (!object->mbRightWay && !object->mbLeftWay && !object->mMoveAnim.isPlaying() &&
|
||||
object->mpLayout != NULL &&
|
||||
!object->mpLayout->getAnim(BoardObject::ANIM_NEXT_PAGE)->isPlaying())) != false;
|
||||
bool modifiedPos = object->mbModifiedPos;
|
||||
result = stillMoving & (modifiedPos == false);
|
||||
}
|
||||
|
||||
if (result) {
|
||||
@@ -1565,31 +1567,30 @@ namespace ipl {
|
||||
void Board::edge_arrow() {
|
||||
Button* button = get_button();
|
||||
|
||||
if (System::getScene(SCENE_CHANNEL_SELECT) == NULL && System::getReservedScene() == NULL) {
|
||||
if (mState == STATE_WAIT_CHILD_CST) {
|
||||
} else {
|
||||
enable_licon();
|
||||
enable_ricon();
|
||||
if (System::getScene(SCENE_CHANNEL_SELECT) != NULL || System::getReservedScene() != NULL || mState == STATE_WAIT_CHILD_CST) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (mCurrentDate == utility::Date::getMaxDate()) {
|
||||
if (button->isArrowVisible(Button::ARROW_BTN_RIGHT) && mbRIconEnable != true) {
|
||||
button->animation(Button::IDANIM_ARROW_RIGHT_DISAPPEAR);
|
||||
}
|
||||
if (!button->isArrowVisible(Button::ARROW_BTN_LEFT)) {
|
||||
button->animation(Button::IDANIM_ARROW_LEFT_APPEAR);
|
||||
}
|
||||
} else {
|
||||
if (mCurrentDate == utility::Date::getMinDate()) {
|
||||
if (button->isArrowVisible(Button::ARROW_BTN_LEFT) && mbLIconEnable != true) {
|
||||
button->animation(Button::IDANIM_ARROW_LEFT_DISAPPEAR);
|
||||
}
|
||||
if (!button->isArrowVisible(Button::ARROW_BTN_RIGHT)) {
|
||||
button->animation(Button::IDANIM_ARROW_RIGHT_APPEAR);
|
||||
}
|
||||
} else {
|
||||
appear_arrow();
|
||||
}
|
||||
enable_licon();
|
||||
enable_ricon();
|
||||
|
||||
if (mCurrentDate == utility::Date::getMaxDate()) {
|
||||
if (button->isArrowVisible(Button::ARROW_BTN_RIGHT) && mbRIconEnable != true) {
|
||||
button->animation(Button::IDANIM_ARROW_RIGHT_DISAPPEAR);
|
||||
}
|
||||
if (!button->isArrowVisible(Button::ARROW_BTN_LEFT)) {
|
||||
button->animation(Button::IDANIM_ARROW_LEFT_APPEAR);
|
||||
}
|
||||
} else {
|
||||
if (mCurrentDate == utility::Date::getMinDate()) {
|
||||
if (button->isArrowVisible(Button::ARROW_BTN_LEFT) && mbLIconEnable != true) {
|
||||
button->animation(Button::IDANIM_ARROW_LEFT_DISAPPEAR);
|
||||
}
|
||||
if (!button->isArrowVisible(Button::ARROW_BTN_RIGHT)) {
|
||||
button->animation(Button::IDANIM_ARROW_RIGHT_APPEAR);
|
||||
}
|
||||
} else {
|
||||
appear_arrow();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1675,6 +1676,12 @@ namespace ipl {
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline nw4r::math::VEC3 addTranslate(const nw4r::math::VEC3& a, const nw4r::math::VEC3& b) {
|
||||
nw4r::math::VEC3 sum;
|
||||
nw4r::math::VEC3Add(&sum, &a, &b);
|
||||
return sum;
|
||||
}
|
||||
|
||||
void Board::calc_board_object() {
|
||||
nw4r::lyt::Pane* pane = mpLayoutBg->FindPaneByName("N_TopBack");
|
||||
|
||||
@@ -1682,8 +1689,7 @@ namespace ipl {
|
||||
FOREACH_OBJ_IN_LIST(object) {
|
||||
nw4r::lyt::Pane* posPane = mpLayoutBg->FindPaneByName(scScrollPane[get_date_label(object->mBoardDate)]);
|
||||
|
||||
math::VEC3 pos;
|
||||
nw4r::math::VEC3Add(&pos, &pane->GetTranslate(), &posPane->GetTranslate());
|
||||
math::VEC3 pos = addTranslate(pane->GetTranslate(), posPane->GetTranslate());
|
||||
|
||||
object->calc(math::VEC2(pos.x, pos.y));
|
||||
}
|
||||
|
||||
@@ -879,11 +879,8 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL Calendar::is_lower_limit() {
|
||||
static const f32 pad0 __attribute__((section(".data"), aligned(1), used)) = 0.0f;
|
||||
return mpBoardDate->year == mscMinDate.year && mpBoardDate->month == mscMinDate.month;
|
||||
}
|
||||
__declspec(weak) f32 calendar_data_pad() {
|
||||
static const f32 pad __attribute__((section(".data"), aligned(1))) = 0.0f;
|
||||
return *((volatile const f32*)&pad);
|
||||
}
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -60,9 +60,11 @@ namespace ipl {
|
||||
// clang-format on
|
||||
|
||||
utility::Date Date::mscMinDate(MIN_YEAR, MIN_MONTH, MIN_DAY);
|
||||
MaxDate Date::mscMaxDate(MAX_YEAR, MAX_MONTH, MAX_DAY);
|
||||
utility::Date Date::mscMaxDate(MAX_YEAR, MAX_MONTH, MAX_DAY);
|
||||
|
||||
DECOMP_FORCE_ACTIVE(iplDate_cpp, &Date::mscMaxDate);
|
||||
u8 padding[0x10];
|
||||
|
||||
DECOMP_FORCE_ACTIVE(iplDate_cpp, padding);
|
||||
|
||||
Date::Date(EGG::Heap* heap, nand::LayoutFile* file, const char* layoutFolder, const char* layoutFileName)
|
||||
: ::gui::EventHandler(), mbAppearMsg(0), unk_0x10(0), unk_0x14(0), mpLayout(NULL), mpCurrentPaneAnim(0), unk_0x3C(0) {
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
#define IPL_ANM_CONTROLLER_FORWARD_GUI
|
||||
#include "scene/channelEdit/iplAnmController.h"
|
||||
#undef IPL_ANM_CONTROLLER_FORWARD_GUI
|
||||
|
||||
#include "scene/channelEdit/iplChanAppBase.h"
|
||||
|
||||
#include "scene/channelEdit/iplChannelEdit.h"
|
||||
|
||||
@@ -7,11 +7,18 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
static inline VEC3 add(const VEC3& a, const VEC3& b) {
|
||||
VEC3 sum;
|
||||
VEC3Add(&sum, &a, &b);
|
||||
return sum;
|
||||
}
|
||||
|
||||
template <>
|
||||
VEC3 LinearIntp<VEC3>::get() const {
|
||||
VEC3 r = mEnd * getCurrentFrame();
|
||||
r += mStart * (mMaxFrame - mFrame);
|
||||
return r * (f64)(1.0f / getMaxFrame());
|
||||
nw4r::math::VEC3 result;
|
||||
VEC3 sum = add(mStart * (mMaxFrame - mFrame), mEnd * getCurrentFrame());
|
||||
VEC3Scale(&result, &sum, 1.0f / getMaxFrame());
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -18,8 +18,6 @@ namespace ipl {
|
||||
return caption;
|
||||
}
|
||||
|
||||
extern "C" char lbl_81650380[0x19] = "my_IplTopBalloon_a.brlyt";
|
||||
|
||||
LetterWriter::LetterWriter(EGG::Heap* heap, int type)
|
||||
: TextWriter(heap), mbToFriend(false), mLetterState(LETTER_STATE_NORMAL), mLetterType((textinput::extend::letter::InputForm::Type)type),
|
||||
mpTextSubjectWork(NULL), mpCaptionString(NULL), mpCaptionAllocator(NULL), mNwc24ErrCountdown2(0) {
|
||||
@@ -91,7 +89,7 @@ namespace ipl {
|
||||
f32 f0 = 30.0f;
|
||||
f32 f1 = 120.0f;
|
||||
mpNigaoeBalloon =
|
||||
new TextBalloon(getSceneHeap(), mpBalloonFile, "arc", lbl_81650380,
|
||||
new TextBalloon(getSceneHeap(), mpBalloonFile, "arc", "my_IplTopBalloon_a.brlyt",
|
||||
math::VEC3(0.0f, (f1 = 120.0f, 0.0f), (f0 = 30.0f, 0.0f)), f1, f0);
|
||||
|
||||
// Scroller
|
||||
@@ -293,6 +291,10 @@ namespace ipl {
|
||||
System::getKeyboard()->endMgr();
|
||||
}
|
||||
|
||||
FaderSceneCommand LetterWriter::calcFadeout() {
|
||||
return TextWriter::calcFadeout();
|
||||
}
|
||||
|
||||
void LetterWriter::onEventDerived(u32 compId, u32 event, const controller::Interface* con) {
|
||||
if (mState != STATE_SEL_FACE) {
|
||||
if (getMemoManager()->getState()->getStateType() != textinput::extend::memo::Manager::ST_Appearing) {
|
||||
@@ -378,30 +380,10 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
FaderSceneCommand LetterWriter::calcFadeout() {
|
||||
return TextWriter::calcFadeout();
|
||||
}
|
||||
|
||||
extern "C" char lbl_816503BF[] = "WIPL_SE_DECIDE";
|
||||
extern "C" char lbl_816503CE[0x12A] =
|
||||
"\x91\x97\x90\x4D\x8E\xB8\x94\x73\n\0"
|
||||
"NWC24InitMsgObj err\n\0"
|
||||
"NWC24SetMsgToId err\n\0"
|
||||
"[to]: %016llu\n\0"
|
||||
"NWC24SetMsgText err\n\0"
|
||||
"RFLSetOfficial2NWC24Msg err = %d\n\0"
|
||||
"NWC24SetMsgMBNoReply err\n\0"
|
||||
"setMsgCommand err\n\0"
|
||||
"NWC24SetMsgAttached err\n\0"
|
||||
"NWC24CommitMsg err\n\0"
|
||||
"NWC24SetMsgToAddr err\n\0"
|
||||
"[LetterWriter]: send to %s\n\0"
|
||||
"setMsgSubjectAndTextPublic err\n\0";
|
||||
|
||||
void LetterWriter::onSend() {
|
||||
Button* button = getButton();
|
||||
|
||||
snd::getSystem()->startSE(lbl_816503BF);
|
||||
snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
|
||||
unk_0x7D = false;
|
||||
|
||||
@@ -417,7 +399,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (sendMessageByNWC24(myUserId, mWCString) != 0) {
|
||||
OSReport(lbl_816503CE);
|
||||
OSReport("送信失敗\n"); // "Send failure"
|
||||
} else {
|
||||
PlayTimeLog::sendMsgLog((wchar_t*)mFriendInfo.attr.name);
|
||||
getBoard()->reopen_log();
|
||||
@@ -488,27 +470,26 @@ namespace ipl {
|
||||
|
||||
int LetterWriter::sendToWii(NWC24UserId userId, const wchar_t* wcString) {
|
||||
NWC24MsgObj msgObj;
|
||||
const char* report = lbl_81650380;
|
||||
|
||||
// Create message object
|
||||
if (!System::getNwc24Manager()->initMsgObj(&msgObj, NWC24_MSGTYPE_WII_MENU)) {
|
||||
OSReport(report + 0x58);
|
||||
OSReport("NWC24InitMsgObj err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
|
||||
// Set message to ID (in this case, my user ID)
|
||||
if (!System::getNwc24Manager()->setMsgToId(&msgObj, userId)) {
|
||||
OSReport(report + 0x6D);
|
||||
OSReport("NWC24SetMsgToId err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
|
||||
OSReport(report + 0x82, userId);
|
||||
OSReport("[to]: %016llu\n", userId);
|
||||
|
||||
// Set letter contents
|
||||
if (*wcString != 0) {
|
||||
if (!System::getNwc24Manager()->setMsgText(&msgObj, (char*)wcString, wcslen(wcString) * sizeof(wchar_t), NWC24_UTF_16BE,
|
||||
NWC24_ENC_BASE64)) {
|
||||
OSReport(report + 0x91);
|
||||
OSReport("NWC24SetMsgText err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
} else {
|
||||
@@ -518,7 +499,7 @@ namespace ipl {
|
||||
|
||||
if (!System::getNwc24Manager()->setMsgText(&msgObj, (char*)blank, wcslen(blank) * sizeof(wchar_t), NWC24_UTF_16BE,
|
||||
NWC24_ENC_BASE64)) {
|
||||
OSReport(report + 0x91);
|
||||
OSReport("NWC24SetMsgText err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
}
|
||||
@@ -528,19 +509,19 @@ namespace ipl {
|
||||
RFLCharData data;
|
||||
RFLErrcode err = RFLiSetOfficial2NWC24Msg(&msgObj, &data, mSelectedFaceId);
|
||||
if (err != RFLErrcode_Success) {
|
||||
OSReport(report + 0xA6, err);
|
||||
OSReport("RFLSetOfficial2NWC24Msg err = %d\n", err);
|
||||
return SEND_ERR_RFL;
|
||||
}
|
||||
}
|
||||
|
||||
// Do not reply
|
||||
if (!System::getNwc24Manager()->setMsgMBNoReply(&msgObj, false)) {
|
||||
OSReport(report + 0xC8);
|
||||
OSReport("NWC24SetMsgMBNoReply err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
|
||||
if (!System::getNwc24Manager()->setLedPattern(&msgObj)) {
|
||||
OSReport(report + 0xE2);
|
||||
OSReport("setMsgCommand err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
|
||||
@@ -549,14 +530,14 @@ namespace ipl {
|
||||
u32 picLength = 0;
|
||||
const void* picData = board->getPicture(&picLength);
|
||||
if (NWC24SetMsgAttached(&msgObj, picData, picLength, NWC24_X_WII_PICTURE) != NWC24_OK) {
|
||||
OSReport(report + 0xF5);
|
||||
OSReport("NWC24SetMsgAttached err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
}
|
||||
|
||||
// Send!
|
||||
if (!System::getNwc24Manager()->commitMsg(&msgObj)) {
|
||||
OSReport(report + 0x10E);
|
||||
OSReport("NWC24CommitMsg err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
|
||||
@@ -565,33 +546,32 @@ namespace ipl {
|
||||
|
||||
int LetterWriter::sendToPC(NWC24UserId userId, const wchar_t* wcString) {
|
||||
NWC24MsgObj msgObj;
|
||||
const char* report = lbl_816503CE + 0x4E;
|
||||
|
||||
// Create message object
|
||||
if (!System::getNwc24Manager()->initMsgObj(&msgObj, NWC24_MSGTYPE_PUBLIC)) {
|
||||
OSReport(report + 0xA);
|
||||
OSReport("NWC24InitMsgObj err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
|
||||
// Set message to ID (in this case, my user ID)
|
||||
if (!System::getNwc24Manager()->setMsgToAddr(&msgObj, mFriendInfo.addr.mailAddr, strlen(mFriendInfo.addr.mailAddr))) {
|
||||
OSReport(report + 0xD4);
|
||||
OSReport("NWC24SetMsgToAddr err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
|
||||
OSReport(report + 0xEB, mFriendInfo.addr.mailAddr);
|
||||
OSReport("[LetterWriter]: send to %s\n", mFriendInfo.addr.mailAddr);
|
||||
|
||||
// Set letter contents
|
||||
const wchar_t* subject = System::getMessage(MESG_LETTERWRITER_EMAIL_SUBJECT);
|
||||
if (!System::getNwc24Manager()->setMsgSubjectAndTextPublic(&msgObj, (u16*)subject, wcslen(subject), (u16*)wcString, wcslen(wcString),
|
||||
mpTextSubjectWork, mTextSubjectWorkSize)) {
|
||||
OSReport(report + 0x107);
|
||||
OSReport("setMsgSubjectAndTextPublic err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
|
||||
// Send!
|
||||
if (!System::getNwc24Manager()->commitMsg(&msgObj)) {
|
||||
OSReport(report + 0xC0);
|
||||
OSReport("NWC24CommitMsg err\n");
|
||||
return SEND_ERR_NWC24;
|
||||
}
|
||||
|
||||
|
||||
@@ -119,175 +119,11 @@ namespace LibTVRC {
|
||||
|
||||
void __FTVRCLoop0Handler(OSAlarm *alarm, OSContext *ctx);
|
||||
|
||||
void __FTVRCLoop1Handler(OSAlarm *alarm, OSContext *ctx) {
|
||||
if (_ctCombo != 0 && _isActive != 0) {
|
||||
if (_func1state == -1) {
|
||||
_unitStartTime = OSGetTime();
|
||||
_func1state = 0;
|
||||
}
|
||||
|
||||
if (_isLastOnOff != 0) {
|
||||
_unitLastTime = OSGetTime();
|
||||
|
||||
if (_func1state == 0) {
|
||||
WPADSetSensorBarPower(TRUE);
|
||||
_func1state = 1;
|
||||
OSSetAlarm(&_alarm, _tickWait[1], __FTVRCLoop1Handler);
|
||||
return;
|
||||
}
|
||||
|
||||
BOOL active = (int)(_unitLastTime - _unitStartTime) < (int)(*(u32*)&_tickT * _ctCombo);
|
||||
WPADSetSensorBarPower(FALSE);
|
||||
_func1state = 0;
|
||||
if (active) {
|
||||
OSSetAlarm(&_alarm, _tickWait[0], __FTVRCLoop1Handler);
|
||||
} else {
|
||||
OSSetAlarm(&_alarm, _tickWait[0], __FTVRCLoop0Handler);
|
||||
}
|
||||
} else {
|
||||
WPADSetSensorBarPower(FALSE);
|
||||
OSSetAlarm(&_alarm, *(u32*)&_tickT * _ctCombo, __FTVRCLoop0Handler);
|
||||
}
|
||||
}
|
||||
}
|
||||
void __FTVRCLoop1Handler(OSAlarm *alarm, OSContext *ctx);
|
||||
} // namespace LibTVRC
|
||||
|
||||
using namespace LibTVRC;
|
||||
|
||||
extern "C" asm void __FTVRCLoop0Handler__7LibTVRCFP7OSAlarmP9OSContext() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
mr r31, r4
|
||||
stw r30, 0x8(r1)
|
||||
mr r30, r3
|
||||
lwz r0, _isActive__7LibTVRC
|
||||
cmpwi r0, 0
|
||||
bne TVRCLoop0_active
|
||||
li r0, 2
|
||||
stw r0, _func0state__7LibTVRC
|
||||
TVRCLoop0_active:
|
||||
lwz r0, _func0state__7LibTVRC
|
||||
cmpwi r0, 1
|
||||
bne TVRCLoop0_check_state
|
||||
li r0, 0
|
||||
stw r0, _func0state__7LibTVRC
|
||||
b TVRCLoop0_prepare
|
||||
TVRCLoop0_check_state:
|
||||
cmpwi r0, 0
|
||||
bne TVRCLoop0_check_stop
|
||||
lwz r4, _loop0count__7LibTVRC
|
||||
li r0, 0
|
||||
lwz r3, _isOnOff__7LibTVRC
|
||||
addi r4, r4, 1
|
||||
stw r0, _func0state__7LibTVRC
|
||||
stw r4, _loop0count__7LibTVRC
|
||||
stw r3, _isLastOnOff__7LibTVRC
|
||||
b TVRCLoop0_prepare
|
||||
TVRCLoop0_check_stop:
|
||||
cmpwi r0, 2
|
||||
bne TVRCLoop0_prepare
|
||||
lwz r0, _isReserveDeactive__7LibTVRC
|
||||
cmpwi r0, 0
|
||||
bne TVRCLoop0_stop
|
||||
bl OSGetTime
|
||||
lis r5, 0x8000
|
||||
lwz r6, _totalStartTime__7LibTVRC+4
|
||||
lwz r5, 0xf8(r5)
|
||||
li r0, 0x3e8
|
||||
subfc r4, r6, r4
|
||||
lwz r7, _totalStartTime__7LibTVRC
|
||||
srwi r6, r5, 2
|
||||
li r5, 0
|
||||
divwu r6, r6, r0
|
||||
subfe r3, r7, r3
|
||||
bl __div2i
|
||||
lwz r7, _limitMilli__7LibTVRC
|
||||
li r6, 0
|
||||
xoris r5, r3, 0x8000
|
||||
xoris r0, r6, 0x8000
|
||||
subfc r3, r4, r7
|
||||
subfe r5, r5, r0
|
||||
subfe r5, r0, r0
|
||||
neg. r5, r5
|
||||
beq TVRCLoop0_continue
|
||||
TVRCLoop0_stop:
|
||||
li r3, 1
|
||||
bl WPADSetSensorBarPower
|
||||
li r0, 0
|
||||
stw r0, _isActive__7LibTVRC
|
||||
b TVRCLoop0_exit
|
||||
TVRCLoop0_continue:
|
||||
lwz r4, _isUseRepeatCode__7LibTVRC
|
||||
lwz r3, _repeatBitLength__7LibTVRC
|
||||
lwz r0, _repeatBitArray__7LibTVRC
|
||||
stw r4, _isRepeatActive__7LibTVRC
|
||||
stw r3, _bitLength__7LibTVRC
|
||||
stw r0, _bitArray__7LibTVRC
|
||||
stw r6, _isOnOff__7LibTVRC
|
||||
stw r6, _isLastOnOff__7LibTVRC
|
||||
stw r6, _func0state__7LibTVRC
|
||||
stw r6, _loop0count__7LibTVRC
|
||||
TVRCLoop0_prepare:
|
||||
li r3, 0
|
||||
lwz r7, _bitArray__7LibTVRC
|
||||
stw r3, _ctCombo__7LibTVRC
|
||||
lwz r8, _bitLength__7LibTVRC
|
||||
lwz r4, _loop0count__7LibTVRC
|
||||
lwz r0, _isLastOnOff__7LibTVRC
|
||||
b TVRCLoop0_check_bits
|
||||
TVRCLoop0_bit_loop:
|
||||
srawi r5, r4, 3
|
||||
addi r3, r3, 1
|
||||
addze r6, r5
|
||||
srawi r5, r4, 3
|
||||
lbzx r6, r7, r6
|
||||
addze r5, r5
|
||||
slwi r5, r5, 3
|
||||
stw r3, _ctCombo__7LibTVRC
|
||||
subf r5, r5, r4
|
||||
subfic r5, r5, 7
|
||||
sraw r5, r6, r5
|
||||
clrlwi r5, r5, 31
|
||||
cmpw r0, r5
|
||||
stw r5, _isOnOff__7LibTVRC
|
||||
beq TVRCLoop0_bit_match
|
||||
li r3, -1
|
||||
li r0, 0
|
||||
stw r3, _func1state__7LibTVRC
|
||||
mr r3, r30
|
||||
mr r4, r31
|
||||
stw r0, _func0state__7LibTVRC
|
||||
bl __FTVRCLoop1Handler__7LibTVRCFP7OSAlarmP9OSContext
|
||||
b TVRCLoop0_exit
|
||||
TVRCLoop0_bit_match:
|
||||
addi r4, r4, 1
|
||||
stw r5, _isLastOnOff__7LibTVRC
|
||||
mr r0, r5
|
||||
stw r4, _loop0count__7LibTVRC
|
||||
TVRCLoop0_check_bits:
|
||||
cmpw r4, r8
|
||||
blt TVRCLoop0_bit_loop
|
||||
addi r3, r3, 1
|
||||
li r5, -1
|
||||
li r0, 2
|
||||
stw r3, _ctCombo__7LibTVRC
|
||||
mr r3, r30
|
||||
mr r4, r31
|
||||
stw r5, _func1state__7LibTVRC
|
||||
stw r0, _func0state__7LibTVRC
|
||||
bl __FTVRCLoop1Handler__7LibTVRCFP7OSAlarmP9OSContext
|
||||
TVRCLoop0_exit:
|
||||
lwz r0, 0x14(r1)
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 0x8(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
}
|
||||
|
||||
BOOL TVRCInit(void* pRsrc) {
|
||||
if (_isInitialized) {
|
||||
_lastError = 0;
|
||||
@@ -596,3 +432,171 @@ TVRCSendStartAsync_exit:
|
||||
addi r1, r1, 0x40
|
||||
blr
|
||||
}
|
||||
|
||||
extern "C" asm void __FTVRCLoop0Handler__7LibTVRCFP7OSAlarmP9OSContext() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
mr r31, r4
|
||||
stw r30, 0x8(r1)
|
||||
mr r30, r3
|
||||
lwz r0, _isActive__7LibTVRC
|
||||
cmpwi r0, 0
|
||||
bne TVRCLoop0_active
|
||||
li r0, 2
|
||||
stw r0, _func0state__7LibTVRC
|
||||
TVRCLoop0_active:
|
||||
lwz r0, _func0state__7LibTVRC
|
||||
cmpwi r0, 1
|
||||
bne TVRCLoop0_check_state
|
||||
li r0, 0
|
||||
stw r0, _func0state__7LibTVRC
|
||||
b TVRCLoop0_prepare
|
||||
TVRCLoop0_check_state:
|
||||
cmpwi r0, 0
|
||||
bne TVRCLoop0_check_stop
|
||||
lwz r4, _loop0count__7LibTVRC
|
||||
li r0, 0
|
||||
lwz r3, _isOnOff__7LibTVRC
|
||||
addi r4, r4, 1
|
||||
stw r0, _func0state__7LibTVRC
|
||||
stw r4, _loop0count__7LibTVRC
|
||||
stw r3, _isLastOnOff__7LibTVRC
|
||||
b TVRCLoop0_prepare
|
||||
TVRCLoop0_check_stop:
|
||||
cmpwi r0, 2
|
||||
bne TVRCLoop0_prepare
|
||||
lwz r0, _isReserveDeactive__7LibTVRC
|
||||
cmpwi r0, 0
|
||||
bne TVRCLoop0_stop
|
||||
bl OSGetTime
|
||||
lis r5, 0x8000
|
||||
lwz r6, _totalStartTime__7LibTVRC+4
|
||||
lwz r5, 0xf8(r5)
|
||||
li r0, 0x3e8
|
||||
subfc r4, r6, r4
|
||||
lwz r7, _totalStartTime__7LibTVRC
|
||||
srwi r6, r5, 2
|
||||
li r5, 0
|
||||
divwu r6, r6, r0
|
||||
subfe r3, r7, r3
|
||||
bl __div2i
|
||||
lwz r7, _limitMilli__7LibTVRC
|
||||
li r6, 0
|
||||
xoris r5, r3, 0x8000
|
||||
xoris r0, r6, 0x8000
|
||||
subfc r3, r4, r7
|
||||
subfe r5, r5, r0
|
||||
subfe r5, r0, r0
|
||||
neg. r5, r5
|
||||
beq TVRCLoop0_continue
|
||||
TVRCLoop0_stop:
|
||||
li r3, 1
|
||||
bl WPADSetSensorBarPower
|
||||
li r0, 0
|
||||
stw r0, _isActive__7LibTVRC
|
||||
b TVRCLoop0_exit
|
||||
TVRCLoop0_continue:
|
||||
lwz r4, _isUseRepeatCode__7LibTVRC
|
||||
lwz r3, _repeatBitLength__7LibTVRC
|
||||
lwz r0, _repeatBitArray__7LibTVRC
|
||||
stw r4, _isRepeatActive__7LibTVRC
|
||||
stw r3, _bitLength__7LibTVRC
|
||||
stw r0, _bitArray__7LibTVRC
|
||||
stw r6, _isOnOff__7LibTVRC
|
||||
stw r6, _isLastOnOff__7LibTVRC
|
||||
stw r6, _func0state__7LibTVRC
|
||||
stw r6, _loop0count__7LibTVRC
|
||||
TVRCLoop0_prepare:
|
||||
li r3, 0
|
||||
lwz r7, _bitArray__7LibTVRC
|
||||
stw r3, _ctCombo__7LibTVRC
|
||||
lwz r8, _bitLength__7LibTVRC
|
||||
lwz r4, _loop0count__7LibTVRC
|
||||
lwz r0, _isLastOnOff__7LibTVRC
|
||||
b TVRCLoop0_check_bits
|
||||
TVRCLoop0_bit_loop:
|
||||
srawi r5, r4, 3
|
||||
addi r3, r3, 1
|
||||
addze r6, r5
|
||||
srawi r5, r4, 3
|
||||
lbzx r6, r7, r6
|
||||
addze r5, r5
|
||||
slwi r5, r5, 3
|
||||
stw r3, _ctCombo__7LibTVRC
|
||||
subf r5, r5, r4
|
||||
subfic r5, r5, 7
|
||||
sraw r5, r6, r5
|
||||
clrlwi r5, r5, 31
|
||||
cmpw r0, r5
|
||||
stw r5, _isOnOff__7LibTVRC
|
||||
beq TVRCLoop0_bit_match
|
||||
li r3, -1
|
||||
li r0, 0
|
||||
stw r3, _func1state__7LibTVRC
|
||||
mr r3, r30
|
||||
mr r4, r31
|
||||
stw r0, _func0state__7LibTVRC
|
||||
bl __FTVRCLoop1Handler__7LibTVRCFP7OSAlarmP9OSContext
|
||||
b TVRCLoop0_exit
|
||||
TVRCLoop0_bit_match:
|
||||
addi r4, r4, 1
|
||||
stw r5, _isLastOnOff__7LibTVRC
|
||||
mr r0, r5
|
||||
stw r4, _loop0count__7LibTVRC
|
||||
TVRCLoop0_check_bits:
|
||||
cmpw r4, r8
|
||||
blt TVRCLoop0_bit_loop
|
||||
addi r3, r3, 1
|
||||
li r5, -1
|
||||
li r0, 2
|
||||
stw r3, _ctCombo__7LibTVRC
|
||||
mr r3, r30
|
||||
mr r4, r31
|
||||
stw r5, _func1state__7LibTVRC
|
||||
stw r0, _func0state__7LibTVRC
|
||||
bl __FTVRCLoop1Handler__7LibTVRCFP7OSAlarmP9OSContext
|
||||
TVRCLoop0_exit:
|
||||
lwz r0, 0x14(r1)
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 0x8(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
}
|
||||
|
||||
namespace LibTVRC {
|
||||
void __FTVRCLoop1Handler(OSAlarm *alarm, OSContext *ctx) {
|
||||
if (_ctCombo != 0 && _isActive != 0) {
|
||||
if (_func1state == -1) {
|
||||
_unitStartTime = OSGetTime();
|
||||
_func1state = 0;
|
||||
}
|
||||
|
||||
if (_isLastOnOff != 0) {
|
||||
_unitLastTime = OSGetTime();
|
||||
|
||||
if (_func1state == 0) {
|
||||
WPADSetSensorBarPower(TRUE);
|
||||
_func1state = 1;
|
||||
OSSetAlarm(&_alarm, _tickWait[1], __FTVRCLoop1Handler);
|
||||
return;
|
||||
}
|
||||
|
||||
BOOL active = (int)(_unitLastTime - _unitStartTime) < (int)(*(u32*)&_tickT * _ctCombo);
|
||||
WPADSetSensorBarPower(FALSE);
|
||||
_func1state = 0;
|
||||
if (active) {
|
||||
OSSetAlarm(&_alarm, _tickWait[0], __FTVRCLoop1Handler);
|
||||
} else {
|
||||
OSSetAlarm(&_alarm, _tickWait[0], __FTVRCLoop0Handler);
|
||||
}
|
||||
} else {
|
||||
WPADSetSensorBarPower(FALSE);
|
||||
OSSetAlarm(&_alarm, *(u32*)&_tickT * _ctCombo, __FTVRCLoop0Handler);
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace LibTVRC
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL Manager::createNewRecord(const char* recordName, const char* recordFileType, const OSCalendarTime* dateTime, u32* gameCode,
|
||||
u16* makerCode, const math::VEC2& recordPos, u32 recordFlags, const NWC24FriendAddr& addr, NWC24FriendType addrType,
|
||||
u16* makerCode, const math::VEC2& recordPos, u32 recordFlags, const NWC24FriendAddr& addr, u16 addrType,
|
||||
u16 noReplyFlag, const wchar_t* titleText, const wchar_t* bodyText, const void* faceData,
|
||||
const void** attachData, u32* attachSize, RBRAttachmentType* attachType) {
|
||||
BOOL result = FALSE;
|
||||
|
||||
@@ -569,7 +569,7 @@ namespace ipl {
|
||||
NWC24FriendAddr msgFriendAddr;
|
||||
memset(&msgFriendAddr, 0, sizeof(msgFriendAddr));
|
||||
|
||||
NWC24FriendType msgFriendType;
|
||||
u16 msgFriendType;
|
||||
|
||||
// Get friend data
|
||||
if (msgType == NWC24_MSGTYPE_PUBLIC) {
|
||||
@@ -586,7 +586,11 @@ namespace ipl {
|
||||
} else {
|
||||
u32 index = 0;
|
||||
getMsgFromId(&msgObj, &msgFriendAddr.wiiId);
|
||||
msgFriendType = msgFriendAddr.wiiId == myUserId ? NWC24_FRIENDTYPE_NONE : NWC24_FRIENDTYPE_WII;
|
||||
if (msgFriendAddr.wiiId == myUserId) {
|
||||
msgFriendType = NWC24_FRIENDTYPE_NONE;
|
||||
} else {
|
||||
msgFriendType = NWC24_FRIENDTYPE_WII;
|
||||
}
|
||||
if (searchFriendInfo(msgFriendAddr.wiiId, &index)) {
|
||||
NWC24FriendInfo friendInfo ALIGN32;
|
||||
readFriendInfo(&friendInfo, index);
|
||||
|
||||
2148
src/system/odh.cpp
2148
src/system/odh.cpp
File diff suppressed because it is too large
Load Diff
@@ -33,20 +33,25 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Graphics::setOrthoProjection(const math::VEC3& translate, const math::VEC2& scale) {
|
||||
nw4r::ut::Rect projRect(0, 0, 0, 0);
|
||||
nw4r::ut::Rect projRect;
|
||||
System::getProjectionRect(&projRect);
|
||||
|
||||
f32 temp_f9 = projRect.right / scale.x;
|
||||
f32 temp_f7 = projRect.left / scale.x;
|
||||
MTXOrtho(mArg.mProjMtx, translate.y - (projRect.top / scale.y), translate.y - (projRect.bottom / scale.y), translate.x + temp_f7,
|
||||
translate.x + temp_f9, -100.0f, 100.0f);
|
||||
f32 right = translate.x + projRect.right / scale.x;
|
||||
f32 left = translate.x + projRect.left / scale.x;
|
||||
f32 bottom = translate.y - (projRect.bottom / scale.y);
|
||||
f32 top = translate.y - (projRect.top / scale.y);
|
||||
MTXOrtho(mArg.mProjMtx, top, bottom, left, right, -100.0f, 100.0f);
|
||||
|
||||
GXSetProjection(mArg.mProjMtx, GX_ORTHOGRAPHIC);
|
||||
}
|
||||
|
||||
void Graphics::setOrthoProjection(u32 id) {
|
||||
GXRenderModeObj* rMode = System::getRenderModeObj();
|
||||
MTXOrtho(mArg.mProjMtx, rMode->efbHeight / 2, -rMode->efbHeight / 2, -rMode->fbWidth / 2, rMode->fbWidth / 2, -100.0f, 100.0f);
|
||||
f32 widthHalf = rMode->fbWidth / 2;
|
||||
f32 negativeWidthHalf = -rMode->fbWidth / 2;
|
||||
f32 negativeHeightHalf = -rMode->efbHeight / 2;
|
||||
f32 heightHalf = rMode->efbHeight / 2;
|
||||
MTXOrtho(mArg.mProjMtx, heightHalf, negativeHeightHalf, negativeWidthHalf, widthHalf, -100.0f, 100.0f);
|
||||
GXSetProjection(mArg.mProjMtx, GX_ORTHOGRAPHIC);
|
||||
|
||||
calcOrthoCamera();
|
||||
|
||||
@@ -7,8 +7,6 @@ from odiff import dis, sym
|
||||
import os
|
||||
import itertools
|
||||
|
||||
os.chdir("/home/cole/projects/tests/wii-ipl")
|
||||
|
||||
|
||||
def main():
|
||||
unit, name = sys.argv[1], sys.argv[2]
|
||||
|
||||
Reference in New Issue
Block a user