Compare commits
1 Commits
agent/fix/
...
agent/bitt
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
113371e1e9 |
@@ -44,18 +44,6 @@ block_relocations:
|
||||
- source: .data:0x8165E19C
|
||||
|
||||
add_relocations:
|
||||
- source: .text:0x8152C08C
|
||||
type: ha
|
||||
target: __ArenaLo
|
||||
- source: .text:0x8152C090
|
||||
type: l
|
||||
target: __ArenaLo
|
||||
- source: .text:0x8152C134
|
||||
type: ha
|
||||
target: __ArenaLo
|
||||
- source: .text:0x8152C138
|
||||
type: l
|
||||
target: __ArenaLo
|
||||
- source: .data:0x8165E15C
|
||||
type: abs
|
||||
target: csAninationFile__Q29textinput7toolbar
|
||||
|
||||
@@ -16022,8 +16022,8 @@ mscBasePaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DC18; // type:object
|
||||
@17309 = .data:0x8164DC42; // type:object size:0xB scope:local data:string
|
||||
@17310 = .data:0x8164DC4D; // type:object size:0xB scope:local data:string
|
||||
@17311 = .data:0x8164DC58; // type:object size:0xB scope:local data:string
|
||||
mscPicturePaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DC64; // type:object size:0x14 data:4byte
|
||||
mscEdgePaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DC78; // type:object size:0x14 data:4byte
|
||||
mscUnk0PaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DC64; // type:object size:0x14 data:4byte
|
||||
mscUnk1PaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DC78; // type:object size:0x14 data:4byte
|
||||
@17317 = .data:0x8164DC8C; // type:object size:0x9 scope:local data:string
|
||||
@17318 = .data:0x8164DC95; // type:object size:0x9 scope:local data:string
|
||||
@17319 = .data:0x8164DC9E; // type:object size:0x9 scope:local data:string
|
||||
|
||||
26
configure.py
26
configure.py
@@ -455,7 +455,7 @@ def IPLSection(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
|
||||
def ZI8Lib(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
|
||||
return {
|
||||
"lib": lib_name,
|
||||
"mw_version": "GC/3.0a5",
|
||||
"mw_version": config.linker_version,
|
||||
"cflags": cflags_zi8,
|
||||
"progress_category": "rvlmwm",
|
||||
"objects": objects,
|
||||
@@ -909,12 +909,12 @@ config.libs = [
|
||||
# it decides to do fast optimization for this one
|
||||
IPLSection("keyboard", [
|
||||
Object(Matching, "keyboard/tiPcKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiCellPhone.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiCellPhone.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiCandidateBox.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiToolBar.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiPredictLang.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiSignWindow.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiSignWindow.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
|
||||
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
|
||||
@@ -991,11 +991,11 @@ config.libs = [
|
||||
Object(Matching, "clib/zi8copy.c"),
|
||||
Object(Matching, "clib/zi8dawg.c"),
|
||||
Object(Matching, "clib/zi8getc.c"),
|
||||
Object(Matching, "clib/zi8getc2.c"),
|
||||
Object(NonMatching, "clib/zi8getc2.c"),
|
||||
Object(Matching, "clib/zi8getSW.c"),
|
||||
Object(Matching, "clib/zi8initd.c"),
|
||||
Object(Matching, "clib/zi8is.c"),
|
||||
Object(Matching, "clib/zi8match.c"),
|
||||
Object(NonMatching, "clib/zi8match.c"),
|
||||
Object(Matching, "clib/zi8misc.c"),
|
||||
Object(Matching, "clib/zi8pud2.c"),
|
||||
Object(Matching, "clib/Zi8punct.c"),
|
||||
@@ -1003,13 +1003,13 @@ config.libs = [
|
||||
Object(NonMatching, "clib/zi8uwd.c"),
|
||||
Object(Matching, "clib/zi8ver.c"),
|
||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||
Object(Matching, "clib/zidawg1.c"),
|
||||
Object(NonMatching, "clib/zidawg1.c"),
|
||||
Object(Matching, "clib/zikorean.c"),
|
||||
Object(Matching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/zkokeyp.c"),
|
||||
Object(Matching, "clib/zierror.c"),
|
||||
Object(Matching, "clib/zmtkey.c"),
|
||||
Object(Matching, "clib/zoemdata.c"),
|
||||
Object(NonMatching, "clib/zmtkey.c"),
|
||||
Object(NonMatching, "clib/zoemdata.c"),
|
||||
Object(NonMatching, "clib/zprepare.c"),
|
||||
]
|
||||
),
|
||||
@@ -1022,7 +1022,7 @@ config.libs = [
|
||||
Object(Matching, "cdb/CDBFileSystem.c"),
|
||||
Object(Matching, "cdb/CDBFileSystemVF.c"),
|
||||
Object(Matching, "cdb/CDBFileSystemSD.c"),
|
||||
Object(Matching, "cdb/CDBRecord.c"),
|
||||
Object(NonMatching, "cdb/CDBRecord.c"),
|
||||
Object(Matching, "cdb/CDBRecordFile.c"),
|
||||
Object(Matching, "cdb/CDBRecordKey.c"),
|
||||
Object(Matching, "cdb/CDBIntArray.c"),
|
||||
@@ -1089,7 +1089,7 @@ config.libs = [
|
||||
Object(Matching, "nwc24/NWC24UserId.c"),
|
||||
Object(Matching, "nwc24/NWC24Time.c"),
|
||||
Object(Matching, "nwc24/NWC24Ipc.c"),
|
||||
Object(Matching, "nwc24/NWC24Download.c"),
|
||||
Object(Equivalent, "nwc24/NWC24Download.c"),
|
||||
Object(Matching, "nwc24/NWC24CHJump.c"),
|
||||
Object(Matching, "nwc24/NWC24System.c"),
|
||||
]
|
||||
@@ -1218,7 +1218,7 @@ config.libs = [
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGBA8.c"),
|
||||
|
||||
Object(Matching, "b65/iqdec_b65_frv32.c"),
|
||||
Object(NonMatching, "b65/iqdec_b65_frv32.c"),
|
||||
]
|
||||
),
|
||||
# NW4R
|
||||
@@ -1559,7 +1559,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RVLSDKLib("kpad", [
|
||||
Object(Matching, "kpad/KPAD.c"),
|
||||
Object(NonMatching, "kpad/KPAD.c"),
|
||||
]
|
||||
),
|
||||
RVLSDKLib("euart", [
|
||||
@@ -1674,7 +1674,7 @@ config.libs = [
|
||||
),
|
||||
RVLSDKLib("wad", [
|
||||
Object(Matching, "wad/certs.c"),
|
||||
Object(Matching, "wad/wad.c"),
|
||||
Object(NonMatching, "wad/wad.c"),
|
||||
]
|
||||
),
|
||||
RVLSDKLib("cnt", [
|
||||
|
||||
@@ -1,211 +0,0 @@
|
||||
# Assembly inventory
|
||||
|
||||
4.3U, 2026-10-05. 173 functions contain 175 assembly
|
||||
bodies/blocks: 162 ORIGINAL functions and 11 PLACEHOLDER functions.
|
||||
|
||||
Run `python3 tools/check_asm_inventory.py`. Completion requires exit 0, complete
|
||||
coverage and zero placeholders. The checker also rejects stale/duplicate rows,
|
||||
invalid classifications and syntax it cannot inspect. This audit supersedes the
|
||||
historical inventory in `tools/decomp-assist/asm-inventory.md`.
|
||||
|
||||
Scope: C/C++ sources and headers in `src/` and `libs/`, including inactive
|
||||
platform branches, plus standalone assembly there or referenced by
|
||||
`configure.py`. There are currently no standalone assembly files in that scope.
|
||||
One row covers all blocks in a function; runtime save/restore entry labels belong
|
||||
to their enclosing assembly body. Names use their source spelling. Declarations,
|
||||
comments and string contents do not count.
|
||||
|
||||
ORIGINAL requires hardware, startup, runtime or original SDK assembly evidence.
|
||||
An SDK path, `nofralloc` alone or an exact assembled object proves no C conversion.
|
||||
The rvl_dec family follows the original decoder convention specified for this
|
||||
audit; ASH/ASR also show unsigned `lis @h`/`ori @l` address construction and
|
||||
hand-built `stmw` frames. C scores below are recorded rejected trials, not fresh
|
||||
measurements or scores of the retained assembly. Unrecorded means no C score was
|
||||
found. Historical logs absent from this branch have commit IDs and excerpts in
|
||||
[the audit log](../tools/decomp-assist/rx36.attempts.md).
|
||||
|
||||
| File | Function | Classification | Evidence |
|
||||
| --- | --- | --- | --- |
|
||||
| `libs/MetroTRK/src/Export/targsupp.c` | `TRKAccessFile` | ORIGINAL | twi 31,r0,0 is the debugger file-service trap, with debugger-controlled return registers. |
|
||||
| `libs/MetroTRK/src/Export/targsupp.c` | `TRKOpenFile` | ORIGINAL | twi 31,r0,0 is the debugger file-service trap, with debugger-controlled return registers. |
|
||||
| `libs/MetroTRK/src/Export/targsupp.c` | `TRKCloseFile` | ORIGINAL | twi 31,r0,0 is the debugger file-service trap, with debugger-controlled return registers. |
|
||||
| `libs/MetroTRK/src/Export/targsupp.c` | `TRKPositionFile` | ORIGINAL | twi 31,r0,0 is the debugger file-service trap, with debugger-controlled return registers. |
|
||||
| `libs/NW4R/include/nw4r/math/arithmetic.h` | `FSelect` | ORIGINAL | fsel inline assembly matches the public [NW4R arithmetic header][arithmetic-h]. |
|
||||
| `libs/NW4R/include/nw4r/math/arithmetic.h` | `FAbs` | ORIGINAL | fabs inline assembly matches the public [NW4R arithmetic header][arithmetic-h]. |
|
||||
| `libs/NW4R/include/nw4r/math/types.h` | `VEC3Add` | ORIGINAL | psq_l/ps_add/psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/NW4R/include/nw4r/math/types.h` | `VEC3Sub` | ORIGINAL | psq_l/ps_sub/psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/NW4R/include/nw4r/math/types.h` | `VEC3Scale` | ORIGINAL | psq_l/ps_muls0/psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/NW4R/src/math/math_arithmetic.cpp` | `FrSqrt` | ORIGINAL | frsqrte plus fixed refinement matches the public [NW4R arithmetic assembly][arithmetic-cpp]. |
|
||||
| `libs/NW4R/src/math/math_types.cpp` | `MTX44Identity` | ORIGINAL | psq_st/ps_merge01/ps_merge10 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVLMiddleware/TMC_JPEG/src/jpegdec/jdec_main.c` | `TMCJPEGDEC_err_restart` | PLACEHOLDER | JPEG marker scan; best C 95.73913%, 114/115 instructions, folded exit branch, [rx19](../tools/decomp-assist/rx19.attempts.md), [rx24][rx24]. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `OSInitFastCast` | ORIGINAL | mtspr programs the GQR quantization registers. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `__OSu16tof32` | ORIGINAL | psq_l uses a GQR integer conversion format for the fast cast. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `__OSf32tou8` | ORIGINAL | psq_st uses a GQR integer conversion format for the fast cast. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `__OSf32tou16` | ORIGINAL | psq_st uses a GQR integer conversion format for the fast cast. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `__OSs16tof32` | ORIGINAL | psq_l uses a GQR integer conversion format for the fast cast. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `__OSf32tos16` | ORIGINAL | psq_st uses a GQR integer conversion format for the fast cast. |
|
||||
| `libs/RVL_SDK/src/ai/ai.c` | `__AICallbackStackSwitch` | ORIGINAL | Saves r1 to __OldStack, installs __CallbackStack, calls through LR, then restores r1. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfmsr` | ORIGINAL | Special-register or synchronization operation: `mfmsr r3`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtmsr` | ORIGINAL | Special-register or synchronization operation: `mtmsr newMSR`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCOrMsr` | ORIGINAL | Special-register or synchronization operation: `mfmsr r4`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCAndMsr` | ORIGINAL | Special-register or synchronization operation: `mfmsr r4`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCAndCMsr` | ORIGINAL | Special-register or synchronization operation: `mfmsr r4`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfhid0` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, HID0`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMthid0` | ORIGINAL | Special-register or synchronization operation: `mtspr HID0, newHID0`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfhid1` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, HID1`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfl2cr` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, L2CR`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtl2cr` | ORIGINAL | Special-register or synchronization operation: `mtspr L2CR, newL2cr`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtdec` | ORIGINAL | Special-register or synchronization operation: `mtdec newDec`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfdec` | ORIGINAL | Special-register or synchronization operation: `mfdec r3`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCSync` | ORIGINAL | Special-register or synchronization operation: `sc`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCEieio` | ORIGINAL | Special-register or synchronization operation: `mfmsr r5`, `mtmsr r6`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCHalt` | ORIGINAL | Special-register or synchronization operation: `sync`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfmmcr0` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, MMCR0`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtmmcr0` | ORIGINAL | Special-register or synchronization operation: `mtspr MMCR0, newMmcr0`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfmmcr1` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, MMCR1`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtmmcr1` | ORIGINAL | Special-register or synchronization operation: `mtspr MMCR1, newMmcr1`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfpmc1` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, PMC1`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtpmc1` | ORIGINAL | Special-register or synchronization operation: `mtspr PMC1, newPmc1`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfpmc2` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, PMC2`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtpmc2` | ORIGINAL | Special-register or synchronization operation: `mtspr PMC2, newPmc2`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfpmc3` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, PMC3`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtpmc3` | ORIGINAL | Special-register or synchronization operation: `mtspr PMC3, newPmc3`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfpmc4` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, PMC4`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtpmc4` | ORIGINAL | Special-register or synchronization operation: `mtspr PMC4, newPmc4`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMffpscr` | ORIGINAL | Special-register or synchronization operation: `mffs fp31`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfsia` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, SIA`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtsia` | ORIGINAL | Special-register or synchronization operation: `mtspr SIA, newSia`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtfpscr` | ORIGINAL | Special-register or synchronization operation: `mtfsf 0xff, fp31`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfhid2` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, HID2`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMthid2` | ORIGINAL | Special-register or synchronization operation: `mtspr HID2, newhid2`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfwpar` | ORIGINAL | Special-register or synchronization operation: `sync`, `mfspr r3, WPAR`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtwpar` | ORIGINAL | Special-register or synchronization operation: `mtspr WPAR, newwpar`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfdmaU` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, DMA_U`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfdmaL` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, DMA_L`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtdmaU` | ORIGINAL | Special-register or synchronization operation: `mtspr DMA_U, newdmau`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtdmaL` | ORIGINAL | Special-register or synchronization operation: `mtspr DMA_L, newdmal`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfpvr` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, PVR`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCSetFpIEEEMode` | ORIGINAL | Special-register or synchronization operation: `mtfsb0 FPSCR_NI_BIT`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCSetFpNonIEEEMode` | ORIGINAL | Special-register or synchronization operation: `mtfsb1 FPSCR_NI_BIT`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMthid4` | ORIGINAL | Both branches write HID4 with mtspr; the fallback preserves the Broadway H4A bit. |
|
||||
| `libs/RVL_SDK/src/cntcache/cntcache.c` | `CNTCACHEClear` | PLACEHOLDER | NAND/token logic; best C 93.364235%, 147/151 instructions, four missing pool literals, [rx30][rx30]. |
|
||||
| `libs/RVL_SDK/src/cntcache/cntcache.c` | `_CNTCACHEIsTitleRemovable` | PLACEHOLDER | NAND/TMD checks; best diagnostic C 93.70731%, 82/82 instructions, status-register interference, [rx18][rx18]. |
|
||||
| `libs/RVL_SDK/src/cntcache/cntcache.c` | `_CNTCACHEDeleteContent` | PLACEHOLDER | Token parsing and ES deletion; best C 95.793106%, 143/145 instructions, missing reload/copy, [rx18][rx18]. |
|
||||
| `libs/RVL_SDK/src/db/db.c` | `__DBExceptionDestination` | ORIGINAL | mfmsr/mtmsr enable address translation before the exception-handler tail branch. |
|
||||
| `libs/RVL_SDK/src/gx/GXLight.c` | `PushLight` | ORIGINAL | psq_l/psq_st transfers paired-single values for the GX command stream. |
|
||||
| `libs/RVL_SDK/src/gx/GXTransform.c` | `WriteProjPS` | ORIGINAL | psq_l/psq_st transfers paired-single values for the GX command stream. |
|
||||
| `libs/RVL_SDK/src/gx/GXTransform.c` | `Copy6Floats` | ORIGINAL | psq_l/psq_st copies three pairs of floats. |
|
||||
| `libs/RVL_SDK/src/gx/GXTransform.c` | `WriteMTXPS4x3` | ORIGINAL | psq_l/psq_st transfers paired-single values for the GX command stream. |
|
||||
| `libs/RVL_SDK/src/gx/GXTransform.c` | `WriteMTXPS3x3from3x4` | ORIGINAL | psq_l/psq_st transfers paired-single values for the GX command stream. |
|
||||
| `libs/RVL_SDK/src/gx/GXTransform.c` | `WriteMTXPS4x2` | ORIGINAL | psq_l/psq_st transfers paired-single values for the GX command stream. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXIdentity` | ORIGINAL | psq_st/ps_merge01/ps_merge10 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXCopy` | ORIGINAL | psq_l/psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXConcat` | ORIGINAL | psq_l/ps_muls0/ps_madds1/ps_madds0 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXInverse` | ORIGINAL | psq_l/ps_merge10/ps_mul/ps_msub implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXInvXpose` | ORIGINAL | psq_l/ps_merge10/ps_mul/ps_msub implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXRotTrig` | ORIGINAL | Two blocks use frsp, ps_neg, ps_merge00 and psq_st to construct a paired-single rotation. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXTrans` | ORIGINAL | psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXTransApply` | ORIGINAL | psq_l/psq_st/ps_sum1 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXScale` | ORIGINAL | psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXScaleApply` | ORIGINAL | psq_l/ps_muls0/psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtxvec.c` | `PSMTXMultVec` | ORIGINAL | psq_l/ps_mul/ps_madd/ps_sum0 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/vec.c` | `PSVECNormalize` | ORIGINAL | psq_l/ps_mul/ps_madd/ps_sum0 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/vec.c` | `PSVECCrossProduct` | ORIGINAL | psq_l/ps_merge10/ps_mul/ps_muls0 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `__OSFPRInit` | ORIGINAL | mfmsr/mtmsr enable the FPU; psq_l initializes paired registers and mtfsf initializes FPSCR. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `__OSDBIntegrator` | ORIGINAL | nofralloc debug-vector fragment changes MSR and transfers through the saved hook LR. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `__OSDBJump` | ORIGINAL | Single absolute bla __OSDBJumpTarget between entry labels copied into exception vectors. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `OSExceptionVector` | ORIGINAL | Saves interrupted state, sets SRR0/SRR1 and executes rfi into the exception handler. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `OSDefaultExceptionHandler` | ORIGINAL | Captures GQR1..7 with mfspr and interrupted r13..31 with stmw before dispatch. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `__OSPSInit` | ORIGINAL | mtspr initializes GQR0..7 for paired-single quantization. |
|
||||
| `libs/RVL_SDK/src/os/OSAlarm.c` | `DecrementerExceptionHandler` | ORIGINAL | Saves interrupted GPRs and GQR1..7 via stmw/mfspr before the C callback. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCEnable` | ORIGINAL | sync and HID0 mfspr/mtspr enable the data cache. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCInvalidateRange` | ORIGINAL | dcbi invalidates each cache line. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCFlushRange` | ORIGINAL | dcbf flushes cache lines; sc invokes the synchronization vector. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCStoreRange` | ORIGINAL | dcbst writes cache lines; sc invokes the synchronization vector. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCFlushRangeNoSync` | ORIGINAL | dcbf flushes cache lines without the synchronization call. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCZeroRange` | ORIGINAL | dcbz zeroes each cache line. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `ICInvalidateRange` | ORIGINAL | icbi invalidates instructions, followed by sync/isync. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `ICFlashInvalidate` | ORIGINAL | HID0 mfspr/mtspr triggers instruction-cache flash invalidation. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `ICEnable` | ORIGINAL | isync and HID0 mfspr/mtspr enable the instruction cache. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `LCDisable` | ORIGINAL | dcbi clears locked-cache lines; HID2 mfspr/mtspr disables the locked cache. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `__OSLoadFPUContext` | ORIGINAL | Restores caller FPRs, FPSCR and paired-single halves using mtfsf/psq_l. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `__OSSaveFPUContext` | ORIGINAL | Captures caller FPSCR/FPRs and paired-single halves using mffs/psq_st. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSLoadFPUContext` | ORIGINAL | Moves context to r4 and tail-branches to __OSLoadFPUContext, which replaces caller FPRs. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSaveFPUContext` | ORIGINAL | Moves context to r5 and tail-branches to __OSSaveFPUContext before caller FPRs change. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSetCurrentContext` | ORIGINAL | mfmsr/mtmsr/isync change the FPU-enable bit while installing context pointers. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSaveContext` | ORIGINAL | Captures caller r1/r2, GPRs, GQR1..7, CR, LR, XER and MSR for a later nonlocal return. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSLoadContext` | ORIGINAL | Restores GPRs and GQR1..7, sets SRR0/SRR1 and resumes interrupted execution with rfi. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSGetStackPointer` | ORIGINAL | nofralloc leaf returns the caller stack pointer directly with mr r3,r1. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSwitchStack` | ORIGINAL | Returns the old r1 and installs the supplied stack pointer directly. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSwitchFiber` | ORIGINAL | Installs another r1 and calls the supplied PC through LR; restores the old stack afterward. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSwitchFiberEx` | ORIGINAL | Preserves r3..r6 arguments while switching r1 and calling the supplied PC through LR. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSInitContext` | ORIGINAL | Copies live ABI registers r2/r13 directly and seeds SRR state for a new execution context. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSwitchFPUContext` | ORIGINAL | mfmsr/mtmsr/isync enable the FPU; the exception path restores SRR state and uses rfi. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSFillFPUContext` | ORIGINAL | mfmsr/mtmsr/isync enable the FPU before mffs and paired-single register saves. |
|
||||
| `libs/RVL_SDK/src/os/OSInterrupt.c` | `OSDisableInterrupts` | ORIGINAL | mfmsr/mtmsr read and clear MSR_EE atomically within the restartable sequence. |
|
||||
| `libs/RVL_SDK/src/os/OSInterrupt.c` | `OSEnableInterrupts` | ORIGINAL | mfmsr/mtmsr read and set MSR_EE. |
|
||||
| `libs/RVL_SDK/src/os/OSInterrupt.c` | `OSRestoreInterrupts` | ORIGINAL | mfmsr/mtmsr replace MSR_EE with the saved interrupt state. |
|
||||
| `libs/RVL_SDK/src/os/OSInterrupt.c` | `ExternalInterruptHandler` | ORIGINAL | Captures interrupted GPRs and GQR1..7 with stmw/mfspr before C interrupt dispatch. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM1_24MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM1_48MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM2_52MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM2_56MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM2_64MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM2_112MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM2_128MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM_ES1_0` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `RealMode` | ORIGINAL | Writes SRR0/SRR1 and executes rfi with address translation disabled. |
|
||||
| `libs/RVL_SDK/src/os/OSSync.c` | `SystemCallVector` | ORIGINAL | Changes HID0 with mfspr/mtspr around sync/isync, then returns with rfi. |
|
||||
| `libs/RVL_SDK/src/os/OSTime.c` | `OSGetTime` | ORIGINAL | mftbu/mftb/mftbu retries until the upper time-base word is stable. |
|
||||
| `libs/RVL_SDK/src/os/OSTime.c` | `OSGetTick` | ORIGINAL | mftb reads the hardware time-base register. |
|
||||
| `libs/RVL_SDK/src/os/OSTime.c` | `__SetTime` | ORIGINAL | mttbl/mttbu/mttbl updates the hardware time base in a fixed sequence. |
|
||||
| `libs/RVL_SDK/src/os/__ppc_eabi_init.cpp` | `__init_hardware` | ORIGINAL | Before normal C startup, mfmsr/mtmsr enables the FPU and r31 holds LR across init calls. |
|
||||
| `libs/RVL_SDK/src/os/__ppc_eabi_init.cpp` | `__flush_cache` | ORIGINAL | dcbst/sync/icbi/isync make freshly initialized code visible to instruction fetch. |
|
||||
| `libs/RVL_SDK/src/os/__ppc_eabi_init.cpp` | `__init_user` | ORIGINAL | fralloc/bl __init_cpp/frfree/blr matches the public [SDK startup assembly][sdk-init]. |
|
||||
| `libs/RevoEX/src/nwc24/NWC24UserId.c` | `getUnScrambleId` | PLACEHOLDER | Integer byte permutation; best C 76.27329%, 161/161 instructions, 97 register/scheduling differences, [rx30][rx30]. |
|
||||
| `libs/Runtime/src/Gecko_setjmp.c` | `__setjmp` | ORIGINAL | Saves or restores caller GPRs/FPRs, LR, CR, and stack state across nonlocal returns. |
|
||||
| `libs/Runtime/src/Gecko_setjmp.c` | `longjmp` | ORIGINAL | Saves or restores caller GPRs/FPRs, LR, CR, and stack state across nonlocal returns. |
|
||||
| `libs/Runtime/src/__init_cpp_exceptions.cpp` | `__exception_info_constants` | ORIGINAL | Reads the caller ABI TOC register r2 directly for exception registration. |
|
||||
| `libs/Runtime/src/ptmf.c` | `__ptmf_scall` | ORIGINAL | Special compiler ABI takes the member-function descriptor in r12 and tail-dispatches through CTR. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_fp2unsigned` | ORIGINAL | Unsigned conversion runtime helper with explicit CR0/CR6/CR7 tests; [public runtime assembly][runtime]. |
|
||||
| `libs/Runtime/src/runtime.c` | `__save_fpr` | ORIGINAL | Entry labels _savefpr_14..31 store caller FPRs relative to r11 without an ABI call frame. |
|
||||
| `libs/Runtime/src/runtime.c` | `__restore_fpr` | ORIGINAL | Entry labels _restfpr_14..31 reload caller FPRs relative to r11 without an ABI call frame. |
|
||||
| `libs/Runtime/src/runtime.c` | `__save_gpr` | ORIGINAL | Entry labels _savegpr_14..31 store caller GPRs relative to r11 without an ABI call frame. |
|
||||
| `libs/Runtime/src/runtime.c` | `__restore_gpr` | ORIGINAL | Entry labels _restgpr_14..31 reload caller GPRs relative to r11 without an ABI call frame. |
|
||||
| `libs/Runtime/src/runtime.c` | `__div2u` | ORIGINAL | 64-bit compiler division helper uses r3:r4/r5:r6 and carry chains; [public assembly][runtime]. |
|
||||
| `libs/Runtime/src/runtime.c` | `__div2i` | ORIGINAL | Signed 64-bit compiler division helper manages register-pair signs/carry; [public assembly][runtime]. |
|
||||
| `libs/Runtime/src/runtime.c` | `__mod2u` | ORIGINAL | 64-bit compiler remainder helper uses register-pair restoring division; [public assembly][runtime]. |
|
||||
| `libs/Runtime/src/runtime.c` | `__mod2i` | ORIGINAL | Signed 64-bit compiler remainder helper manages register-pair signs/carry; [public assembly][runtime]. |
|
||||
| `libs/Runtime/src/runtime.c` | `__shl2i` | ORIGINAL | Compiler helper shifts r3:r4 by r5 without recursively calling the 64-bit shift helper. |
|
||||
| `libs/Runtime/src/runtime.c` | `__shr2u` | ORIGINAL | Compiler helper shifts unsigned r3:r4 by r5 across the word boundary. |
|
||||
| `libs/Runtime/src/runtime.c` | `__shr2i` | ORIGINAL | Compiler helper shifts signed r3:r4 by r5, explicitly propagating the sign. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_sll_dbl` | ORIGINAL | Compiler conversion ABI uses r3:r4 input and f1 result with explicit carry/rounding. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_ull_dbl` | ORIGINAL | Compiler conversion ABI uses r3:r4 input and f1 result with explicit carry/rounding. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_ull_flt` | ORIGINAL | Compiler conversion ABI uses r3:r4 input and f1 result with explicit single-precision rounding. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_dbl_usll` | ORIGINAL | Compiler conversion ABI uses f1 input and r3:r4 result without a recursive conversion call. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_dbl_ull` | ORIGINAL | Compiler conversion helper decodes f1 into r3:r4; [public runtime assembly][runtime]. |
|
||||
| `src/BS2/BS2Init.c` | `ClearOtherBATs` | ORIGINAL | isync and direct IBAT/DBAT register writes. |
|
||||
| `src/BS2/BS2Mach.c` | `Run` | ORIGINAL | Clears ABI registers, replaces r1, uses dcbz/dcbf, and jumps via LR. |
|
||||
| `src/BS2/BS2Start.c` | `__start` | ORIGINAL | Runs before the C stack and ABI registers exist; constructs the initial stack. |
|
||||
| `src/BS2/BS2Start.c` | `__init_registers` | ORIGINAL | Initializes GPRs, r1, r2, and r13 for the C runtime. |
|
||||
| `src/scene/nakamuraTest/gamespy/common/gsPlatformUtil.c` | `GetTicks` | ORIGINAL | Inactive PS2 branch reads the CP0 Count register with mfc0 $9. |
|
||||
| `src/system/TVRC.cpp` | `TVRCSendStartAsync` | PLACEHOLDER | IR command setup; best recorded C 99.77273%, 198/198 instructions, seven differences, [rx2](../tools/decomp-assist/rx2.attempts.md); newer [rx17][rx17] 99.747475%. |
|
||||
| `src/system/iplChannelManager.cpp` | `getTitleName__Q33ipl7channel7ManagerCFiii` | PLACEHOLDER | Channel-name copying; best C 99.57746%, 71/71 instructions, four address-order differences, [rx17][rx17]. |
|
||||
| `src/system/iplSaveDataManager.cpp` | `Manager::hasChannel` | PLACEHOLDER | Title-slot search; best C 98.87324%, 71/71 instructions, 14 mask/base register differences, [rx30][rx30]. |
|
||||
| `src/system/iplSaveDataManager.cpp` | `Manager::makePriorTitleIDList` | PLACEHOLDER | Title filtering; best recorded C 80.22556%, 124/133 instructions, address CSE, [da1](../tools/decomp-assist/da1.attempts.md); newer [rx17][rx17] 79.827065%. |
|
||||
| `src/system/iplSaveDataManager.cpp` | `Manager::doUpdateChanInfos` | PLACEHOLDER | Channel metadata updates; best C 93.35821%, 68/67 instructions, extra memset base, [rx17][rx17]. |
|
||||
| `src/system/iplSystem.cpp` | `System::warning_run` | PLACEHOLDER | Scene/render calls; best C 98.66477%, 176/176 instructions, 47 saved-register differences, [rx17][rx17]. |
|
||||
| `src/system/rvl_dec.c` | `Rvl_decode` | ORIGINAL | Direct beq decoder entries preserve r3/r4 and LR; lis/ori builds the format signatures. |
|
||||
| `src/system/rvl_dec.c` | `Rvl_decode_szs` | ORIGINAL | Original SZS decoder convention: nofralloc, r0 retains output length, fixed r3..r10/CTR byte-copy pipeline. |
|
||||
| `src/system/rvl_dec.c` | `Rvl_decode_ash` | ORIGINAL | nofralloc hand-built 0x40 frame saves r21..31 with stmw; work address uses lis @h/ori @l. |
|
||||
| `src/system/rvl_dec.c` | `Rvl_decode_asr` | ORIGINAL | nofralloc hand-built 0x40 frame saves r21..31 with stmw; work address uses lis @h/ori @l. |
|
||||
|
||||
[rx17]: ../tools/decomp-assist/rx36.attempts.md#rx17
|
||||
[rx18]: ../tools/decomp-assist/rx36.attempts.md#rx18
|
||||
[rx24]: ../tools/decomp-assist/rx36.attempts.md#rx24
|
||||
[rx30]: ../tools/decomp-assist/rx36.attempts.md#rx30
|
||||
[rx36-osinit]: ../tools/decomp-assist/rx36.attempts.md#osinit
|
||||
[sdk-init]: https://github.com/doldecomp/ogws/blob/master/src/revolution/OS/__ppc_eabi_init.c
|
||||
[runtime]: https://github.com/doldecomp/ogws/blob/master/src/runtime/runtime.c
|
||||
[arithmetic-h]: https://github.com/doldecomp/ogws/blob/master/include/nw4r/math/math_arithmetic.h
|
||||
[arithmetic-cpp]: https://github.com/doldecomp/ogws/blob/master/src/nw4r/math/math_arithmetic.cpp
|
||||
@@ -38,7 +38,7 @@ private:
|
||||
|
||||
private:
|
||||
SetupParam mSetupParam; // 0x9C
|
||||
bool mReserved; // 0xB0
|
||||
bool unk_0xB0; // 0xB0
|
||||
bool mIsSetData; // 0xB1
|
||||
bool mIsPlaying; // 0xB2
|
||||
bool mIsSetBuf; // 0xB3
|
||||
|
||||
@@ -24,7 +24,7 @@ public:
|
||||
virtual void setDataCur(u32 sampleOffset) = 0;
|
||||
|
||||
private:
|
||||
undefined4 mReserved; // 0x04
|
||||
undefined4 unk_0x04; // 0x04
|
||||
};
|
||||
|
||||
class WaveFileAiff : public WaveFile {
|
||||
|
||||
@@ -15,12 +15,12 @@ public:
|
||||
|
||||
AXVPB* getAXVPB() { return mpVPB; }
|
||||
u32 getState() { return mState; }
|
||||
u32 getUnk_0x08() { return mStopResetState; }
|
||||
u32 getUnk_0x08() { return unk_0x08; }
|
||||
int getUpdateFlag() { return mUpdateFlag; }
|
||||
|
||||
void setAXVPB(AXVPB* newVal) { mpVPB = newVal; }
|
||||
void setState(u32 newVal) { mState = newVal; }
|
||||
void setUnk_0x08(u32 newVal) { mStopResetState = newVal; }
|
||||
void setUnk_0x08(u32 newVal) { unk_0x08 = newVal; }
|
||||
void setUpdateFlag(u32 newVal) { mUpdateFlag = newVal; }
|
||||
|
||||
AXPBMIX* getMix() { return &mMix; }
|
||||
@@ -30,7 +30,7 @@ public:
|
||||
private:
|
||||
AXVPB* mpVPB; // 0x00
|
||||
u32 mState; // 0x04
|
||||
u32 mStopResetState; // 0x08
|
||||
u32 unk_0x08; // 0x08
|
||||
int mUpdateFlag; // 0x0c
|
||||
AXPBMIX mMix; // 0x10
|
||||
};
|
||||
|
||||
@@ -64,7 +64,7 @@ private:
|
||||
SimpleWavePlayer mWavePlayer; // 0x18
|
||||
AxAdpcmSimplePlayer mAdpcmPlayer; // 0x500
|
||||
AxAdpcmHandle mAdpcmHandle; // 0x508
|
||||
u8 mReserved; // 0x510
|
||||
u8 unk_0x510; // 0x510
|
||||
f32 mMasterVolume; // 0x514
|
||||
};
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ typedef struct CHANSVmObjHdr CHANSVmObjHdr;
|
||||
typedef struct CHANSVmNativeClass CHANSVmNativeClass;
|
||||
|
||||
typedef struct {
|
||||
vmU8 reserved; // 0x00
|
||||
vmU8 unk_0x00; // 0x00
|
||||
vmS32 val; // 0x01
|
||||
} vmInt32ObjVal;
|
||||
|
||||
@@ -168,7 +168,7 @@ typedef struct CHANSVmNativeMethod {
|
||||
u8 hasStar; // 0x06
|
||||
u8 pad_0x07; // 0x07
|
||||
CHANSVmFunction func; // 0x08
|
||||
undefined reserved[0x14]; // 0x0C
|
||||
undefined unk_0x0C[0x14]; // 0x0C
|
||||
} CHANSVmNativeMethod;
|
||||
|
||||
typedef struct CHANSVmPropertyList {
|
||||
@@ -184,7 +184,7 @@ typedef struct CHANSVmNativeProperty {
|
||||
u8 pad_0x07; // 0x07
|
||||
CHANSVmFunction getter; // 0x08
|
||||
CHANSVmFunction setter; // 0x0C
|
||||
undefined reserved[0x10]; // 0x10
|
||||
undefined unk_0x10[0x10]; // 0x10
|
||||
} CHANSVmNativeProperty;
|
||||
|
||||
struct CHANSVmNativeClass {
|
||||
@@ -200,7 +200,7 @@ struct CHANSVmNativeClass {
|
||||
vmSize nameLength; // 0x18
|
||||
char sName[4]; // 0x1C
|
||||
|
||||
undefined classNameStorage[0x1C];
|
||||
undefined unk_0x20[0x1C];
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -131,7 +131,7 @@ typedef struct CHANSVmPrivate {
|
||||
vmU32 exeStart; // 0x08
|
||||
vmU32 exeSize; // 0x0C
|
||||
vmS32 depth; // 0x10
|
||||
vmU8 reserved[4]; // 0x14
|
||||
vmU8 unk_0x14[4]; // 0x14
|
||||
CHANSVmExecutionCtx* pContextListHead; // 0x18
|
||||
vmU32 minFreeHeapSize; // 0x1C
|
||||
vmU8* pHeapStart; // 0x20
|
||||
|
||||
@@ -15,11 +15,11 @@ namespace ipl {
|
||||
} FileInfo; // 0x0C
|
||||
|
||||
typedef struct CardState {
|
||||
vu8 reservedState; // 0x00
|
||||
vu8 unk_0x00; // 0x00
|
||||
vu8 changed; // 0x01
|
||||
vs16 state; // 0x02
|
||||
vu16 reservedSlot; // 0x04
|
||||
vu16 reservedCommand; // 0x06
|
||||
vu16 unk_0x04; // 0x04
|
||||
vu16 unk_0x06; // 0x06
|
||||
vu32 key; // 0x08
|
||||
vu16 unk_0x0C; // 0x0C
|
||||
vu16 unk_0x0E; // 0x0E
|
||||
|
||||
@@ -139,13 +139,13 @@ namespace www {
|
||||
namespace ext_ead {
|
||||
namespace www {
|
||||
typedef struct ImeData {
|
||||
u32 eventType; // 0x00
|
||||
u32 unk_0x00; // 0x00
|
||||
u32 imeID; // 0x04
|
||||
char* text; // 0x08
|
||||
u32 creationDataA; // 0x0c
|
||||
u32 creationDataB; // 0x10
|
||||
u32 creationDataC; // 0x14
|
||||
u32 creationDataD; // 0x18
|
||||
u32 unk_0x0C; // 0x0c
|
||||
u32 unk_0x10; // 0x10
|
||||
u32 unk_0x14; // 0x14
|
||||
u32 unk_0x18; // 0x18
|
||||
u32 maxLength; // 0x1c
|
||||
|
||||
ImeData& operator=(const ImeData&);
|
||||
@@ -177,7 +177,7 @@ namespace ext_ead {
|
||||
struct {
|
||||
u32 imeID;
|
||||
char* str;
|
||||
u32 updateData;
|
||||
u32 unk_0x0C;
|
||||
} updateIme; // ID 4
|
||||
u32 raw[6];
|
||||
} data;
|
||||
@@ -203,12 +203,12 @@ namespace ext_ead {
|
||||
|
||||
void CreateImeData(ImeData* data, const WWWIMEData* wwwData);
|
||||
void DisposeImeData(ImeData* data);
|
||||
void CommitIme(ImeData* data, const char* text);
|
||||
void CommitIme(ImeData* data, const char* something);
|
||||
|
||||
void CommitImeCmdPacket(const CmdPacket* data);
|
||||
void UpdateImeCmdPacket(const CmdPacket* data);
|
||||
|
||||
static void FlushCallback(WWWRect* rect, int callbackData);
|
||||
static void FlushCallback(WWWRect* rect, int unk);
|
||||
|
||||
u32* GetRaster() { return mpRaster; }
|
||||
WWWHandle* GetHandle() { return mpBrowserHandle; }
|
||||
@@ -222,7 +222,7 @@ namespace ext_ead {
|
||||
|
||||
bool CheckThreadExit_();
|
||||
void InitSurface_();
|
||||
void InitFonts_(const char* fontDirectory);
|
||||
void InitFonts_(const char* unk);
|
||||
|
||||
void SendKeyboardEvent_(u32 btnMask, u32 triggerFlag, u32 releaseFlag, WWWKeySym sym);
|
||||
WWWKeySym GetKeyboardSym_(u32 input);
|
||||
|
||||
@@ -70,7 +70,7 @@ namespace ext_ead {
|
||||
u32 mWidth; // 0x04
|
||||
u32 mHeight; // 0x08
|
||||
|
||||
u32 mReserved; // 0x0C
|
||||
u32 unk_0x0C; // 0x0C
|
||||
|
||||
OSMutex mMutex; // 0x10
|
||||
BrowserThread* mpBrowserThread; // 0x28
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace ext_ead {
|
||||
void SendNotifyEvent(WWWEvent event, WWWHandleEventData* dataHandle);
|
||||
void ExecuteEvent();
|
||||
void UpdateTexture();
|
||||
void* GetTextureBuffer(int pageOffset, bool forUpdate, WWWRect** rectPtrOut);
|
||||
void* GetTextureBuffer(int a, bool b, WWWRect** rectPtrOut);
|
||||
void SetWindowSize(int w, int h);
|
||||
|
||||
WWWHandlewindow* GetHandleWindow() { return mpWwwWindow; };
|
||||
@@ -55,11 +55,11 @@ namespace ext_ead {
|
||||
u32 mRenderingMode; // 0x2AC
|
||||
|
||||
public:
|
||||
int mDisplayPageIndex; // 0x2B0
|
||||
u32 mDisplayBufferIndices[2]; // 0x2B4
|
||||
u32 mUpdateBufferIndex; // 0x2BC
|
||||
u32 mUpdatePageIndex; // 0x2C0
|
||||
u8 mPageLoadStatus[6]; // 0x2C4
|
||||
int unk_0x2B0; // 0x2B0
|
||||
u32 unk_0x2B4[2]; // 0x2B4
|
||||
u32 unk_0x2BC; // 0x2BC
|
||||
u32 unk_0x2C0; // 0x2C0
|
||||
u8 unk_0x2C4[6]; // 0x2C4
|
||||
};
|
||||
} // namespace www
|
||||
} // namespace ext_ead
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace textinput {
|
||||
InputForm(textinput::Manager* manager, nw4r::lyt::MultiArcResourceAccessor* multiArc,
|
||||
const char* layoutName, EventObserver* event, const char* fontName)
|
||||
: textinput::InputForm(manager, multiArc, layoutName, event, fontName),
|
||||
mpMemoPane(NULL), mpMemoRootPane(NULL), mpBoundPane(NULL), mpDrawPane(NULL),
|
||||
unk_0x308(NULL), unk_0x30C(NULL), unk_0x310(NULL), unk_0x314(NULL),
|
||||
mfScroll(0.0f), mfScrollFrom(0.0f), mfScrollTo(0.0f), mnLine(0),
|
||||
mDrawRect(), mDefaultDrawSize(), mDefaultBoundSize(), mExScrollAnm(),
|
||||
mpNigaoeObserver(NULL), mpDefaultNigaoe(NULL), mpSendString(NULL),
|
||||
@@ -159,11 +159,11 @@ namespace textinput {
|
||||
nw4r::lyt::Pane* mpDrawPane;
|
||||
#else
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
undefined4* mpMemoPane;
|
||||
undefined4* unk_0x308;
|
||||
#endif
|
||||
undefined4* mpMemoRootPane;
|
||||
undefined4* mpBoundPane;
|
||||
undefined4* mpDrawPane;
|
||||
undefined4* unk_0x30C;
|
||||
undefined4* unk_0x310;
|
||||
undefined4* unk_0x314;
|
||||
#endif
|
||||
f32 mfScroll; // 0x318
|
||||
f32 mfScrollFrom; // 0x31C
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace textinput {
|
||||
InputForm(textinput::Manager* manager, nw4r::lyt::MultiArcResourceAccessor* multiArc,
|
||||
const char* layoutName, EventObserver* event, const char* fontName)
|
||||
: textinput::MemoInputForm(manager, multiArc, layoutName, event, fontName),
|
||||
mbPhotoScaledUp(0), mbPhotoDraw(false), meType(T_MailAddressSel) {}
|
||||
unk_0x400(0), mbPhotoDraw(false), meType(T_MailAddressSel) {}
|
||||
#endif
|
||||
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
@@ -50,7 +50,7 @@ namespace textinput {
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
bool mbPhotoScaledUp;
|
||||
#else
|
||||
u8 mbPhotoScaledUp;
|
||||
u8 unk_0x400;
|
||||
#endif
|
||||
bool mbPhotoDraw; // 0x401
|
||||
Type meType; // 0x404
|
||||
|
||||
@@ -241,7 +241,7 @@ namespace textinput {
|
||||
#endif
|
||||
#endif
|
||||
private:
|
||||
u8 mKeyboardStateStorage[0xFC];
|
||||
u8 unk_0x00[0xFC];
|
||||
|
||||
static HKBManager sInstance;
|
||||
};
|
||||
|
||||
@@ -52,17 +52,17 @@ namespace textinput {
|
||||
const Manager *mgr() const { return mpManager; }
|
||||
|
||||
Manager* mpManager; // 0x10
|
||||
u8 mbShiftTapPending; // 0x14
|
||||
u8 field_0x14; // 0x14
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
u8 mbSingleQuoteClosing;
|
||||
u8 mbDoubleQuoteClosing;
|
||||
#else
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
bool mbSingleQuoteClosing;
|
||||
bool mbDoubleQuoteClosing;
|
||||
bool field_0x15;
|
||||
bool field_0x16;
|
||||
#else
|
||||
u8 mbSingleQuoteClosing; // 0x15
|
||||
u8 mbDoubleQuoteClosing; // 0x16
|
||||
u8 field_0x15; // 0x15
|
||||
u8 field_0x16; // 0x16
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -414,9 +414,9 @@ namespace textinput {
|
||||
#else
|
||||
private:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
u8 mInputStateStorage[0x48];
|
||||
u8 unk_0x2C0[0x48];
|
||||
#else
|
||||
u8 mInputStateStorage[0x4C];
|
||||
u8 unk_0x2C0[0x4C];
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -129,11 +129,7 @@ namespace textinput {
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
EventObserver* getEventObserverForHardware() const { return mpEventObserver; }
|
||||
#endif
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
virtual InputForm* getInputForm();
|
||||
#else
|
||||
virtual InputForm* getInputForm() { return mpInputForm; }
|
||||
#endif
|
||||
virtual const InputForm* getInputForm() const { return mpInputForm; }
|
||||
|
||||
virtual keyboard::hwkey::HWKeyboard* getHWKeyboard() { return mpHWKeyboard; }
|
||||
|
||||
@@ -24,10 +24,10 @@ namespace textinput {
|
||||
u8 remaining[8];
|
||||
#else
|
||||
// todo
|
||||
u32 controller; // 0x00
|
||||
u32 field_0x00; // 0x00
|
||||
u8 dummy[8];
|
||||
u32 trigger; // 0x0C
|
||||
u32 hold; // 0x10
|
||||
u32 field_0x0C; // 0x0C
|
||||
u32 field_0x10; // 0x10
|
||||
u8 dummy2[12];
|
||||
#endif
|
||||
} Input;
|
||||
|
||||
@@ -18,7 +18,6 @@ struct LanguageDependency {
|
||||
|
||||
class Base : public KeyboardBase {
|
||||
public:
|
||||
Base(Manager* manager) : mpAllocator(NULL), mpManager(manager) {}
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator*) override;
|
||||
virtual void init() override;
|
||||
@@ -46,8 +45,6 @@ class EventHandler;
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
|
||||
public:
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mbActive(false), mbInput(false), mpEventHandler(NULL), mpKeyboard(NULL) {}
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator*) override;
|
||||
virtual void init() override;
|
||||
@@ -78,9 +75,7 @@ public:
|
||||
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: LayoutByNW4R(manager, accessor, observer, layoutName) {}
|
||||
virtual ~Sample() {}
|
||||
virtual ~Sample();
|
||||
};
|
||||
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
|
||||
@@ -72,7 +72,7 @@ namespace textinput {
|
||||
wchar_t mOutput[5];
|
||||
#else
|
||||
private:
|
||||
u8 mKanaStateStorage[0x24];
|
||||
u8 field_0x00[0x24];
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -81,7 +81,7 @@ namespace textinput {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
Decolated(u16 maxLen) : StringBase(maxLen), mCursorStart(0), mCursorEnd(0), mbSustain(false), mTranslateMode(0) { initKanaConverter(); }
|
||||
#else
|
||||
Decolated(u16 maxLen) : StringBase(maxLen), mCursorStart(0), mCursorEnd(0), mbSustain(0), mTranslateMode(0) { initKanaConverter(); }
|
||||
Decolated(u16 maxLen) : StringBase(maxLen), field_0x18(0), field_0x1C(0), field_0x20(0), field_0x24(0) { initKanaConverter(); }
|
||||
#endif
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
@@ -181,10 +181,10 @@ namespace textinput {
|
||||
u32 mTranslateMode;
|
||||
#endif
|
||||
#else
|
||||
u32 mCursorStart; // 0x18
|
||||
u32 mCursorEnd; // 0x1C
|
||||
u8 mbSustain; // 0x20
|
||||
u32 mTranslateMode; // 0x24
|
||||
u32 field_0x18; // 0x18
|
||||
u32 field_0x1C; // 0x1C
|
||||
u8 field_0x20; // 0x20
|
||||
u32 field_0x24; // 0x24
|
||||
#endif
|
||||
KanaStream mKanaStream; // 0x28
|
||||
};
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace textinput {
|
||||
nw4r::ut::Rect rect;
|
||||
wchar_t character;
|
||||
#else
|
||||
u8 rectangleAndCharacterStorage[32];
|
||||
u8 unk_0x00[32];
|
||||
#endif
|
||||
} DrawInfo;
|
||||
|
||||
@@ -177,7 +177,7 @@ namespace textinput {
|
||||
u32 muDrawCacheStartPos;
|
||||
#else
|
||||
private:
|
||||
u8 mDrawStateStorage[0x78];
|
||||
u8 unk_0x50[0x78];
|
||||
#endif
|
||||
bool mbSecretMode; // 0xC8
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
@@ -202,7 +202,7 @@ namespace textinput {
|
||||
f32 mfDrawScrollY;
|
||||
u8 mDrawCacheState[0x14];
|
||||
#else
|
||||
u8 mCacheStateStorage[0x3C];
|
||||
u8 unk_0xCC[0x3C];
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace textinput {
|
||||
void replaceChar(char* dest, u32 destLen, const char* src, int replaceIdx, char newCh);
|
||||
bool isAlphabet(wchar_t ch);
|
||||
|
||||
f32 hermiteInterporation(f32 time, f32 startTime, f32 startValue, f32 startTangent, f32 endTime, f32 endValue, f32 endTangent);
|
||||
f32 hermiteInterporation(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6);
|
||||
|
||||
void getProjectionRect4x3(nw4r::ut::Rect* rect);
|
||||
void getProjectionRect16x9(nw4r::ut::Rect* rect);
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
private:
|
||||
u32 mReserved;
|
||||
u32 unk_0x28;
|
||||
EGG::Heap* mpHeap;
|
||||
|
||||
bool mbDisableCon; // 0x30
|
||||
|
||||
@@ -113,37 +113,37 @@ namespace ipl {
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
|
||||
T get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
f32 var_f27 = mFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
T r =
|
||||
(mStart *
|
||||
(1.0f + ((inverseDuration * (inverseDuration * (inverseDuration * (frame * (2.0f * frame * frame))))) -
|
||||
(inverseDuration * (inverseDuration * (3.0f * frame * frame)))))) -
|
||||
(mEnd * ((inverseDuration * (inverseDuration * (inverseDuration * (frame * (2.0f * frame * frame))))) -
|
||||
(inverseDuration * (inverseDuration * (3.0f * frame * frame)))));
|
||||
(1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(mStartTangent *
|
||||
(frame +
|
||||
((inverseDuration * (inverseDuration * (frame * (frame * frame)))) -
|
||||
(inverseDuration * (2.0f * frame * frame))))) +
|
||||
(mEndTangent * ((inverseDuration * (inverseDuration * (frame * (frame * frame)))) -
|
||||
(inverseDuration * (frame * frame))));
|
||||
(var_f27 +
|
||||
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
|
||||
/*f32 maxFrame = mMaxFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
T weightedEnd = mEnd * ((inverseDuration * (inverseDuration * (inverseDuration * (maxFrame * (2.0f * maxFrame * maxFrame))))) -
|
||||
(inverseDuration * (inverseDuration * (3.0f * maxFrame * maxFrame))));
|
||||
T weightedStart = mStart * (1.0f + ((inverseDuration * (inverseDuration * (inverseDuration * (maxFrame * (2.0f * maxFrame * maxFrame))))) -
|
||||
(inverseDuration * (inverseDuration * (3.0f * maxFrame * maxFrame)))));
|
||||
T r = weightedStart - weightedEnd;
|
||||
/*f32 var_f27 = mMaxFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
T sp28 = mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))));
|
||||
T sp1C = mStart * (1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
T r = sp1C - sp28;
|
||||
|
||||
f32 frameSquared = maxFrame * maxFrame;
|
||||
f32 scaledCubic = inverseDuration * (inverseDuration * (maxFrame * frameSquared));
|
||||
f32 tangentContribution =
|
||||
(mStartTangent * (maxFrame + (scaledCubic - (inverseDuration * (2.0f * maxFrame * maxFrame))))) + (mEndTangent * (scaledCubic - (inverseDuration * frameSquared)));
|
||||
r = r + tangentContribution;
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
|
||||
@@ -167,20 +167,20 @@ namespace ipl {
|
||||
f32 get() const;
|
||||
#else
|
||||
f32 get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
f32 var_f27 = mFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
f32 r =
|
||||
(mStart *
|
||||
(1.0f + ((inverseDuration * (inverseDuration * (inverseDuration * (frame * (2.0f * frame * frame))))) -
|
||||
(inverseDuration * (inverseDuration * (3.0f * frame * frame)))))) -
|
||||
(mEnd * ((inverseDuration * (inverseDuration * (inverseDuration * (frame * (2.0f * frame * frame))))) -
|
||||
(inverseDuration * (inverseDuration * (3.0f * frame * frame)))));
|
||||
(1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(mStartTangent *
|
||||
(frame + ((inverseDuration * (inverseDuration * (frame * (frame * frame)))) -
|
||||
(inverseDuration * (2.0f * frame * frame))))) +
|
||||
(mEndTangent * ((inverseDuration * (inverseDuration * (frame * (frame * frame)))) -
|
||||
(inverseDuration * (frame * frame))));
|
||||
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
}
|
||||
@@ -231,35 +231,35 @@ namespace ipl {
|
||||
}
|
||||
#else
|
||||
T get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
f32 var_f27 = mFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
f32 t1t2 =
|
||||
(inverseDuration * (inverseDuration * (inverseDuration * (frame * (2.0f * frame * frame))))) - (inverseDuration * (inverseDuration * (3.0f * frame * frame)));
|
||||
(var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) - (var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)));
|
||||
|
||||
T r = (mStart * (1.0f + t1t2)) - (mEnd * t1t2);
|
||||
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 scaledCubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangentContribution =
|
||||
(mStartTangent * (frame + (scaledCubic - (inverseDuration * (2.0f * frame * frame))))) + (mEndTangent * (scaledCubic - (inverseDuration * frameSquared)));
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
|
||||
r = r + tangentContribution;
|
||||
r = r + temp_f3;
|
||||
|
||||
return r;
|
||||
|
||||
/*f32 maxFrame = mMaxFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
T weightedEnd = mEnd * ((inverseDuration * (inverseDuration * (inverseDuration * (maxFrame * (2.0f * maxFrame * maxFrame))))) -
|
||||
(inverseDuration * (inverseDuration * (3.0f * maxFrame * maxFrame))));
|
||||
T weightedStart = mStart * (1.0f + ((inverseDuration * (inverseDuration * (inverseDuration * (maxFrame * (2.0f * maxFrame * maxFrame))))) -
|
||||
(inverseDuration * (inverseDuration * (3.0f * maxFrame * maxFrame)))));
|
||||
T r = weightedStart - weightedEnd;
|
||||
/*f32 var_f27 = mMaxFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
T sp28 = mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))));
|
||||
T sp1C = mStart * (1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
T r = sp1C - sp28;
|
||||
|
||||
f32 frameSquared = maxFrame * maxFrame;
|
||||
f32 scaledCubic = inverseDuration * (inverseDuration * (maxFrame * frameSquared));
|
||||
f32 tangentContribution =
|
||||
(mStartTangent * (maxFrame + (scaledCubic - (inverseDuration * (2.0f * maxFrame * maxFrame))))) + (mEndTangent * (scaledCubic - (inverseDuration * frameSquared)));
|
||||
r = r + tangentContribution;
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -159,7 +159,7 @@ namespace ipl {
|
||||
int mButton; // 0x10
|
||||
int mNextCount; // 0x14
|
||||
int mPrevCount; // 0x18
|
||||
int mResetState; // 0x1C
|
||||
int unk_0x1C; // 0x1C
|
||||
bool mbDragging; // 0x20
|
||||
};
|
||||
|
||||
@@ -234,7 +234,7 @@ namespace ipl {
|
||||
DragInfo mDrag; // 0x64
|
||||
int mMode; // 0x88
|
||||
layout::Object* mpLayout; // 0x8C
|
||||
int mReserved; // 0x90
|
||||
int unk_0x90; // 0x90
|
||||
AddressEvent* mpEvent; // 0x94
|
||||
gui::PaneManager* mpGui; // 0x98
|
||||
layout::Object* mpBackLayout; // 0x9C
|
||||
|
||||
@@ -369,8 +369,8 @@ namespace ipl {
|
||||
BoardSD mBoardSD; // 0xFAC
|
||||
|
||||
bool mbExitRequest; // 0xFB4
|
||||
int mNewMailAnimationPending;
|
||||
u8 mReserved[4];
|
||||
int unk_0xFB8;
|
||||
u8 unk_0xFBC[4];
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -139,7 +139,7 @@ namespace ipl {
|
||||
math::LinearIntp<math::VEC2> mMoveAnim; // 0x44
|
||||
|
||||
CDBId mCDBId; // 0x74
|
||||
u8 mReservedBeforeRecordKey[4];
|
||||
u8 unk_0x7C[4];
|
||||
CDBRecordKey mCDBRecordKey; // 0x80
|
||||
u32 mCDBGameCode; // 0xB0
|
||||
|
||||
@@ -179,7 +179,7 @@ namespace ipl {
|
||||
int mState; // 0x12C
|
||||
math::VEC2 mConPos; // 0x130
|
||||
int mConChan; // 0x138
|
||||
u8 mReserved[4];
|
||||
u8 unk_0x13C[4];
|
||||
|
||||
static const char* mAnimNames[TYPE_MAX][1 + ANIM_MAX];
|
||||
|
||||
|
||||
@@ -332,12 +332,12 @@ namespace ipl {
|
||||
scroller mScroller; // 0x58
|
||||
picture mPicture; // 0xC8
|
||||
|
||||
int mReservedWord;
|
||||
u8 mReservedByte;
|
||||
int unk_0xF8;
|
||||
u8 unk_0xFC;
|
||||
|
||||
EGG::Allocator mGUIAlloc; // 0x100
|
||||
|
||||
wchar_t mUrlTerminators[6];
|
||||
wchar_t unk_0x114[6];
|
||||
|
||||
u8* mpCmpArcData; // 0x120
|
||||
u8* mpArcData; // 0x124
|
||||
|
||||
@@ -75,9 +75,9 @@ namespace ipl {
|
||||
void set_textbox_day();
|
||||
void set_textbox_month();
|
||||
void set_textbox_month(const char* paneName, const utility::Date& date);
|
||||
void set_textbox_date(int calendarIndex, const utility::Date& date);
|
||||
void set_textbox_date(int unk, const utility::Date& date);
|
||||
|
||||
void set_date_pos(int calendarIndex);
|
||||
void set_date_pos(int unk);
|
||||
|
||||
void exec_search_task();
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace ipl {
|
||||
Date(EGG::Heap* heap, nand::LayoutFile* file, const char* layoutFolder, const char* layoutFileName);
|
||||
|
||||
void calc();
|
||||
void draw(bool focusedPass);
|
||||
void draw(bool unk);
|
||||
|
||||
layout::PaneAnimator* doAnim(int animId);
|
||||
|
||||
|
||||
@@ -225,7 +225,7 @@ namespace ipl {
|
||||
nw4r::ut::List mNandListingList; // 0x1C
|
||||
nw4r::ut::List mSDListingList; // 0x28
|
||||
|
||||
undefined4 mReserved; // 0x34
|
||||
undefined4 unk_0x34; // 0x34
|
||||
Thumbnail mThumbnails[15]; // 0x38
|
||||
|
||||
WiiBannerFileInfo mBanners[15]; // 0x5C90
|
||||
@@ -243,7 +243,7 @@ namespace ipl {
|
||||
|
||||
bool mbDisableThumbFetch; // 0xE8790
|
||||
ESTitleId mTmpTitleId; // 0xE8798
|
||||
bool mbDeleteSDAppAfterRestore; // 0xE87a0
|
||||
bool unk_0xE87A0; // 0xE87a0
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace ipl {
|
||||
|
||||
void initExtModule(EGG::Heap* workHeap, channel::RsoThread* thread);
|
||||
|
||||
int calcExtModule(EGG::ExpHeap* expHeap, bool canStartModule, bool onSceneChange);
|
||||
int calcExtModule(EGG::ExpHeap* expHeap, bool unk0, bool unk1);
|
||||
|
||||
void drawThumbnail();
|
||||
void drawCursor();
|
||||
@@ -57,14 +57,14 @@ namespace ipl {
|
||||
BOOL isDiskChannel() const;
|
||||
BOOL isValid() const;
|
||||
|
||||
void onPoint(int eventFlags);
|
||||
void onLeft(int eventFlags);
|
||||
void onPinch(bool pinched);
|
||||
void onPoint(int unk);
|
||||
void onLeft(int unk);
|
||||
void onPinch(bool unk);
|
||||
|
||||
void setCursorDecideAnim();
|
||||
|
||||
void initCursorAnim(bool resetPointCount);
|
||||
void initBalloonAnim(bool resetPointCount);
|
||||
void initCursorAnim(bool unk);
|
||||
void initBalloonAnim(bool unk);
|
||||
|
||||
void FillModuleCount();
|
||||
|
||||
@@ -83,15 +83,15 @@ namespace ipl {
|
||||
void initCursor();
|
||||
void calcCursor(const nw4r::math::VEC3& vec);
|
||||
|
||||
void setCursorAnim(int state) NO_INLINE;
|
||||
void setCursorAnim(int unk) NO_INLINE;
|
||||
void calcCursorAnim();
|
||||
void startCursorAnim(int animationIndex);
|
||||
void startCursorAnim(int unk);
|
||||
|
||||
void initBalloon();
|
||||
void setBalloonText(const wchar_t* text);
|
||||
void calcBalloon(const nw4r::math::VEC3& vec);
|
||||
|
||||
void setBalloonAnim(int state) NO_INLINE;
|
||||
void setBalloonAnim(int unk) NO_INLINE;
|
||||
void calcBalloonAnim();
|
||||
|
||||
void clearModuleParam();
|
||||
@@ -107,7 +107,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
private:
|
||||
u8 mListLinkStorage[8];
|
||||
u8 unk_0x00[8];
|
||||
|
||||
EGG::Heap* mpCursorHeap; // 0x08
|
||||
EGG::Heap* mpBalloonHeap; // 0x0C
|
||||
@@ -149,22 +149,22 @@ namespace ipl {
|
||||
|
||||
layout::Object* mpCursorLayout; // 0x48
|
||||
layout::Animator* mpCursorAnims[ANIM_CURSOR_MAX]; // 0x4C
|
||||
int mCursorState;
|
||||
int mPendingCursorState;
|
||||
int unk_0x58;
|
||||
int unk_0x5C;
|
||||
|
||||
layout::Object* mpBalloonLayout; // 0x60
|
||||
layout::Animator* mpBalloonAnim; // 0x64
|
||||
int mBalloonState;
|
||||
int mPendingBalloonState;
|
||||
int mBalloonWaitFrame;
|
||||
int unk_0x68;
|
||||
int unk_0x6C;
|
||||
int unk_0x70;
|
||||
|
||||
int mPointCount;
|
||||
int unk_0x74;
|
||||
|
||||
nw4r::lyt::Group* mpNwc24NewGroup; // 0x78
|
||||
layout::GroupAnimator* mpNwc24NewAnim; // 0x7C
|
||||
bool mpNwc24NewPlayAnim; // 0x80
|
||||
int mNewMessageState;
|
||||
u32 mNewMessageFrame;
|
||||
int unk_0x84;
|
||||
u32 unk_0x88;
|
||||
|
||||
f32 mThumbWidth; // 0x8C
|
||||
f32 mThumbHeight; // 0x90
|
||||
@@ -188,7 +188,7 @@ namespace ipl {
|
||||
channel::RsoThread* mpModuleThread; // 0xE8
|
||||
int mExtModuleState; // 0xEC
|
||||
nand::SharedFile* mpModuleFile; // 0xF0
|
||||
bool mbModuleFlag;
|
||||
bool unk_0xF4;
|
||||
u32 mModuleCount; // 0xF8
|
||||
u32 mMaxModuleCount; // 0xFC
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ namespace ipl {
|
||||
void appendToChannelList(int page, int index);
|
||||
void destroyChannelObj(ChannelObj * channelObj);
|
||||
void sortChannelList(int page);
|
||||
void sortChannelListByPage(int page, int edgeDirection);
|
||||
void sortChannelListByPage(int page, int unk);
|
||||
ChannelObj* searchList(int page, int index) const;
|
||||
|
||||
void setupDiskChanObj();
|
||||
@@ -87,7 +87,7 @@ namespace ipl {
|
||||
void setChanFrameVisibility();
|
||||
|
||||
BOOL isChannelInView(int page, int index) const;
|
||||
BOOL isChannelInCalc(int page, int index, int currentPage) const;
|
||||
BOOL isChannelInCalc(int page, int index, int unk2) const;
|
||||
|
||||
BOOL isPageCreated(int page) const;
|
||||
BOOL isPageCreatedAllDone(int page) const;
|
||||
@@ -108,14 +108,14 @@ namespace ipl {
|
||||
BOOL prepareRestarting(int page);
|
||||
void restart(int page, int index);
|
||||
|
||||
nw4r::lyt::Pane* getChannelBasePane(int page, int index, int currentPage) const;
|
||||
nw4r::lyt::Pane* getChannelBasePane(int page, int index, int unk3) const;
|
||||
const nw4r::lyt::Pane* getChannelBasePane(int index) const;
|
||||
nw4r::lyt::Pane* getChannelBasePane(int index);
|
||||
|
||||
nw4r::math::VEC3 getDispChanTrans(int index) const;
|
||||
|
||||
void setChannelScissor(const ChannelObj* channelObj) const;
|
||||
void initChanZoomParam(const math::VEC3& pos, BOOL zoomOut);
|
||||
void initChanZoomParam(const math::VEC3& pos, BOOL unk);
|
||||
|
||||
void calcChanZoomParam();
|
||||
void setChanZoomOrtho();
|
||||
@@ -148,11 +148,11 @@ namespace ipl {
|
||||
void startResetting();
|
||||
|
||||
bool unkBool() {
|
||||
return !mbWaitForModuleStop || mModuleState == 3;
|
||||
return !unk_0x185 || unk_0x180 == 3;
|
||||
}
|
||||
void setSomething() {
|
||||
mbModuleSceneChange = true;
|
||||
mbWaitForModuleStop = 1;
|
||||
unk_0x185 = 1;
|
||||
}
|
||||
|
||||
enum {
|
||||
@@ -274,25 +274,25 @@ namespace ipl {
|
||||
clock mClock; // 0x108
|
||||
s32 mPrevSDState; // 0x168
|
||||
|
||||
EGG::Heap* mpThumbnailHeap;
|
||||
EGG::Heap* unk_0x16C;
|
||||
|
||||
EGG::Heap* mpDiskHeap; // 0x170
|
||||
EGG::Heap* mpCursorHeap; // 0x174
|
||||
EGG::Heap* mpBalloonHeap; // 0x178
|
||||
|
||||
EGG::Heap* mpChannelObjHeap;
|
||||
EGG::Heap* unk_0x17C;
|
||||
|
||||
int mModuleState;
|
||||
int unk_0x180;
|
||||
|
||||
bool mbModuleSceneChange; // 0x184
|
||||
bool mbWaitForModuleStop;
|
||||
bool unk_0x185;
|
||||
ChannelObj* mpCurrentRsoChanObj; // 0x188
|
||||
ChannelObj* mpPriorityModuleChanObj;
|
||||
ChannelObj* unk_0x18C;
|
||||
|
||||
EGG::Heap* mpModuleWorkHeap; // 0x190
|
||||
channel::RsoThread* mpModuleThread; // 0x194
|
||||
EGG::ExpHeap* mpModuleHeaps[49]; // 0x198
|
||||
bool mbModuleHeapInUse[49];
|
||||
bool unk_0x25C[49];
|
||||
|
||||
nw4r::math::VEC2 mDragPos; // 0x290
|
||||
int mConChan; // 0x298
|
||||
@@ -300,21 +300,21 @@ namespace ipl {
|
||||
int mMoveOldIndex; // 0x2A0
|
||||
int mMoveNewPage; // 0x2A4
|
||||
int mMoveNewIndex; // 0x2A8
|
||||
int mDragRightScrollFrame;
|
||||
int mDragLeftScrollFrame;
|
||||
int mReleaseWaitFrame;
|
||||
bool mbDragReleased;
|
||||
int unk_0x2AC;
|
||||
int unk_0x2B0;
|
||||
int unk_0x2B4;
|
||||
bool unk_0x2B8;
|
||||
nand::File* mpSaveDataFile; // 0x2BC
|
||||
ChannelObj* mpMovedChanObj;
|
||||
layout::Object* mpMoveThumbnailLayout;
|
||||
layout::Animator* mpMoveThumbnailAnim;
|
||||
ChannelObj* unk_0x2C0;
|
||||
layout::Object* unk_0x2C4;
|
||||
layout::Animator* unk_0x2C8;
|
||||
u32 unused_0x2CC;
|
||||
|
||||
static BOOL msInitFlag;
|
||||
static const char* mscChanPaneNames[CHAN_SCROLL_MAX][MAX_CHANNEL_INDEX];
|
||||
static const char* mscBasePaneNames[CHAN_SCROLL_MAX];
|
||||
static const char* mscPicturePaneNames[CHAN_SCROLL_MAX];
|
||||
static const char* mscEdgePaneNames[CHAN_SCROLL_MAX];
|
||||
static const char* mscUnk0PaneNames[CHAN_SCROLL_MAX];
|
||||
static const char* mscUnk1PaneNames[CHAN_SCROLL_MAX];
|
||||
static const char* mscClockPaneNames[3];
|
||||
static const char* mscMaskPaneName;
|
||||
|
||||
|
||||
@@ -112,7 +112,7 @@ namespace ipl {
|
||||
|
||||
void startChangeChannel(int page, int index);
|
||||
void reserveNextScene();
|
||||
void reserveSettingScene(bool skipConfirmation);
|
||||
void reserveSettingScene(bool unk);
|
||||
|
||||
void prepareForBoot1(int sceneID);
|
||||
void prepareForBoot2(int sceneID);
|
||||
@@ -318,9 +318,9 @@ namespace ipl {
|
||||
int mDiskState2; // 0x78
|
||||
|
||||
nw4r::math::VEC3 mDispTrans; // 0x7C
|
||||
u32 mBootWaitFrame;
|
||||
int mStartButtonState;
|
||||
bool mbBannerStartPending;
|
||||
u32 unk_0x88;
|
||||
int unk_0x8C;
|
||||
bool unk_0x90;
|
||||
|
||||
layout::GroupAnimator* mpGrpAnims[ANIM_GRP_MAX][ANIM_MAX]; // 0x94
|
||||
layout::Animator* mpChangeAnims[ANIM_MAX]; // 0x1D4
|
||||
@@ -352,8 +352,8 @@ namespace ipl {
|
||||
layout::Object* mpDiskBnrLayout; // 0x254
|
||||
layout::Animator* mpDiskBnrAnims[DISK_ANIM_GRP_MAX][DISK_ANIM_MAX]; // 0x258
|
||||
|
||||
undefined reservedAfterDiskAnims[4];
|
||||
undefined mWiiDiskReady;
|
||||
undefined unk_0x320[4];
|
||||
undefined unk_0x324;
|
||||
|
||||
nand::LayoutFile* mpGCBannerFile; // 0x328
|
||||
layout::Object* mpGCBannerLyt; // 0x32C
|
||||
@@ -371,24 +371,24 @@ namespace ipl {
|
||||
CsChanTtlButtonEventHandler* mpButtonEvent; // 0x354
|
||||
utility::Capture* mpCapture; // 0x358
|
||||
ESTmdView* mpCurTicket; // 0x35C
|
||||
bool mbTmdReady;
|
||||
bool unk_0x360;
|
||||
u16 mCurGameCode; // 0x362
|
||||
|
||||
ESTitleId mTmpTitleID; // 0x368
|
||||
bool mbTmpTitleCleanupDone;
|
||||
bool mbTicketLimitReady;
|
||||
bool unk_0x370;
|
||||
bool unk_0x371;
|
||||
|
||||
u32 mLimitType; // 0x374
|
||||
u32 mTimeLimitRemain; // 0x378
|
||||
|
||||
bool mbStartButtonFocusPlayed;
|
||||
bool unk_0x37C;
|
||||
|
||||
int mModuleState; // 0x380
|
||||
int mModuleType; // 0x384
|
||||
volatile bool mbModuleSceneChange; // 0x388
|
||||
bool mbRSODoneCalc; // 0x389
|
||||
u32 mModuleFrame;
|
||||
u32 mModuleInterval;
|
||||
u32 unk_0x38C;
|
||||
u32 unk_0x390;
|
||||
nand::SharedFile* mpModuleFile; // 0x394
|
||||
EGG::ExpHeap* mpRsoExpHeaps[2]; // 0x398
|
||||
int mCurRsoExpHeap; // 0x39C
|
||||
|
||||
@@ -57,8 +57,8 @@ namespace ipl {
|
||||
kitayama::NandSDWorker_AutoTest* mpAutoTest; // 0x64
|
||||
void* mpWorkerBuf; // 0x68
|
||||
void* mpWorkerCacheBuf; // 0x6C
|
||||
u32 mReservedWorkerState; // 0x70 (unused)
|
||||
u32 mReservedCacheState; // 0x74 (unused)
|
||||
u32 unk_0x70; // 0x70 (unused)
|
||||
u32 unk_0x74; // 0x74 (unused)
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -74,13 +74,13 @@ namespace ipl {
|
||||
s32 mState; // 0x88
|
||||
s32 mPrevState; // 0x8C
|
||||
u8 mSlot; // 0x90
|
||||
u8 mReservedSlot[3]; // 0x91
|
||||
u8 unk_0x91[3]; // 0x91
|
||||
s32 mSlotState[2]; // 0x94
|
||||
s16 mIconIndex; // 0x9C
|
||||
s16 mIconCount; // 0x9E
|
||||
u8 mShowArwR; // 0xA0
|
||||
u8 mShowArwL; // 0xA1
|
||||
u8 mReservedArrows[2]; // 0xA2
|
||||
u8 unk_0xA2[2]; // 0xA2
|
||||
MemoryCardManager* mpManager; // 0xA4
|
||||
MemoryBaseEvent* mpEvent; // 0xA8
|
||||
nw4r::ut::List mSaveDataList; // 0xAC
|
||||
|
||||
@@ -52,10 +52,10 @@ namespace ipl {
|
||||
|
||||
class Button {
|
||||
public:
|
||||
Button(nw4r::lyt::Pane* pane) : mHoverCount(0), mPane(pane) {}
|
||||
Button(nw4r::lyt::Pane* pane) : unk_0x04(0), mPane(pane) {}
|
||||
virtual ~Button();
|
||||
|
||||
u32 mHoverCount; // 0x04
|
||||
u32 unk_0x04; // 0x04
|
||||
nw4r::lyt::Pane* mPane; // 0x08
|
||||
nw4r::ut::Link mLink; // 0x0C
|
||||
};
|
||||
@@ -63,8 +63,8 @@ namespace ipl {
|
||||
class AnmButton {
|
||||
public:
|
||||
AnmButton(const char* name, Anm* anm1, Anm* anm2, Anm* anm3)
|
||||
: mHoverCount(0), mName(name), mCurrentAnm(NULL), mAnm1(anm1), mAnm2(anm2), mAnm3(anm3),
|
||||
mAnimationState(0), mLastCmd(0), mpBalloon(NULL) {}
|
||||
: unk_0x04(0), mName(name), mCurrentAnm(NULL), mAnm1(anm1), mAnm2(anm2), mAnm3(anm3),
|
||||
unk_0x24(0), mLastCmd(0), mpBalloon(NULL) {}
|
||||
virtual ~AnmButton();
|
||||
|
||||
void calc();
|
||||
@@ -72,14 +72,14 @@ namespace ipl {
|
||||
|
||||
void setBalloon(TextBalloon* balloon);
|
||||
|
||||
int mHoverCount; // 0x04
|
||||
int unk_0x04; // 0x04
|
||||
const char* mName; // 0x08
|
||||
Anm* mCurrentAnm; // 0x0C
|
||||
Anm* mAnm1; // 0x10
|
||||
Anm* mAnm2; // 0x14
|
||||
Anm* mAnm3; // 0x18
|
||||
nw4r::ut::Link mLink; // 0x1C
|
||||
u32 mAnimationState; // 0x24
|
||||
u32 unk_0x24; // 0x24
|
||||
int mLastCmd; // 0x28
|
||||
TextBalloon* mpBalloon; // 0x2C
|
||||
};
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
#ifdef IPL_MEMORYCARD_BASE_CTOR_OUT_OF_LINE
|
||||
MemoryBase();
|
||||
#else
|
||||
MemoryBase() : mpLayout(NULL), mpLayoutFile(NULL) {
|
||||
MemoryBase() : mpLayout(NULL), unk_0x08(NULL) {
|
||||
nw4r::ut::List_Init(&mAnmList, offsetof(Anm, mLink));
|
||||
nw4r::ut::List_Init(&mButtonList, offsetof(Button, mLink));
|
||||
nw4r::ut::List_Init(&mAnmButtonList, offsetof(AnmButton, mLink));
|
||||
@@ -136,7 +136,7 @@ namespace ipl {
|
||||
|
||||
protected:
|
||||
layout::Object* mpLayout; // 0x04
|
||||
nand::LayoutFile* mpLayoutFile; // 0x08
|
||||
nand::LayoutFile* unk_0x08; // 0x08
|
||||
gui::PaneManager* mpPaneManager; // 0x0C
|
||||
nw4r::ut::List mAnmList; // 0x10
|
||||
nw4r::ut::List mButtonList; // 0x1C
|
||||
|
||||
@@ -71,15 +71,15 @@ namespace ipl {
|
||||
|
||||
typedef struct MCFile {
|
||||
u32 fileNo; // 0x00
|
||||
u32 reserved; // 0x04
|
||||
u32 sortKeyHigh; // 0x08
|
||||
u32 unk_0x04; // 0x04
|
||||
u32 unk_0x08; // 0x08
|
||||
s32 sortKey; // 0x0C
|
||||
} MCFile; // 0x10
|
||||
|
||||
typedef struct MCFileCell {
|
||||
wchar_t comment[2][0x40]; // 0x000
|
||||
s16 iconAnmCounter; // 0x100
|
||||
u16 reserved; // 0x102
|
||||
u16 unk_0x102; // 0x102
|
||||
GXTexObj icon; // 0x104
|
||||
GXTexObj banner; // 0x124
|
||||
GXTlutObj iconTlut; // 0x144
|
||||
@@ -99,8 +99,8 @@ namespace ipl {
|
||||
mLastCmd = 0;
|
||||
__CARDSetDiskID(NULL);
|
||||
memorycard::initCardThread();
|
||||
sort_file_array(CARD_CHAN_0);
|
||||
sort_file_array(CARD_CHAN_1);
|
||||
sort_file_array(0);
|
||||
sort_file_array(1);
|
||||
}
|
||||
virtual ~MemoryCardManager();
|
||||
|
||||
@@ -187,28 +187,12 @@ namespace ipl {
|
||||
}
|
||||
|
||||
private:
|
||||
GXTexObj* initBannerTexture(u8 slot, s32 file, void* data) {
|
||||
GXInitTexObj(&mFileCell[slot][file].banner, data, CARD_BANNER_WIDTH, CARD_BANNER_HEIGHT,
|
||||
GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
return &mFileCell[slot][file].banner;
|
||||
}
|
||||
|
||||
void initBannerTextureCI(u8 slot, s32 file, void* data) {
|
||||
GXInitTexObjCI(&mFileCell[slot][file].banner, data, CARD_BANNER_WIDTH, CARD_BANNER_HEIGHT,
|
||||
GX_TF_C8, GX_CLAMP, GX_CLAMP, GX_FALSE, GX_TLUT0);
|
||||
}
|
||||
|
||||
GXTlutObj* initBannerPalette(u8 slot, s32 file, void* data) {
|
||||
GXInitTlutObj(&mFileCell[slot][file].bannerTlut, data, GX_TL_RGB5A3, 0x100);
|
||||
return &mFileCell[slot][file].bannerTlut;
|
||||
}
|
||||
|
||||
u32 reserved; // 0x00004
|
||||
MCFile mFile[2][CARD_MAX_FILE]; // 0x00008
|
||||
MCFileCell mFileCell[2][CARD_MAX_FILE]; // 0x00FE8
|
||||
u32 unk_0x04; // 0x00004
|
||||
MCFile mFile[2][0x7F]; // 0x00008
|
||||
MCFileCell mFileCell[2][0x7F]; // 0x00FE8
|
||||
s32 mLastResult; // 0x16930
|
||||
s32 mLastCmd; // 0x16934
|
||||
u32 mReservedResult; // 0x16938
|
||||
u32 unk_0x16938; // 0x16938
|
||||
MemCardEventListener* mpEventHandler; // 0x1693C
|
||||
};
|
||||
} // namespace scene
|
||||
|
||||
@@ -54,9 +54,9 @@ namespace ipl {
|
||||
u64 mAmtTotal; // 0x2B70
|
||||
u16 mCurrVersion; // 0x2B78
|
||||
void* mpNUPInstance; // 0x2B7C
|
||||
u32 mReserved0; // 0x2B80
|
||||
u32 mReserved1; // 0x2B84
|
||||
u32 mReserved2; // 0x2B88
|
||||
u32 unk_0x2B80; // 0x2B80
|
||||
u32 unk_0x2B84; // 0x2B84
|
||||
u32 unk_0x2B88; // 0x2B88
|
||||
|
||||
static EGG::Heap* spHeap;
|
||||
static BOOL sNHTTPFinished;
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace ipl {
|
||||
NET_SETUP_REQUESTED_STARTUP,
|
||||
NET_SETUP_RUNNING,
|
||||
NET_SETUP_SUCCESS,
|
||||
NET_SETUP_ALTERNATE_ERROR,
|
||||
NET_SETUP_UNK_4,
|
||||
NET_SETUP_ERROR,
|
||||
};
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace ipl {
|
||||
#endif
|
||||
|
||||
struct SettingAPScanList {
|
||||
u8 reservedHeader[0x14];
|
||||
u8 unknown[0x14];
|
||||
union {
|
||||
struct {
|
||||
u16 count;
|
||||
@@ -180,33 +180,33 @@ namespace ipl {
|
||||
ARG_SETUP,
|
||||
ARG_UPDATE,
|
||||
ARG_INTERNET_PAGE,
|
||||
ARG_RESUME_SETUP,
|
||||
ARG_DIRECT_PAGE,
|
||||
ARG_UNK_5,
|
||||
ARG_UNK_6,
|
||||
};
|
||||
|
||||
private:
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
int mUpdateTiming;
|
||||
u8 mBrowserStopRequested;
|
||||
u8 reservedAfterBrowserStop[3];
|
||||
u8 unk_0x5C;
|
||||
u8 unk_0x5D[3];
|
||||
nand::Base* mpWWWLibraryFile;
|
||||
nand::Base* mpSettingHTMLFile;
|
||||
nand::Base* mpWWWArchiveFile;
|
||||
nand::Base* mpFontFile;
|
||||
nand::Base* mpBackgroundTPLFile;
|
||||
int mDialogState;
|
||||
int mAPScanState;
|
||||
int mEULAState;
|
||||
int unk_0x74;
|
||||
int unk_0x78;
|
||||
int unk_0x7C;
|
||||
int mProfileIDMode;
|
||||
int mUSBAPState;
|
||||
int unk_0x84;
|
||||
int mAOSSState;
|
||||
int mRakuState;
|
||||
int mFuncMsgPending;
|
||||
int mSafeModeDialogState;
|
||||
int unk_0x94;
|
||||
ESTitleId mUpdateTitleId;
|
||||
u32 mPrepareTick;
|
||||
u8 mSettingData[0x16];
|
||||
u8 reservedAfterSettingData[2];
|
||||
u8 unk_0xBA[2];
|
||||
nand::LayoutFile* mpSettingLayoutFile;
|
||||
layout::Object* mpChangeLayout;
|
||||
layout::Object* mpMainLayout;
|
||||
@@ -221,25 +221,25 @@ namespace ipl {
|
||||
APScanThread* mpAPScanThread;
|
||||
SettingAPScanList mAPScanList;
|
||||
void* mpMem1BrowserBuffer;
|
||||
u32 reservedBrowserWord;
|
||||
u32 unk_0x908;
|
||||
void* mpMem2BrowserBuffer;
|
||||
void* mpBrowserStringBuffer;
|
||||
int mAPScrollOffset;
|
||||
int mAPAnimationIndex;
|
||||
u8 mUiStatus[4];
|
||||
int unk_0x914;
|
||||
int unk_0x918;
|
||||
u8 unk_0x91C[4];
|
||||
ext_ead::www::ImeData* mpBrowserData;
|
||||
www::wiisetting::WiiData* mpWiiSettingData;
|
||||
www::wiisetting::WiiFlag* mpWiiSettingFlag;
|
||||
u8 mActionFrame;
|
||||
u8 reservedAfterActionFrame[3];
|
||||
int mSupportCode;
|
||||
u8 unk_0x92C;
|
||||
u8 unk_0x92D[3];
|
||||
int unk_0x930;
|
||||
www::wiisetting::SetStringBuf* mpStringBuffer;
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
wchar_t mInputText[0x101];
|
||||
wchar_t unk_0x938[0x101];
|
||||
#else
|
||||
u8 mInputText[0x202];
|
||||
u8 unk_0x938[0x202];
|
||||
#endif
|
||||
u8 reservedAfterInputText;
|
||||
u8 unk_0xB3A;
|
||||
u8 mBrowserCreated;
|
||||
keyboard::Manager::State mKeyboardState;
|
||||
int mInitialArgument;
|
||||
@@ -247,21 +247,21 @@ namespace ipl {
|
||||
int mProgressiveMode;
|
||||
int mEuRgb60Mode;
|
||||
u8 mIsResetAcceptable;
|
||||
u8 reservedAfterResetFlag[3];
|
||||
u8 unk_0xB5D[3];
|
||||
OSMessageQueue mFuncMessageQueue;
|
||||
OSMessage mFuncMessages[5];
|
||||
int mScreenModeChangeState;
|
||||
int unk_0xB94;
|
||||
int mState;
|
||||
int mInputDelayFrame;
|
||||
int unk_0xB9C;
|
||||
OSTime mCreatePageTime;
|
||||
u32 mConnectedControllerMask;
|
||||
u8 mNetSettingResultSent;
|
||||
u8 reservedAfterNetSettingResult[3];
|
||||
u8 reservedTail[0x10];
|
||||
u32 unk_0xBA8;
|
||||
u8 unk_0xBAC;
|
||||
u8 unk_0xBAD[3];
|
||||
u8 unk_0xBB0[0x10];
|
||||
static void* mem1Buffer_;
|
||||
static void* mem2Buffer_;
|
||||
#else
|
||||
u8 mSettingStorage[0xB68];
|
||||
u8 unk_0x58[0xB68];
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
@@ -48,8 +48,8 @@ namespace ipl {
|
||||
void set_size(const char* paneName, const nw4r::lyt::Size& size);
|
||||
const nw4r::lyt::Size* get_size(const char* paneName);
|
||||
|
||||
undefined4 mReserved;
|
||||
undefined4 mReservedState;
|
||||
undefined4 unk_0x00;
|
||||
undefined4 unk_0x04;
|
||||
BOOL mbWaitingFadeIn; // 0x08
|
||||
|
||||
layout::Object* mpLayout; // 0x0C
|
||||
|
||||
@@ -39,13 +39,13 @@ namespace ipl {
|
||||
int holdSEwithPosDis(const char* sndName, f32 x, f32 y);
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void stopBGM(int fadeFrames = 0);
|
||||
void stopBGM(int unk = 0);
|
||||
#else
|
||||
int stopBGM(int fadeFrames = 0);
|
||||
int stopBGM(int unk = 0);
|
||||
#endif
|
||||
int stopBGM(nw4r::snd::SoundHandle* handle, int fadeFrames = 0);
|
||||
void stopSE(nw4r::snd::SoundHandle* handle, int fadeFrames = 0);
|
||||
void stopAllSound(int fadeFrames = 0);
|
||||
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
void stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
void stopAllSound(int unk = 0);
|
||||
|
||||
int resetAllSound();
|
||||
|
||||
@@ -92,14 +92,14 @@ namespace ipl {
|
||||
tagSSeInfo* getFreeSEBlock(bool force);
|
||||
|
||||
BOOL startBannerSound(void*, u32, bool ignoreSize = false);
|
||||
void stopBannerSound(int fadeFrames = 0);
|
||||
void stopBannerSound(int unk = 0);
|
||||
|
||||
BOOL checkTmpSoundFile(void*, u32);
|
||||
|
||||
long clipGELT_S32(long value, long lo, long hi);
|
||||
|
||||
private:
|
||||
u32 mSoundWork[3];
|
||||
u32 unk_0x620[3];
|
||||
};
|
||||
|
||||
// use getSystem() and getBannerPlayer() instead
|
||||
|
||||
@@ -209,9 +209,9 @@
|
||||
#define MESG_DATA_SD_CARD_LOCKED 62
|
||||
#define MESG_DATA_SD_PROCESS_FAILED 151
|
||||
#define MESG_DATA_FILE_CANT_BE_MOVED 205
|
||||
#define MESG_DATA_MOVE_FAILED 215
|
||||
#define MESG_DATA_COPY_FAILED 227
|
||||
#define MESG_DATA_DELETE_FAILED 229
|
||||
#define MESG_DATA_MOVE_UNK_ERROR 215
|
||||
#define MESG_DATA_COPY_UNK_ERROR 227
|
||||
#define MESG_DATA_DEL_UNK_ERROR 229
|
||||
#define MESG_DATA_ERASE_DIALOG 247
|
||||
#define MESG_DATA_ERASED 248
|
||||
#define MESG_DATA_ERASING 251
|
||||
|
||||
@@ -63,7 +63,7 @@ typedef union RBRRecordFlags {
|
||||
u32 data;
|
||||
struct {
|
||||
u8 optOut; // 0x00
|
||||
u8 reserved[2];
|
||||
u8 unk_0x01[2];
|
||||
u8 type; // 0x03
|
||||
};
|
||||
} RBRRecordFlags;
|
||||
|
||||
@@ -40,8 +40,8 @@ enum {
|
||||
|
||||
typedef struct tagSTVRCSettings {
|
||||
u32 magic; // 0x00
|
||||
u32 formatVersion;
|
||||
u32 configurationValid;
|
||||
u32 unk_0x04;
|
||||
u32 unk_0x08;
|
||||
u32 modelMakerID; // 0x0C
|
||||
u32 modelType; // 0x10
|
||||
u8 commandMap[TVRC_COMMAND_MAP_MAX]; // 0x14
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace ipl {
|
||||
BOOL isUnderFlow() const;
|
||||
|
||||
BOOL findByKey(CDBRecord* record, CDBRecordKey* recordKey);
|
||||
BOOL search(const CDBDate& begin, const CDBDate& end, CDBSearchDirection searchDirection, CDBRecordLocation recordLocation, int openRecord,
|
||||
BOOL search(const CDBDate& begin, const CDBDate& end, CDBSearchDirection searchDirection, CDBRecordLocation recordLocation, int unk2,
|
||||
CDBSearchRecordCB searchRecordCB, void* searchRecordWork);
|
||||
|
||||
BOOL getDataSize(CDBRecord* record, u32* recordDataSize);
|
||||
@@ -113,8 +113,8 @@ namespace ipl {
|
||||
u8* mpSDVFWork; // 0x1C
|
||||
OSMutex mMutex; // 0x20
|
||||
|
||||
u8 mReserved0;
|
||||
u8 mReserved1;
|
||||
u8 unk_0x38;
|
||||
u8 unk_0x39;
|
||||
};
|
||||
|
||||
class auto_closer {
|
||||
|
||||
@@ -127,22 +127,22 @@ namespace ipl {
|
||||
u32 bannerRSOIdx : 4; // 0x00:00001111000000000000000000000000
|
||||
u32 iconCSIdx : 4; // 0x01:00000000111100000000000000000000
|
||||
u32 bannerCSIdx : 4; // 0x01:00000000000011110000000000000000
|
||||
u32 reservedBit15 : 1; // 0x02:00000000000000001000000000000000
|
||||
u32 unk_15 : 1; // 0x02:00000000000000001000000000000000
|
||||
u32 useAltSound : 1; // 0x02:00000000000000000100000000000000
|
||||
u32 reservedBit13 : 1; // 0x02:00000000000000000010000000000000
|
||||
u32 reservedBit12 : 1; // 0x02:00000000000000000001000000000000
|
||||
u32 reservedBit11 : 1; // 0x02:00000000000000000000100000000000
|
||||
u32 reservedBit10 : 1; // 0x02:00000000000000000000010000000000
|
||||
u32 reservedBit09 : 1; // 0x02:00000000000000000000001000000000
|
||||
u32 unk_13 : 1; // 0x02:00000000000000000010000000000000
|
||||
u32 unk_12 : 1; // 0x02:00000000000000000001000000000000
|
||||
u32 unk_11 : 1; // 0x02:00000000000000000000100000000000
|
||||
u32 unk_10 : 1; // 0x02:00000000000000000000010000000000
|
||||
u32 unk_09 : 1; // 0x02:00000000000000000000001000000000
|
||||
u32 netSetting : 1; // 0x02:00000000000000000000000100000000
|
||||
u32 reservedBit07 : 1; // 0x03:00000000000000000000000010000000
|
||||
u32 reservedBit06 : 1; // 0x03:00000000000000000000000001000000
|
||||
u32 reservedBit05 : 1; // 0x03:00000000000000000000000000100000
|
||||
u32 reservedBit04 : 1; // 0x03:00000000000000000000000000010000
|
||||
u32 reservedBit03 : 1; // 0x03:00000000000000000000000000001000
|
||||
u32 reservedBit02 : 1; // 0x03:00000000000000000000000000000100
|
||||
u32 reservedBit01 : 1; // 0x03:00000000000000000000000000000010
|
||||
u32 isDisk : 1; // 0x03:00000000000000000000000000000001
|
||||
u32 unk_07 : 1; // 0x03:00000000000000000000000010000000
|
||||
u32 unk_06 : 1; // 0x03:00000000000000000000000001000000
|
||||
u32 unk_05 : 1; // 0x03:00000000000000000000000000100000
|
||||
u32 unk_04 : 1; // 0x03:00000000000000000000000000010000
|
||||
u32 unk_03 : 1; // 0x03:00000000000000000000000000001000
|
||||
u32 unk_02 : 1; // 0x03:00000000000000000000000000000100
|
||||
u32 unk_01 : 1; // 0x03:00000000000000000000000000000010
|
||||
u32 unk_00 : 1; // 0x03:00000000000000000000000000000001
|
||||
};
|
||||
}; // 0x18
|
||||
} SMetaBlockHeader;
|
||||
@@ -226,9 +226,9 @@ namespace ipl {
|
||||
BOOL setupUrlJump(const char* url);
|
||||
BOOL setupChannelJump(ESTitleId titleId, const char* data);
|
||||
|
||||
void* getDiskThumbnail(bool invalidateReady);
|
||||
void* getDiskBanner(bool invalidateReady);
|
||||
void* getDiskSound(bool invalidateReady);
|
||||
void* getDiskThumbnail(bool unk);
|
||||
void* getDiskBanner(bool unk);
|
||||
void* getDiskSound(bool unk);
|
||||
|
||||
nand::MetaFile* loadThumbnailAsync(EGG::Heap* heap, int page, int index);
|
||||
nand::MetaFile* loadBannerAsync(EGG::Heap* heap, int page, int index);
|
||||
@@ -322,7 +322,7 @@ namespace ipl {
|
||||
int updateWaitSCFlush();
|
||||
void updateDiskState();
|
||||
|
||||
void* getDiskBannerData(int index, bool invalidateReady);
|
||||
void* getDiskBannerData(int index, bool unk);
|
||||
|
||||
int searchMetaHeader(const u8* buffer);
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace ipl {
|
||||
// here to avoid typing in long namespaces constantly :P
|
||||
enum {
|
||||
CHANS_VM_ALT_SND_STATE_UNAVAILABLE = 0,
|
||||
CHANS_VM_ALT_SND_STATE_FALLBACK,
|
||||
CHANS_VM_ALT_SND_STATE_UNK1,
|
||||
CHANS_VM_ALT_SND_STATE_PLAY,
|
||||
};
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace ipl {
|
||||
layout::Animator** anims; // 0x08
|
||||
u64 titleId; // 0x10
|
||||
bool threadTerminated; // 0x18
|
||||
bool isThumbnail;
|
||||
bool unk_0x19;
|
||||
bool mbHasNewMessage; // 0x1A
|
||||
|
||||
EGG::ExpHeap* getHeap() { return heap; }
|
||||
@@ -64,19 +64,19 @@ namespace ipl {
|
||||
|
||||
private:
|
||||
enum {
|
||||
CHANS_VM_STATE_IDLE = 0,
|
||||
CHANS_VM_STATE_STARTING,
|
||||
CHANS_VM_STATE_WAIT_BEGIN_RENDER,
|
||||
CHANS_VM_STATE_RUNNING,
|
||||
CHANS_VM_STATE_EXITING,
|
||||
CHANS_VM_STATE_UNK0 = 0,
|
||||
CHANS_VM_STATE_UNK1,
|
||||
CHANS_VM_STATE_UNK2,
|
||||
CHANS_VM_STATE_UNK3,
|
||||
CHANS_VM_STATE_UNK4,
|
||||
};
|
||||
|
||||
enum {
|
||||
CHANS_VM_MSG_STATE_NONE = 0,
|
||||
CHANS_VM_MSG_STATE_BEGIN_RENDER,
|
||||
CHANS_VM_MSG_STATE_WAIT_RETRACE,
|
||||
CHANS_VM_MSG_STATE_RESERVED,
|
||||
CHANS_VM_MSG_STATE_EXIT,
|
||||
CHANS_VM_MSG_STATE_UNK0 = 0,
|
||||
CHANS_VM_MSG_STATE_UNK1,
|
||||
CHANS_VM_MSG_STATE_UNK2,
|
||||
CHANS_VM_MSG_STATE_UNK3,
|
||||
CHANS_VM_MSG_STATE_UNK4,
|
||||
};
|
||||
|
||||
u8* mpChansWork; // 0x00
|
||||
|
||||
@@ -144,7 +144,7 @@ namespace ipl {
|
||||
u32 mCurrentConChan; // 0x20
|
||||
Vec2 projCenter; // 0x24
|
||||
bool mbActivated; // 0x2C
|
||||
u8 mReserved;
|
||||
u8 unk_0x2D;
|
||||
textinput::extend::savedata::MemoSetting mSaveData; // 0x2E
|
||||
nand::File* mpSaveFile; // 0x38
|
||||
};
|
||||
|
||||
@@ -45,7 +45,7 @@ namespace ipl {
|
||||
typedef struct MESGInfoBlock {
|
||||
u32 offset; // 0x00
|
||||
u32 flags; // 0x04
|
||||
u32 reserved; // 0x08
|
||||
u32 unk_0x08; // 0x08
|
||||
} MESGInfoBlock;
|
||||
|
||||
typedef struct MESGDataHeader {
|
||||
|
||||
@@ -47,13 +47,13 @@ namespace ipl {
|
||||
RESULT_BROKEN_MEDIA = -9,
|
||||
RESULT_ILLEGAL_MEDIA = -10,
|
||||
RESULT_WRITE_PROTECTED = -11,
|
||||
RESULT_FILENAME_CONFLICT = -12,
|
||||
RESULT_UNK_N12 = -12,
|
||||
RESULT_NOCOPY = -13,
|
||||
RESULT_ES_ERROR = -14,
|
||||
RESULT_NOT_TRANSFERRABLE = -15,
|
||||
RESULT_VERSION_ERR = -16,
|
||||
RESULT_SD_APP_LOC_NOT_FOUND = -17,
|
||||
RESULT_CANCELLED = -18,
|
||||
RESULT_UNK_18 = -18,
|
||||
};
|
||||
|
||||
typedef struct SDAppMetaEntry {
|
||||
@@ -211,8 +211,8 @@ namespace ipl {
|
||||
MEMHeapHandle mainHeap; // 0x1E690
|
||||
MEMHeapHandle saveCacheHeap; // 0x1E694
|
||||
MEMHeapHandle appCacheHeap; // 0x1E698
|
||||
MEMHeapHandle scratchHeap; // 0x1E69C
|
||||
MEMAllocator scratchAllocator; // 0x1E6A0
|
||||
MEMHeapHandle unkHeap; // 0x1E69C
|
||||
MEMAllocator unkAllocator; // 0x1E6A0
|
||||
u8 threadStack[STACK_SIZE]; // 0x1E6B0
|
||||
OSThread thread; // 0x3e6B0
|
||||
OSMutex mutex; // 0x3e9C8
|
||||
@@ -240,7 +240,7 @@ namespace ipl {
|
||||
nw4r::ut::Link link; // 0x10
|
||||
u8 thumbnail[100 * 1024]; // 0x18
|
||||
channel::SChanMgrMetaHeader metaHdr; // 0x19018
|
||||
u8 reserved[8]; // 0x19618
|
||||
u8 unk_0x19018[8]; // 0x19618
|
||||
} AppCacheEntry;
|
||||
|
||||
typedef struct SaveCacheEntry {
|
||||
@@ -248,7 +248,7 @@ namespace ipl {
|
||||
ESTitleId titleId; // 0xF0A0
|
||||
s32 size; // 0xF0A8
|
||||
nw4r::ut::Link link; // 0xF0AC
|
||||
u8 reserved[12]; // 0xF0B4
|
||||
u8 unk_0xf0b4[12]; // 0xF0B4
|
||||
} SaveCacheEntry;
|
||||
|
||||
typedef struct SDSaveBanner {
|
||||
@@ -265,8 +265,8 @@ namespace ipl {
|
||||
u32 thumbSize; // 0x08
|
||||
NETMD5Sum headerMD5; // 0x0C
|
||||
NETMD5Sum iconMD5; // 0x1C
|
||||
u64 reservedBeforeMeta;
|
||||
u64 reservedBeforeMetaEnd;
|
||||
u64 unk_0x30;
|
||||
u64 unk_0x38;
|
||||
channel::SChanMgrMetaHeader metaHdr; // 0x40
|
||||
} SDAppBanner;
|
||||
|
||||
@@ -332,7 +332,7 @@ namespace ipl {
|
||||
MESSAGE_CHECK_BACKUP_FITS,
|
||||
MESSAGE_COPY_SD_APP_TO_NAND,
|
||||
MESSAGE_DEL_NAND_APP_HIDDEN,
|
||||
MESSAGE_CHECK_SD_APP_TITLES,
|
||||
MESSAGE_UNK_49,
|
||||
MESSAGE_CHANGE_NAND_APP_COUNT,
|
||||
MESSAGE_CHECK_SD_TITLE_RESTORABLE
|
||||
} WorkMessage;
|
||||
|
||||
@@ -133,7 +133,7 @@ namespace ipl {
|
||||
void addDlTask();
|
||||
|
||||
BOOL getNewTitleTbl(u32* titleTbl) const;
|
||||
BOOL isNewMessageThere(u32 appId) const;
|
||||
BOOL isNewMessageThere(u32 unk) const;
|
||||
|
||||
int getErrCode();
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ namespace ipl {
|
||||
enum {
|
||||
TYPE_POINT = 0,
|
||||
TYPE_GRAB,
|
||||
TYPE_RESERVED,
|
||||
TYPE_UNK2,
|
||||
TYPE_MAX, /* ??? */
|
||||
};
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace ipl {
|
||||
namespace postman {
|
||||
class Manager : public utility::ut_thread {
|
||||
public:
|
||||
enum { STATE_NONE = 0, STATE_RUN_RECEIVE, STATE_STOP_RUN, STATE_USBETHER_MAC, STATE_DL_TASK, STATE_INITIALIZING };
|
||||
enum { STATE_NONE = 0, STATE_RUN_RECEIVE, STATE_STOP_RUN, STATE_USBETHER_MAC, STATE_DL_TASK, STATE_UNKNOWN };
|
||||
Manager(EGG::Heap* heap);
|
||||
virtual ~Manager() {}
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace ipl {
|
||||
virtual void* Run();
|
||||
|
||||
int Get_CurrentState() const { return mState; }
|
||||
BOOL IsUnknown() { return mState != STATE_INITIALIZING; }
|
||||
BOOL IsUnknown() { return mState != STATE_UNKNOWN; }
|
||||
BOOL NotRunning() { return mState == STATE_STOP_RUN; }
|
||||
|
||||
void Start_RegistTask(EGG::TaskThread* task) { task->request(register_nwc24, NULL, NULL); }
|
||||
|
||||
@@ -21,8 +21,8 @@ namespace ipl {
|
||||
static bool checkLANMacAddrAvailable();
|
||||
|
||||
private:
|
||||
static void* allocfunc(u32 allocationName, s32 size);
|
||||
static void freefunc(u32 allocationName, void* buffer, s32 size);
|
||||
static void* allocfunc(u32 unk, s32 size);
|
||||
static void freefunc(u32 unk, void* buffer, s32 size);
|
||||
|
||||
static char mMac[64];
|
||||
|
||||
|
||||
@@ -210,7 +210,7 @@ namespace ipl {
|
||||
|
||||
u32 mBS2BootType; // 0x21C
|
||||
u32 mBS2LaunchCode; // 0x220
|
||||
u32 mReservedSceneState;
|
||||
u32 unk_0x224;
|
||||
char* mspNetSettingArg; // 0x228
|
||||
char* mspDataManageArg; // 0x22C
|
||||
char msBS2FirstArgv[128]; // 0x230
|
||||
@@ -241,7 +241,7 @@ namespace ipl {
|
||||
vs32 mRegistState; // 0x2C0
|
||||
vs32 mRegistErrCode; // 0x2C4
|
||||
volatile bool mbGoingToDataManager; // 0x2C8
|
||||
u8 mReserved[0x2D0 - 0x2CC];
|
||||
u8 unk_0x2CC[0x2D0 - 0x2CC];
|
||||
ESTitleId mBS2LaunchTitle; // 0x2B0
|
||||
|
||||
friend class System;
|
||||
|
||||
@@ -55,27 +55,27 @@ namespace ipl {
|
||||
STATE_12,
|
||||
};
|
||||
|
||||
u32 mbDisabledTriggerEnabled;
|
||||
u32 unk_0x04;
|
||||
BOOL mbInitialized; // 0x08
|
||||
nand::SharedFile* mpDBFile; // 0x0C
|
||||
BOOL mbResetting; // 0x10
|
||||
s32 mCurrentCommand; // 0x14
|
||||
u32 mRepeatCount;
|
||||
u32 mbRepeatCommand;
|
||||
u32 unk_0x18;
|
||||
u32 unk_0x1C;
|
||||
u32 mModelMakerID; // 0x20
|
||||
u32 mModelType; // 0x24
|
||||
BOOL mbPrepTVRC; // 0x28
|
||||
void* mpDatabaseArc; // 0x2C
|
||||
OSTime mCommandTransitionTime;
|
||||
OSTime mMuteStartTime;
|
||||
OSTime mSoundShutupTime;
|
||||
OSTime mLastCommandTime;
|
||||
OSTime unk_0x30;
|
||||
OSTime unk_0x38;
|
||||
OSTime unk_0x40;
|
||||
OSTime unk_0x48;
|
||||
int mCmdMaps[TVRC_COMMAND_MAP_MAX]; // 0x50
|
||||
u32 mState; // 0x70
|
||||
OSTick mDisabledTriggerTick;
|
||||
OSTick unk_0x74;
|
||||
BOOL mbDisabled; // 0x78
|
||||
BOOL mbDisabledTriggerPending;
|
||||
u8 mDisabledTriggerState;
|
||||
BOOL unk_0x7C;
|
||||
u8 unk_0x80;
|
||||
undefined unused_0x81[7];
|
||||
};
|
||||
} // namespace ipl
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#define TITLE_TYPE_DISC_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0004) /* 0x00010004 */
|
||||
#define TITLE_TYPE_SHARED ((TITLE_HITYPE_USER << 16) | 0x0005) /* 0x00010005 */
|
||||
#define TITLE_TYPE_UNK6 ((TITLE_HITYPE_USER << 16) | 0x0006) /* 0x00010006 */
|
||||
#define TITLE_TYPE_USER_APP7 ((TITLE_HITYPE_USER << 16) | 0x0007) /* 0x00010007 */
|
||||
#define TITLE_TYPE_UNK7 ((TITLE_HITYPE_USER << 16) | 0x0007) /* 0x00010007 */
|
||||
#define TITLE_TYPE_HIDDEN_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0008) /* 0x00010008 */
|
||||
|
||||
#define TITLE_REGION_ALL 'A'
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
namespace ipl {
|
||||
namespace utility {
|
||||
typedef struct CSFlagsData {
|
||||
u8 reservedHeader[0x04 - 0x00];
|
||||
u8 unk_0x00[0x04 - 0x00];
|
||||
u32 flags; // 0x04
|
||||
u8 reserved[0x20 - 0x08];
|
||||
u8 unk_0x08[0x20 - 0x08];
|
||||
|
||||
enum {
|
||||
FLAG_SYSCONF_EULA = 0,
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace ipl {
|
||||
|
||||
private:
|
||||
OSMessage mMessages[count]; // 0x24
|
||||
u32 mReserved; // (sizeof(mMessages) * count) + 0x00
|
||||
u32 unk_0x00; // (sizeof(mMessages) * count) + 0x00
|
||||
};
|
||||
} // namespace utility
|
||||
} // namespace ipl
|
||||
|
||||
@@ -32,8 +32,8 @@ namespace ipl {
|
||||
void set_arw_param();
|
||||
|
||||
int mState; // 0x04
|
||||
math::VEC2 mPointerPosition;
|
||||
math::VEC2 mScrollOrigin;
|
||||
math::VEC2 unk_0x08;
|
||||
math::VEC2 unk_0x10;
|
||||
f32 mSpeed; // 0x18
|
||||
f32 mSoundFreq; // 0x1C
|
||||
};
|
||||
@@ -94,9 +94,9 @@ namespace ipl {
|
||||
f32 mUpLimit; // 0x38
|
||||
f32 unk_0x3C;
|
||||
f32 mScroll; // 0x40
|
||||
f32 mButtonScrollOrigin;
|
||||
f32 mVelocityDecay;
|
||||
f32 mScrollAcceleration;
|
||||
f32 unk_0x44;
|
||||
f32 unk_0x48;
|
||||
f32 unk_0x4C;
|
||||
};
|
||||
} // namespace utility
|
||||
} // namespace ipl
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace EGG {
|
||||
public:
|
||||
struct Arg {
|
||||
Heap* pHeap; // 0x00
|
||||
undefined4 reserved;
|
||||
undefined4 unk_0x04;
|
||||
s32 soundThreadPrio; // 0x08
|
||||
s32 dvdThreadPrio; // 0x0C
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace EGG {
|
||||
static const u32 DEFAULT_SOUND_HEAP_SIZE = 0x8CA000;
|
||||
|
||||
u32 soundHeapSize; // 0x10
|
||||
u32 reservedSoundHeap;
|
||||
u32 unk_0x14;
|
||||
|
||||
SimpleAudioMgrArg();
|
||||
};
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace EGG {
|
||||
u16 mFadeFrame; // 0x0A
|
||||
u16 mFrame; // 0x0C
|
||||
|
||||
u8 mReserved[2];
|
||||
u8 unk_0x0E[2];
|
||||
|
||||
nw4r::ut::Color mColor; // 0x10
|
||||
nw4r::ut::Rect mSpace; // 0x14
|
||||
|
||||
@@ -202,7 +202,7 @@ namespace EGG {
|
||||
return false;
|
||||
}
|
||||
|
||||
return mSoundArchivePlayer.LoadGroup(id, pHeap, 0);
|
||||
return mSoundArchivePlayer.LoadGroup((int)id, pHeap, 0);
|
||||
}
|
||||
|
||||
bool ArcPlayer::loadGroup(const char* pName, nw4r::snd::SoundHeap* pHeap) {
|
||||
|
||||
@@ -15,14 +15,14 @@ namespace EGG {
|
||||
AudioFxMgr::AudioFxMgrArg unused1;
|
||||
}
|
||||
|
||||
void SimpleAudioMgrWithFx::initialize(IAudioMgr::Arg* audioArgs) {
|
||||
SimpleAudioMgr::initialize(audioArgs);
|
||||
void SimpleAudioMgrWithFx::initialize(IAudioMgr::Arg* arg) {
|
||||
SimpleAudioMgr::initialize(arg);
|
||||
|
||||
if (audioArgs != NULL) {
|
||||
audioArgs = (IAudioMgr::Arg*)&((ArgWithFx*)audioArgs)->fxArg;
|
||||
if (arg != NULL) {
|
||||
arg = (IAudioMgr::Arg*)&((ArgWithFx*)arg)->fxArg;
|
||||
}
|
||||
|
||||
initializeFx(&mHeap, (AudioFxMgrArg*)audioArgs);
|
||||
initializeFx(&mHeap, (AudioFxMgrArg*)arg);
|
||||
|
||||
setFxReverbHi(nw4r::snd::AUX_A, AudioFxMgr::getDefaultFxReverbHi());
|
||||
setFxChorus(nw4r::snd::AUX_B, AudioFxMgr::getDefaultFxChorus());
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace EGG {
|
||||
soundThreadPrio = nw4r::snd::SoundSystem::DEFAULT_SOUND_THREAD_PRIORITY;
|
||||
dvdThreadPrio = nw4r::snd::SoundSystem::DEFAULT_DVD_THREAD_PRIORITY;
|
||||
|
||||
reserved = 0;
|
||||
unk_0x04 = 0;
|
||||
}
|
||||
|
||||
SimpleAudioMgr::SimpleAudioMgrArg::SimpleAudioMgrArg() {
|
||||
|
||||
@@ -103,7 +103,7 @@ namespace EGG {
|
||||
}
|
||||
|
||||
namespace {
|
||||
void free_all_visitor(void* ptr, MEMiHeapHead* heapHandle, u32 userData) {
|
||||
void free_all_visitor(void* ptr, MEMiHeapHead* heapHandle, u32 unk) {
|
||||
MEMFreeToExpHeap(heapHandle, ptr);
|
||||
}
|
||||
} // namespace
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace EGG {
|
||||
|
||||
mpOSThread = static_cast<OSThread*>(Heap::alloc(sizeof(OSThread), 32, mpContainHeap));
|
||||
|
||||
OSCreateThread(mpOSThread, Thread::start, this, static_cast<u8*>(mpStackMemory) + mStackSize, mStackSize, priority,
|
||||
OSCreateThread(mpOSThread, Thread::start, this, reinterpret_cast<u8*>(mpStackMemory) + mStackSize, mStackSize, priority,
|
||||
OS_THREAD_ATTR_DETACH);
|
||||
|
||||
setCommonMesgQueue(capacity, mpContainHeap);
|
||||
|
||||
@@ -9,12 +9,12 @@ extern "C" {
|
||||
#define SIGNAL_ACTION_IGNORE ((__signal_func_ptr)1)
|
||||
|
||||
#define SIGNAL_ABORT 1
|
||||
#define SIGNAL_HANDLER_2 2
|
||||
#define SIGNAL_HANDLER_3 3
|
||||
#define SIGNAL_HANDLER_4 4
|
||||
#define SIGNAL_HANDLER_5 5
|
||||
#define SIGNAL_HANDLER_6 6
|
||||
#define SIGNAL_HANDLER_7 7
|
||||
#define SIGNAL_UNK2 2
|
||||
#define SIGNAL_UNK3 3
|
||||
#define SIGNAL_UNK4 4
|
||||
#define SIGNAL_UNK5 5
|
||||
#define SIGNAL_UNK6 6
|
||||
#define SIGNAL_UNK7 7
|
||||
|
||||
typedef void (*__signal_func_ptr)(int);
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ typedef struct {
|
||||
int precision;
|
||||
} print_format;
|
||||
|
||||
static const char* parse_format(const char* format_string, va_list* args, print_format* format) {
|
||||
static const char* parse_format(const char* format_string, va_list* arg, print_format* format) {
|
||||
print_format f;
|
||||
const char* s = format_string;
|
||||
int c;
|
||||
@@ -109,7 +109,7 @@ static const char* parse_format(const char* format_string, va_list* args, print_
|
||||
}
|
||||
|
||||
if (c == '*') {
|
||||
if ((f.field_width = va_arg(*args, int)) < 0) {
|
||||
if ((f.field_width = va_arg(*arg, int)) < 0) {
|
||||
f.justification_options = left_justification;
|
||||
f.field_width = -f.field_width;
|
||||
}
|
||||
@@ -132,7 +132,7 @@ static const char* parse_format(const char* format_string, va_list* args, print_
|
||||
f.precision_specified = 1;
|
||||
|
||||
if ((c = *++s) == '*') {
|
||||
if ((f.precision = va_arg(*args, int)) < 0) {
|
||||
if ((f.precision = va_arg(*arg, int)) < 0) {
|
||||
f.precision_specified = 0;
|
||||
}
|
||||
|
||||
@@ -960,7 +960,7 @@ static char* float2str(long double num, char* buff, print_format format) {
|
||||
}
|
||||
|
||||
int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProcArg,
|
||||
const char* format_str, va_list args
|
||||
const char* format_str, va_list arg
|
||||
|
||||
)
|
||||
{
|
||||
@@ -1000,27 +1000,27 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
}
|
||||
|
||||
format_ptr = curr_format;
|
||||
format_ptr = parse_format(format_ptr, (va_list*)args, &format);
|
||||
format_ptr = parse_format(format_ptr, (va_list*)arg, &format);
|
||||
|
||||
switch (format.conversion_char) {
|
||||
case 'd':
|
||||
case 'i':
|
||||
if (format.argument_options == long_argument) {
|
||||
long_num = va_arg(args, signed long);
|
||||
long_num = va_arg(arg, signed long);
|
||||
} else if (format.argument_options == long_long_argument) {
|
||||
long_long_num = va_arg(args, signed long long);
|
||||
long_long_num = va_arg(arg, signed long long);
|
||||
}
|
||||
else if (format.argument_options == intmax_argument) {
|
||||
long_long_num = va_arg(args, intmax_t);
|
||||
long_long_num = va_arg(arg, intmax_t);
|
||||
}
|
||||
else if (format.argument_options == size_t_argument) {
|
||||
long_num = va_arg(args, size_t);
|
||||
long_num = va_arg(arg, size_t);
|
||||
}
|
||||
else if (format.argument_options == ptrdiff_argument) {
|
||||
long_num = va_arg(args, ptrdiff_t);
|
||||
long_num = va_arg(arg, ptrdiff_t);
|
||||
}
|
||||
else {
|
||||
long_num = va_arg(args, int);
|
||||
long_num = va_arg(arg, int);
|
||||
}
|
||||
|
||||
if (format.argument_options == short_argument) {
|
||||
@@ -1052,21 +1052,21 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
case 'x':
|
||||
case 'X':
|
||||
if (format.argument_options == long_argument) {
|
||||
long_num = va_arg(args, unsigned long);
|
||||
long_num = va_arg(arg, unsigned long);
|
||||
} else if (format.argument_options == long_long_argument) {
|
||||
long_long_num = va_arg(args, signed long long);
|
||||
long_long_num = va_arg(arg, signed long long);
|
||||
}
|
||||
else if (format.argument_options == intmax_argument) {
|
||||
long_long_num = va_arg(args, intmax_t);
|
||||
long_long_num = va_arg(arg, intmax_t);
|
||||
}
|
||||
else if (format.argument_options == size_t_argument) {
|
||||
long_num = va_arg(args, size_t);
|
||||
long_num = va_arg(arg, size_t);
|
||||
}
|
||||
else if (format.argument_options == ptrdiff_argument) {
|
||||
long_num = va_arg(args, ptrdiff_t);
|
||||
long_num = va_arg(arg, ptrdiff_t);
|
||||
}
|
||||
else {
|
||||
long_num = va_arg(args, unsigned int);
|
||||
long_num = va_arg(arg, unsigned int);
|
||||
}
|
||||
|
||||
if (format.argument_options == short_argument) {
|
||||
@@ -1100,9 +1100,9 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
case 'g':
|
||||
case 'G':
|
||||
if (format.argument_options == long_double_argument) {
|
||||
long_double_num = va_arg(args, long double);
|
||||
long_double_num = va_arg(arg, long double);
|
||||
} else {
|
||||
long_double_num = va_arg(args, double);
|
||||
long_double_num = va_arg(arg, double);
|
||||
}
|
||||
|
||||
if (!(buff_ptr = float2str(long_double_num, buff + 512, *fmt_ptr))) {
|
||||
@@ -1115,9 +1115,9 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
case 'a':
|
||||
case 'A':
|
||||
if (format.argument_options == long_double_argument) {
|
||||
long_double_num = va_arg(args, long double);
|
||||
long_double_num = va_arg(arg, long double);
|
||||
} else {
|
||||
long_double_num = va_arg(args, double);
|
||||
long_double_num = va_arg(arg, double);
|
||||
}
|
||||
|
||||
if (!(buff_ptr = double2hex(long_double_num, buff + 512, *fmt_ptr))) {
|
||||
@@ -1129,7 +1129,7 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
|
||||
case 's':
|
||||
if (format.argument_options == wchar_argument) {
|
||||
wchar_t* wcs_ptr = va_arg(args, wchar_t*);
|
||||
wchar_t* wcs_ptr = va_arg(arg, wchar_t*);
|
||||
|
||||
if (wcs_ptr == NULL) {
|
||||
wcs_ptr = L"";
|
||||
@@ -1141,7 +1141,7 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
|
||||
buff_ptr = &buff[0];
|
||||
} else {
|
||||
buff_ptr = va_arg(args, char*);
|
||||
buff_ptr = va_arg(arg, char*);
|
||||
}
|
||||
|
||||
if (buff_ptr == NULL) {
|
||||
@@ -1167,7 +1167,7 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
break;
|
||||
|
||||
case 'n':
|
||||
buff_ptr = va_arg(args, char*);
|
||||
buff_ptr = va_arg(arg, char*);
|
||||
|
||||
switch (format.argument_options) {
|
||||
case normal_argument:
|
||||
@@ -1197,7 +1197,7 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
|
||||
case 'c':
|
||||
buff_ptr = buff;
|
||||
*buff_ptr = va_arg(args, int);
|
||||
*buff_ptr = va_arg(arg, int);
|
||||
num_chars = 1;
|
||||
break;
|
||||
|
||||
@@ -1294,7 +1294,7 @@ int printf(const char* format, ...) {
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, format);
|
||||
res = __pformatter(&__FileWrite, stdout, format, args);
|
||||
res = __pformatter(&__FileWrite, (void*)stdout, format, args);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
@@ -1308,18 +1308,18 @@ int fprintf(FILE* file, const char* format, ...) {
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, format);
|
||||
res = __pformatter(&__FileWrite, file, format, args);
|
||||
res = __pformatter(&__FileWrite, (void*)file, format, args);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
int vprintf(const char* format, va_list args) {
|
||||
int vprintf(const char* format, va_list arg) {
|
||||
int ret;
|
||||
|
||||
if (fwide(stdout, -1) >= 0) {
|
||||
return -1;
|
||||
}
|
||||
ret = __pformatter(&__FileWrite, stdout, format, args);
|
||||
ret = __pformatter(&__FileWrite, (void*)stdout, format, arg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -1345,8 +1345,8 @@ int vsnprintf(char* s, size_t n, const char* fmt, va_list args) {
|
||||
return end;
|
||||
}
|
||||
|
||||
int vsprintf(char *s, const char *format, va_list args) {
|
||||
return vsnprintf(s, 0xFFFFFFFF, format, args);
|
||||
int vsprintf(char *s, const char *format, va_list arg) {
|
||||
return vsnprintf(s, 0xFFFFFFFF, format, arg);
|
||||
}
|
||||
|
||||
int snprintf(char* s, size_t n, const char* format, ...) {
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
char* p; \
|
||||
char* q; \
|
||||
size_t n = cnt; \
|
||||
unsigned long savedWord; \
|
||||
unsigned long tmp; \
|
||||
for (p = (char*)src - 1, q = (char*)dst - 1, n++; --n;) { \
|
||||
savedWord = *++q; \
|
||||
tmp = *++q; \
|
||||
*q = *++p; \
|
||||
*p = savedWord; \
|
||||
*p = tmp; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
|
||||
@@ -257,7 +257,7 @@ static const char* parse_format(const char* format_string, scan_format* format)
|
||||
return s + 1;
|
||||
}
|
||||
|
||||
int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char* format_str, va_list args,
|
||||
int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char* format_str, va_list arg,
|
||||
int is_secure) {
|
||||
int num_chars, chars_read, items_assigned, conversions;
|
||||
int base, negative, overflow;
|
||||
@@ -319,7 +319,7 @@ int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char
|
||||
format_ptr = parse_format(format_ptr, &format);
|
||||
|
||||
if (!format.suppress_assignment && format.conversion_char != '%') {
|
||||
arg_ptr = va_arg(args, char*);
|
||||
arg_ptr = va_arg(arg, char*);
|
||||
} else {
|
||||
arg_ptr = 0;
|
||||
}
|
||||
@@ -552,7 +552,7 @@ int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char
|
||||
if (arg_ptr) {
|
||||
if (is_secure) {
|
||||
elem_valid = 1;
|
||||
elem_maxsize = va_arg(args, size_t);
|
||||
elem_maxsize = va_arg(arg, size_t);
|
||||
}
|
||||
|
||||
num_chars = 0;
|
||||
@@ -648,7 +648,7 @@ int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char
|
||||
if (arg_ptr) {
|
||||
if (is_secure) {
|
||||
elem_valid = 1;
|
||||
elem_maxsize = va_arg(args, size_t) - 1;
|
||||
elem_maxsize = va_arg(arg, size_t) - 1;
|
||||
}
|
||||
|
||||
num_chars = 0;
|
||||
@@ -797,7 +797,7 @@ int __StringRead(void* pPtr, int ch, int act) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
inline int vsscanf(const char* s, const char* format, va_list args) {
|
||||
inline int vsscanf(const char* s, const char* format, va_list arg) {
|
||||
__InStrCtrl isc;
|
||||
isc.NextChar = (char*)s;
|
||||
|
||||
@@ -806,7 +806,7 @@ inline int vsscanf(const char* s, const char* format, va_list args) {
|
||||
}
|
||||
|
||||
isc.NullCharDetected = 0;
|
||||
return __sformatter(&__StringRead, (void*)&isc, format, args, 0);
|
||||
return __sformatter(&__StringRead, (void*)&isc, format, arg, 0);
|
||||
}
|
||||
|
||||
int sscanf(const char* s, const char* pFormat, ...) {
|
||||
|
||||
@@ -7,7 +7,7 @@ __signal_func_ptr signal_funcs[8];
|
||||
int raise(int sig) {
|
||||
__signal_func_ptr signal_func;
|
||||
|
||||
if (sig < SIGNAL_ABORT || sig > SIGNAL_HANDLER_7) {
|
||||
if (sig < SIGNAL_ABORT || sig > SIGNAL_UNK7) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ typedef struct {
|
||||
|
||||
|
||||
|
||||
static const wchar_t* parse_format(const wchar_t* format_string, va_list* args, print_format* format) {
|
||||
static const wchar_t* parse_format(const wchar_t* format_string, va_list* arg, print_format* format) {
|
||||
print_format f;
|
||||
const wchar_t* s = format_string;
|
||||
wchar_t c;
|
||||
@@ -110,14 +110,14 @@ static const wchar_t* parse_format(const wchar_t* format_string, va_list* args,
|
||||
}
|
||||
|
||||
if (c == '*') {
|
||||
if ((f.field_width = va_arg(*args, int)) < 0) {
|
||||
if ((f.field_width = va_arg(*arg, int)) < 0) {
|
||||
f.justification_options = left_justification;
|
||||
f.field_width = -f.field_width;
|
||||
}
|
||||
|
||||
c = *++s;
|
||||
} else {
|
||||
while ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISDIGIT_MAP) != 0) {
|
||||
while ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x8) != 0) {
|
||||
f.field_width = f.field_width * 10 + (c - '0');
|
||||
c = *++s;
|
||||
}
|
||||
@@ -133,13 +133,13 @@ static const wchar_t* parse_format(const wchar_t* format_string, va_list* args,
|
||||
f.precision_specified = 1;
|
||||
|
||||
if ((c = *++s) == '*') {
|
||||
if ((f.precision = va_arg(*args, int)) < 0) {
|
||||
if ((f.precision = va_arg(*arg, int)) < 0) {
|
||||
f.precision_specified = 0;
|
||||
}
|
||||
|
||||
c = *++s;
|
||||
} else {
|
||||
while ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISDIGIT_MAP) != 0)
|
||||
while ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x8) != 0)
|
||||
{
|
||||
f.precision = f.precision * 10 + (c - '0');
|
||||
c = *++s;
|
||||
@@ -769,7 +769,7 @@ static wchar_t* float2str(double num, wchar_t* buff, print_format format) {
|
||||
c = format.conversion_char;
|
||||
p = buff - 5;
|
||||
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISUPPER_MAP) != 0) {
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x200) != 0) {
|
||||
wcscpy(p, L"-INF");
|
||||
} else {
|
||||
wcscpy(p, L"-inf");
|
||||
@@ -777,7 +777,7 @@ static wchar_t* float2str(double num, wchar_t* buff, print_format format) {
|
||||
} else {
|
||||
c = format.conversion_char;
|
||||
p = buff - 4;
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISUPPER_MAP) != 0) {
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x200) != 0) {
|
||||
wcscpy(p, L"INF");
|
||||
} else {
|
||||
wcscpy(p, L"inf");
|
||||
@@ -790,7 +790,7 @@ static wchar_t* float2str(double num, wchar_t* buff, print_format format) {
|
||||
if (dec.sign) {
|
||||
c = format.conversion_char;
|
||||
p = buff - 5;
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISUPPER_MAP) != 0) {
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x200) != 0) {
|
||||
wcscpy(p, L"-NAN");
|
||||
} else {
|
||||
wcscpy(p, L"-nan");
|
||||
@@ -798,7 +798,7 @@ static wchar_t* float2str(double num, wchar_t* buff, print_format format) {
|
||||
} else {
|
||||
c = format.conversion_char;
|
||||
p = buff - 4;
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISUPPER_MAP) != 0) {
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x200) != 0) {
|
||||
wcscpy(p, L"NAN");
|
||||
} else {
|
||||
wcscpy(p, L"nan");
|
||||
@@ -958,8 +958,8 @@ static wchar_t* float2str(double num, wchar_t* buff, print_format format) {
|
||||
break;
|
||||
}
|
||||
|
||||
p = buff - strlen(p2) - 1;
|
||||
mbstowcs(p, p2, strlen(p2));
|
||||
p = buff - strlen((char*)p2) - 1;
|
||||
mbstowcs(p, p2, strlen((char*)p2));
|
||||
|
||||
return p;
|
||||
}
|
||||
@@ -1290,7 +1290,7 @@ void* __wStringWrite(void* wosc, const wchar_t* buffer, size_t numchars) {
|
||||
void* res;
|
||||
__wOutStrCtrl* wOscp = (__wOutStrCtrl*)wosc;
|
||||
tobewritten = ((wOscp->CharsWritten + numchars) <= wOscp->MaxCharCount) ? numchars : wOscp->MaxCharCount - wOscp->CharsWritten;
|
||||
res = wmemcpy(wOscp->wCharStr + wOscp->CharsWritten, buffer, tobewritten);
|
||||
res = (void*)wmemcpy(wOscp->wCharStr + wOscp->CharsWritten, buffer, tobewritten);
|
||||
wOscp->CharsWritten += tobewritten;
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#include <math.h>
|
||||
|
||||
double nan(const char* tag) {}
|
||||
double nan(const char* arg) {}
|
||||
|
||||
@@ -68,10 +68,10 @@ static void __dorounddecup(decimal* d, int digits) {
|
||||
|
||||
static void __rounddec(decimal* d, int digits) {
|
||||
if (digits > 0 && digits < d->sig.length) {
|
||||
int roundDirection = __must_round(d, digits);
|
||||
int unkBool = __must_round(d, digits);
|
||||
d->sig.length = digits;
|
||||
|
||||
if (roundDirection >= 0) {
|
||||
if (unkBool >= 0) {
|
||||
__dorounddecup(d, digits);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,14 +37,14 @@ inline DSIOResult __access_file(unsigned int handle, unsigned char* buffer, int*
|
||||
}
|
||||
|
||||
DSIOResult __read_console(unsigned int handle, unsigned char* buffer, int* count, void* ref_con) {
|
||||
if (!GetUseSerialIO()) {
|
||||
if (GetUseSerialIO() == FALSE) {
|
||||
return DS_IOError;
|
||||
}
|
||||
return __read_file(DS_Stdin, buffer, count, ref_con);
|
||||
}
|
||||
|
||||
DSIOResult __TRK_write_console(unsigned int handle, unsigned char* buffer, int* count, void* ref_con) {
|
||||
if (!GetUseSerialIO()) {
|
||||
if (GetUseSerialIO() == 0) {
|
||||
return DS_IOError;
|
||||
}
|
||||
return __write_file(DS_Stdout, buffer, count, ref_con);
|
||||
|
||||
@@ -100,7 +100,7 @@ namespace nw4r {
|
||||
u8* pCachedBase; // 0x0C
|
||||
u8* pCachedStart; // 0x10
|
||||
u8* pCachedEnd; // 0x14
|
||||
u32 cacheWorkspaceOffset; // 0x18
|
||||
u32 unk_0x18; // 0x18
|
||||
};
|
||||
|
||||
class ConstructContext {
|
||||
|
||||
@@ -79,7 +79,7 @@ namespace nw4r {
|
||||
sException.frameMemory = NULL;
|
||||
sException.exceptionRenderObj = NULL;
|
||||
|
||||
OSCreateThread(&sException.thread, RunThread_, NULL, sThreadBuffer + 0x4000, 0x4000, 0, OS_THREAD_ATTR_DETACH);
|
||||
OSCreateThread(&sException.thread, RunThread_, NULL, sThreadBuffer + 0x4000, 0x4000, 0, 1);
|
||||
OSInitMessageQueue(&sException.queue, sMessageBuffer, 1);
|
||||
OSResumeThread(&sException.thread);
|
||||
|
||||
@@ -98,7 +98,7 @@ namespace nw4r {
|
||||
sException.FPCSR_COPY = context->fpscr;
|
||||
OSFillFPUContext(context);
|
||||
OSSetErrorHandler(error, NULL);
|
||||
if (error == OS_EXCEPTION_MEMORY_PROTECTION) {
|
||||
if (error == 0xf) {
|
||||
OSProtectRange(0, 0, 0, 3);
|
||||
OSProtectRange(1, 0, 0, 3);
|
||||
OSProtectRange(2, 0, 0, 3);
|
||||
@@ -111,7 +111,7 @@ namespace nw4r {
|
||||
param.dsisr = dsisr;
|
||||
param.dar = dar;
|
||||
|
||||
OSSendMessage(&sException.queue, ¶m, OS_MESSAGE_BLOCK);
|
||||
OSSendMessage(&sException.queue, ¶m, 1);
|
||||
|
||||
OSEnableScheduler();
|
||||
OSYieldThread();
|
||||
@@ -138,7 +138,7 @@ namespace nw4r {
|
||||
|
||||
u32 msr = PPCMfmsr();
|
||||
PPCMtmsr(msr & ~(MSR_FE0 | MSR_FE1));
|
||||
OSReceiveMessage(&sException.queue, &message, OS_MESSAGE_BLOCK);
|
||||
OSReceiveMessage(&sException.queue, &message, 1);
|
||||
OSDisableInterrupts();
|
||||
|
||||
VISetPreRetraceCallback(NULL);
|
||||
@@ -303,46 +303,46 @@ namespace nw4r {
|
||||
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
|
||||
u32 fpcsr = sException.FPCSR_COPY;
|
||||
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((fpcsr & FPSCR_VX) != 0) {
|
||||
if ((fpcsr & 0x20000000) != 0) {
|
||||
Exception_Printf_(" FPE: Invalid operation\n");
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXSNAN) != 0) {
|
||||
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
|
||||
Exception_Printf_(" SNaN\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXISI) != 0) {
|
||||
if ((sException.FPCSR_COPY & 0x800000) != 0) {
|
||||
Exception_Printf_(" Infinity - Infinity\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXIDI) != 0) {
|
||||
if ((sException.FPCSR_COPY & 0x400000) != 0) {
|
||||
Exception_Printf_(" Infinity / Infinity\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXZDZ) != 0) {
|
||||
if ((sException.FPCSR_COPY & 0x200000) != 0) {
|
||||
Exception_Printf_(" 0 / 0\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXIMZ) != 0) {
|
||||
if ((sException.FPCSR_COPY & 0x100000) != 0) {
|
||||
Exception_Printf_(" Infinity * 0\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXVC) != 0) {
|
||||
if ((sException.FPCSR_COPY & 0x80000) != 0) {
|
||||
Exception_Printf_(" Invalid compare\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXSOFT) != 0) {
|
||||
if ((sException.FPCSR_COPY & 0x400) != 0) {
|
||||
Exception_Printf_(" Software request\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXSQRT) != 0) {
|
||||
if ((sException.FPCSR_COPY & 0x200) != 0) {
|
||||
Exception_Printf_(" Invalid square root\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXCVI) != 0) {
|
||||
if ((sException.FPCSR_COPY & 0x100) != 0) {
|
||||
Exception_Printf_(" Invalid integer convert\n");
|
||||
}
|
||||
}
|
||||
if ((fpcsr & FPSCR_OX) != 0) {
|
||||
if ((fpcsr & 0x10000000) != 0) {
|
||||
Exception_Printf_(" FPE: Overflow\n");
|
||||
}
|
||||
if ((fpcsr & FPSCR_UX) != 0) {
|
||||
if ((fpcsr & 0x8000000) != 0) {
|
||||
Exception_Printf_(" FPE: Underflow\n");
|
||||
}
|
||||
if ((fpcsr & FPSCR_ZX) != 0) {
|
||||
if ((fpcsr & 0x4000000) != 0) {
|
||||
Exception_Printf_(" FPE: Zero division\n");
|
||||
}
|
||||
if ((fpcsr & FPSCR_XX) != 0) {
|
||||
if ((fpcsr & 0x2000000) != 0) {
|
||||
Exception_Printf_(" FPE: Inexact result\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,12 +135,12 @@ namespace nw4r {
|
||||
for (int i = 0; i < texCoordNum; i++) {
|
||||
GXSetVtxDesc(static_cast<GXAttr>(GX_VA_TEX0 + i), GX_DIRECT);
|
||||
}
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_F32, 0);
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
|
||||
if (bModulate) {
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
|
||||
}
|
||||
for (int i = 0; i < texCoordNum; i++) {
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, static_cast<GXAttr>(GX_VA_TEX0 + i), GX_TEX_ST, GX_F32, 0);
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, static_cast<GXAttr>(GX_VA_TEX0 + i), GX_CLR_RGBA, GX_F32, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -968,8 +968,8 @@ namespace nw4r {
|
||||
for (u8 id = 0; id < tevStageNum; id++) {
|
||||
GXTevStageID tevStage = static_cast<GXTevStageID>(id);
|
||||
|
||||
GXSetTevColorOp(tevStage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(tevStage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevColorOp(tevStage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(tevStage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
|
||||
GXSetTevDirect(tevStage);
|
||||
GXSetTevSwapMode(tevStage, GX_TEV_SWAP0, GX_TEV_SWAP0);
|
||||
|
||||
@@ -411,8 +411,8 @@ namespace nw4r {
|
||||
mtxPtr = mGlbMtx;
|
||||
}
|
||||
|
||||
GXLoadPosMtxImm(mtxPtr, GX_PNMTX0);
|
||||
GXSetCurrentMtx(GX_PNMTX0);
|
||||
GXLoadPosMtxImm(mtxPtr, 0);
|
||||
GXSetCurrentMtx(0);
|
||||
}
|
||||
|
||||
math::VEC2 Pane::GetVtxPos() const {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal(front, back, ::scLytFatalMsg); \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system
|
||||
if (!(x)) { \
|
||||
GXColor front = {255, 255, 255, 0}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal(front, back, ::scLytFatalMsg); \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
@@ -25,16 +25,16 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
VEC4* VEC4Transform(VEC4* pOut, const MTX44* pM, const VEC4* pV) {
|
||||
VEC4 transformed;
|
||||
transformed.x = pM->_00 * pV->x + pM->_01 * pV->y + pM->_02 * pV->z + pM->_03 * pV->w;
|
||||
transformed.y = pM->_10 * pV->x + pM->_11 * pV->y + pM->_12 * pV->z + pM->_13 * pV->w;
|
||||
transformed.z = pM->_20 * pV->x + pM->_21 * pV->y + pM->_22 * pV->z + pM->_23 * pV->w;
|
||||
transformed.w = pM->_30 * pV->x + pM->_31 * pV->y + pM->_32 * pV->z + pM->_33 * pV->w;
|
||||
VEC4 tmp;
|
||||
tmp.x = pM->_00 * pV->x + pM->_01 * pV->y + pM->_02 * pV->z + pM->_03 * pV->w;
|
||||
tmp.y = pM->_10 * pV->x + pM->_11 * pV->y + pM->_12 * pV->z + pM->_13 * pV->w;
|
||||
tmp.z = pM->_20 * pV->x + pM->_21 * pV->y + pM->_22 * pV->z + pM->_23 * pV->w;
|
||||
tmp.w = pM->_30 * pV->x + pM->_31 * pV->y + pM->_32 * pV->z + pM->_33 * pV->w;
|
||||
|
||||
pOut->x = transformed.x;
|
||||
pOut->y = transformed.y;
|
||||
pOut->z = transformed.z;
|
||||
pOut->w = transformed.w;
|
||||
pOut->x = tmp.x;
|
||||
pOut->y = tmp.y;
|
||||
pOut->z = tmp.z;
|
||||
pOut->w = tmp.w;
|
||||
return pOut;
|
||||
}
|
||||
} // namespace math
|
||||
|
||||
@@ -808,7 +808,7 @@ namespace nw4r {
|
||||
} else {
|
||||
u16 a0, b0;
|
||||
|
||||
if (mVpb[0][0]->pb.lpf.on == AX_PB_LPF_ON) {
|
||||
if (mVpb[0][0]->pb.lpf.on == TRUE) {
|
||||
AXGetLpfCoefs(freq, &a0, &b0);
|
||||
|
||||
for (int j = 0; j < mChannelCount; j++) {
|
||||
@@ -817,7 +817,7 @@ namespace nw4r {
|
||||
} else {
|
||||
AXPBLPF lpf;
|
||||
|
||||
lpf.on = AX_PB_LPF_ON;
|
||||
lpf.on = TRUE;
|
||||
lpf.yn1 = 0;
|
||||
|
||||
AXGetLpfCoefs(freq, &lpf.a0, &lpf.b0);
|
||||
|
||||
@@ -148,7 +148,7 @@ namespace nw4r {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pSub = pIndexTable->ref + (splitKey - pIndexTable->min);
|
||||
pSub = reinterpret_cast<const BankFile::DataRegion*>(pIndexTable->ref + (splitKey - pIndexTable->min));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,9 +61,9 @@ namespace nw4r {
|
||||
|
||||
if (mPlayFlag) {
|
||||
if (playFlag) {
|
||||
wencMode = WENC_FLAG_USER_INFO;
|
||||
wencMode = 1;
|
||||
} else {
|
||||
wencMode = WENC_FLAG_USER_INFO;
|
||||
wencMode = 1;
|
||||
lastFlag = true;
|
||||
}
|
||||
} else {
|
||||
@@ -71,7 +71,7 @@ namespace nw4r {
|
||||
if (mFirstEncodeFlag) {
|
||||
wencMode = 0;
|
||||
} else {
|
||||
wencMode = WENC_FLAG_USER_INFO;
|
||||
wencMode = 1;
|
||||
}
|
||||
|
||||
mFirstEncodeFlag = false;
|
||||
|
||||
@@ -58,7 +58,7 @@ namespace nw4r {
|
||||
OSMessage message;
|
||||
|
||||
while (true) {
|
||||
OSReceiveMessage(&mMsgQueue, &message, OS_MESSAGE_BLOCK);
|
||||
OSReceiveMessage(&mMsgQueue, &message, 1);
|
||||
|
||||
if (reinterpret_cast<u32>(message) == MSG_AX_CALLBACK) {
|
||||
ut::AutoMutexLock autoMutex(mMutex);
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace nw4r {
|
||||
|
||||
u8 mask = 1 << 0;
|
||||
|
||||
for (int j = 0; j < BITS_PER_BYTE; j++, mask <<= 1) {
|
||||
for (int j = 0; j < 8; j++, mask <<= 1) {
|
||||
// Block represented by this bit is in use
|
||||
if (flag & mask) {
|
||||
continue;
|
||||
|
||||
@@ -718,7 +718,7 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
void StrmPlayer::NotifyStrmHeaderAsyncEndCallback(bool result, const StrmHeader* header, void* userData) {
|
||||
StrmPlayer* player = static_cast<StrmPlayer*>(userData);
|
||||
StrmPlayer* player = reinterpret_cast<StrmPlayer*>(userData);
|
||||
if (result) {
|
||||
player->Setup(header);
|
||||
} else {
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace nw4r {
|
||||
|
||||
void* TaskThread::ThreadFunc(void* arg) {
|
||||
TaskThread* thread = static_cast<TaskThread*>(arg);
|
||||
OSInitMessageQueue(&thread->mMsgQueue, thread->mMsgBuffer, MSG_QUEUE_CAPACITY);
|
||||
OSInitMessageQueue(&thread->mMsgQueue, thread->mMsgBuffer, 8);
|
||||
|
||||
thread->ThreadProc();
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace nw4r {
|
||||
OSMessage msg;
|
||||
|
||||
while (true) {
|
||||
OSReceiveMessage(&mMsgQueue, &msg, OS_MESSAGE_BLOCK);
|
||||
OSReceiveMessage(&mMsgQueue, &msg, 1);
|
||||
|
||||
if (reinterpret_cast<u32>(msg) == MSG_EXECUTE) {
|
||||
TaskManager::GetInstance().Execute();
|
||||
|
||||
@@ -160,7 +160,7 @@ namespace nw4r {
|
||||
void WavePlayer::Pause(bool flag) {
|
||||
ut::AutoInterruptLock lock;
|
||||
|
||||
if (!mStartFlag) {
|
||||
if (mStartFlag == false) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -224,7 +224,7 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
void WavePlayer::VoiceCallbackFunc(detail::AxVoice* voice, detail::AxVoice::CallbackStatus status, void* arg) {
|
||||
WavePlayer* wavePlayer = static_cast<WavePlayer*>(arg);
|
||||
WavePlayer* wavePlayer = reinterpret_cast<WavePlayer*>(arg);
|
||||
switch (status) {
|
||||
case detail::AxVoice::CALLBACK_STATUS_FINISH_WAVE:
|
||||
case detail::AxVoice::CALLBACK_STATUS_INVALIDATE_WAVE: {
|
||||
|
||||
@@ -250,7 +250,7 @@ namespace nw4r {
|
||||
}
|
||||
if (!mPauseFlag && !mSkipFlag) {
|
||||
if (mHomeButtonMenuFlag || !AxManager::GetInstance().IsHomeButtonMenu()) {
|
||||
if (ParseNextTick(true)) {
|
||||
if (ParseNextTick(true) != 0) {
|
||||
FinishPlayer();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -632,7 +632,7 @@ namespace nw4r {
|
||||
pCachedStart = NULL;
|
||||
pCachedEnd = NULL;
|
||||
|
||||
cacheWorkspaceOffset = 0;
|
||||
unk_0x18 = 0;
|
||||
}
|
||||
|
||||
void ArchiveFontBase::CachedStreamReader::Attach(const void* data, u32 dataLen) {
|
||||
@@ -653,7 +653,7 @@ namespace nw4r {
|
||||
pCachedBase = NULL;
|
||||
pCachedStart = NULL;
|
||||
pCachedEnd = NULL;
|
||||
cacheWorkspaceOffset = 0;
|
||||
unk_0x18 = 0;
|
||||
} else {
|
||||
if (ctx->remWorkSpace() < (offset << 1)) {
|
||||
return false;
|
||||
@@ -675,7 +675,7 @@ namespace nw4r {
|
||||
pCachedBase = dst;
|
||||
pCachedStart = dst;
|
||||
pCachedEnd = dst + available;
|
||||
cacheWorkspaceOffset = offset;
|
||||
unk_0x18 = offset;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
Color CharWriter::GetTextColor() const {
|
||||
return mTextColor.start;
|
||||
return *reinterpret_cast<const Color*>(&mTextColor);
|
||||
}
|
||||
|
||||
void CharWriter::SetScale(f32 hScale, f32 vScale) {
|
||||
@@ -274,8 +274,8 @@ namespace nw4r {
|
||||
if (loadInfo != mLoadingTexture) {
|
||||
GXTexObj tobj;
|
||||
|
||||
GXInitTexObj(&tobj, glyph.pTexture, glyph.texWidth, glyph.texHeight, glyph.texFormat, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
GXInitTexObjLOD(&tobj, mFilter.atSmall, mFilter.atLarge, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
|
||||
GXInitTexObj(&tobj, glyph.pTexture, glyph.texWidth, glyph.texHeight, glyph.texFormat, GX_CLAMP, GX_CLAMP, 0);
|
||||
GXInitTexObjLOD(&tobj, mFilter.atSmall, mFilter.atLarge, 0.0f, 0.0f, 0.0f, false, false, GX_ANISO_1);
|
||||
GXLoadTexObj(&tobj, slot);
|
||||
|
||||
mLoadingTexture = loadInfo;
|
||||
@@ -333,14 +333,14 @@ namespace nw4r {
|
||||
|
||||
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C0, GX_CC_C1, GX_CC_TEXC, GX_CC_ZERO);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_A0, GX_CA_A1, GX_CA_TEXA, GX_CA_ZERO);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
|
||||
GXSetTevOrder(GX_TEVSTAGE1, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
|
||||
GXSetTevColorIn(GX_TEVSTAGE1, GX_CC_ZERO, GX_CC_CPREV, GX_CC_RASC, GX_CC_ZERO);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE1, GX_CA_ZERO, GX_CA_APREV, GX_CA_RASA, GX_CA_ZERO);
|
||||
GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
|
||||
SetupVertexFormat();
|
||||
}
|
||||
@@ -354,8 +354,8 @@ namespace nw4r {
|
||||
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
|
||||
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_RASC);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_TEXA, GX_CA_RASA, GX_CA_ZERO);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
|
||||
SetupVertexFormat();
|
||||
}
|
||||
|
||||
@@ -200,10 +200,10 @@ namespace nw4r {
|
||||
|
||||
glyph->pTexture = pSheet;
|
||||
glyph->widths = GetCharWidthsFromIndex(index);
|
||||
glyph->height = tg.cellHeight;
|
||||
glyph->height = static_cast<u8>(tg.cellHeight);
|
||||
glyph->texFormat = static_cast<GXTexFmt>(tg.sheetFormat);
|
||||
glyph->texWidth = tg.sheetWidth;
|
||||
glyph->texHeight = tg.sheetHeight;
|
||||
glyph->texWidth = static_cast<u16>(tg.sheetWidth);
|
||||
glyph->texHeight = static_cast<u16>(tg.sheetHeight);
|
||||
glyph->cellX = cellPixelX + 1;
|
||||
glyph->cellY = cellPixelY + 1;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user