Compare commits

...

12 Commits

Author SHA1 Message Date
coah
7832ae88f2 Link iplLetterWriter as matching
Use string literals instead of hand-placed pool arrays so sendToPC addresses the pool base, emit calcFadeout before onEventDerived, and force-active the NigaoeEventObserver vtable that the original link keeps.
2026-09-28 04:46:49 +00:00
coah
5ffea56c30 feat: match tiToolBar unit (#218)
Fix the cancelStateFocusIn case label, declare the toolbar Sample class
with its inline constructors so the LayoutByNW4R thunks are emitted in
the original order, relabel the unit's data, and point the two
one-past-the-end csPaneToAnimation entries at csAninationFile+0x1DC.
2026-09-27 23:40:50 -05:00
coah
3dfeacd4f6 Match HomeButton base unit (#217)
Name the HBMAllocMem result so create's pane manager web colors like the original, replace the lbl_ float externs with literals, move the unused HomeButton int constants to in-class initializers, and emit calc_battery before calc_letter. HBMBase.cpp is now Matching.
2026-09-27 23:32:44 -05:00
coah
36f3716be7 link matching iplCalendar, CDBConv, WPAD and cntcache (#216) 2026-09-27 23:31:40 -05:00
coah
784a463f27 feat: match iplChanAppBase unit (#215)
Define AnmController before the gui classes in this unit so its weak
vtable is emitted last, name the unit's .data literals as
compiler-generated symbols, and link the unit.
2026-09-27 23:29:20 -05:00
coah
fadf50ce43 feat: match iplChanAppEdit unit (#214)
Rewrite LinearIntp<VEC3>::get so the add goes through a separate
temporary, name the unit's .data literals as compiler-generated
symbols so objdiff pairs them by value, and link the unit.
2026-09-27 23:28:15 -05:00
coah
a824e02a30 fix: restore 43U DOL hash on main (#213)
* fix: restore MSL extab flags and force-active stripped symbols

* fix: limit ChannelTitle novtable header changes to IPL_CHANNEL_TITLE_NOVTABLE

PR #182 made gui::EventHandler novtable and rewrote HermiteIntp for every
unit, which dropped __vt__Q23gui12EventHandler from linked scene units and
moved EventHandler::onEvent. Restore the pre-#182 definitions unless the
macro is defined.

* fix: restore u16 addrType in cdb::Manager::createNewRecord

The original symbol takes u16 (mangled UsUs); the enum parameter made
createNewRecord 4 bytes longer. Match the caller in iplNwc24Manager with a
u16 local assigned through if/else.

* fix: emit TVRC loop handlers after TVRCSendStartAsync

The original object places both alarm handlers at the end of .text.

* fix: construct scene::Date::mscMaxDate with utility::Date

The MaxDate wrapper emitted a weak MaxDate ctor that the original does
not have, shifting .text by 0x10 after iplDate. Go back to a plain
utility::Date followed by the 0x10-byte padding array.

* fix: define textinput PaneComponent dtor after PaneManager dtor

Matches the original object's function order, which also pulls the weak
GUIComponent dtor into place.

* fix: define EGG audio Arg and SoundHeapMgr ctors out of line

Emits IAudioMgr::Arg::Arg first and SoundHeapMgr's weak dtor ahead of its
ctor, matching the original eggAudioMgr function order.

* fix: define WaveFile dtors in AudioWavePlayer after the ctor

The original emits WavePacket's weak dtor first, then the WaveFileAiff and
WaveFileWav dtors. Declaring the dtors after getBit keeps the vtables in
AudioWaveUtility.

* fix: restore fork-point iplCSMtx string pooling

Moving "MTX34" into a static const array put it in .sdata2 and left the
pooled .sdata copy to be dead-stripped, shifting both sections.

* fix: share tiGUIManager's named 0.0f constant

drawLine_ and PaneComponent::contain now load lbl_81694EE8, as in the
original, instead of emitting their own 0.0f ahead of it in .sdata2.

* fix: force-active unreferenced iplDate and WDScan data

MWLD dead-strips scene::padding (the 0x10 bytes after Date::mscMaxDate)
and the unreferenced WDScan .sdata2 bytes lbl_81695063/lbl_81695067,
which shifted .bss and .sdata2.

* fix: unlink eggAudioExpMgr

MWCC emits the @52 calc thunk ahead of the @52 dtor thunk, but the
original has them the other way round, which swaps two vtable entries.
Link the original object until the order is matched.

* fix: shrink Calendar .data padding now that EventHandler has a vtable

With gui::EventHandler no longer novtable, its 0x18-byte vtable fills most
of the gap after __vt__Q33ipl5scene8Calendar; keep one 4-byte pad.
2026-09-27 23:26:31 -05:00
coah
75c7a24c2f docs: define agent reporting rules (#212) 2026-09-22 22:39:00 -05:00
coah
12c7a67d2c Match iplwww browser object (#208) 2026-09-22 22:21:38 -05:00
coah
e2c26aad07 Match iplCalendar data (#210) 2026-09-22 21:32:40 -05:00
coah
622b7e678e Match RVL SDK FAFinfo wrapper (#211) 2026-09-22 21:31:13 -05:00
coah
ddbb9b1ab9 Match MSL strtoul unit (#209) 2026-09-22 21:30:47 -05:00
33 changed files with 975 additions and 449 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -36,3 +36,7 @@ SECTIONS {
__ArenaLo = (_db_stack_addr + 0x1F) & ~0x1F;
__ArenaHi = $ARENAHI;
}
FORCEACTIVE {
$FORCEACTIVE
}

View File

@@ -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,7 +911,7 @@ 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(Matching, "keyboard/tiToolBar.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "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"]),
@@ -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"),
@@ -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"),
@@ -1832,7 +1832,7 @@ config.libs = [
Object(NonMatching, "fa/api/FADetach.c"),
Object(NonMatching, "fa/api/FAErrnum.c"),
Object(Matching, "fa/api/FAFclose.c"),
Object(NonMatching, "fa/api/FAFinfo.c"),
Object(Matching, "fa/api/FAFinfo.c"),
Object(NonMatching, "fa/api/FAFopen.c"),
Object(NonMatching, "fa/api/FAFormat.c"),
Object(Matching, "fa/api/FAFread.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"),

View File

@@ -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;

View File

@@ -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;

View File

@@ -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();

View File

@@ -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:

View File

@@ -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,

View File

@@ -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

View File

@@ -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

View File

@@ -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 {

View File

@@ -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);

View File

@@ -15,7 +15,7 @@ namespace EGG {
class SoundHeapMgr {
public:
SoundHeapMgr() NO_INLINE {}
SoundHeapMgr();
~SoundHeapMgr() { destroySoundHeap(); }

View File

@@ -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:

View File

@@ -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() {
}

View 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);
}

View File

@@ -0,0 +1,8 @@
#include <revolution/fa.h>
extern s32 pfstub_finfo(FAFILE* stream, FAFileInfo* info);
FAError FAFinfo(FAFILE* stream, FAFileInfo* info) {
s32 error = pfstub_finfo(stream, info);
return (-error | error) >> 31;
}

View File

@@ -80,6 +80,10 @@ SimpleWavePlayer::SimpleWavePlayer() : mSetupParam(1, nw4r::snd::SAMPLE_FORMAT_P
mThreadRunning = false;
}
WaveFileAiff::~WaveFileAiff() {}
WaveFileWav::~WaveFileWav() {}
SimpleWavePlayer::~SimpleWavePlayer() {
}

View File

@@ -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;

View File

@@ -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) {

View File

@@ -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

View File

@@ -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)

View File

@@ -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;

View File

@@ -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

View File

@@ -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) {

View File

@@ -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"

View File

@@ -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;
}
}

View File

@@ -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;
}

View File

@@ -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

View File

@@ -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;

View File

@@ -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);