Compare commits

...

156 Commits

Author SHA1 Message Date
coah
dd2993f12d Match RVL SDK FAFinfo wrapper 2026-09-23 02:26:52 +00:00
coah
4b71db7dfd Match FAInitDiskManager data (#207) 2026-09-22 21:23:18 -05:00
coah
e052c9ae0c Match RVL SDK ferror wrapper (#206) 2026-09-22 21:22:57 -05:00
coah
a843f0770f Match RVL SDK flock wrapper (#204) 2026-09-22 03:49:37 -05:00
coah
c356c90f22 Match RVL SDK ferror wrapper (#203) 2026-09-22 03:49:32 -05:00
coah
6af767089f Match RVL SDK FAFclose wrapper (#201) 2026-09-22 03:40:42 -05:00
coah
bee0a51dbf Match MSL wctype tables (#200) 2026-09-22 03:40:29 -05:00
coah
d9e7306a99 Match RVL SDK errnum wrapper (#198) 2026-09-22 03:37:57 -05:00
coah
f214b726b5 Match RVL SDK closedir wrapper (#190) 2026-09-22 03:35:37 -05:00
coah
cbe489cd37 Match AXFX HiExp reverb unit (#195) 2026-09-22 03:33:39 -05:00
coah
d78ab4cfd1 Link matching www browser unit (#193) 2026-09-22 03:32:00 -05:00
coah
311b437e5f Match RVL SDK feof wrapper (#192) 2026-09-22 03:31:56 -05:00
coah
8581b15e80 Match RVL SDK OS exception jump (#191) 2026-09-22 03:31:22 -05:00
coah
16317c11e2 Match RVLFaceLib controller data (#188) 2026-09-22 03:28:53 -05:00
coah
667b9f6fa2 Match MSL wide string helpers (#187) 2026-09-22 03:27:28 -05:00
coah
bf479c7e3f Match ChannelTitle unit (#182) 2026-09-22 03:22:51 -05:00
coah
5ce99fb34c Match RVL SDK fsync wrapper (#179) 2026-09-22 03:19:44 -05:00
coah
44a074bdce Link matching TVRC unit (#178) 2026-09-22 03:17:51 -05:00
coah
59e3ec6007 Match Kitayama normal state (#175) 2026-09-22 03:13:59 -05:00
coah
f9a70d7d43 Match RVL SDK fclose wrapper (#174) 2026-09-22 03:12:48 -05:00
coah
e5adf3de29 Link matching TMC JPEG inverse quantizer (#173) 2026-09-22 03:11:46 -05:00
coah
373ea6a875 Link matching TMC JPEG jdec_main unit (#172) 2026-09-22 03:11:09 -05:00
coah
84c3af7235 Link matching TMC Huffman decoder (#171) 2026-09-22 03:09:50 -05:00
coah
1f0ce55081 Link matching iplDate unit (#170) 2026-09-22 03:09:47 -05:00
coah
002e2e7e36 Link matching NWC24 user ID unit (#168) 2026-09-22 03:07:33 -05:00
coah
6713cca2e3 Match MSL file position helpers (#167) 2026-09-22 03:06:52 -05:00
coah
43fb4f1bb7 Match MSL extras unit (#165) 2026-09-22 03:06:49 -05:00
coah
e926be4585 Match RVLFaceLib system unit (#166) 2026-09-22 03:05:56 -05:00
coah
8d95ccd8ab Match CDB filesystem data padding (#164) 2026-09-22 03:05:14 -05:00
coah
cf3d7c4393 Link matching system menu CSPane unit (#163) 2026-09-22 03:03:43 -05:00
coah
da448d002b Link matching RevoEX SD driver unit (#162) 2026-09-22 03:02:46 -05:00
coah
d6c74589e5 Match RVL SDK fwrite wrapper (#161) 2026-09-22 03:02:43 -05:00
coah
63492be139 Link matching EGG audio manager unit (#160) 2026-09-22 03:02:39 -05:00
coah
bede348ee3 Mark TMC JPEG getcode matching (#157) 2026-09-22 02:59:55 -05:00
coah
75bdcc3e2c Match tiPredictLang rodata padding (#159) 2026-09-22 02:58:36 -05:00
coah
4872b6e925 Match RevoEX WDScan data (#158) 2026-09-22 02:57:22 -05:00
coah
7b96616b53 Link matching EGG ArcPlayer unit (#156) 2026-09-22 02:55:23 -05:00
coah
b9895bb3d6 Match MSL direct IO (#155) 2026-09-22 02:55:20 -05:00
coah
22961c86a3 Match RVL SDK fread wrapper (#154) 2026-09-22 02:54:44 -05:00
coah
e4b8d405ed Match d_vf_sys unit (#153) 2026-09-22 02:52:40 -05:00
coah
584dbb6906 Match MSL multibyte string helpers (#152) 2026-09-22 02:51:42 -05:00
coah
2f865cb308 Match CDB record key dictionary (#151) 2026-09-22 02:49:57 -05:00
coah
476e471184 fix: match CNTCACHE data (#150) 2026-09-22 02:49:53 -05:00
coah
45514dad2d Link matching EGG audio expansion unit (#149) 2026-09-22 02:46:27 -05:00
coah
9e2b86d38a Match iplwww browser window (#148) 2026-09-22 02:43:48 -05:00
coah
86ed50ab79 Match CDBConv (#147) 2026-09-22 02:35:56 -05:00
coah
4a30cfa843 Link matching eZiText zHuwd unit (#146) 2026-09-22 02:32:04 -05:00
coah
bb3365c7da Merge pull request #145 from coah80/agent/continue-0922/refill03-next9
Link matching MSL string unit
2026-09-22 02:25:29 -05:00
coah
511b8d2a57 Link matching MSL string unit 2026-09-22 07:23:26 +00:00
coah
98f0f11dc7 Merge pull request #144 from coah80/agent/refill05/next-unit6
Match RVLFaceLib random face
2026-09-22 02:22:54 -05:00
coah
e194e9ccd4 Merge pull request #143 from coah80/agent/continue-0922/refill15-pf_fatfs
Match RVL SDK FATFS wrapper
2026-09-22 02:22:51 -05:00
coah
9b89894ee2 Match RVLFaceLib random face 2026-09-22 07:21:49 +00:00
coah
71c1c07d3b Match RVL SDK FATFS wrapper 2026-09-22 07:21:27 +00:00
coah
12e0ec188d Merge pull request #142 from coah80/agent/continue-0922/32-iplPostmanManager-pr
[codex] Match CNTCACHE unit
2026-09-22 02:13:06 -05:00
coah
93b2f44cfc Match CNTCACHE unit 2026-09-22 07:12:05 +00:00
coah
9df26503a6 Merge pull request #141 from coah80/agent/refill05/next-unit5
Match RevoEX SSL API data
2026-09-22 02:09:58 -05:00
coah
836a348b64 Merge pull request #140 from coah80/agent/continue-0922/17-next
[codex] Match channel script matrix data
2026-09-22 02:09:54 -05:00
coah
8201dbba31 Merge pull request #139 from coah80/agent/continue-0922/refill21-NWC24StdAPI
Match NWC24 standard API
2026-09-22 02:09:12 -05:00
coah
1711e860c7 Match RevoEX SSL API data 2026-09-22 07:08:41 +00:00
coah
0c3af7ea2e Merge pull request #138 from coah80/agent/refill24-ncdsystem
decomp: match RevoEX ncdsystem
2026-09-22 02:08:31 -05:00
coah
fb539fe968 Merge pull request #137 from coah80/agent/continue-0922/refill03-next8
Link eZiText zaddress unit
2026-09-22 02:08:20 -05:00
coah
cd2a126243 decomp: match RevoEX ncdsystem 2026-09-22 07:07:16 +00:00
coah
620f8c8b4e Merge remote-tracking branch 'origin/main' into agent/continue-0922/refill21-NWC24StdAPI 2026-09-22 07:06:56 +00:00
coah
7bf0665f40 Link eZiText zaddress unit 2026-09-22 07:06:33 +00:00
coah
f5ccda1cb4 Merge pull request #136 from coah80/agent/continue-0922/refill15-FAFwrite
Match RVL SDK FAFwrite
2026-09-22 02:06:02 -05:00
coah
4c84325f64 Match FAFwrite wrapper 2026-09-22 07:05:33 +00:00
coah
380c8a059c Merge origin/main 2026-09-22 07:05:22 +00:00
coah
df19b05818 Match NWC24 standard API 2026-09-22 07:05:09 +00:00
coah
e27bb4c191 Merge pull request #134 from coah80/agent/continue-0922/refill15-FAFread
Match RVL SDK FAFread
2026-09-22 01:59:41 -05:00
coah
6aafa4acfe Merge pull request #135 from coah80/agent/continue-0922/refill03-next7
Link SD interface unit
2026-09-22 01:59:37 -05:00
coah
704850f5dd Link SD interface unit 2026-09-22 06:58:44 +00:00
coah
ca4acc8625 Match FAFread wrapper 2026-09-22 06:56:49 +00:00
coah
9e9c6bcd54 Match channel script matrix data 2026-09-22 06:54:58 +00:00
coah
1975cefade Merge pull request #133 from coah80/agent/refill05/next-unit4
Match get_cursor_pos
2026-09-22 01:54:20 -05:00
coah
721f9907df Merge pull request #132 from coah80/agent/continue-0922/refill03-next6
Link text input GUI manager
2026-09-22 01:52:46 -05:00
coah
21c1e8a207 Match get_cursor_pos 2026-09-22 06:52:29 +00:00
coah
34f121b783 Merge pull request #128 from coah80/agent/refill51/nwc24-userid
[codex] Match NWC24UserId
2026-09-22 01:52:22 -05:00
coah
8647740dd8 Link text input GUI manager 2026-09-22 06:51:53 +00:00
coah
84d8c7fe7a Merge pull request #131 from coah80/agent/continue-0922/17-iplNigaoe
[codex] Match keyboard GUI manager
2026-09-22 01:49:42 -05:00
coah
8923728dc4 Match keyboard GUI manager 2026-09-22 06:48:36 +00:00
coah
71b4ac3296 Merge pull request #130 from coah80/agent/continue-0922/refill15-tiInputForm
Match tiInputForm word wrapping
2026-09-22 01:48:01 -05:00
coah
21c4d9b7d9 Merge pull request #129 from coah80/agent/continue-0922/refill03-next5
Link NWC24 friend list unit
2026-09-22 01:47:14 -05:00
coah
558bb52727 Link NWC24 friend list unit 2026-09-22 06:46:34 +00:00
coah
cacffaa5ee Merge pull request #127 from coah80/agent/refill04/next-unit
Match channel edit box unit
2026-09-22 01:22:49 -05:00
coah
d4cb1ee2ee Merge pull request #126 from coah80/agent/refill61/cdbdatabase
Link matching CDBDatabase unit
2026-09-22 01:22:22 -05:00
coah
ec93b2aad3 Match NWC24 user ID validation 2026-09-22 06:21:34 +00:00
coah
f026821af2 Link matching CDBDatabase unit 2026-09-22 06:20:23 +00:00
coah
dd369fbb8c Match channel edit box unit 2026-09-22 06:17:42 +00:00
coah
47f78dcead Match tiInputForm word wrapping 2026-09-22 06:17:40 +00:00
coah
d951489ea3 Merge pull request #125 from coah80/agent/continue-0922/refill03-next4
Link board URL processor unit
2026-09-22 01:16:45 -05:00
coah
2afb673a8e Link board URL processor unit 2026-09-22 06:15:34 +00:00
coah
5b7475fe54 Merge pull request #124 from coah80/agent/refill05/next-unit3
Match iplCSMtx data
2026-09-22 01:14:20 -05:00
coah
51f1c36f3f Match iplCSMtx data 2026-09-22 06:10:52 +00:00
coah
eb2d67bfe3 Merge pull request #123 from coah80/agent/continue-0922/refill03-next3
Link NW4R ArchiveFont unit
2026-09-22 01:10:06 -05:00
coah
e167441313 Link NW4R ArchiveFont unit 2026-09-22 05:56:44 +00:00
coah
fcf28f93e2 Merge pull request #122 from coah80/agent/refill61/cardblock
Link matching CARDBlock unit
2026-09-22 00:54:23 -05:00
coah
956f076799 Merge pull request #121 from coah80/agent/continue-0922/tools-wchar
[codex] Match MSL wide stream orientation
2026-09-22 00:53:53 -05:00
coah
3283047615 Link matching CARDBlock unit 2026-09-22 05:53:13 +00:00
coah
d0f6f8a7b9 Match MSL wide stream orientation 2026-09-22 05:52:40 +00:00
coah
8bec89c069 Merge pull request #120 from coah80/agent/continue-0922/65-signal
Match MSL signal
2026-09-22 00:51:23 -05:00
coah
84ce6d4198 Match MSL signal 2026-09-22 05:47:20 +00:00
coah
fba54700b6 Merge pull request #119 from coah80/agent/refill05/next-unit2
Match UrlProcessor unit
2026-09-22 00:46:15 -05:00
coah
748265e71b Merge pull request #118 from coah80/agent/continue-0922/49-SOCommon-pr
Match RevoEX SO common
2026-09-22 00:44:09 -05:00
coah
06e8788815 Match RevoEX SO common 2026-09-22 05:42:50 +00:00
coah
44a7f17e41 Match UrlProcessor unit 2026-09-22 05:41:56 +00:00
coah
e1bd339ba5 Merge pull request #116 from coah80/agent/continue-0922/refill03-next2
Link RevoEX NWC24 CH jump unit
2026-09-22 00:40:35 -05:00
coah
0532e405d3 Merge pull request #115 from coah80/agent/continue-0922/61-cdbfilesystemutils
Link matching CDB filesystem utilities
2026-09-22 00:39:46 -05:00
coah
961a1b0431 Merge pull request #114 from coah80/agent/continue-0922/tools-misc
[codex] Match MSL misc IO hook
2026-09-22 00:38:57 -05:00
coah
e65297484f Match MSL misc IO hook 2026-09-22 05:37:53 +00:00
coah
10f3bbc57c Merge pull request #113 from coah80/agent/refill-0922/nwc24manage-pr
[codex] Link NWC24Manage
2026-09-22 00:36:05 -05:00
coah
747e87959f Link matching CDB filesystem utilities 2026-09-22 05:35:39 +00:00
coah
0f89a4218d Link RevoEX NWC24 CH jump unit 2026-09-22 05:34:33 +00:00
coah
d0127008b2 Link NWC24Manage 2026-09-22 05:33:12 +00:00
coah
8f31470be5 Merge pull request #102 from coah80/agent/continue-0922/04-iplSystem
Match iplSystem unit
2026-09-22 00:32:43 -05:00
coah
8a46eaae2d Merge pull request #112 from coah80/agent/continue-0922/tools-buffer
[codex] Link matching MSL buffer IO
2026-09-22 00:32:04 -05:00
coah
55946192bf Merge pull request #111 from coah80/agent/continue-0922/65-qsort
Match MSL qsort
2026-09-22 00:31:17 -05:00
coah
f5486c85f4 Link matching MSL buffer IO 2026-09-22 05:31:04 +00:00
coah
bcbffb2c06 Match MSL qsort 2026-09-22 05:28:43 +00:00
coah
3793ce8c4e Match iplSystem unit 2026-09-22 05:28:25 +00:00
coah
5cd7bcb31f Merge pull request #110 from coah80/agent/refill05/next-unit
Match NWC24 friend list
2026-09-22 00:27:48 -05:00
coah
c6ae812dd3 Match NWC24 friend list 2026-09-22 05:24:44 +00:00
coah
eeb6e310cf Merge pull request #109 from coah80/agent/continue-0922/refill03-next
Match RevoEX NWC24MsgObj
2026-09-22 00:24:40 -05:00
coah
2242c861de Merge pull request #108 from coah80/agent/continue-0922/tools-bsearch
[codex] Match MSL bsearch
2026-09-22 00:22:43 -05:00
coah
ded8d62531 Match MSL bsearch 2026-09-22 05:21:31 +00:00
coah
2c9e8eb028 Merge pull request #107 from coah80/agent/refill-0922/zi8ZHuwd
[codex] Match Zi8GetZHuwdPtr
2026-09-22 00:20:10 -05:00
coah
a8c6bcf550 Match Zi8GetZHuwdPtr 2026-09-22 05:19:33 +00:00
coah
aa72085db7 Match NWC24 message object 2026-09-22 05:19:14 +00:00
coah
4f747f363b Merge pull request #106 from coah80/agent/continue-0922/65-HBMBase
Match MSL math_sun
2026-09-22 00:19:12 -05:00
coah
2dce7103d1 Merge pull request #105 from coah80/agent/continue-0922/cdb-database
[codex] Match CDBDatabase
2026-09-22 00:17:34 -05:00
coah
f812a3bf87 Match MSL math_sun 2026-09-22 05:16:12 +00:00
coah
25177c690e Match CDBDatabase 2026-09-22 05:14:14 +00:00
coah
912546fd58 Merge pull request #104 from coah80/integrate/audio-wave-0922
Match and link AudioWavePlayer
2026-09-22 00:13:48 -05:00
coah
39aef1c7c0 Link matching AudioWavePlayer unit 2026-09-22 05:13:22 +00:00
coah
872f55c573 Merge pull request #103 from coah80/integrate/letterwriter-0922
Match and link iplLetterWriter
2026-09-22 00:12:44 -05:00
coah
ba46047e4d Match LetterWriter init calculation 2026-09-22 05:12:31 +00:00
coah
3e41051d36 Merge pull request #101 from coah80/agent/continue-0922/tools-arith
[codex] Match MSL arithmetic helpers
2026-09-22 00:10:58 -05:00
coah
fa2c5714ad Match MSL arithmetic helpers 2026-09-22 05:09:50 +00:00
coah
cebdd7236d Merge pull request #99 from coah80/agent/continue-0922/iplCalendar
Match iplCalendar completely
2026-09-21 23:35:17 -05:00
coah
87cf5dacc3 Merge pull request #100 from coah80/agent/continue-0922/21-iplNwc24Manager
Match iplNwc24Manager
2026-09-21 23:34:51 -05:00
coah
9424c50f7b Match Calendar data padding 2026-09-22 04:32:20 +00:00
coah
020ba288c3 Match Calendar date positioning 2026-09-22 04:32:20 +00:00
coah
1ab4726f50 Merge pull request #98 from coah80/integrate/nwc24-manager-0922
Match and link NWC24 manager
2026-09-21 23:32:04 -05:00
coah
2b016f9144 Match iplNwc24Manager 2026-09-22 04:31:50 +00:00
coah
29984adbed Merge pull request #97 from coah80/integrate/wdscan-0922
Match and link WDScan
2026-09-21 23:30:58 -05:00
coah
e2832af0d2 Match RevoEX WDScan 2026-09-22 04:30:41 +00:00
coah
df3f27980e Merge pull request #96 from coah80/integrate/sd-drv-0922
Match and link SD driver
2026-09-21 23:30:24 -05:00
coah
28a693c7ad Match RevoEX SD driver 2026-09-22 04:30:16 +00:00
coah
1d16705416 Match iplNwc24Manager 2026-09-22 04:29:48 +00:00
coah
1ccf72e0d5 Merge pull request #95 from coah80/integrate/archivefont-0922
Match and link NW4R ArchiveFont
2026-09-21 23:29:14 -05:00
coah
11b63fc609 Match NW4R ArchiveFont 2026-09-22 04:29:02 +00:00
coah
3ae7c32d1c Merge pull request #94 from coah80/integrate/iplDate-0922
Match and link iplDate
2026-09-21 23:25:56 -05:00
coah
1171037c9b Match iplDate static data 2026-09-22 04:25:34 +00:00
coah
0a6a722237 Match and link www_window (#93)
* Match BrowserWindow tile blit

* Match BrowserWindow tile row setup

* Link matching BrowserWindow unit
2026-09-21 23:23:06 -05:00
coah
18e76c8e59 Revert "Match MSL printf (#91)" (#92)
This reverts commit b9ceb6a11a.
2026-09-21 23:20:59 -05:00
coah
0391409f25 Match iplSystem init (#90) 2026-09-21 23:17:29 -05:00
coah
b9ceb6a11a Match MSL printf (#91)
* Match MSL printf

* Link MSL printf match
2026-09-21 23:17:03 -05:00
82 changed files with 8929 additions and 748 deletions

View File

@@ -623,7 +623,7 @@ config.libs = [
Object(Matching, "system/enc_dummy.c"),
Object(Matching, "system/rvl_dec.c"),
Object(Matching, "system/RIPL_BoardRecord.c"),
Object(Equivalent, "system/iplSystem.cpp"),
Object(Matching, "system/iplSystem.cpp"),
Object(NonMatching, "system/iplController.cpp"),
Object(Matching, "system/iplChannelManager.cpp"),
Object(Matching, "system/iplChannelScriptManager.cpp"),
@@ -641,7 +641,7 @@ config.libs = [
Object(Matching, "system/iplCdbManager.cpp"),
Object(Matching, "system/iplCdbWrapper.cpp"),
Object(Matching, "system/iplPlayTimeLog.cpp"),
Object(Equivalent, "system/iplNwc24Manager.cpp"),
Object(Matching, "system/iplNwc24Manager.cpp"),
Object(Matching, "system/iplPointer.cpp"),
Object(Matching, "system/iplPointerCore.cpp"),
Object(Matching, "system/iplDialogWindow.cpp"),
@@ -662,7 +662,7 @@ config.libs = [
Object(Matching, "system/iplNandWrapper.cpp"),
Object(Matching, "system/main.cpp"),
Object(Matching, "system/iplBS2Manager.cpp"),
Object(NonMatching, "system/TVRC.cpp"),
Object(Matching, "system/TVRC.cpp"),
Object(Matching, "system/iplTVRCManager.cpp"),
Object(Matching, "system/_DATA_.c"),
]
@@ -692,12 +692,12 @@ config.libs = [
]
),
IPLSection("iplwww", [
Object(Equivalent, "iplwww/www_browser.cpp"),
Object(Matching, "iplwww/www_browser.cpp"),
Object(Matching, "iplwww/www_message.cpp"),
Object(Matching, "iplwww/www_surface.cpp"),
Object(Matching, "iplwww/www_thread.cpp"),
Object(Matching, "iplwww/www_print.cpp"),
Object(Equivalent, "iplwww/www_window.cpp"),
Object(Matching, "iplwww/www_window.cpp"),
Object(Matching, "iplwww/www_trasition.cpp"),
Object(Equivalent, "iplwww/www_wiisetting.cpp"),
Object(Matching, "iplwww/www_arcreader.cpp"),
@@ -740,7 +740,7 @@ config.libs = [
Object(Equivalent, "scene/board/iplBoard.cpp"),
Object(Equivalent, "scene/board/iplBoardObject.cpp"),
Object(Matching, "scene/board/iplBoardSD.cpp"),
Object(Equivalent, "scene/board/iplUrlProcessor.cpp"),
Object(Matching, "scene/board/iplUrlProcessor.cpp"),
Object(Equivalent, "scene/board/iplFocusObject.cpp"),
]
),
@@ -751,13 +751,13 @@ config.libs = [
),
IPLSection("calendar", [
Object(Equivalent, "scene/calendar/iplCalendar.cpp"),
Object(Equivalent, "scene/calendar/iplDate.cpp"),
Object(Matching, "scene/calendar/iplDate.cpp"),
]
),
IPLSection("channelEdit", [
Object(Matching, "scene/channelEdit/iplChannelEdit.cpp"),
Object(Equivalent, "scene/channelEdit/iplChanAppBase.cpp"),
Object(Equivalent, "scene/channelEdit/iplChanAppBox.cpp"),
Object(Matching, "scene/channelEdit/iplChanAppBox.cpp"),
Object(Equivalent, "scene/channelEdit/iplChanAppEdit.cpp"),
Object(Matching, "scene/channelEdit/iplAnmController.cpp"),
Object(Matching, "scene/channelEdit/iplNandSDCardManager.cpp"),
@@ -783,7 +783,7 @@ config.libs = [
]
),
IPLSection("kitayamaTest", [
Object(Equivalent, "scene/kitayamaTest/iplKitayamaTest.cpp"),
Object(Matching, "scene/kitayamaTest/iplKitayamaTest.cpp"),
Object(Matching, "scene/kitayamaTest/nandsdworker_autotest.cpp"),
]
),
@@ -899,7 +899,7 @@ config.libs = [
]
),
IPLSection("bannerSound", [
Object(Equivalent, "bannerSound/AudioWavePlayer.cpp"),
Object(Matching, "bannerSound/AudioWavePlayer.cpp"),
Object(Equivalent, "bannerSound/AxAdpcmPlayer.cpp"),
Object(Matching, "bannerSound/BannerSoundPlayer.cpp"),
Object(Matching, "bannerSound/AudioWaveUtility.cpp"),
@@ -931,7 +931,7 @@ config.libs = [
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
Object(Equivalent, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiLayout.cpp", extra_cflags=["-O4,p"]),
@@ -944,7 +944,7 @@ config.libs = [
Object(Matching, "channelScript/systemmenu/VmSystem.c"),
Object(Matching, "channelScript/systemmenu/iplCSSystem.cpp"),
Object(Matching, "channelScript/systemmenu/iplCSLayout.cpp"),
Object(Equivalent, "channelScript/systemmenu/iplCSPane.cpp"),
Object(Matching, "channelScript/systemmenu/iplCSPane.cpp"),
Object(Matching, "channelScript/systemmenu/iplCSMaterial.cpp"),
Object(Matching, "channelScript/systemmenu/iplCSTexture.cpp"),
Object(Matching, "channelScript/systemmenu/iplCSSavedata.cpp"),
@@ -980,7 +980,7 @@ config.libs = [
]
),
ZI8Lib("zi8clib", [
Object(NonMatching, "clib/zaddress.c"),
Object(Matching, "clib/zaddress.c"),
Object(NonMatching, "clib/zconvert.c"),
Object(NonMatching, "clib/zi81key.c"),
Object(NonMatching, "clib/zi8alpha.c"),
@@ -1001,7 +1001,7 @@ config.libs = [
Object(NonMatching, "clib/zi8space.c"),
Object(NonMatching, "clib/zi8uwd.c"),
Object(Matching, "clib/zi8ver.c"),
Object(NonMatching, "clib/zi8ZHuwd.c"),
Object(Matching, "clib/zi8ZHuwd.c"),
Object(NonMatching, "clib/zidawg1.c"),
Object(NonMatching, "clib/zikorean.c"),
Object(NonMatching, "clib/ziswordw.c"),
@@ -1016,14 +1016,14 @@ config.libs = [
RevoEXLib("cdb", [
Object(Matching, "cdb/cdb.c"),
Object(Equivalent, "cdb/CDBConv.c"), # hmm
Object(NonMatching, "cdb/CDBDatabase.c"),
Object(Equivalent, "cdb/CDBFileSystemUtils.c"),
Object(Matching, "cdb/CDBDatabase.c"),
Object(Matching, "cdb/CDBFileSystemUtils.c"),
Object(Matching, "cdb/CDBFileSystem.c"),
Object(Matching, "cdb/CDBFileSystemVF.c"),
Object(Matching, "cdb/CDBFileSystemSD.c"),
Object(NonMatching, "cdb/CDBRecord.c"),
Object(Matching, "cdb/CDBRecordFile.c"),
Object(NonMatching, "cdb/CDBRecordKey.c"),
Object(Matching, "cdb/CDBRecordKey.c"),
Object(NonMatching, "cdb/CDBIntArray.c"),
Object(NonMatching, "cdb/CDBSystem.c"),
Object(Equivalent, "cdb/CDBAttr.c"),
@@ -1068,12 +1068,12 @@ config.libs = [
]
),
RevoEXLib("nwc24", [
Object(NonMatching, "nwc24/NWC24StdAPI.c"),
Object(Matching, "nwc24/NWC24StdAPI.c"),
Object(Matching, "nwc24/NWC24FileAPI.c"),
Object(Matching, "nwc24/NWC24Config.c"),
Object(Matching, "nwc24/NWC24Utils.c"),
Object(NonMatching, "nwc24/NWC24Manage.c"),
Object(NonMatching, "nwc24/NWC24MsgObj.c"),
Object(Matching, "nwc24/NWC24Manage.c"),
Object(Matching, "nwc24/NWC24MsgObj.c"),
Object(NonMatching, "nwc24/NWC24MBoxCtrl.c"),
Object(NonMatching, "nwc24/NWC24Mime.c"),
Object(Matching, "nwc24/NWC24Stream.c"),
@@ -1083,18 +1083,18 @@ config.libs = [
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
Object(Matching, "nwc24/NWC24Schedule.c"),
Object(NonMatching, "nwc24/NWC24DateParser.c"),
Object(Equivalent, "nwc24/NWC24FriendList.c"),
Object(Matching, "nwc24/NWC24FriendList.c"),
Object(Matching, "nwc24/NWC24SecretFList.c"),
Object(NonMatching, "nwc24/NWC24UserId.c"),
Object(Matching, "nwc24/NWC24UserId.c"),
Object(Matching, "nwc24/NWC24Time.c"),
Object(Matching, "nwc24/NWC24Ipc.c"),
Object(NonMatching, "nwc24/NWC24Download.c"),
Object(Equivalent, "nwc24/NWC24CHJump.c"),
Object(Matching, "nwc24/NWC24CHJump.c"),
Object(NonMatching, "nwc24/NWC24System.c"),
]
),
RevoEXLib("so", [
Object(NonMatching, "so/SOCommon.c"),
Object(Matching, "so/SOCommon.c"),
Object(NonMatching, "so/SOBasic.c"),
Object(NonMatching, "so/SOInformation.c"),
Object(NonMatching, "so/SOOption.c"),
@@ -1159,19 +1159,19 @@ config.libs = [
Object(Matching, "vf/system/pf_system.c"),
Object(Matching, "vf/develop/d_vf.c"),
Object(NonMatching, "vf/develop/d_vf_sys.c"),
Object(Matching, "vf/develop/d_vf_sys.c"),
Object(Matching, "vf/develop/d_hash.c"),
Object(Matching, "vf/develop/d_time.c"),
Object(Matching, "vf/develop/d_common.c"),
Object(NonMatching, "vf/develop/nand_drv.c"),
Object(NonMatching, "vf/develop/sd_drv.c"),
Object(Matching, "vf/develop/sd_drv.c"),
]
),
RevoEXLib("wd", [
Object(Matching, "wd/wd_misc.c"),
Object(Matching, "wd/wd_request.c"),
Object(Matching, "wd/wd_init.c"),
Object(NonMatching, "wd/WDScan.c"),
Object(Matching, "wd/WDScan.c"),
]
),
# RVLFaceLib
@@ -1197,20 +1197,20 @@ config.libs = [
# TMC JPEG
TMCJpegLib(
[
Object(NonMatching, "buffer/mkhdec3.c"),
Object(Matching, "buffer/mkhdec3.c"),
Object(Matching, "buffer/buffer_system.c"),
Object(Equivalent, "buffer/getcode.c"),
Object(Matching, "buffer/getcode.c"),
Object(NonMatching, "buffer/idct_block_var.c"),
Object(Matching, "api/decapi.c"),
Object(Matching, "jpegdec/jdec.c"),
Object(NonMatching, "jpegdec/jdec_main.c"),
Object(Matching, "jpegdec/jdec_main.c"),
Object(Matching, "jpegdec/jpformat.c"),
Object(NonMatching, "exif/exif_parse.c"),
Object(Equivalent, "reschange/iqdec_resolution_change_a3.c"),
Object(Matching, "reschange/iqdec_resolution_change_a3.c"),
Object(NonMatching, "reschange/idct_resolution_change_var.c"),
Object(NonMatching, "texturecvtr/Texture_MCUtoY8U8V8.c"),
@@ -1299,7 +1299,7 @@ config.libs = [
Object(Matching, "ut/ut_ResFontBase.cpp"),
Object(Matching, "ut/ut_ResFont.cpp"),
Object(NonMatching, "ut/ut_ArchiveFontBase.cpp"),
Object(NonMatching, "ut/ut_ArchiveFont.cpp"),
Object(Matching, "ut/ut_ArchiveFont.cpp"),
Object(Matching, "ut/ut_CharWriter.cpp"),
Object(Matching, "ut/ut_TextWriterBase.cpp"),
]
@@ -1446,7 +1446,7 @@ config.libs = [
RVLSDKLib("axfx", [
Object(Matching, "axfx/AXFXReverbHi.c"),
Object(Matching, "axfx/AXFXReverbHiDpl2.c"),
Object(NonMatching, "axfx/AXFXReverbHiExp.c"),
Object(Matching, "axfx/AXFXReverbHiExp.c"),
Object(NonMatching, "axfx/AXFXReverbHiExpDpl2.c"),
Object(Matching, "axfx/AXFXDelay.c"),
Object(Matching, "axfx/AXFXReverbStd.c"),
@@ -1483,7 +1483,7 @@ config.libs = [
Object(Matching, "card/CARDBios.c"),
Object(Matching, "card/CARDUnlock.c"),
Object(Matching, "card/CARDRdwr.c"),
Object(Equivalent, "card/CARDBlock.c"),
Object(Matching, "card/CARDBlock.c"),
Object(Matching, "card/CARDDir.c"),
Object(Matching, "card/CARDCheck.c"),
Object(Matching, "card/CARDMount.c"),
@@ -1699,7 +1699,7 @@ config.libs = [
Object(NonMatching, "fa/pf_fat12.c"),
Object(NonMatching, "fa/pf_fat16.c"),
Object(NonMatching, "fa/pf_fat32.c"),
Object(NonMatching, "fa/pf_fatfs.c"),
Object(Matching, "fa/pf_fatfs.c"),
Object(NonMatching, "fa/pf_file.c"),
Object(NonMatching, "fa/pf_path.c"),
Object(NonMatching, "fa/pf_sector.c"),
@@ -1714,7 +1714,7 @@ config.libs = [
Object(NonMatching, "fa/pf_chdmod.c"),
Object(NonMatching, "fa/pf_chmod.c"),
Object(NonMatching, "fa/pf_cinsert.c"),
Object(NonMatching, "fa/pf_closedir.c"),
Object(Matching, "fa/pf_closedir.c"),
Object(NonMatching, "fa/pf_combine.c"),
Object(NonMatching, "fa/pf_create.c"),
Object(NonMatching, "fa/pf_createdir.c"),
@@ -1722,27 +1722,27 @@ config.libs = [
Object(NonMatching, "fa/pf_derrnum.c"),
Object(NonMatching, "fa/pf_detach.c"),
Object(NonMatching, "fa/pf_divide.c"),
Object(NonMatching, "fa/pf_errnum.c"),
Object(Matching, "fa/pf_errnum.c"),
Object(NonMatching, "fa/pf_fadjust.c"),
Object(NonMatching, "fa/pf_fappend.c"),
Object(NonMatching, "fa/pf_fchdir.c"),
Object(NonMatching, "fa/pf_fclose.c"),
Object(Matching, "fa/pf_fclose.c"),
Object(NonMatching, "fa/pf_fconcat.c"),
Object(NonMatching, "fa/pf_feof.c"),
Object(NonMatching, "fa/pf_ferror.c"),
Object(Matching, "fa/pf_feof.c"),
Object(Matching, "fa/pf_ferror.c"),
Object(NonMatching, "fa/pf_finfo.c"),
Object(NonMatching, "fa/pf_flock.c"),
Object(Matching, "fa/pf_flock.c"),
Object(NonMatching, "fa/pf_fopen.c"),
Object(NonMatching, "fa/pf_format.c"),
Object(NonMatching, "fa/pf_fread.c"),
Object(Matching, "fa/pf_fread.c"),
Object(NonMatching, "fa/pf_fseek.c"),
Object(NonMatching, "fa/pf_fsetclstlink.c"),
Object(NonMatching, "fa/pf_fsexec.c"),
Object(NonMatching, "fa/pf_fsfirst.c"),
Object(NonMatching, "fa/pf_fsnext.c"),
Object(NonMatching, "fa/pf_fstat.c"),
Object(NonMatching, "fa/pf_fsync.c"),
Object(NonMatching, "fa/pf_fwrite.c"),
Object(Matching, "fa/pf_fsync.c"),
Object(Matching, "fa/pf_fwrite.c"),
Object(NonMatching, "fa/pf_getdev.c"),
Object(NonMatching, "fa/pf_getvol.c"),
Object(NonMatching, "fa/pf_getvolcfg.c"),
@@ -1831,19 +1831,19 @@ config.libs = [
Object(NonMatching, "fa/api/FACreatedir.c"),
Object(NonMatching, "fa/api/FADetach.c"),
Object(NonMatching, "fa/api/FAErrnum.c"),
Object(NonMatching, "fa/api/FAFclose.c"),
Object(NonMatching, "fa/api/FAFinfo.c"),
Object(Matching, "fa/api/FAFclose.c"),
Object(Matching, "fa/api/FAFinfo.c"),
Object(NonMatching, "fa/api/FAFopen.c"),
Object(NonMatching, "fa/api/FAFormat.c"),
Object(NonMatching, "fa/api/FAFread.c"),
Object(Matching, "fa/api/FAFread.c"),
Object(NonMatching, "fa/api/FAFseek.c"),
Object(NonMatching, "fa/api/FAFsfirst.c"),
Object(NonMatching, "fa/api/FAFsnext.c"),
Object(NonMatching, "fa/api/FAFstat.c"),
Object(NonMatching, "fa/api/FAFwrite.c"),
Object(Matching, "fa/api/FAFwrite.c"),
Object(NonMatching, "fa/api/FAGetdev.c"),
Object(NonMatching, "fa/api/FAInit.c"),
Object(NonMatching, "fa/api/FAInitDiskManager.c"),
Object(Matching, "fa/api/FAInitDiskManager.c"),
Object(NonMatching, "fa/api/FAMount.c"),
Object(NonMatching, "fa/api/FARegistCB.c"),
Object(NonMatching, "fa/api/FARemove.c"),
@@ -1863,7 +1863,7 @@ config.libs = [
]
),
RVLSDKLib("sdi", [
Object(NonMatching, "sdi/sdi_api.c"),
Object(Matching, "sdi/sdi_api.c"),
]
),
RVLSDKLib("nup", [
@@ -1906,10 +1906,10 @@ config.libs = [
EGGLib(
[
Object(Matching, "core/eggAllocator.cpp"),
Object(Equivalent, "core/eggAudioArcPlayerMgr.cpp"),
Object(Equivalent, "core/eggAudioExpMgr.cpp"),
Object(Matching, "core/eggAudioArcPlayerMgr.cpp"),
Object(Matching, "core/eggAudioExpMgr.cpp"),
Object(Matching, "core/eggAudioFxMgr.cpp"),
Object(Equivalent, "core/eggAudioMgr.cpp"),
Object(Matching, "core/eggAudioMgr.cpp"),
Object(Matching, "core/eggAudioHeapMgr.cpp"),
Object(Matching, "core/eggColorFader.cpp"),
Object(Matching, "core/eggDisposer.cpp"),
@@ -1946,38 +1946,38 @@ config.libs = [
Object(NonMatching, "MSL_Common_Embedded/ansi_fp.c"),
Object(Matching, "MSL_Common/ctype.c"),
Object(NonMatching, "MSL_Common/locale.c"),
Object(NonMatching, "MSL_Common/arith.c"),
Object(NonMatching, "MSL_Common/bsearch.c"),
Object(NonMatching, "MSL_Common/buffer_io.c"),
Object(NonMatching, "MSL_Common/direct_io.c"),
Object(Matching, "MSL_Common/arith.c"),
Object(Matching, "MSL_Common/bsearch.c"),
Object(Matching, "MSL_Common/buffer_io.c"),
Object(Matching, "MSL_Common/direct_io.c", extra_cflags=["-Cpp_exceptions on"]),
Object(NonMatching, "MSL_Common/file_io.c"),
Object(NonMatching, "MSL_Common/FILE_POS.c"),
Object(NonMatching, "MSL_Common/mbstring.c"),
Object(Matching, "MSL_Common/FILE_POS.c"),
Object(Matching, "MSL_Common/mbstring.c"),
Object(Matching, "MSL_Common/mem.c"),
Object(Matching, "MSL_Common/mem_funcs.c"),
Object(Matching, "MSL_Common/math_api.c"),
Object(NonMatching, "MSL_Common/misc_io.c"),
Object(Matching, "MSL_Common/misc_io.c"),
Object(NonMatching, "MSL_Common/printf.c"),
Object(NonMatching, "MSL_Common/qsort.c"),
Object(Matching, "MSL_Common/qsort.c", extra_cflags=["-Cpp_exceptions on"]),
Object(Matching, "MSL_Common/rand.c"),
Object(NonMatching, "MSL_Common/scanf.c"),
Object(NonMatching, "MSL_Common/signal.c"),
Object(NonMatching, "MSL_Common/string.c"),
Object(Matching, "MSL_Common/signal.c", extra_cflags=["-Cpp_exceptions on"]),
Object(Matching, "MSL_Common/string.c"),
Object(Matching, "MSL_Common/float.c"),
Object(NonMatching, "MSL_Common/strtold.c"),
Object(NonMatching, "MSL_Common/strtoul.c"),
Object(NonMatching, "MSL_Common/time.c"),
Object(NonMatching, "MSL_Common/wctype.c"),
Object(Matching, "MSL_Common/wctype.c"),
Object(Matching, "MSL_Common/wmem.c"),
Object(NonMatching, "MSL_Common/wprintf.c"),
Object(NonMatching, "MSL_Common/wstring.c"),
Object(NonMatching, "MSL_Common/wchar_io.c"),
Object(Matching, "MSL_Common/wstring.c"),
Object(Matching, "MSL_Common/wchar_io.c"),
Object(Matching, "PPC_EABI/time.dolphin.c"),
Object(Matching, "PPC_EABI/sysenv.GCN.c"),
Object(Matching, "PPC_EABI/uart_console_io_gcn.c"),
Object(Matching, "PPC_EABI/abort_exit_ppc_eabi.c"),
Object(NonMatching, "MSL_Common/math_sun.c"),
Object(NonMatching, "MSL_Common/extras.c"),
Object(Matching, "MSL_Common/math_sun.c", extra_cflags=["-Cpp_exceptions on"]),
Object(Matching, "MSL_Common/extras.c"),
Object(Matching, "MSL_Common_Embedded/Math/e_acos.c"),
Object(Matching, "MSL_Common_Embedded/Math/e_asin.c"),

View File

@@ -290,7 +290,7 @@ namespace textinput {
public:
PaneComponent(u32 id) : GUIComponent(id) { mpPane = NULL; }
virtual ~PaneComponent() {} // 0x08
virtual ~PaneComponent(); // 0x08
virtual void draw(); // 0x1C

View File

@@ -162,6 +162,7 @@ namespace textinput {
virtual void autoScroll();
virtual bool doWordWrap(const wchar_t* string, u32, f32);
f32 getWordWrapRectWidth() const { return mRect.right - mRect.left; }
virtual void drawFixString(u32);
virtual void onSE(sound::SE seId);

View File

@@ -79,7 +79,7 @@ namespace textinput {
virtual void isEnableCursorCache();
virtual void getDrawModifyStartLine();
virtual void getDrawModifyEndLine();
virtual void getDrawCacheStartPos();
virtual u32 getDrawCacheStartPos() const;
virtual void dirtyDrawCache();
virtual void dirtyCursorCache();

View File

@@ -30,10 +30,14 @@ namespace gui {
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
virtual void draw() {} // 0x18 (0x06)
virtual ~Interface() {} // 0x1C (0x07)
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~Interface(); // 0x1C (0x07)
#else
virtual ~Interface() {} // 0x1C (0x07)
#endif
};
class EventHandler {
class __declspec(novtable) EventHandler {
public:
enum {
ON_TRIG = 0,

View File

@@ -11,14 +11,18 @@
namespace ipl {
namespace gui {
class PaneComponent : public ::gui::PaneComponent {};
class PaneManager : public ::gui::PaneManager {
class PaneManager : public ::gui::PaneManager {
public:
PaneManager(::gui::EventHandler* event, const nw4r::lyt::DrawInfo* drawInfo, EGG::Heap* heap, EGG::Allocator* allocator, bool bDisableCon = false) :
::gui::PaneManager(event, allocator, drawInfo),
mpHeap(heap),
mbDisableCon(bDisableCon) {}
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~PaneManager();
#else
virtual ~PaneManager() {}
#endif
void update();
void update(int chan);

View File

@@ -45,32 +45,29 @@ namespace ipl {
};
template <typename T>
class HermiteIntp : public Interporation<T> {
class __declspec(novtable) HermiteIntp : public utility::FrameController {
public:
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
mStart = start;
mEnd = end;
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
unkVal0 = param_5;
unkVal1 = param_6;
}
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
T get() const {
f32 var_f27 = mFrame;
f32 var_f28 = 1.0f / mMaxFrame;
f32 t1t2 =
(var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) - (var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)));
T r = (mStart * (1.0f + t1t2)) - (mEnd * t1t2);
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
T r =
(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)))))) -
(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 +=
(unkVal0 *
(var_f27 +
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
@@ -91,9 +88,49 @@ namespace ipl {
}
protected:
T mStart;
T mEnd;
f32 unkVal0;
f32 unkVal1;
};
template <>
class HermiteIntp<f32> : public utility::FrameController {
public:
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
f32 speed = 1.0f);
f32 get() const {
f32 var_f27 = mFrame;
f32 var_f28 = 1.0f / mMaxFrame;
f32 r =
(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)))))) -
(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 +=
(unkVal0 *
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
}
protected:
f32 mStart;
f32 mEnd;
f32 unkVal0;
f32 unkVal1;
};
#pragma dont_instantiate HermiteIntp<float>
} // namespace math
} // namespace ipl

View File

@@ -7,6 +7,12 @@
namespace ipl {
namespace scene {
class MaxDate : public utility::Date {
public:
u8 padding[0x10];
MaxDate(int year, int month, int day) : utility::Date(year, month, day) {}
};
class Date : ::gui::EventHandler {
public:
typedef struct AnmFrame {
@@ -82,7 +88,7 @@ namespace ipl {
static const char* mscAnimPanes[ANIM_PANE_MAX];
static utility::Date mscMinDate;
static utility::Date mscMaxDate;
static MaxDate mscMaxDate;
nw4r::ut::Link mNode1; // 0x40
nw4r::ut::Link mNode2; // 0x48

View File

@@ -404,7 +404,12 @@ namespace ipl {
int mModuleIndex; // 0x400
EGG::ExpHeap* mpCSHeap; // 0x404
static ESTicketView msTicketView;
struct TicketViewStorage {
ESTicketView view;
u8 pad[8];
};
static TicketViewStorage msTicketView;
static ESTicketView msUnlockTicket;
static const char* mscBtnNames[BTN_MAX];

View File

@@ -25,7 +25,7 @@ namespace ipl {
void closeDatabase();
BOOL createNewRecord(const char* recordName, const char* recordFileType, const OSCalendarTime* dateTime, u32* gameCode, u16* makerCode,
const math::VEC2& recordPos, u32 recordFlags, const NWC24FriendAddr& addr, u16 addrType, u16 noReplyFlag,
const math::VEC2& recordPos, u32 recordFlags, const NWC24FriendAddr& addr, NWC24FriendType addrType, u16 noReplyFlag,
const wchar_t* titleText, const wchar_t* bodyText, const void* faceData, const void** attachData, u32* attachSize,
RBRAttachmentType* attachType);

View File

@@ -5,6 +5,19 @@
extern "C" {
#endif
#define SIGNAL_ACTION_DEFAULT ((__signal_func_ptr)0)
#define SIGNAL_ACTION_IGNORE ((__signal_func_ptr)1)
#define SIGNAL_ABORT 1
#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);
int raise(int signal);
#ifdef __cplusplus

View File

@@ -0,0 +1,112 @@
#include <errno.h>
#include <internal/file_struct.h>
#include <stdio.h>
enum file_kinds {
file_closed,
file_disk,
file_console,
file_unavailable
};
enum io_states {
neutral,
writing,
reading,
rereading
};
enum io_modes {
io_read = 1,
io_write = 2,
io_append = 4
};
int __flush_buffer(FILE* file, size_t* pos);
long _ftell(FILE* file) {
int buf = 0;
int pos;
unsigned char file_kind = file->mode.file_kind;
if (!(file_kind == file_disk || file_kind == file_console) || file->state.error) {
errno = EFPOS;
return -1;
}
if (file->state.io_state == neutral) {
return file->pos;
}
pos = file->buffer_pos + (file->buffer_ptr - file->buffer);
if (file->state.io_state >= rereading) {
buf = file->state.io_state - reading;
pos -= buf;
}
if (!file->mode.binary_io) {
int n = file->buffer_ptr - file->buffer - buf;
unsigned char* p = file->buffer;
while (n-- != 0) {
if (*p++ == '\n') {
pos++;
}
}
}
return pos;
}
long ftell(FILE* stream) {
return _ftell(stream);
}
int _fseek(FILE* file, long offset, int whence) {
if (file->mode.file_kind != file_disk || file->state.error != 0) {
errno = EFPOS;
return -1;
}
if (file->state.io_state == writing) {
if (__flush_buffer(file, 0) != 0) {
file->state.error = 1;
file->buffer_len = 0;
errno = EFPOS;
return -1;
}
}
if (whence == 1) {
whence = 0;
offset += _ftell(file);
}
if ((whence != 2) && file->mode.io_mode != (io_read | io_write) && (file->state.io_state == reading || file->state.io_state == rereading)) {
if ((offset >= file->pos) || offset < file->buffer_pos) {
file->state.io_state = neutral;
} else {
file->buffer_ptr = file->buffer + (offset - file->buffer_pos);
file->buffer_len = file->pos - offset;
file->state.io_state = reading;
}
} else {
file->state.io_state = neutral;
}
if (file->state.io_state == neutral) {
if (file->pos_proc != 0 && (*file->pos_proc)(file->handle, &offset, whence, file->ref)) {
file->state.error = 1;
file->buffer_len = 0;
errno = EFPOS;
return -1;
}
file->state.eof = 0;
file->pos = offset;
file->buffer_len = 0;
}
return 0;
}

View File

@@ -0,0 +1,142 @@
#include <limits.h>
#include <math.h>
typedef struct ldiv_t {
long quot;
long rem;
} ldiv_t;
#undef abs
int abs(int n) {
int mask = n >> 31;
return (mask ^ n) - mask;
}
long labs(long n) {
long mask = n >> 31;
return (mask ^ n) - mask;
}
div_t div(int numerator, int denominator) {
int n_sign, d_sign;
div_t value;
n_sign = 1;
d_sign = 1;
if (numerator < 0) {
numerator = -numerator;
n_sign = -1;
}
if (denominator < 0) {
denominator = -denominator;
d_sign = -1;
}
value.quot = (numerator / denominator) * (n_sign * d_sign);
value.rem = (numerator * n_sign) - (value.quot * denominator * d_sign);
return value;
}
int __msl_add(int* a, int b) {
int val = *a;
if (b < 0) {
if (val < 0 && b < (-LONG_MAX - 1) - val) {
return 0;
}
} else if (val > 0 && b > LONG_MAX - val) {
return 0;
}
*a = val + b;
return 1;
}
int __msl_ladd(long* a, long b) {
long val = *a;
if (b < 0) {
if (val < 0 && b < (-LONG_MAX - 1L) - val) {
return 0;
}
} else if (val > 0 && b > LONG_MAX - val) {
return 0;
}
*a = val + b;
return 1;
}
int __msl_lmul(long* a, long b) {
long val = *a;
int sign = (val < 0) ^ (b < 0) ? -1 : 1;
if (val < 0) {
val = -val;
}
if (b < 0) {
b = -b;
}
if (val > LONG_MAX / b) {
return 0;
}
*a = val * b * sign;
return 1;
}
ldiv_t __msl_div(long a, long b) {
ldiv_t ret;
long quotient, a_sign, b_sign, sign, remainder;
a_sign = 1;
b_sign = 1;
if (a < 0) {
a = -a;
a_sign = -1;
}
if (b < 0) {
b = -b;
b_sign = -1;
}
sign = a_sign * b_sign;
quotient = (a / b) * sign;
remainder = a * a_sign - b_sign * (quotient * b);
if (remainder != 0 && sign < 0) {
quotient--;
remainder += b * b_sign;
}
ret.quot = quotient;
ret.rem = remainder;
return ret;
}
int __msl_mod(int a, int b) {
int quotient, remainder, a_sign, b_sign, sign;
a_sign = 1;
b_sign = 1;
if (a < 0) {
a = -a;
a_sign = -1;
}
if (b < 0) {
b = -b;
b_sign = -1;
}
sign = a_sign * b_sign;
quotient = (a / b) * sign;
remainder = (a * a_sign) - (quotient * b * b_sign);
if (remainder && sign < 0) {
quotient -= 1;
remainder += b * b_sign;
}
return remainder;
}

View File

@@ -0,0 +1,43 @@
#include <search.h>
void* bsearch(const void* key, const void* ptr, size_t count, size_t size, COMPARE_FUNC comp) {
const char* p;
int cmp;
size_t low, high, mid;
if (key == NULL || ptr == NULL || count == 0 || size == 0 || comp == NULL) {
return NULL;
}
p = (const char*)ptr;
cmp = comp(key, p);
if (cmp == 0) {
return (void*)p;
}
if (cmp < 0) {
return NULL;
}
low = 1;
high = count - 1;
while (low <= high) {
mid = (low + high) >> 1;
p = (const char*)ptr + size * mid;
cmp = comp(key, p);
if (cmp == 0) {
return (void*)p;
}
if (cmp < 0) {
high = mid - 1;
} else {
low = mid + 1;
}
}
return NULL;
}

View File

@@ -0,0 +1,146 @@
#include <internal/file_struct.h>
#include <stddef.h>
#include <string.h>
#include <wchar.h>
enum file_kinds {
file_closed,
file_disk,
file_console,
file_unavailable
};
enum io_states {
neutral,
writing,
reading,
rereading
};
enum io_modes {
io_read = 1,
io_write = 2,
io_append = 4
};
enum buffer_modes {
buffer_none,
buffer_full,
buffer_line
};
void __prep_buffer(FILE* file);
int __flush_buffer(FILE* file, size_t* pos);
void __stdio_atexit(void);
int _fseek(FILE* file, long offset, int whence);
void* __memrchr(const void* ptr, int ch, size_t count);
size_t __fwrite(const void* ptr, size_t memb_size, size_t num_memb, FILE* file) {
unsigned char* cur_ptr;
size_t num_bytes, rem_bytes, bytes_written;
int res, buff;
if (fwide(file, 0) == 0) {
fwide(file, -1);
}
rem_bytes = memb_size * num_memb;
if (rem_bytes == 0 || file->state.error || file->mode.file_kind == file_closed) {
return 0;
}
if (file->mode.file_kind == file_console) {
__stdio_atexit();
}
buff = !file->mode.binary_io || file->mode.buffer_mode == buffer_line || file->mode.buffer_mode == buffer_full;
if (file->state.io_state == neutral && file->mode.io_mode & io_write) {
if (file->mode.io_mode & io_append) {
if (_fseek(file, 0, 2)) {
return 0;
}
}
file->state.io_state = writing;
__prep_buffer(file);
}
if (file->state.io_state != writing) {
file->state.error = 1;
file->buffer_len = 0;
return 0;
}
cur_ptr = (unsigned char*)ptr;
bytes_written = 0;
if (rem_bytes && (file->buffer_ptr != file->buffer || buff)) {
file->buffer_len = file->buffer_size - (file->buffer_ptr - file->buffer);
do {
unsigned char* nw = NULL;
num_bytes = file->buffer_len;
if (num_bytes > rem_bytes) {
num_bytes = rem_bytes;
}
if (file->mode.buffer_mode == buffer_full && num_bytes) {
if ((nw = (unsigned char*)__memrchr(cur_ptr, '\n', num_bytes)) != NULL) {
num_bytes = nw + 1 - cur_ptr;
}
}
if (num_bytes != 0) {
memcpy(file->buffer_ptr, cur_ptr, num_bytes);
cur_ptr += num_bytes;
rem_bytes -= num_bytes;
file->buffer_ptr += num_bytes;
file->buffer_len -= num_bytes;
}
if (file->buffer_len == 0 || nw != 0 || file->mode.buffer_mode == buffer_none) {
res = __flush_buffer(file, 0);
if (res != 0) {
file->state.error = 1;
file->buffer_len = 0;
rem_bytes = 0;
break;
}
}
bytes_written += num_bytes;
} while (rem_bytes && buff);
}
if (rem_bytes && buff == 0) {
unsigned char* save_buf = file->buffer;
size_t save_size = file->buffer_size;
file->buffer = cur_ptr;
file->buffer_size = rem_bytes;
file->buffer_ptr = cur_ptr + rem_bytes;
if (__flush_buffer(file, &num_bytes) != 0) {
file->state.error = 1;
file->buffer_len = 0;
} else {
bytes_written += num_bytes;
}
file->buffer = save_buf;
file->buffer_size = save_size;
__prep_buffer(file);
file->buffer_len = 0;
}
if (file->mode.buffer_mode != buffer_line) {
file->buffer_len = 0;
}
return bytes_written / memb_size;
}

View File

@@ -0,0 +1,73 @@
#include <ctype.h>
#include <internal/locale.h>
#include <stdbool.h>
#include <string.h>
extern int __msl_strnicmp(const char*, const char*, int);
extern char* __msl_itoa(int, char*, int);
int stricmp(const char* s1, const char* s2) {
char c1, c2;
while (true) {
c1 = tolower(*s1++);
c2 = tolower(*s2++);
if (c1 < c2) {
return -1;
}
if (c1 > c2) {
return 1;
}
if (c1 == 0) {
return 0;
}
}
}
int strnicmp(const char* s1, const char* s2, size_t n) {
return __msl_strnicmp(s1, s2, n);
}
int strcmpi(const char* s1, const char* s2) {
return stricmp(s1, s2);
}
char* itoa(int value, char* buffer, int radix) {
return __msl_itoa(value, buffer, radix);
}
int wcsnicmp(const char* s1, const char* s2, size_t n) {
const wchar_t* p1 = (const wchar_t*)s1;
const wchar_t* p2 = (const wchar_t*)s2;
unsigned int c1;
unsigned int c2;
struct _loc_ctype_cmpt* ctype_cmpt = _current_locale.ctype_cmpt_ptr;
size_t i;
for (i = 0; i < n; i++) {
c1 = *p1++;
c1 = (c1 >= 256) ? c1 : ctype_cmpt->wlower_map_ptr[(unsigned short)c1];
c1 &= 0xFFFF;
c2 = *p2++;
c2 = (c2 >= 256) ? c2 : ctype_cmpt->wlower_map_ptr[(unsigned short)c2];
c2 &= 0xFFFF;
if (c1 < c2) {
return -1;
}
if (c1 > c2) {
return 1;
}
if (c1 == 0) {
return 0;
}
}
return 0;
}

View File

@@ -0,0 +1,10 @@
#include <math.h>
double scalbn(double x, int n) {
double man;
int exponent;
man = frexp(x, &exponent);
exponent += n;
return ldexp(man, exponent);
}

View File

@@ -0,0 +1,97 @@
#include <internal/locale.h>
#include <string.h>
int mbtowc(wchar_t* pwc, const char* s, size_t n) {
return _current_locale.ctype_cmpt_ptr->decode_mb(pwc, s, n);
}
int __mbtowc_noconv(wchar_t* pwc, const char* s, size_t n) {
if (s == NULL) {
return 0;
}
if (n == 0) {
return -1;
}
if (pwc != NULL) {
*pwc = (unsigned char)*s;
}
if (!*s) {
return 0;
}
return 1;
}
int __wctomb_noconv(char* s, wchar_t wchar) {
if (s == NULL) {
return 0;
}
*s = (char)wchar;
return 1;
}
size_t mbstowcs(wchar_t* dest, const char* src, size_t len) {
int count;
char* src_ptr;
size_t slen;
slen = strlen(src);
if (dest != NULL) {
src_ptr = (char*)src;
for (count = 0; count < len; count++) {
if (*src_ptr) {
int res = mbtowc(dest++, src_ptr, slen);
if (res > 0) {
src_ptr += res;
slen -= res;
} else {
return -1;
}
} else {
*dest = 0;
break;
}
}
} else {
count = 0;
}
return count;
}
size_t wcstombs(char* s, const wchar_t* pwcs, size_t n) {
int result;
int chars_written = 0;
char temp[3];
wchar_t* source;
if (s == NULL || pwcs == NULL) {
return 0;
}
source = (wchar_t*)pwcs;
while (chars_written <= n) {
if (!*source) {
*(s + chars_written) = '\0';
break;
}
result = _current_locale.ctype_cmpt_ptr->encode_wc(temp, *source++);
if (chars_written + result > n) {
break;
}
strncpy(s + chars_written, temp, result);
chars_written += result;
}
return chars_written;
}

View File

@@ -0,0 +1,6 @@
extern void (*__stdio_exit)(void);
void __close_all(void);
void __stdio_atexit(void) {
__stdio_exit = __close_all;
}

View File

@@ -0,0 +1,73 @@
#include <search.h>
#define swap(dst, src, cnt) \
do { \
char* p; \
char* q; \
size_t n = cnt; \
unsigned long tmp; \
for (p = (char*)src - 1, q = (char*)dst - 1, n++; --n;) { \
tmp = *++q; \
*q = *++p; \
*p = tmp; \
} \
} while (0)
void qsort(void* table_base, size_t num_members, size_t member_size, COMPARE_FUNC compare_members) {
size_t cur_ofs;
size_t neg_size;
size_t l, r, j;
char* lp;
char* rp;
char* ip;
char* jp;
char* kp;
if (num_members < 2) {
return;
}
r = num_members;
l = (r / 2) + 1;
lp = (char*)table_base + member_size * (l - 1);
rp = (char*)table_base + member_size * (r - 1);
neg_size = (long)(member_size - member_size * 2);
cur_ofs = l * member_size;
for (;;) {
if (l > 1) {
l--;
cur_ofs -= member_size;
lp -= member_size;
} else {
swap(lp, rp, member_size);
if (--r == 1) {
return;
}
rp -= member_size;
}
j = l;
jp = (char*)table_base + (cur_ofs + neg_size);
while (j * 2 <= r) {
j *= 2;
ip = jp;
jp = (char*)table_base + member_size * (j - 1);
if (j < r) {
kp = jp + member_size;
if (compare_members(jp, kp) < 0) {
j++;
jp = kp;
}
}
if (compare_members(ip, jp) < 0) {
swap(ip, jp, member_size);
} else {
break;
}
}
}
}

View File

@@ -0,0 +1,30 @@
#include <signal.h>
int exit(int);
__signal_func_ptr signal_funcs[8];
int raise(int sig) {
__signal_func_ptr signal_func;
if (sig < SIGNAL_ABORT || sig > SIGNAL_UNK7) {
return -1;
}
signal_func = signal_funcs[sig - 1];
if (signal_func != SIGNAL_ACTION_IGNORE) {
signal_funcs[sig - 1] = SIGNAL_ACTION_DEFAULT;
}
if (signal_func == SIGNAL_ACTION_IGNORE || (signal_func == SIGNAL_ACTION_DEFAULT && sig == SIGNAL_ABORT)) {
return 0;
}
if (signal_func == SIGNAL_ACTION_DEFAULT) {
exit(0);
}
(*signal_func)(sig);
return 0;
}

View File

@@ -0,0 +1,44 @@
#include "internal/file_struct.h"
enum file_kinds {
file_closed
};
enum file_orientation {
file_unoriented,
file_char_oriented,
file_wide_oriented
};
int fwide(FILE* file, int file_mode) {
int orientation;
int res;
if (file == NULL || file->mode.file_kind == file_closed) {
return 0;
}
orientation = file->mode.file_orientation;
switch (orientation) {
case file_unoriented:
if (file_mode > 0) {
file->mode.file_orientation = file_wide_oriented;
} else if (file_mode < 0) {
file->mode.file_orientation = file_char_oriented;
}
res = file_mode;
break;
case file_wide_oriented:
res = 1;
break;
case file_char_oriented:
res = -1;
break;
}
return res;
}

View File

@@ -0,0 +1,104 @@
const unsigned int __wctype_mapC[128] = {
0x00040004, 0x00040004, 0x00040004, 0x00040004,
0x00040106, 0x01040104, 0x01040104, 0x00040004,
0x00040004, 0x00040004, 0x00040004, 0x00040004,
0x00040004, 0x00040004, 0x00040004, 0x00040004,
0x014200D0, 0x00D000D0, 0x00D000D0, 0x00D000D0,
0x00D000D0, 0x00D000D0, 0x00D000D0, 0x00D000D0,
0x04580458, 0x04580458, 0x04580458, 0x04580458,
0x04580458, 0x00D000D0, 0x00D000D0, 0x00D000D0,
0x00D00651, 0x06510651, 0x06510651, 0x06510251,
0x02510251, 0x02510251, 0x02510251, 0x02510251,
0x02510251, 0x02510251, 0x02510251, 0x02510251,
0x02510251, 0x025100D0, 0x00D000D0, 0x00D000D0,
0x00D00471, 0x04710471, 0x04710471, 0x04710071,
0x00710071, 0x00710071, 0x00710071, 0x00710071,
0x00710071, 0x00710071, 0x00710071, 0x00710071,
0x00710071, 0x007100D0, 0x00D000D0, 0x00D00004,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
};
const unsigned int __wlower_mapC[128] = {
0x00000001, 0x00020003, 0x00040005, 0x00060007,
0x00080009, 0x000A000B, 0x000C000D, 0x000E000F,
0x00100011, 0x00120013, 0x00140015, 0x00160017,
0x00180019, 0x001A001B, 0x001C001D, 0x001E001F,
0x00200021, 0x00220023, 0x00240025, 0x00260027,
0x00280029, 0x002A002B, 0x002C002D, 0x002E002F,
0x00300031, 0x00320033, 0x00340035, 0x00360037,
0x00380039, 0x003A003B, 0x003C003D, 0x003E003F,
0x00400061, 0x00620063, 0x00640065, 0x00660067,
0x00680069, 0x006A006B, 0x006C006D, 0x006E006F,
0x00700071, 0x00720073, 0x00740075, 0x00760077,
0x00780079, 0x007A005B, 0x005C005D, 0x005E005F,
0x00600061, 0x00620063, 0x00640065, 0x00660067,
0x00680069, 0x006A006B, 0x006C006D, 0x006E006F,
0x00700071, 0x00720073, 0x00740075, 0x00760077,
0x00780079, 0x007A007B, 0x007C007D, 0x007E007F,
0x00800081, 0x00820083, 0x00840085, 0x00860087,
0x00880089, 0x008A008B, 0x008C008D, 0x008E008F,
0x00900091, 0x00920093, 0x00940095, 0x00960097,
0x00980099, 0x009A009B, 0x009C009D, 0x009E009F,
0x00A000A1, 0x00A200A3, 0x00A400A5, 0x00A600A7,
0x00A800A9, 0x00AA00AB, 0x00AC00AD, 0x00AE00AF,
0x00B000B1, 0x00B200B3, 0x00B400B5, 0x00B600B7,
0x00B800B9, 0x00BA00BB, 0x00BC00BD, 0x00BE00BF,
0x00C000C1, 0x00C200C3, 0x00C400C5, 0x00C600C7,
0x00C800C9, 0x00CA00CB, 0x00CC00CD, 0x00CE00CF,
0x00D000D1, 0x00D200D3, 0x00D400D5, 0x00D600D7,
0x00D800D9, 0x00DA00DB, 0x00DC00DD, 0x00DE00DF,
0x00E000E1, 0x00E200E3, 0x00E400E5, 0x00E600E7,
0x00E800E9, 0x00EA00EB, 0x00EC00ED, 0x00EE00EF,
0x00F000F1, 0x00F200F3, 0x00F400F5, 0x00F600F7,
0x00F800F9, 0x00FA00FB, 0x00FC00FD, 0x00FE00FF,
};
const unsigned int __wupper_mapC[128] = {
0x00000001, 0x00020003, 0x00040005, 0x00060007,
0x00080009, 0x000A000B, 0x000C000D, 0x000E000F,
0x00100011, 0x00120013, 0x00140015, 0x00160017,
0x00180019, 0x001A001B, 0x001C001D, 0x001E001F,
0x00200021, 0x00220023, 0x00240025, 0x00260027,
0x00280029, 0x002A002B, 0x002C002D, 0x002E002F,
0x00300031, 0x00320033, 0x00340035, 0x00360037,
0x00380039, 0x003A003B, 0x003C003D, 0x003E003F,
0x00400041, 0x00420043, 0x00440045, 0x00460047,
0x00480049, 0x004A004B, 0x004C004D, 0x004E004F,
0x00500051, 0x00520053, 0x00540055, 0x00560057,
0x00580059, 0x005A005B, 0x005C005D, 0x005E005F,
0x00600041, 0x00420043, 0x00440045, 0x00460047,
0x00480049, 0x004A004B, 0x004C004D, 0x004E004F,
0x00500051, 0x00520053, 0x00540055, 0x00560057,
0x00580059, 0x005A007B, 0x007C007D, 0x007E007F,
0x00800081, 0x00820083, 0x00840085, 0x00860087,
0x00880089, 0x008A008B, 0x008C008D, 0x008E008F,
0x00900091, 0x00920093, 0x00940095, 0x00960097,
0x00980099, 0x009A009B, 0x009C009D, 0x009E009F,
0x00A000A1, 0x00A200A3, 0x00A400A5, 0x00A600A7,
0x00A800A9, 0x00AA00AB, 0x00AC00AD, 0x00AE00AF,
0x00B000B1, 0x00B200B3, 0x00B400B5, 0x00B600B7,
0x00B800B9, 0x00BA00BB, 0x00BC00BD, 0x00BE00BF,
0x00C000C1, 0x00C200C3, 0x00C400C5, 0x00C600C7,
0x00C800C9, 0x00CA00CB, 0x00CC00CD, 0x00CE00CF,
0x00D000D1, 0x00D200D3, 0x00D400D5, 0x00D600D7,
0x00D800D9, 0x00DA00DB, 0x00DC00DD, 0x00DE00DF,
0x00E000E1, 0x00E200E3, 0x00E400E5, 0x00E600E7,
0x00E800E9, 0x00EA00EB, 0x00EC00ED, 0x00EE00EF,
0x00F000F1, 0x00F200F3, 0x00F400F5, 0x00F600F7,
0x00F800F9, 0x00FA00FB, 0x00FC00FD, 0x00FE00FF,
};

View File

@@ -0,0 +1,160 @@
#include <wchar.h>
size_t wcslen(const wchar_t* str) {
const wchar_t* p = str - 1;
size_t len = -1;
do {
len++;
} while (*++p != 0);
return len;
}
wchar_t* wcscpy(wchar_t* dest, const wchar_t* src) {
const wchar_t* s = src - 1;
wchar_t* d = dest - 1;
wchar_t c;
do {
c = *++s;
*++d = c;
} while (c != 0);
return dest;
}
wchar_t* wcsncpy(wchar_t* dest, const wchar_t* src, size_t num) {
const wchar_t* s = src - 1;
wchar_t* d = dest - 1;
wchar_t c;
size_t n = num + 1;
while (--n != 0) {
c = *++s;
*++d = c;
if (c == 0) {
while (--n != 0) {
*++d = 0;
}
break;
}
}
return dest;
}
wchar_t* wcscat(wchar_t* dest, const wchar_t* src) {
const wchar_t* s = src - 1;
wchar_t* d = dest - 1;
while (*++d != 0)
;
d--;
do {
*++d = *++s;
} while (*s != 0);
return dest;
}
wchar_t* wcsncat(wchar_t* dest, const wchar_t* src, size_t num) {
const wchar_t* s = src - 1;
wchar_t* d = dest - 1;
wchar_t c;
size_t n;
while (*++d != 0)
;
d--;
n = num + 1;
while (--n != 0) {
c = *++s;
*++d = c;
if (c == 0) {
d--;
break;
}
}
*++d = 0;
return dest;
}
int wcsncmp(const wchar_t* s1, const wchar_t* s2, size_t num) {
wchar_t c2;
wchar_t c1;
const wchar_t* p1;
const wchar_t* p2;
size_t n;
p1 = s1 - 1;
p2 = s2 - 1;
n = num + 1;
while (--n != 0) {
c1 = *++p1;
c2 = *++p2;
if (c1 != c2) {
return (int)(c1 - c2);
}
if (c1 == 0) {
break;
}
}
return 0;
}
wchar_t* wcschr(wchar_t* ws, wchar_t wc) {
wchar_t* p = ws - 1;
wchar_t ch;
while ((ch = *++p) != 0) {
if (ch == wc) {
return p;
}
}
if (wc == 0) {
return p;
}
return 0;
}
wchar_t* wcsstr(const wchar_t* s1, const wchar_t* s2) {
const wchar_t* p1;
wchar_t c;
wchar_t c1;
wchar_t c2;
c = *s2;
p1 = s1 - 1;
if (c == 0) {
return (wchar_t*)s1;
}
while ((c1 = *++p1) != 0) {
if (c1 == c) {
wchar_t ic1;
const wchar_t* ps1;
const wchar_t* p2;
ps1 = p1 - 1;
p2 = s2 - 1;
do {
ic1 = *++ps1;
c2 = *++p2;
if (ic1 != c2) {
break;
}
} while (ic1 != 0);
if (c2 == 0) {
return (wchar_t*)p1;
}
}
}
return 0;
}

View File

@@ -59,7 +59,7 @@ namespace nw4r {
b = blue;
a = alpha;
}
} Color;
} ATTRIBUTE_ALIGN(4) Color;
} // namespace ut
} // namespace nw4r

View File

@@ -34,20 +34,29 @@ namespace nw4r {
const u32* flags0A;
const u32* flags0C;
int i, j;
int i;
int entryI;
const HeaderedGlyphGroups* offsetPGlgr;
const u8* offsetFlags;
u32 loadedSheetCount, loadedSmth0ASize, loadedSmth0CSize;
u32 flagWord;
const u8* offsetFlags;
const char* groupName;
const u32* offsetData;
int j;
u32 sheetOffsetsSize;
u32 loadedSheetsSize;
u32 neededCharacterSize;
u32 baseSize;
u32 count0CWork;
u32& neededCharacterSizeRef = neededCharacterSize;
u32 loadedSizeRef;
u32 groupOffset;
if (!ArchiveFontBase::IsValidResource(fontData, 0x4000)) {
return 0;
}
@@ -55,29 +64,30 @@ namespace nw4r {
font = (ArchiveFontBinaryLayout*)fontData;
pGlgr = &font->glgr;
countName = font->glgr.inner.nameCount;
countSheet = font->glgr.inner.sheetCount;
count0A = font->glgr.inner.smthCount_0x0a;
count0C = font->glgr.inner.smthCount_0x0c;
countName = pGlgr->inner.nameCount;
countSheet = pGlgr->inner.sheetCount;
count0A = pGlgr->inner.smthCount_0x0a;
count0C = pGlgr->inner.smthCount_0x0c;
count0CWork = count0C;
stepSheets = ((s32)countSheet + 0x1f) / 32 * 4;
step0A = ((s32)count0A + 0x1f) / 32 * 4;
step0C = ((s32)count0C + 0x1f) / 32 * 4;
step0C = ((s32)count0CWork + 0x1f) / 32 * 4;
dataSheetsOff = ROUNDUP(offsetof(ArchiveFontBinaryLayout, glgr.inner.nameOffsets) + countName * sizeof(u16), 4);
data0AOff = ROUNDUP(dataSheetsOff + countSheet * sizeof(u32), 4);
data0COff = ROUNDUP(data0AOff + count0A * sizeof(u32), 4);
dataSheets = lyt::detail::ConvertOffsToPtr<u32>(fontData, dataSheetsOff);
data0A = lyt::detail::ConvertOffsToPtr<u32>(fontData, data0AOff);
data0C = lyt::detail::ConvertOffsToPtr<u32>(fontData, data0COff);
dataSheets = (const u32*)((u32)dataSheetsOff + (u32)fontData);
data0A = (const u32*)((u32)data0AOff + (u32)fontData);
data0C = (const u32*)((u32)data0COff + (u32)fontData);
flagsSheetsOff = ROUNDUP(data0COff + count0C * sizeof(u32), 4);
flagsSheetsOff = ROUNDUP(data0COff + count0CWork * sizeof(u32), 4);
flags0AOff = ROUNDUP(flagsSheetsOff + stepSheets * countName, 4);
flags0COff = ROUNDUP(flags0AOff + step0A * countName, 4);
flagsSheets = lyt::detail::ConvertOffsToPtr<u32>(fontData, flagsSheetsOff);
flags0A = lyt::detail::ConvertOffsToPtr<u32>(fontData, flags0AOff);
flags0C = lyt::detail::ConvertOffsToPtr<u32>(fontData, flags0COff);
flagsSheets = (const u32*)((u32)flagsSheetsOff + (u32)fontData);
flags0A = (const u32*)((u32)flags0AOff + (u32)fontData);
flags0C = (const u32*)((u32)flags0COff + (u32)fontData);
loadedSheetCount = 0;
loadedSmth0ASize = 0;
@@ -90,7 +100,7 @@ namespace nw4r {
flagWord = 0;
for (j = 0, offsetPGlgr = pGlgr; j < pGlgr->inner.nameCount;
offsetPGlgr = (const HeaderedGlyphGroups*)((const u8*)offsetPGlgr + 2), j++) {
groupName = (const char*)fontData + offsetPGlgr->inner.nameOffsets[0];
groupName = (const char*)((u32)offsetPGlgr->inner.nameOffsets[0] + (u32)fontData);
if (*includedGroups == '\0' || detail::ArchiveFontBase::IncludeName(includedGroups, groupName)) {
flagWord |= *(const u32*)((const u8*)offsetFlags + ROUNDDOWN(j * stepSheets, 4));
}
@@ -101,12 +111,13 @@ namespace nw4r {
// getLoadedSheetCount(pGlgr, flagsSheets, stepSheets, fontData, includedGroups, &loadedSheetCount);
// Get the SIZE of unk_0x0a that should be loaded
for (i = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0a; entryI += 32, i++) {
for (i = 0; i * 32 < pGlgr->inner.smthCount_0x0a; i++) {
offsetFlags = (const u8*)flags0A + i * sizeof(u32);
flagWord = 0;
for (j = 0; j < pGlgr->inner.nameCount; j++) {
groupName = (const char*)fontData + pGlgr->inner.nameOffsets[j];
groupOffset = pGlgr->inner.nameOffsets[j];
groupName = (const char*)(groupOffset + (u32)fontData);
if (*includedGroups == '\0' || detail::ArchiveFontBase::IncludeName(includedGroups, groupName)) {
flagWord |= *(const u32*)((const u8*)offsetFlags + ROUNDDOWN(j * step0A, 4));
}
@@ -121,12 +132,13 @@ namespace nw4r {
}
// Get the SIZE of unk_0x0C that should be loaded
for (i = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0c; entryI += 32, i++) {
for (i = 0; i * 32 < pGlgr->inner.smthCount_0x0c; i++) {
offsetFlags = (const u8*)flags0C + i * sizeof(u32);
flagWord = 0;
for (j = 0; j < pGlgr->inner.nameCount; j++) {
groupName = (const char*)fontData + pGlgr->inner.nameOffsets[j];
groupOffset = pGlgr->inner.nameOffsets[j];
groupName = (const char*)(groupOffset + (u32)fontData);
if (*includedGroups == '\0' || detail::ArchiveFontBase::IncludeName(includedGroups, groupName)) {
flagWord |= *(const u32*)((const u8*)offsetFlags + ROUNDDOWN(j * step0C, 4));
}
@@ -145,13 +157,14 @@ namespace nw4r {
sheetOffsetsSize = ROUNDUP(pGlgr->inner.sheetCount * 2, 4);
loadedSheetsSize = ROUNDUP(loadedSheetCount * pGlgr->inner.uncompSheetSize, 4);
neededCharacterSize = sizeof(CXUncompContextHuffman);
if (loadedSmth0ASize + loadedSmth0CSize >= sizeof(CXUncompContextHuffman)) {
neededCharacterSize = loadedSmth0ASize + loadedSmth0CSize;
loadedSizeRef = loadedSmth0ASize + loadedSmth0CSize;
neededCharacterSizeRef = sizeof(CXUncompContextHuffman);
if (loadedSizeRef >= sizeof(CXUncompContextHuffman)) {
neededCharacterSize = loadedSizeRef;
}
baseSize = OSRoundUp32B(sizeof(FontInformation) + sizeof(FontTextureGlyph) + sheetOffsetsSize);
return baseSize + neededCharacterSize + loadedSheetsSize;
return (baseSize + loadedSheetsSize) + neededCharacterSize;
}
detail::ArchiveFontBase::ConstructState ArchiveFont::StreamingConstruct(ConstructContext* ctx, const void* fontData, u32 fontDataSize) {
@@ -164,8 +177,9 @@ namespace nw4r {
}
state = CONSTRUCT_STATE_WORKING;
reader = &ctx->mReader;
reader->Attach(fontData, fontDataSize);
CachedStreamReader& readerRef = ctx->mReader;
reader = &readerRef;
readerRef.Attach(fontData, fontDataSize);
while (state == CONSTRUCT_STATE_WORKING) {
switch (ctx->mNextCmd) {

View File

@@ -57,6 +57,46 @@ void RFLiInitCtrlBuf(MEMiHeapHead* sysHeap) {
}
}
int RFLiGetControllerData(RFLiCharInfo* dst, s32 chan, u8 index, BOOL hiddenAvailable) {
RFLiCtrlManager* manager;
RFLiCtrlBuffer* buffer;
u16 flag;
RFLi_ASSERTLINE_RANGE(chan, 0, WPAD_MAX_CONTROLLERS, 1412);
RFLi_ASSERTLINE_RANGE(index, 0, RFL_MAX_CTRL_BUFFER, 1413);
if (chan < 0 || chan >= WPAD_MAX_CONTROLLERS) {
return FALSE;
}
if (index >= RFL_MAX_CTRL_BUFFER) {
return FALSE;
}
manager = RFLiGetCtrlBufManager();
if (manager == NULL) {
return FALSE;
}
if (!manager->mIsLoaded[chan]) {
return FALSE;
}
flag = (1 << index);
buffer = manager->mBuffer[chan];
if (!RFLiIsValidID((RFLCreateID*)&buffer->mData[index].createID)) {
return FALSE;
}
if (!hiddenAvailable && (buffer->mSecretFlag & flag) != 0) {
return FALSE;
}
RFLiConvertRaw2Info(&buffer->mData[index], dst);
return TRUE;
}
BOOL RFLiCheckCtrlBufferCore(const RFLiCtrlBuffer* buffer, u8 index, RFLiCtrlCheckType type) {
u16 flag = (1 << index);
@@ -771,46 +811,6 @@ int RFLiSetControllerData(const RFLiCharInfo* src, s32 chan, u8 index) {
return setDataCore_(src, chan, index, FALSE);
}
int RFLiGetControllerData(RFLiCharInfo* dst, s32 chan, u8 index, BOOL hiddenAvailable) {
RFLiCtrlManager* manager;
RFLiCtrlBuffer* buffer;
u16 flag;
RFLi_ASSERTLINE_RANGE(chan, 0, WPAD_MAX_CONTROLLERS, 1412);
RFLi_ASSERTLINE_RANGE(index, 0, RFL_MAX_CTRL_BUFFER, 1413);
if (chan < 0 || chan >= WPAD_MAX_CONTROLLERS) {
return FALSE;
}
if (index >= RFL_MAX_CTRL_BUFFER) {
return FALSE;
}
manager = RFLiGetCtrlBufManager();
if (manager == NULL) {
return FALSE;
}
if (!manager->mIsLoaded[chan]) {
return FALSE;
}
flag = (1 << index);
buffer = manager->mBuffer[chan];
if (!RFLiIsValidID((RFLCreateID*)&buffer->mData[index].createID)) {
return FALSE;
}
if (!hiddenAvailable && (buffer->mSecretFlag & flag) != 0) {
return FALSE;
}
RFLiConvertRaw2Info(&buffer->mData[index], dst);
return TRUE;
}
RFLErrcode RFLUnloadController(s32 chan) {
RFLi_ASSERTLINE_RANGE(chan, 0, WPAD_MAX_CONTROLLERS, 1461);

View File

@@ -204,7 +204,7 @@ void RFLi_MakeRandomFace_Core(RFLiCharInfo* pCharInfo, RFLi_SEX argSex, RFLi_AGE
pCharInfo->personal.localonly = FALSE;
}
u8 RFLi_GetFacelineType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
static u8 RFLi_GetFacelineType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
// clang-format off
static const u8 facelineTypeTable[RFLSex_All * RFLAge_All * RFLRace_All][10] = {
/* Male, Child, Black */ {0, 0, 0, 1, 1, 1, 2, 3, 4, 5},
@@ -272,7 +272,7 @@ u8 RFLi_GetHairType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
return hair_parts[index][RFLi_GetRandU32(hair_parts_num[index])];
}
u8 RFLi_GetEyeType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
static u8 RFLi_GetEyeType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
// clang-format off
u8 eye_parts[RFLSex_All * RFLAge_All * RFLRace_All][48] = {
/* Male, Child, Black */ { 2, 3, 5, 7, 8, 9, 11, 12, 13, 15, 16, 18, 27, 29, 32, 34, 36, 38, 39, 41, 43, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -307,7 +307,7 @@ u8 RFLi_GetEyeType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
return eye_parts[index][RFLi_GetRandU32(eye_parts_num[index])];
}
u8 RFLi_GetEyebrowType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
static u8 RFLi_GetEyebrowType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
// clang-format off
static const u8 eyebrow_parts[RFLSex_All * RFLAge_All * RFLRace_All][24] = {
/* Male, Child, Black */ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 17, 18, 20, 0, 0, 0, 0, 0, 0},
@@ -342,7 +342,7 @@ u8 RFLi_GetEyebrowType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
return eyebrow_parts[index][RFLi_GetRandU32(eyebrow_parts_num[index])];
}
u8 RFLi_GetNoseType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
static u8 RFLi_GetNoseType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
// clang-format off
u8 nose_parts[RFLSex_All * RFLAge_All * RFLRace_All][12] = {
/* Male, Child, Black */ { 0, 1, 2, 3, 4, 5, 7, 8, 10, 0, 0, 0},
@@ -377,7 +377,7 @@ u8 RFLi_GetNoseType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
return nose_parts[index][RFLi_GetRandU32(nose_parts_num[index])];
}
u8 RFLi_GetMouthType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
static u8 RFLi_GetMouthType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
// clang-format off
u8 mouth_parts[RFLSex_All * RFLAge_All * RFLRace_All][24] = {
/* Male, Child, Black */ { 0, 2, 3, 6, 7, 8, 9, 10, 12, 14, 15, 17, 18, 19, 21, 22, 23, 0, 0, 0, 0, 0, 0, 0},
@@ -412,7 +412,7 @@ u8 RFLi_GetMouthType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
return mouth_parts[index][RFLi_GetRandU32(mouth_parts_num[index])];
}
u8 RFLi_GetFaceTexType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
static u8 RFLi_GetFaceTexType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
// clang-format off
static const u8 faceTexTypeTable[RFLSex_All * RFLAge_All * RFLRace_All][20] = {
/* Male, Child, Black */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3},
@@ -507,7 +507,7 @@ u8 RFLi_GetGlassType(RFLi_AGE age) {
}
}
u8 RFLi_GetFaceColor(RFLi_SEX sex, RFLi_RACE race) {
static u8 RFLi_GetFaceColor(RFLi_SEX sex, RFLi_RACE race) {
// clang-format off
static const u8 faceColorTable[RFLSex_All * RFLRace_All][10] = {
/* Male, Black */ { 2, 2, 4, 4, 4, 4, 5, 5, 5, 5 },
@@ -526,7 +526,7 @@ u8 RFLi_GetFaceColor(RFLi_SEX sex, RFLi_RACE race) {
return faceColorTable[(sex * RFLRace_All) + race][RFLi_GetRandU32(GET_ARRAY_LENGTH(faceColorTable[0]))];
}
u8 RFLi_GetHairColor(RFLi_AGE age, RFLi_RACE race) {
static u8 RFLi_GetHairColor(RFLi_AGE age, RFLi_RACE race) {
// clang-format off
static const u8 hairColorTable[RFLAge_All * RFLRace_All][20] = {
/* Black, Child */ {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -547,7 +547,7 @@ u8 RFLi_GetHairColor(RFLi_AGE age, RFLi_RACE race) {
return hairColorTable[(race * 4 - race) + age][RFLi_GetRandU32(GET_ARRAY_LENGTH(hairColorTable[0]))];
}
u8 RFLi_GetEyeColor(RFLi_RACE race) {
static u8 RFLi_GetEyeColor(RFLi_RACE race) {
// clang-format off
static const u8 eyeColorTable[RFLRace_All][10] = {
/* Black */ {0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
@@ -561,6 +561,6 @@ u8 RFLi_GetEyeColor(RFLi_RACE race) {
return eyeColorTable[race][RFLi_GetRandU32(GET_ARRAY_LENGTH(eyeColorTable[0]))];
}
u32 RFLi_GetRandU32(u32 max) {
static u32 RFLi_GetRandU32(u32 max) {
return OSGetTick() % max;
}

View File

@@ -202,7 +202,7 @@ void RFLExit() {
}
}
RFLErrcode RFLiBootLoad() {
static inline RFLErrcode RFLiBootLoad() {
RFLiBootLoadAsync();
return RFLWaitAsync();
}
@@ -223,7 +223,7 @@ static void bootloadDB2Res_() {
}
}
RFLErrcode RFLiBootLoadAsync() {
static inline RFLErrcode RFLiBootLoadAsync() {
return RFLiBootLoadDatabaseAsync(bootloadDB2Res_);
}
@@ -249,7 +249,7 @@ void RFLiFree(void* block) {
MEMFreeToExpHeap(RFLiGetManager()->mTmpHeap, block);
}
u32 RFLiGetUsedWorkSize() {
static inline u32 RFLiGetUsedWorkSize() {
if (RFLAvailable()) {
MEMiHeapHead* heap = RFLiGetManager()->mTmpHeap;
return MEMGetAllocatableSizeForExpHeap(heap) - MEMGetTotalFreeSizeForExpHeap(heap);
@@ -397,7 +397,7 @@ BOOL RFLiNeedRepairError() {
return ((*list & (1 << RFLiFileBrokenType_DBBroken)) != 0) ? TRUE : FALSE;
}
BOOL RFLiCriticalError() {
static inline BOOL RFLiCriticalError() {
u8* list = &sRFLBrokenType;
BOOL ret = FALSE; // Unused

View File

@@ -9,7 +9,7 @@ ziU32 Zi8GetZHuwdPtr(ziU32* arg0, ziU16* arg1 ZI_NEED_WORK) {
return 0;
} else {
*arg1 = ZI_WORK->unk_0x124[ZI_WORK->unk_0x12C - 1][1] / 3;
*arg0 = ZI_WORK->unk_0x124[ZI_WORK->unk_0x12C - 1][0];
*arg0 = (ziU32)ZI_WORK->unk_0x124[ZI_WORK->unk_0x12C - 1];
*arg0 += 8;
Zi8LogError(0x64, ZI_WORK);
return 1;

View File

@@ -55,7 +55,7 @@ typedef struct AXFX_REVERBHI_EXP {
f32 sendGain; // 0x144
} AXFX_REVERBHI_EXP;
u32 AXFXReverbHiExpGetMemSize(const AXFX_REVERBHI_EXP* fx);
u32 AXFXReverbHiExpGetMemSize(AXFX_REVERBHI_EXP* fx);
BOOL AXFXReverbHiExpInit(AXFX_REVERBHI_EXP* fx);
void AXFXReverbHiExpShutdown(AXFX_REVERBHI_EXP* fx);
BOOL AXFXReverbHiExpSettings(AXFX_REVERBHI_EXP* fx);

View File

@@ -10,7 +10,16 @@ extern "C" {
#endif
typedef struct _GXColor {
#ifdef IPL_SYSTEM_COLOR_ALIGNMENT
union {
struct {
u8 r, g, b, a;
};
u32 value;
};
#else
u8 r, g, b, a; // 0x00
#endif
} GXColor;
typedef struct _GXColorS10 {

View File

@@ -0,0 +1,447 @@
#include <private/axfx.h>
#include <revolution/AXFX.h>
#include <revolution/MEM.h>
#include <revolution/OS.h>
#include <math.h>
#include <string.h>
static BOOL __AllocDelayLine(AXFX_REVERBHI_EXP* fx);
static void __BzeroDelayLines(AXFX_REVERBHI_EXP* fx);
static void __FreeDelayLine(AXFX_REVERBHI_EXP* fx);
static BOOL __InitParams(AXFX_REVERBHI_EXP* fx);
static u32 __EarlySizeTable[8][3] = {{157, 479, 829}, {317, 809, 1117}, {479, 941, 1487}, {641, 1259, 1949},
{797, 1667, 2579}, {967, 1901, 2903}, {1123, 2179, 3413}, {1279, 2477, 3889}};
static f32 __EarlyCoefTable[8][3] = {{0.4f, -1.0f, 0.3f}, {0.5f, -0.95f, 0.3f}, {0.6f, -0.9f, 0.3f}, {0.75f, -0.85f, 0.3f},
{-0.9f, 0.8f, 0.3f}, {-1.0f, 0.7f, 0.3f}, {-1.0f, 0.7f, 0.3f}, {-1.0f, 0.7f, 0.3f}};
static u32 __FilterSizeTable[7][8] = {{1789, 1999, 2333, 433, 149, 47, 73, 67}, {149, 293, 449, 251, 103, 47, 73, 67},
{947, 1361, 1531, 433, 137, 47, 73, 67}, {1279, 1531, 1973, 509, 149, 47, 73, 67},
{1531, 1847, 2297, 563, 179, 47, 73, 67}, {1823, 2357, 2693, 571, 137, 47, 73, 67},
{1823, 2357, 2693, 571, 179, 47, 73, 67}};
u32 AXFXReverbHiExpGetMemSize(AXFX_REVERBHI_EXP* fx) {
u32 sum = 0;
u32 i = 0;
sum += __EarlySizeTable[7][2];
sum += (int)(fx->preDelayTimeMax * 32000);
for (i = 0; i < 5; i++) {
sum += __FilterSizeTable[6][i];
}
sum *= 3;
for (i = 5; i < 8; i++) {
sum += __FilterSizeTable[6][i];
}
sum *= 4;
return sum;
}
BOOL AXFXReverbHiExpInit(AXFX_REVERBHI_EXP* fx) {
u32 ch, i;
BOOL result = TRUE;
BOOL mask = OSDisableInterrupts();
fx->active = 1;
if (fx->preDelayTimeMax < 0.0f) {
AXFXReverbHiExpShutdown(fx);
OSRestoreInterrupts(mask);
return FALSE;
}
fx->earlyMaxLength = __EarlySizeTable[8 - 1][2];
fx->preDelayMaxLength = (u32)(fx->preDelayTimeMax * 32000);
for (i = 0; i < 3; i++) {
fx->combMaxLength[i] = __FilterSizeTable[6][i];
}
for (i = 0; i < 2; i++) {
fx->allpassMaxLength[i] = __FilterSizeTable[6][3 + i];
}
for (ch = 0; ch < 3; ch++) {
fx->lastAllpassMaxLength[ch] = __FilterSizeTable[6][5 + ch];
}
result = __AllocDelayLine(fx);
if (result == FALSE) {
AXFXReverbHiExpShutdown(fx);
OSRestoreInterrupts(mask);
return FALSE;
}
__BzeroDelayLines(fx);
result = __InitParams(fx);
if (result == FALSE) {
AXFXReverbHiExpShutdown(fx);
OSRestoreInterrupts(mask);
return FALSE;
}
fx->active &= ~1;
OSRestoreInterrupts(mask);
return TRUE;
}
BOOL AXFXReverbHiExpSettings(AXFX_REVERBHI_EXP* fx) {
BOOL mask = OSDisableInterrupts();
fx->active = fx->active | 1;
AXFXReverbHiExpShutdown(fx);
if (!AXFXReverbHiExpInit(fx)) {
AXFXReverbHiExpShutdown(fx);
OSRestoreInterrupts(mask);
return FALSE;
} else {
fx->active |= 2;
fx->active &= ~1;
OSRestoreInterrupts(mask);
return TRUE;
}
}
void AXFXReverbHiExpShutdown(AXFX_REVERBHI_EXP* fx) {
BOOL mask = OSDisableInterrupts();
fx->active |= 1;
__FreeDelayLine(fx);
OSRestoreInterrupts(mask);
}
void AXFXReverbHiExpCallback(AXFX_BUFFERUPDATE* bufferUpdate, AXFX_REVERBHI_EXP* fx) {
u32 ch, i;
u32 samp;
s32* input[3];
f32 data;
f32 output[3];
f32* earlyLine;
f32 earlyOut;
f32* preDelayLine;
f32 preDelayOut;
f32 filterOut;
f32* combLine;
f32 combOutOne;
f32* allpass;
f32 outTmp;
f32 allpassIn;
f32 allpassCoef;
f32 lpfOut;
f32 lpfCoef1;
f32 lpfCoef2;
f32 fusedOut[3];
f32 fusedGain;
f32 crosstalkGain;
f32 crosstalkL;
f32 crosstalkR;
f32 crosstalkS;
s32* inBusData[3];
s32* outBusData[3];
if (fx->active != 0) {
fx->active &= ~2;
return;
}
input[0] = bufferUpdate->left;
input[1] = bufferUpdate->right;
input[2] = bufferUpdate->surround;
if (fx->busIn != NULL) {
inBusData[0] = fx->busIn->left;
inBusData[1] = fx->busIn->right;
inBusData[2] = fx->busIn->surround;
}
if (fx->busOut != NULL) {
outBusData[0] = fx->busOut->left;
outBusData[1] = fx->busOut->right;
outBusData[2] = fx->busOut->surround;
}
lpfCoef1 = 1.0f - fx->lpfCoef;
lpfCoef2 = fx->lpfCoef;
allpassCoef = fx->allpassCoef;
fusedGain = fx->fusedGain * 0.6f;
crosstalkGain = fx->crosstalk * 0.5f;
for (samp = 0; samp < 96; samp++) {
for (ch = 0; ch < 3; ch++) {
if (fx->busIn != NULL) {
data = (f32)(*(input[ch]) + *(inBusData[ch]++));
} else {
data = (f32)(*input[ch]);
}
earlyLine = fx->earlyLine[ch];
earlyOut = earlyLine[fx->earlyPos[0]] * fx->earlyCoef[0] + earlyLine[fx->earlyPos[1]] * fx->earlyCoef[1] +
earlyLine[fx->earlyPos[2]] * fx->earlyCoef[2];
earlyLine[fx->earlyPos[2]] = data;
if (fx->preDelayLength != 0) {
preDelayLine = fx->preDelayLine[ch];
preDelayOut = preDelayLine[fx->preDelayPos];
preDelayLine[fx->preDelayPos] = data;
} else {
preDelayOut = data;
}
filterOut = 0.0f;
for (i = 0; i < 3; i++) {
combLine = fx->combLine[ch][i];
combOutOne = combLine[fx->combPos[i]];
combLine[fx->combPos[i]] = preDelayOut + (combOutOne * fx->combCoef[i]);
filterOut += combOutOne;
}
for (i = 0; i < 2; i++) {
allpass = fx->allpassLine[ch][i];
outTmp = allpass[fx->allpassPos[i]];
allpassIn = filterOut + outTmp * allpassCoef;
allpass[fx->allpassPos[i]] = allpassIn;
filterOut = outTmp - allpassIn * allpassCoef;
}
lpfOut = lpfCoef1 * filterOut + lpfCoef2 * fx->lastLpfOut[ch];
fx->lastLpfOut[ch] = lpfOut;
allpass = fx->lastAllpassLine[ch];
outTmp = allpass[fx->lastAllpassPos[ch]];
allpassIn = lpfOut + outTmp * allpassCoef;
allpass[fx->lastAllpassPos[ch]] = allpassIn;
fusedOut[ch] = outTmp - allpassIn * allpassCoef;
if (++fx->lastAllpassPos[ch] >= fx->lastAllpassLength[ch]) {
fx->lastAllpassPos[ch] = 0;
}
fusedOut[ch] *= fusedGain;
fusedOut[ch] += earlyOut;
}
crosstalkL = fusedOut[1] + fusedOut[2];
crosstalkR = fusedOut[0] + fusedOut[2];
crosstalkS = fusedOut[0] + fusedOut[1];
output[0] = fusedOut[0] + crosstalkL * crosstalkGain;
output[1] = fusedOut[1] + crosstalkR * crosstalkGain;
output[2] = fusedOut[2] + crosstalkS * crosstalkGain;
*(input[0]++) = (s32)(output[0] * fx->outGain);
*(input[1]++) = (s32)(output[1] * fx->outGain);
*(input[2]++) = (s32)(output[2] * fx->outGain);
if (fx->busOut != NULL) {
*(outBusData[0]++) = (s32)(output[0] * fx->sendGain);
*(outBusData[1]++) = (s32)(output[1] * fx->sendGain);
*(outBusData[2]++) = (s32)(output[2] * fx->sendGain);
}
for (i = 0; i < 3; i++) {
if (++fx->earlyPos[i] >= fx->earlyLength) {
fx->earlyPos[i] = 0;
}
}
if (fx->preDelayLength != 0) {
if (++fx->preDelayPos >= fx->preDelayLength) {
fx->preDelayPos = 0;
}
}
for (i = 0; i < 3; i++) {
if (++fx->combPos[i] >= fx->combLength[i]) {
fx->combPos[i] = 0;
}
}
for (i = 0; i < 2; i++) {
if (++fx->allpassPos[i] >= fx->allpassLength[i]) {
fx->allpassPos[i] = 0;
}
}
}
}
static BOOL __AllocDelayLine(AXFX_REVERBHI_EXP* fx) {
u32 ch, i;
for (ch = 0; ch < 3; ch++) {
fx->earlyLine[ch] = (f32*)__AXFXAlloc(sizeof(f32) * fx->earlyMaxLength);
if (fx->earlyLine[ch] == NULL)
return FALSE;
if (fx->preDelayMaxLength != 0) {
fx->preDelayLine[ch] = (f32*)__AXFXAlloc(sizeof(f32) * fx->preDelayMaxLength);
if (fx->preDelayLine[ch] == NULL)
return FALSE;
} else {
fx->preDelayLine[ch] = NULL;
}
for (i = 0; i < 3; i++) {
fx->combLine[ch][i] = (f32*)__AXFXAlloc(sizeof(f32) * fx->combMaxLength[i]);
if (fx->combLine[ch][i] == NULL)
return FALSE;
}
for (i = 0; i < 2; i++) {
fx->allpassLine[ch][i] = (f32*)__AXFXAlloc(sizeof(f32) * fx->allpassMaxLength[i]);
if (fx->allpassLine[ch][i] == NULL)
return FALSE;
}
fx->lastAllpassLine[ch] = (f32*)__AXFXAlloc(sizeof(f32) * fx->lastAllpassMaxLength[ch]);
if (fx->lastAllpassLine[ch] == NULL)
return FALSE;
}
return TRUE;
}
static void __BzeroDelayLines(AXFX_REVERBHI_EXP* fx) {
u32 ch, i;
for (ch = 0; ch < 3; ch++) {
if (fx->earlyLine[ch] != NULL) {
memset(fx->earlyLine[ch], 0, sizeof(f32) * fx->earlyMaxLength);
}
if (fx->preDelayLine[ch] != NULL) {
memset(fx->preDelayLine[ch], 0, sizeof(f32) * fx->preDelayMaxLength);
}
for (i = 0; i < 3; i++) {
if (fx->combLine[ch][i] != NULL) {
memset(fx->combLine[ch][i], 0, sizeof(f32) * fx->combMaxLength[i]);
}
}
for (i = 0; i < 2; i++) {
if (fx->allpassLine[ch][i] != NULL) {
memset(fx->allpassLine[ch][i], 0, sizeof(f32) * fx->allpassMaxLength[i]);
}
}
if (fx->lastAllpassLine[ch] != NULL) {
memset(fx->lastAllpassLine[ch], 0, sizeof(f32) * fx->lastAllpassMaxLength[ch]);
}
}
}
static void __FreeDelayLine(AXFX_REVERBHI_EXP* fx) {
u32 ch, i;
for (ch = 0; ch < 3; ch++) {
if (fx->earlyLine[ch] != NULL) {
__AXFXFree(fx->earlyLine[ch]);
fx->earlyLine[ch] = NULL;
}
if (fx->preDelayLine[ch] != NULL) {
__AXFXFree(fx->preDelayLine[ch]);
fx->preDelayLine[ch] = NULL;
}
for (i = 0; i < 3; i++) {
if (fx->combLine[ch][i] != NULL) {
__AXFXFree(fx->combLine[ch][i]);
fx->combLine[ch][i] = NULL;
}
}
for (i = 0; i < 2; i++) {
if (fx->allpassLine[ch][i] != NULL) {
__AXFXFree(fx->allpassLine[ch][i]);
fx->allpassLine[ch][i] = NULL;
}
}
if (fx->lastAllpassLine[ch] != NULL) {
__AXFXFree(fx->lastAllpassLine[ch]);
fx->lastAllpassLine[ch] = NULL;
}
}
}
DECOMP_FORCE_LITERAL(AXFXReverbHiExp_c, -3.0f, 10.0);
static BOOL __InitParams(AXFX_REVERBHI_EXP* reverb) {
u32 ch, i;
if (reverb->earlyMode >= 8)
return FALSE;
if (reverb->preDelayTime < 0.0f || reverb->preDelayTime > reverb->preDelayTimeMax)
return FALSE;
if (reverb->fusedMode >= 6)
return FALSE;
if (reverb->fusedTime < 0.0f)
return FALSE;
if (reverb->coloration < 0.0f || reverb->coloration > 1.0f)
return FALSE;
if (reverb->damping < 0.0f || reverb->damping > 1.0f)
return FALSE;
if (reverb->crosstalk < 0.0f || reverb->crosstalk > 1.0f)
return FALSE;
if (reverb->earlyGain < 0.0f || reverb->earlyGain > 1.0f)
return FALSE;
if (reverb->fusedGain < 0.0f || reverb->fusedGain > 1.0f)
return FALSE;
if (reverb->outGain < 0.0f || reverb->outGain > 1.0f)
return FALSE;
if (reverb->sendGain < 0.0f || reverb->sendGain > 1.0f)
return FALSE;
reverb->earlyLength = __EarlySizeTable[reverb->earlyMode][2];
for (i = 0; i < 3; i++) {
reverb->earlyPos[i] = reverb->earlyLength - __EarlySizeTable[reverb->earlyMode][i];
reverb->earlyCoef[i] = __EarlyCoefTable[reverb->earlyMode][i] * reverb->earlyGain * 0.6f;
}
reverb->preDelayPos = 0;
reverb->preDelayLength = (u32)(reverb->preDelayTime * (f32)32000);
for (i = 0; i < 3; i++) {
reverb->combPos[i] = 0;
reverb->combLength[i] = __FilterSizeTable[reverb->fusedMode][i];
reverb->combCoef[i] = pow(10.0f, (-3.0f * (f32)(reverb->combLength[i]) / (f32)(reverb->fusedTime * 32000)));
}
for (i = 0; i < 2; i++) {
reverb->allpassPos[i] = 0;
reverb->allpassLength[i] = __FilterSizeTable[reverb->fusedMode][3 + i];
}
for (ch = 0; ch < 3; ch++) {
reverb->lastAllpassPos[ch] = 0;
reverb->lastAllpassLength[ch] = __FilterSizeTable[reverb->fusedMode][5 + ch];
}
reverb->allpassCoef = reverb->coloration;
reverb->lpfCoef = 1.0f - reverb->damping;
if (reverb->lpfCoef > 0.95f)
reverb->lpfCoef = 0.95f;
for (ch = 0; ch < 3; ch++) {
reverb->lastLpfOut[ch] = 0.0f;
}
return TRUE;
}

View File

@@ -1,35 +1,55 @@
#include <revolution/verdefs.h>
#include <revolution/os.h>
#include <private/nand.h>
#include <revolution/nand.h>
#include <private/es.h>
#include <errno.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
SDKDefineVersion(CNTCACHE, "Apr 20 2010", "14:15:28");
char lbl_81693350[0xd0] = {
0x3c, 0x3c, 0x20, 0x52, 0x56, 0x4c, 0x5f, 0x53, 0x44, 0x4b, 0x20, 0x2d, 0x20, 0x43, 0x4e, 0x54,
0x43, 0x41, 0x43, 0x48, 0x45, 0x20, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x62,
0x75, 0x69, 0x6c, 0x64, 0x3a, 0x20, 0x41, 0x70, 0x72, 0x20, 0x32, 0x30, 0x20, 0x32, 0x30, 0x31,
0x30, 0x20, 0x31, 0x34, 0x3a, 0x31, 0x35, 0x3a, 0x32, 0x38, 0x20, 0x28, 0x30, 0x78, 0x34, 0x31,
0x39, 0x39, 0x5f, 0x36, 0x30, 0x38, 0x33, 0x31, 0x29, 0x20, 0x3e, 0x3e, 0x00, 0x00, 0x00, 0x00,
0x2f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x32, 0x2f, 0x63, 0x6e, 0x74, 0x63, 0x61, 0x63, 0x68,
0x65, 0x2e, 0x74, 0x78, 0x74, 0x00, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69,
0x74, 0x6c, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x30, 0x31, 0x36, 0x6c, 0x6c, 0x78, 0x20,
0x00, 0x00, 0x00, 0x00, 0x2f, 0x74, 0x6d, 0x70, 0x2f, 0x63, 0x6e, 0x74, 0x63, 0x61, 0x63, 0x68,
0x65, 0x2e, 0x74, 0x78, 0x74, 0x00, 0x00, 0x00, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x32,
0x00, 0x00, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
0x74, 0x20, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00,
0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00
};
char lbl_81693420[0x16] = {
0x2f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2f, 0x25, 0x30, 0x38, 0x78, 0x2f, 0x25, 0x30, 0x38, 0x78,
0x2f, 0x64, 0x61, 0x74, 0x61, 0x00,
};
const char* __CNTCACHEVersion = lbl_81693350;
char lbl_816985DC[3] = {0x20, 0x0a, 0x00};
extern void _savegpr_23();
extern void _restgpr_23();
extern void _savegpr_26();
extern void _restgpr_26();
OSMutex _CNTCACHEMutex;
int _CNTCACHEUnused816997A8;
long long _CNTCACHEUnused816997A8;
int _CNTCACHEUnused816997A4;
BOOL _CNTCACHEInitialized;
void CNTCACHEClear();
BOOL _CNTCACHEIsTitleRemovable(ESTitleId titleId);
void _CNTCACHEDeleteTitle();
void _CNTCACHEDeleteContent();
void CNTCACHEInit(int unk0, int unk1) {
if (_CNTCACHEInitialized == FALSE) {
BOOL old;
OSRegisterVersion(GetVersion(CNTCACHE));
OSRegisterVersion(__CNTCACHEVersion);
OSInitMutex(&_CNTCACHEMutex);
ES_InitLib();
@@ -41,87 +61,492 @@ void CNTCACHEInit(int unk0, int unk1) {
CNTCACHEClear();
_CNTCACHEUnused816997A4 = unk0;
_CNTCACHEUnused816997A8 = unk1;
*((int*)&_CNTCACHEUnused816997A8) = unk1;
}
asm void CNTCACHEClear() {
clrlwi r11, r1, 0x1b
mr r12, r1
subfic r11, r11, -0x500
stwux r1, r1, r11
mflr r0
mr r11, r12
stw r0, 4(r12)
bl _savegpr_23
lis r30, lbl_81693350@ha
lis r3, _CNTCACHEMutex@ha
addi r30, r30, lbl_81693350@l
li r29, 0
addi r3, r3, _CNTCACHEMutex@l
bl OSLockMutex
addi r3, r30, 0x50
addi r4, r1, 0x24
li r27, 1
li r5, 3
bl NANDPrivateOpen
cmpwi r3, -0xc
mr r28, r3
bne L_d4
li r28, 0
b L_28c
L_d4:
cmpwi r3, 0
beq L_e0
b L_268
L_e0:
addi r3, r1, 0x24
addi r4, r1, 0x20
bl NANDGetLength
cmpwi r3, 0
mr r28, r3
beq L_fc
b L_268
L_fc:
li r26, 0
li r31, 0
b L_25c
L_108:
lwz r25, 0x20(r1)
cmplwi r25, 0x400
ble L_118
li r25, 0x400
L_118:
addi r24, r1, 0xc0
addi r0, r25, 0x1f
addi r3, r1, 0x24
mr r4, r24
rlwinm r5, r0, 0, 0, 0x1a
bl NANDRead
cmpw r3, r25
beq L_140
li r28, -0x14b3
b L_268
L_140:
mr r4, r24
li r28, 0
mtctr r25
cmplwi r25, 0
ble L_16c
L_154:
lbz r0, 0(r4)
cmpwi r0, 0xa
bne L_164
b L_170
L_164:
addi r4, r4, 1
bdnz L_154
L_16c:
li r4, 0
L_170:
cmpwi r4, 0
bne L_224
li r28, 0
b L_268
b L_224
L_184:
stb r31, 0(r4)
subf r23, r24, r4
mr r3, r24
la r4, lbl_816985DC
bl strtok
cmpwi r3, 0
mr r29, r3
beq L_1d4
addi r4, r30, 0xb4
bl strcmp
cmpwi r3, 0
bne L_1bc
bl _CNTCACHEDeleteTitle
b L_1d4
L_1bc:
mr r3, r29
addi r4, r30, 0xc0
bl strcmp
cmpwi r3, 0
bne L_1d4
bl _CNTCACHEDeleteContent
L_1d4:
lwz r0, 0x20(r1)
addi r23, r23, 1
add r24, r24, r23
subf r0, r23, r0
subf r25, r23, r25
mr r4, r24
stw r0, 0x20(r1)
add r26, r26, r23
mtctr r25
cmplwi r25, 0
ble L_218
L_200:
lbz r0, 0(r4)
cmpwi r0, 0xa
bne L_210
b L_21c
L_210:
addi r4, r4, 1
bdnz L_200
L_218:
li r4, 0
L_21c:
cmpwi r4, 0
beq L_22c
L_224:
cmpwi r25, 0
bgt L_184
L_22c:
lwz r0, 0x20(r1)
cmpwi r0, 0
beq L_25c
mr r4, r26
addi r3, r1, 0x24
li r5, 0
bl NANDSeek
cmplw r3, r26
beq L_258
li r28, -0x14b3
b L_268
L_258:
li r28, 0
L_25c:
lwz r0, 0x20(r1)
cmpwi r0, 0
bne L_108
L_268:
addi r3, r1, 0x24
bl NANDClose
addi r3, r30, 0x50
li r29, 0
bl NANDPrivateDelete
cmpwi r3, 0
addi r3, r30, 0x84
bl NANDPrivateDelete
cmpwi r3, 0
L_28c:
cmpwi r29, 0
beq L_29c
addi r3, r1, 0x24
bl NANDClose
L_29c:
cmpwi r27, 0
beq L_2b0
lis r3, _CNTCACHEMutex@ha
addi r3, r3, _CNTCACHEMutex@l
bl OSUnlockMutex
L_2b0:
mr r3, r28
lwz r10, 0(r1)
mr r11, r10
bl _restgpr_23
lwz r0, 4(r10)
mtlr r0
mr r1, r10
blr
}
void _CNTCACHEDeleteTitle() {
char* tok = strtok(NULL, " \n");
while (tok != NULL) {
ESTitleId titleId;
errno = 0;
titleId = strtoull(tok, NULL, 16);
if (errno == 0 && NANDTitleIdHi(titleId) != 0x00000001) {
BOOL result = _CNTCACHEIsTitleRemovable(titleId);
if (result == TRUE) {
ES_DeleteTitle(titleId);
} else if (result == FALSE) {
ES_DeleteTitleContent(titleId);
}
}
tok = strtok(NULL, " \n");
}
asm void _CNTCACHEDeleteTitle() {
stwu r1, -0x20(r1)
mflr r0
li r3, 0
la r4, lbl_816985DC
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
stw r30, 0x18(r1)
stw r29, 0x14(r1)
stw r28, 0x10(r1)
bl strtok
li r30, 0
li r31, -1
b L_370
L_304:
stw r30, errno(r0)
li r4, 0
li r5, 0x10
bl strtoull
lwz r0, errno(r0)
mr r28, r4
mr r29, r3
cmpwi r0, 0
bne L_364
and r0, r3, r31
cmplwi r0, 1
beq L_364
bl _CNTCACHEIsTitleRemovable
cmpwi r3, 1
bne L_350
mr r4, r28
mr r3, r29
bl ES_DeleteTitle
b L_364
L_350:
cmpwi r3, 0
bne L_364
mr r4, r28
mr r3, r29
bl ES_DeleteTitleContent
L_364:
li r3, 0
la r4, lbl_816985DC
bl strtok
L_370:
cmpwi r3, 0
bne L_304
lwz r0, 0x24(r1)
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
lwz r29, 0x14(r1)
lwz r28, 0x10(r1)
mtlr r0
addi r1, r1, 0x20
blr
}
static int GetSavePath(ESTitleId titleId) {
char nandPath[64] ALIGN32;
s32 ret;
u32 usedBlocks = 1;
u32 usedINodes = 1;
snprintf(nandPath, (int)sizeof(nandPath), "/title/%08x/%08x/data", NANDTitleIdHi(titleId), NANDTitleIdLo(titleId));
ret = NANDSecretGetUsage(nandPath, &usedBlocks, &usedINodes);
if (ret == NAND_RESULT_NOEXISTS) {
ret = 2;
} else if (ret >= NAND_RESULT_OK) {
if (usedINodes == 1 && usedBlocks == 0) {
ret = 1;
} else {
ret = 0;
}
}
return ret;
asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
clrlwi r11, r1, 0x1b
mr r12, r1
subfic r11, r11, -0x2100
stwux r1, r1, r11
mflr r0
lis r5, lbl_81693420@ha
stw r0, 4(r12)
li r0, 1
addi r5, r5, lbl_81693420@l
stw r31, -4(r12)
stw r30, -8(r12)
mr r30, r3
addi r3, r1, 0x40
stw r29, -0xc(r12)
mr r29, r4
li r4, -1
stw r0, 0x20(r1)
and r6, r30, r4
and r7, r29, r4
li r4, 0x40
stw r0, 0x24(r1)
crclr 4*cr1+eq
bl snprintf
addi r3, r1, 0x40
addi r4, r1, 0x20
addi r5, r1, 0x24
bl NANDSecretGetUsage
cmpwi r3, -0xc
mr r4, r3
bne L_418
li r4, 2
b L_444
L_418:
cmpwi r3, 0
blt L_444
lwz r0, 0x24(r1)
cmplwi r0, 1
bne L_440
lwz r0, 0x20(r1)
cmpwi r0, 0
bne L_440
li r4, 1
b L_444
L_440:
li r4, 0
L_444:
cmpwi r4, 1
bne L_4bc
mr r4, r29
mr r3, r30
addi r31, r1, 0x80
addi r6, r1, 0x28
li r5, 0
bl ES_GetTmdView
cmpwi r3, 0
beq L_470
b L_4c0
L_470:
lwz r0, 0x28(r1)
cmplwi r0, 0x2060
ble L_484
li r3, -0x400
b L_4c0
L_484:
mr r4, r29
mr r3, r30
mr r5, r31
addi r6, r1, 0x28
bl ES_GetTmdView
cmpwi r3, 0
beq L_4a4
b L_4c0
L_4a4:
lhz r0, 0xd8(r1)
rlwinm. r0, r0, 0x18, 0x18, 0x1f
bne L_4b8
li r4, 1
b L_4bc
L_4b8:
li r4, 0
L_4bc:
mr r3, r4
L_4c0:
lwz r10, 0(r1)
lwz r0, 4(r10)
lwz r31, -4(r10)
lwz r30, -8(r10)
lwz r29, -0xc(r10)
mtlr r0
mr r1, r10
blr
}
static int GetTmdView(ESTitleId titleId, ESTmdView* tmdView) {
s32 ret;
u32* tmdSize = NULL;
ret = ES_GetTmdView(titleId, NULL, tmdSize);
if (ret != ES_ERR_OK) {
return ret;
}
if (*tmdSize > OSRoundUp32B(sizeof(ESTmdView))) {
ret = -1024;
goto out;
}
ret = ES_GetTmdView(titleId, tmdView, tmdSize);
out:
return ret;
}
int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
ESTmdView tmd ALIGN32;
s32 ret = -1;
ret = GetSavePath(titleId);
if (ret == 1) {
ret = GetTmdView(titleId, &tmd);
if (ret != ES_ERR_OK) {
return ret;
}
if (tmd.head.titleVersion >> 8 == 0) {
ret = 1;
} else {
ret = 0;
}
goto out;
}
out:
return ret;
asm void _CNTCACHEDeleteContent() {
clrlwi r11, r1, 0x1b
mr r12, r1
subfic r11, r11, -0x2100
stwux r1, r1, r11
mflr r0
mr r11, r12
stw r0, 4(r12)
bl _savegpr_26
li r3, 0
la r4, lbl_816985DC
bl strtok
li r31, 0
li r4, 0
stw r31, errno(r0)
li r5, 0x10
bl strtoull
lwz r0, errno(r0)
mr r29, r4
mr r30, r3
cmpwi r0, 0
bne L_708
li r0, -1
and r5, r3, r0
addis r0, r5, -1
cmplwi r0, 5
bne L_708
addi r28, r1, 0x80
addi r6, r1, 0x28
li r5, 0
bl ES_GetTmdView
cmpwi r3, -0x6a
beq L_708
cmpwi r3, 0
bne L_708
mr r4, r29
mr r3, r30
mr r5, r28
addi r6, r1, 0x28
bl ES_GetTmdView
cmpwi r3, 0
bne L_708
lwz r3, 0x94(r1)
rlwinm. r0, r3, 0, 0x1c, 0x1c
beq L_6f0
rlwinm. r0, r3, 0, 0x1b, 0x1b
beq L_6f0
li r3, 0
la r4, lbl_816985DC
bl strtok
li r26, 1
lis r27, lbl_81693420@ha
b L_6e8
L_5b0:
stw r31, errno(r0)
li r4, 0
li r5, 0xa
bl strtoul
lwz r0, errno(r0)
cmpwi r0, 0
bne L_6dc
cmplwi r3, 0x1fe
bgt L_6dc
lhz r0, 0xda(r1)
li r4, 0
mtctr r0
cmplwi r0, 0
ble L_6dc
L_5e8:
add r5, r28, r4
lhz r0, 0x60(r5)
cmplw r3, r0
bne L_6d4
lhz r0, 0x62(r5)
rlwinm. r0, r0, 0, 0x10, 0x10
bne L_6dc
lwz r5, 0x5c(r5)
mr r4, r29
mr r3, r30
bl ES_DeleteContent
cmpwi r3, 0
bne L_6dc
mr r4, r29
mr r3, r30
addi r6, r1, 0x2c
li r5, 0
bl ES_ListTitleContentsOnCard
cmpwi r3, 0
bne L_6dc
lwz r0, 0x2c(r1)
cmpwi r0, 0
bne L_6dc
li r0, -1
stw r26, 0x20(r1)
addi r3, r1, 0x40
addi r5, r27, lbl_81693420@l
stw r26, 0x24(r1)
and r6, r30, r0
and r7, r29, r0
li r4, 0x40
crclr 4*cr1+eq
bl snprintf
addi r3, r1, 0x40
addi r4, r1, 0x20
addi r5, r1, 0x24
bl NANDSecretGetUsage
cmpwi r3, -0xc
mr r0, r3
bne L_690
li r0, 2
b L_6bc
L_690:
cmpwi r3, 0
blt L_6bc
lwz r0, 0x24(r1)
cmplwi r0, 1
bne L_6b8
lwz r0, 0x20(r1)
cmpwi r0, 0
bne L_6b8
li r0, 1
b L_6bc
L_6b8:
li r0, 0
L_6bc:
cmpwi r0, 1
bne L_6dc
mr r4, r29
mr r3, r30
bl ES_DeleteTitle
b L_6dc
L_6d4:
addi r4, r4, 0x10
bdnz L_5e8
L_6dc:
li r3, 0
la r4, lbl_816985DC
bl strtok
L_6e8:
cmpwi r3, 0
bne L_5b0
L_6f0:
lwz r5, 0x28(r1)
addi r3, r1, 0x80
li r4, 0
addi r0, r5, 0x1f
rlwinm r5, r0, 0, 0, 0x1a
bl memset
L_708:
lwz r10, 0(r1)
mr r11, r10
bl _restgpr_26
lwz r0, 4(r10)
mtlr r0
mr r1, r10
blr
}

View File

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

View File

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

View File

@@ -0,0 +1,7 @@
#include <revolution/fa.h>
extern size_t pfstub_fread(void* buffer, size_t size, size_t count, FAFILE* stream);
size_t FAFread(void* buffer, size_t size, size_t count, FAFILE* stream) {
return pfstub_fread(buffer, size, count, stream);
}

View File

@@ -0,0 +1,7 @@
#include <revolution/fa.h>
extern size_t pfstub_fwrite(void* buffer, size_t size, size_t count, FAFILE* stream);
size_t FAFwrite(void* buffer, size_t size, size_t count, FAFILE* stream) {
return pfstub_fwrite(buffer, size, count, stream);
}

View File

@@ -0,0 +1,2 @@
int FADiskInitializedPadding;
int FADiskInitialized;

View File

@@ -0,0 +1,10 @@
typedef int s32;
extern s32 PFDIR_closedir(void* dir);
extern s32 PFAPI_convertReturnValue(s32 err);
s32 pf2_closedir(void* dir) {
s32 err = PFDIR_closedir(dir);
err = PFAPI_convertReturnValue(err);
return err;
}

View File

@@ -0,0 +1,10 @@
#include <revolution/fa.h>
extern s32 PFVOL_errnum(void);
extern s32 PFAPI_convertError(s32 error);
FAError pf2_errnum() {
s32 error = PFVOL_errnum();
error = PFAPI_convertError(error);
return error;
}

View File

@@ -0,0 +1,7 @@
#include <revolution/types.h>
extern s32 PFVOL_InitModule(u32 config, void* param);
s32 PFFATFS_initializeFATFS(u32 config, void* param) {
return PFVOL_InitModule(config, param);
}

View File

@@ -0,0 +1,10 @@
#include <revolution/fa.h>
extern s32 PFFILE_fclose(FAFILE* stream);
extern s32 PFAPI_convertReturnValue(s32 error);
FAError pf2_fclose(FAFILE* stream) {
s32 error = PFFILE_fclose(stream);
error = PFAPI_convertReturnValue(error);
return error;
}

View File

@@ -0,0 +1,10 @@
#include <revolution/fa.h>
extern s32 PFFILE_feof(FAFILE* stream);
extern s32 PFAPI_convertReturnValue4feof(s32 error);
FAError pf2_feof(FAFILE* stream) {
s32 error = PFFILE_feof(stream);
error = PFAPI_convertReturnValue4feof(error);
return error;
}

View File

@@ -0,0 +1,10 @@
#include <revolution/fa.h>
extern s32 PFFILE_ferror(FAFILE* stream);
extern s32 PFAPI_convertError(s32 error);
FAError pf2_ferror(FAFILE* stream) {
s32 error = PFFILE_ferror(stream);
error = PFAPI_convertError(error);
return error;
}

View File

@@ -0,0 +1,12 @@
#include <revolution/fa.h>
extern s32 PFFILE_flock(FAFILE* stream, s32 mode);
extern s32 PFAPI_convertReturnValue(s32 error);
FAError pf2_flock(FAFILE* stream, s32 mode) {
s32 error;
mode |= 8;
error = PFFILE_flock(stream, mode);
error = PFAPI_convertReturnValue(error);
return error;
}

View File

@@ -0,0 +1,9 @@
#include <revolution/fa.h>
extern s32 PFFILE_fread(void* buffer, size_t size, size_t count, FAFILE* stream, size_t* countRead);
size_t pf2_fread(void* buffer, size_t size, size_t count, FAFILE* stream) {
size_t countRead;
PFFILE_fread(buffer, size, count, stream, &countRead);
return countRead;
}

View File

@@ -0,0 +1,10 @@
#include <revolution/fa.h>
extern s32 PFFILE_fsync(FAFILE* stream);
extern s32 PFAPI_convertReturnValue(s32 error);
FAError pf2_fsync(FAFILE* stream) {
s32 error = PFFILE_fsync(stream);
error = PFAPI_convertReturnValue(error);
return error;
}

View File

@@ -0,0 +1,9 @@
#include <revolution/fa.h>
extern s32 PFFILE_fwrite(void* buffer, size_t size, size_t count, FAFILE* stream, size_t* countWritten);
size_t pf2_fwrite(void* buffer, size_t size, size_t count, FAFILE* stream) {
size_t countWritten;
PFFILE_fwrite(buffer, size, count, stream, &countWritten);
return countWritten;
}

View File

@@ -66,6 +66,7 @@ void __OSEVStart();
void __OSEVEnd();
#define __OSEVSize ((u32)__OSEVEnd - (u32)__OSEVStart)
void __OSEVSetNumber();
void __OSDBJumpTarget();
void __DBVECTOR();
@@ -795,7 +796,7 @@ static asm void __OSDBJump() {
#ifdef __MWERKS__
nofralloc
entry __OSDBJUMPSTART
bla OS_ADDR_DB_INTEGRATOR_HOOK
bla __OSDBJumpTarget
entry __OSDBJUMPEND
#endif // __MWERKS__
// clang-format on
@@ -831,6 +832,7 @@ entry __OSEVStart
mflr r3
stw r3, OSContext.lr(r4)
mfctr r3
entry __OSDBJumpTarget
stw r3, OSContext.ctr(r4)
mfxer r3
stw r3, OSContext.xer(r4)

View File

@@ -46,7 +46,7 @@ void CDBRecordKeyGetKeyStr(CDBRecordKey* recordKey, char* keyString);
void CDBRecordKeySetSerialNumber(CDBRecordKey* recordKey, int serialNum);
void CDBRecordKeyCopy(CDBRecordKey* recordKey, CDBRecordKey* newRecordKey);
void CDBRecordKeyCopy(CDBRecordKey* recordKey, const CDBRecordKey* newRecordKey);
BOOL CDBRecordKeyCompare(CDBRecordKey* recordKey1, CDBRecordKey* recordKey2);
int CDBRecordKeyCompareByDate(CDBRecordKey* recordKey1, CDBRecordKey* recordKey2);

View File

@@ -16,7 +16,7 @@ int STD_strnlen(const char* str, u32 len);
int Util_xtoi(char ch);
void* Mail_memcpy(void* dest, void* src, u32 len);
void* Mail_memcpy(void* dest, const void* src, u32 len);
void* Mail_memset(void* dest, int fill, u32 count);
int Mail_strlen(const char* str);

View File

@@ -324,25 +324,37 @@ CDBErr CDBConvKeyToFullPath(CDBRecordKey* recordKey, char* fullPath) {
}
void CDBConvKeyStrToFullPath_(char* keyString, char* fullPath, CDBLocation location, u64* wiiId) {
char fileNameStr[8];
char yearStr[8];
char monthStr[8];
char dayStr[8];
char hourStr[8];
char minStr[8];
char codeStr[8];
char typeStr[8];
char serialNumStr[8];
char fileNameStr[8];
char typeStr[5];
CDBDate epoch;
int year;
int month;
int day;
int hour;
int min;
char serialNumStr[4];
char fileSerial[4];
CDBDate fileEpoch;
char fileEpochStr[40];
CDBConvKeyStrToEpochValue(keyString, &epoch);
{
union {
char storage[20];
struct {
char prefix[8];
char value[12];
} epoch;
} epochBuffer;
strncpy(epochBuffer.epoch.value, CDBKeyStrEpoch(keyString), CDB_KEYSTR_EPOCH_SIZE);
epochBuffer.epoch.value[CDB_KEYSTR_EPOCH_SIZE] = 0;
sscanf(epochBuffer.epoch.value, "%ul", &epoch);
}
CDBConvEpochValueToDate(epoch, &year, &month, &day, &hour, &min, NULL);
CDBConvYearValueToYearStr(yearStr, year);
@@ -354,7 +366,12 @@ void CDBConvKeyStrToFullPath_(char* keyString, char* fullPath, CDBLocation locat
CDBConvKeyStrToCode(keyString, codeStr);
CDBConvKeyStrToSerialNumber(keyString, serialNumStr);
CDBConvKeyStrToType(keyString, typeStr);
CDBConvKeyStrToFileName(keyString, fileNameStr);
strncpy(fileEpochStr, CDBKeyStrEpoch(keyString), CDB_KEYSTR_EPOCH_SIZE);
fileEpochStr[CDB_KEYSTR_EPOCH_SIZE] = 0;
sscanf(fileEpochStr, "%ul", &fileEpoch);
strncpy(fileSerial, CDBKeyStrSerialNumber(keyString), CDB_KEYSTR_SERIAL_NUMBER_SIZE);
fileSerial[CDB_KEYSTR_SERIAL_NUMBER_SIZE] = 0;
sprintf(fileNameStr, "%08X.%s", fileEpoch, fileSerial);
if (location == CDB_FS_LOCATION_NAND || location == CDB_FS_LOCATION_SD) {
CDBConvFileNameStrToFullPath(fullPath, yearStr, monthStr, dayStr, hourStr, minStr, codeStr, typeStr, fileNameStr, location, wiiId);

File diff suppressed because it is too large Load Diff

View File

@@ -8,7 +8,7 @@
#pragma push
#pragma section sconst_type ".sdata"
extern const char lbl_816979E8[8] = "/";
extern const char lbl_816979E8[8] = "/\0\0\0\0\0\0\0";
#pragma pop
void CDBFSConcatenatePath(char* path, const char* concatPath) {

View File

@@ -29,23 +29,25 @@ BOOL CDBRecordKeyIsValid(CDBRecordKey* recordKey) {
}
void CDBRecordKeyInit(CDBRecordKey* recordKey, CDBDate epoch, int gameCode, u16 makerCode, int serialNumber, char* fileType, int unk) {
char typeStr[8];
char gcStr[8];
char mcStr[8];
struct {
char mcStr[4];
char typeStr[8];
char gcStr[8];
} strings;
u32 typeLength;
CDBConvMCValueToMCStr(makerCode, mcStr);
CDBConvGCValueToGCStr(gameCode, gcStr);
CDBConvMCValueToMCStr(makerCode, strings.mcStr);
CDBConvGCValueToGCStr(gameCode, strings.gcStr);
recordKey->wiiId = CDBGetWiiId();
recordKey->location = unk;
typeLength = strlen(typeStr);
strcpy(typeStr, fileType);
CDBToLower(typeStr, typeLength);
typeLength = strlen(fileType);
strcpy(strings.typeStr, fileType);
CDBToLower(((char*)strings.typeStr), typeLength);
sprintf(recordKey->keyString, "%010u_%s_%s_%03d.%s", epoch, gcStr, mcStr, serialNumber, typeStr);
sprintf(recordKey->keyString, "%010u_%s_%s_%03d.%s", epoch, strings.gcStr, strings.mcStr, serialNumber, strings.typeStr);
}
void CDBRecordKeySetSerialNumber(CDBRecordKey* recordKey, int serialNum) {
@@ -72,9 +74,8 @@ void CDBRecordKeyInitFromFileName2(CDBRecordKey* recordKey, char* keyString, cha
recordKey->location = CDB_FS_LOCATION_SD;
}
void CDBRecordKeyCopy(CDBRecordKey* recordKey, CDBRecordKey* newRecordKey) {
void CDBRecordKeyCopy(CDBRecordKey* recordKey, const CDBRecordKey* newRecordKey) {
strcpy(recordKey->keyString, newRecordKey->keyString);
recordKey->wiiId = newRecordKey->wiiId;
recordKey->location = newRecordKey->location;
}
@@ -136,6 +137,156 @@ CDBRecordKey* CDBRecordKeyArrayEnd(CDBRecordKeyArray* recordArray) {
return recordArray->records + recordArray->size;
}
#pragma dont_inline on
int CDBRecordKeyArrayDicInsertR(CDBRecordKeyArray* recordArray, CDBRecordKey* recordKey, int first, int last) {
int index;
int result;
if (first == last || first == last - 1) {
result = CDBRecordKeyCompare(recordKey, recordArray->records + first);
if (result < 0) {
return first;
}
result = CDBRecordKeyCompare(recordKey, recordArray->records + last);
if (result >= 0) {
last++;
}
return last;
}
index = first + (last - first) / 2;
result = CDBRecordKeyCompare(recordKey, recordArray->records + index);
if (result < 0) {
return CDBRecordKeyArrayDicInsertR(recordArray, recordKey, first, index);
}
if (result > 0) {
return CDBRecordKeyArrayDicInsertR(recordArray, recordKey, index, last);
}
return index;
}
CDBRecordKey* CDBRecordKeyArrayDicInsert(CDBRecordKeyArray* recordArray, CDBRecordKey* recordKey) {
int size = recordArray->size;
int index;
int moveCount;
CDBRecordKey* record;
if (size == 0) {
if (size < recordArray->capacity) {
record = recordArray->records + size;
CDBRecordKeyCopy(record, recordKey);
recordArray->size++;
}
return recordKey;
}
if (recordArray->capacity <= size) {
if (recordArray->reverse == 1) {
if (size != 0) {
record = recordArray->records + (size - 1);
} else {
record = recordArray->records;
}
if (CDBRecordKeyCompare(record, recordKey) < 0) {
return record;
}
recordArray->size--;
index = CDBRecordKeyArrayDicInsertR(recordArray, recordKey, 0, recordArray->size - 1);
moveCount = (recordArray->size - index) * sizeof(CDBRecordKey);
if (recordArray->capacity <= recordArray->size) {
moveCount -= sizeof(CDBRecordKey);
}
if (moveCount > 0) {
memmove((CDBRecordKey*)((char*)recordArray->records + (index + 1) * sizeof(CDBRecordKey)),
(CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)),
moveCount);
}
CDBRecordKeyCopy((CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)), recordKey);
if (recordArray->size < recordArray->capacity) {
recordArray->size++;
}
return (CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey));
}
record = recordArray->records;
if (CDBRecordKeyCompare(recordKey, record) < 0) {
return record;
}
recordArray->size--;
if (recordArray->size >= 0 && recordArray->capacity - 1 >= 0) {
memmove(recordArray->records, recordArray->records + 1, recordArray->size * sizeof(CDBRecordKey));
}
index = CDBRecordKeyArrayDicInsertR(recordArray, recordKey, 0, recordArray->size - 1);
moveCount = (recordArray->size - index) * sizeof(CDBRecordKey);
if (recordArray->capacity <= recordArray->size) {
moveCount -= sizeof(CDBRecordKey);
}
if (moveCount > 0) {
memmove((CDBRecordKey*)((char*)recordArray->records + (index + 1) * sizeof(CDBRecordKey)),
(CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)),
moveCount);
}
CDBRecordKeyCopy((CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)), recordKey);
if (recordArray->size < recordArray->capacity) {
recordArray->size++;
}
return (CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey));
}
index = CDBRecordKeyArrayDicInsertR(recordArray, recordKey, 0, size - 1);
moveCount = (recordArray->size - index) * sizeof(CDBRecordKey);
if (recordArray->capacity <= recordArray->size) {
moveCount -= sizeof(CDBRecordKey);
}
if (moveCount > 0) {
memmove((CDBRecordKey*)((char*)recordArray->records + (index + 1) * sizeof(CDBRecordKey)),
(CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)),
moveCount);
}
CDBRecordKeyCopy((CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)), recordKey);
if (recordArray->size < recordArray->capacity) {
recordArray->size++;
}
return (CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey));
}
int CDBRecordKeyArrayDicFindR(CDBRecordKeyArray* recordArray, CDBRecordKey* recordKey, int first, int last) {
int index;
int result;
if (first == last || first == last - 1) {
result = CDBRecordKeyCompare(recordKey, recordArray->records + first);
if (result == 0) {
return first;
}
result = CDBRecordKeyCompare(recordKey, recordArray->records + last);
if (result != 0) {
return -1;
}
return last;
}
index = first + (last - first) / 2;
result = CDBRecordKeyCompare(recordKey, recordArray->records + index);
if (result < 0) {
return CDBRecordKeyArrayDicFindR(recordArray, recordKey, first, index);
}
if (result > 0) {
return CDBRecordKeyArrayDicFindR(recordArray, recordKey, index, last);
}
return index;
}
#pragma dont_inline reset
CDBRecordKey* CDBRecordKeyArrayDicFind(CDBRecordKeyArray* recordArray, CDBRecordKey* recordKey) {
int size = recordArray->size;
int index;

View File

@@ -0,0 +1,585 @@
#include <private/ipc.h>
#include <private/ios.h>
#include <private/nwc24/NWC24Schedule.h>
#include <revolution/ncd.h>
#include <revolution/os.h>
#include <string.h>
#define NCD_IPC_HEAP_SIZE 0x1B60
#define NCD_MAX_PROFILE 3
static u32 ncdInitialized;
static NCDConfig* ncdCommonBuffer;
struct NCDMutex {
OSMutex mutex;
u8 padding[8];
} ncdMutex;
s32 ncdCommonResult[8] ATTRIBUTE_ALIGN(32);
IOSIoVector ncdCommonVector[4] ATTRIBUTE_ALIGN(32);
const char* __NCDVersion = "<< RVL_SDK - NCD \trelease build: Dec 12 2008 03:06:03 (0x4199_60831) >>";
const char* __NCDUnofficialVersion = "<< RVL_SDK - NCD \trelease build: Dec 12 2008 03:06:03 (0x4199_60831) UNOFFICIAL >>";
static void LockRight(void);
static NCDErr ExecConfigCommand(const char* name, NCDConfig* config, u32 command);
static NCDErr NCDiGetWirelessMacAddress(u8* macAddr);
NCDErr NCDReadConfig(NCDConfig* config) {
if (config == NULL) {
return -3;
}
return ExecConfigCommand("NCDReadConfig", config, 5);
}
NCDErr NCDWriteConfig(const NCDConfig* config) {
BOOL enabled;
enabled = OSDisableInterrupts();
if (!(ncdInitialized & 2)) {
OSRegisterVersion(__NCDUnofficialVersion);
ncdInitialized |= 2;
}
OSRestoreInterrupts(enabled);
if (config == NULL) {
return -3;
}
return ExecConfigCommand("NCDWriteConfig", (NCDConfig*)config, 6);
}
NCDErr NCDSetIfConfig(NCDIfConfig* ifConfig) {
union {
BOOL enabled;
NCDConfig* config;
} state;
NCDErr lockErr;
NCDProfile* profile;
NCDErr result;
s32 i;
u32 count;
state.enabled = OSDisableInterrupts();
if (!(ncdInitialized & 2)) {
OSRegisterVersion(__NCDUnofficialVersion);
ncdInitialized |= 2;
}
OSRestoreInterrupts(state.enabled);
if (ifConfig == NULL) {
return -3;
}
if (!OSGetCurrentThread()) {
return -5;
}
LockRight();
lockErr = NWC24iLockSocket();
if (lockErr == 0) {
result = ExecConfigCommand("NCDSetIfConfig", NULL, 3);
if (result == 0) {
state.config = ncdCommonBuffer;
if (ifConfig->selectedMedia != 1 && ifConfig->selectedMedia != 2) {
state.config->selectedMedia = 0;
} else {
state.config->selectedMedia = ifConfig->selectedMedia;
profile = state.config->profiles;
i = 0;
state.config->linkTimeout = ifConfig->linkTimeout;
count = 0;
for (; i < NCD_MAX_PROFILE; i++, profile++) {
if (state.config->profiles[i].flags & 0x80) {
switch (ifConfig->selectedMedia) {
case 1:
state.config->profiles[i].flags &= ~1;
memcpy(&profile->netif, &ifConfig->netif, 0x15c);
break;
case 2:
state.config->profiles[i].flags |= 1;
memcpy(&profile->netif, &ifConfig->netif, 4);
break;
}
count++;
}
}
if (count == 0) {
state.config->profiles[0].flags |= 0x80;
switch (ifConfig->selectedMedia) {
case 1:
state.config->profiles[0].flags &= ~1;
memcpy(&state.config->profiles[0].netif.wireless, &ifConfig->netif, 0x15c);
break;
case 2:
state.config->profiles[0].flags |= 1;
memcpy(&state.config->profiles[0].netif.wired, &ifConfig->netif, 4);
break;
}
memset(&state.config->profiles[0].adjust, 0, 0xc);
state.config->profiles[0].flags |= 6;
memset(&state.config->profiles[0].ip, 0, 0x14);
state.config->profiles[0].flags &= ~0x10;
memset(&state.config->profiles[0].proxy, 0, 0x79c);
}
}
result = ExecConfigCommand("NCDSetIfConfig", NULL, 4);
}
NWC24iUnlockSocket();
} else if (lockErr == -0x16) {
result = -4;
} else if (lockErr == -0x1d) {
result = -8;
} else {
result = -2;
}
OSUnlockMutex((OSMutex*)&ncdMutex);
return result;
}
NCDErr NCDSetIpConfig(NCDIpConfig* ipConfig) {
NCDErr err;
BOOL enabled;
s32 i;
u32 count;
NCDConfig* config;
enabled = OSDisableInterrupts();
if (!(ncdInitialized & 2)) {
OSRegisterVersion(__NCDUnofficialVersion);
ncdInitialized |= 2;
}
OSRestoreInterrupts(enabled);
if (ipConfig == NULL) {
return -3;
}
if (!OSGetCurrentThread()) {
return -5;
}
LockRight();
err = NWC24iLockSocket();
if (err == 0) {
err = ExecConfigCommand("NCDSetIpConfig", NULL, 3);
if (err == 0) {
i = 0;
count = 0;
config = ncdCommonBuffer;
for (; i < NCD_MAX_PROFILE; i++) {
if (config->profiles[i].flags & 0x80) {
NCDProfile* profile = &config->profiles[i];
memcpy(&profile->adjust, &ipConfig->adjust, 0xc);
if (ipConfig->useDhcp == 1) {
config->profiles[i].flags |= 6;
memcpy(&profile->ip, &ipConfig->ip, 0x14);
} else {
config->profiles[i].flags &= ~6;
memcpy(&profile->ip, &ipConfig->ip, 0x14);
}
if (ipConfig->useProxy == 1) {
config->profiles[i].flags |= 0x10;
memcpy(&profile->proxy, &ipConfig->proxy, 0x79c);
} else {
config->profiles[i].flags &= ~0x10;
memset(&profile->proxy, 0, 0x79c);
}
count++;
}
}
if (count == 0) {
NCDProfile* profile = config->profiles;
profile->flags |= 0x80;
memcpy(&profile->adjust, &ipConfig->adjust, 0xc);
if (ipConfig->useDhcp == 1) {
profile->flags |= 6;
memcpy(&profile->ip, &ipConfig->ip, 0x14);
} else {
profile->flags &= ~6;
memcpy(&profile->ip, &ipConfig->ip, 0x14);
}
if (ipConfig->useProxy == 1) {
profile->flags |= 0x10;
memcpy(&profile->proxy, &ipConfig->proxy, 0x79c);
} else {
profile->flags &= ~0x10;
memset(&profile->proxy, 0, 0x79c);
}
profile->flags = profile->flags & ~1;
memset(&profile->netif, 0, 0x15c);
}
err = ExecConfigCommand("NCDSetIpConfig", NULL, 4);
}
NWC24iUnlockSocket();
} else if (err == -0x16) {
err = -4;
} else if (err == -0x1d) {
err = -8;
} else {
err = -2;
}
OSUnlockMutex((OSMutex*)&ncdMutex);
return err;
}
NCDErr NCDGetCurrentIpConfig(NCDIpConfig* ipConfig) {
NCDErr err = 0;
NCDConfig* config;
s32 idx;
if (ipConfig == NULL) {
return -3;
}
LockRight();
err = ExecConfigCommand("NCDGetCurrentIpConfig", 0, 3);
if (err == 0) {
config = ncdCommonBuffer;
idx = ncdCommonResult[1];
if (idx < 0 || idx >= NCD_MAX_PROFILE) {
err = -7;
} else {
memcpy(&ipConfig->adjust, &config->profiles[idx].adjust, 0xc);
if (config->profiles[idx].flags & 0x6) {
ipConfig->useDhcp = TRUE;
memcpy(&ipConfig->ip, &config->profiles[idx].ip, 0x14);
} else {
ipConfig->useDhcp = FALSE;
memcpy(&ipConfig->ip, &config->profiles[idx].ip, 0x14);
}
if (config->profiles[idx].flags & 0x10) {
ipConfig->useProxy = TRUE;
memcpy(&ipConfig->proxy, &config->profiles[idx].proxy, 0x79c);
} else {
ipConfig->useProxy = FALSE;
memset(&ipConfig->proxy, 0, 0x79c);
}
}
}
OSUnlockMutex((OSMutex*)&ncdMutex);
return err;
}
NCDErr NCDGetLinkStatus(void) {
NCDErr err;
s32 fd;
if (!OSGetCurrentThread()) {
return -5;
}
LockRight();
fd = IOS_Open("/dev/net/ncd/manage", 0);
if (fd < 0) {
if (fd == -6) {
err = -8;
} else {
err = -2;
}
} else {
ncdCommonVector[0].base = (u8*)ncdCommonResult;
ncdCommonVector[0].length = sizeof(ncdCommonResult);
if (IOS_Ioctlv(fd, 7, 0, 1, ncdCommonVector) < 0) {
err = -2;
} else {
err = ncdCommonResult[0];
if (err == 0) {
err = ncdCommonResult[1];
err = err >= 0 ? err : -1;
}
}
if (IOS_Close(fd) < 0) {
err = -1;
}
}
OSUnlockMutex((OSMutex*)&ncdMutex);
return err;
}
BOOL NCDIsInterfaceDecided(void) {
NCDErr err = NCDGetLinkStatus();
switch (err) {
case 3:
case 4:
case 5:
return TRUE;
default:
return FALSE;
}
}
NCDErr NCDGetWirelessMacAddress(u8* macAddr) {
return NCDiGetWirelessMacAddress(macAddr);
}
static NCDErr NCDiGetWirelessMacAddress(u8* macAddr) {
NCDErr err = 0;
s32 fd;
if (macAddr == NULL) {
return -3;
}
if (!OSGetCurrentThread()) {
return -5;
}
LockRight();
fd = IOS_Open("/dev/net/ncd/manage", 0);
if (fd < 0) {
if (fd == -6) {
err = -8;
} else {
err = -2;
}
} else {
ncdCommonVector[0].base = (u8*)ncdCommonResult;
ncdCommonVector[0].length = sizeof(ncdCommonResult);
ncdCommonVector[1].base = (u8*)ncdCommonBuffer;
ncdCommonVector[1].length = NCD_MAC_ADDRESS_LENGTH;
if (IOS_Ioctlv(fd, 8, 0, 2, ncdCommonVector) < 0) {
err = -2;
} else {
err = ncdCommonResult[0];
if (err == 0) {
memcpy(macAddr, ncdCommonBuffer, NCD_MAC_ADDRESS_LENGTH);
}
}
if (IOS_Close(fd) < 0) {
err = -1;
}
}
OSUnlockMutex((OSMutex*)&ncdMutex);
return err;
}
NCDErr NCDLockWirelessDriver(void) {
NCDErr err;
s32 fd;
if (!OSGetCurrentThread()) {
return -5;
}
LockRight();
fd = IOS_Open("/dev/net/ncd/manage", 0);
if (fd < 0) {
if (fd == -6) {
err = -8;
} else {
err = -2;
}
} else {
ncdCommonVector[0].base = (u8*)ncdCommonResult;
ncdCommonVector[0].length = sizeof(ncdCommonResult);
if (IOS_Ioctlv(fd, 1, 0, 1, ncdCommonVector) < 0) {
err = -2;
} else {
err = ncdCommonResult[0];
if (err == 0) {
err = ncdCommonResult[1];
err = err > 0 ? err : -1;
}
}
if (IOS_Close(fd) < 0) {
err = -1;
}
}
OSUnlockMutex((OSMutex*)&ncdMutex);
return err;
}
NCDErr NCDUnlockWirelessDriver(s32 id) {
NCDErr err;
s32 fd;
if (id <= 0) {
return -3;
}
if (!OSGetCurrentThread()) {
return -5;
}
LockRight();
fd = IOS_Open("/dev/net/ncd/manage", 0);
if (fd < 0) {
if (fd == -6) {
err = -8;
} else {
err = -2;
}
} else {
ncdCommonVector[0].base = (u8*)ncdCommonBuffer;
ncdCommonVector[0].length = 4;
ncdCommonVector[1].base = (u8*)ncdCommonResult;
ncdCommonVector[1].length = sizeof(ncdCommonResult);
ncdCommonBuffer->version = id;
if (IOS_Ioctlv(fd, 2, 1, 1, ncdCommonVector) < 0) {
err = -2;
} else {
err = ncdCommonResult[0];
}
if (IOS_Close(fd) < 0) {
err = -1;
}
}
OSUnlockMutex((OSMutex*)&ncdMutex);
return err;
}
s32 NCDRestoreConfig(void) {
NCDErr err;
if (!OSGetCurrentThread()) {
return -5;
}
LockRight();
err = NWC24iLockSocket();
if (err == 0) {
err = ExecConfigCommand("NCDRestoreConfig", NULL, 5);
if (err == 0) {
err = ExecConfigCommand("NCDRestoreConfig", NULL, 4);
}
NWC24iUnlockSocket();
} else if (err == -0x16) {
err = -4;
} else if (err == -0x1d) {
err = -8;
} else {
err = -2;
}
OSUnlockMutex((OSMutex*)&ncdMutex);
return err;
}
NCDErr NCDiGetEnabledConfigList(u32* list0, u32* list1, u32* list2) {
NCDErr err;
u32 mask0 = 0;
u32 mask1 = 0;
u32 mask2 = 0;
u8 flags;
u32 i;
LockRight();
err = ExecConfigCommand("NCDiGetEnabledConfigList", NULL, 3);
if (err == 0) {
for (i = 0; i < NCD_MAX_PROFILE; i++) {
NCDProfile* profile = &ncdCommonBuffer->profiles[i];
flags = profile->flags;
if (flags & 0x80) {
if (flags & 1) {
mask0 |= 1 << i;
} else {
if (profile->netif.wireless.configMethod != 1) {
mask1 |= 1 << i;
}
if (ncdCommonBuffer->profiles[i].netif.wireless.configMethod == 1) {
mask2 |= 1 << i;
}
}
}
}
}
OSUnlockMutex((OSMutex*)&ncdMutex);
if (list0 != NULL) {
*list0 = mask0;
}
if (list1 != NULL) {
*list1 = mask1;
}
if (list2 != NULL) {
*list2 = mask2;
}
return err;
}
static NCDErr ExecConfigCommand(const char* name, NCDConfig* config, u32 command) {
NCDErr err = 0;
s32 fd;
if (!OSGetCurrentThread()) {
return -5;
}
LockRight();
fd = IOS_Open("/dev/net/ncd/manage", 0);
if (fd < 0) {
if (fd == -6) {
err = -8;
} else {
err = -2;
}
} else {
ncdCommonVector[0].base = (u8*)ncdCommonBuffer;
ncdCommonVector[0].length = sizeof(NCDConfig);
ncdCommonVector[1].base = (u8*)ncdCommonResult;
ncdCommonVector[1].length = sizeof(ncdCommonResult);
switch (command) {
case 3:
case 5:
if (IOS_Ioctlv(fd, command, 0, 2, ncdCommonVector) < 0) {
err = -2;
} else {
err = ncdCommonResult[0];
if (err == 0 && config != NULL) {
memcpy(config, ncdCommonBuffer, sizeof(NCDConfig));
}
}
break;
case 4:
case 6:
if (config != NULL) {
memcpy(ncdCommonBuffer, config, sizeof(NCDConfig));
}
if (IOS_Ioctlv(fd, command, 1, 1, ncdCommonVector) < 0) {
err = -2;
} else {
err = ncdCommonResult[0];
}
break;
}
if (IOS_Close(fd) < 0) {
err = -1;
}
}
OSUnlockMutex((OSMutex*)&ncdMutex);
return err;
}
static void LockRight(void) {
BOOL enabled;
void* lo;
enabled = OSDisableInterrupts();
if (!(ncdInitialized & 1)) {
OSRegisterVersion(__NCDVersion);
OSInitMutex((OSMutex*)&ncdMutex);
lo = (void*)OSRoundUp32B(IPCGetBufferLo());
if ((u32)IPCGetBufferHi() - (u32)lo < NCD_IPC_HEAP_SIZE) {
OSPanic("ncdsystem.c", 0x5B1, "Could not reserve heap for NCD library from IPC arena");
}
IPCSetBufferLo((u8*)lo + NCD_IPC_HEAP_SIZE);
ncdCommonBuffer = (NCDConfig*)lo;
memset(ncdCommonBuffer, 0, NCD_IPC_HEAP_SIZE);
memset(ncdCommonResult, 0, sizeof(ncdCommonResult));
memset(ncdCommonVector, 0, sizeof(ncdCommonVector));
ncdInitialized |= 1;
}
OSRestoreInterrupts(enabled);
OSLockMutex((OSMutex*)&ncdMutex);
}

View File

@@ -18,10 +18,16 @@ enum {
#define FRIEND_LIST_MAGIC 'WcFl'
#define FRIEND_LIST_VERSION 2
static const char* FLFilePath = "/shared2/wc24/nwc24fl.bin";
const char lbl_8166E160[26] __attribute__((section(".data"), aligned(8))) = "/shared2/wc24/nwc24fl.bin";
void* const lbl_8166E160_pad __attribute__((section(".data"))) = (void*)0;
static const char* FLFilePath = lbl_8166E160;
const u32 FLFilePath_pad __attribute__((section(".sdata"), aligned(1))) = 0;
const char g_SpecialsChars[16] = { '(', ')', '<', '>', '[', ']', ':', ';', '\\', ',', '"' };
static NWC24Err GetCachedFLHeader(NWC24FLHeader** header);
static ChkHostNameError CheckHostName(const char* hostName, u32 hostNameLength);
static inline NWC24Err CheckFriendInfo(const NWC24FriendInfo* friendInfo);
static u32 GetUnkFlag(u32 index) {
NWC24Err result;
@@ -127,7 +133,7 @@ NWC24Err NWC24WriteFriendInfo(const NWC24FriendInfo* friendInfo, u32 index) {
return NWC24_ERR_ALIGNMENT;
}
result = NWC24CheckFriendInfo(friendInfo);
result = CheckFriendInfo(friendInfo);
if (result != NWC24_OK) {
return result;
}
@@ -219,63 +225,6 @@ NWC24Err NWC24WriteFriendInfo(const NWC24FriendInfo* friendInfo, u32 index) {
return result;
}
NWC24Err NWC24DeleteFriendInfo(u32 index) {
NWC24Err result;
NWC24Err resultWrite;
NWC24FLHeader* header;
NWC24FriendInfo* tmpFriendInfo;
NWC24File file;
u32 fileOffset;
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool()) {
return NWC24_ERR_LIB_NOT_OPENED;
}
result = GetCachedFLHeader(&header);
if (result != NWC24_OK) {
return result;
}
if (index >= header->infoCount) {
return NWC24_ERR_INVALID_VALUE;
}
if (header->friendIds[index] == 0) {
return NWC24_ERR_NULL;
}
tmpFriendInfo = (NWC24FriendInfo*)nwc24Work->mainWork;
Mail_memset(tmpFriendInfo, 0, sizeof(NWC24FriendInfo));
result = NWC24FOpen(&file, FLFilePath, NWC24_OPEN_RW);
if (result != NWC24_OK) {
return result;
}
fileOffset = (index * sizeof(NWC24FriendInfo)) + sizeof(NWC24FLHeader);
NWC24FSeek(&file, fileOffset, NWC24_SEEK_BEG);
resultWrite = NWC24FWrite(tmpFriendInfo, sizeof(NWC24FriendInfo), &file);
if (resultWrite == NWC24_OK) {
header->friendIds[index] = 0;
header->registeredCount--;
result = SetUnkFlag(index, 0);
if (result == NWC24_OK) {
NWC24FSeek(&file, 0, NWC24_SEEK_BEG);
resultWrite = NWC24FWrite(header, sizeof(NWC24FLHeader), &file);
}
}
result = NWC24FClose(&file);
if (resultWrite != NWC24_OK) {
result = resultWrite;
}
return result;
}
NWC24Err NWC24UpdateFriendInfo(const NWC24FriendInfo* friendInfo, u32 index) {
NWC24Err result;
NWC24Err resultFile;
@@ -296,7 +245,7 @@ NWC24Err NWC24UpdateFriendInfo(const NWC24FriendInfo* friendInfo, u32 index) {
return NWC24_ERR_ALIGNMENT;
}
result = NWC24CheckFriendInfo(friendInfo);
result = CheckFriendInfo(friendInfo);
if (result != NWC24_OK) {
return result;
}
@@ -358,6 +307,63 @@ out:
return result;
}
NWC24Err NWC24DeleteFriendInfo(u32 index) {
NWC24Err result;
NWC24Err resultWrite;
NWC24FLHeader* header;
NWC24FriendInfo* tmpFriendInfo;
NWC24File file;
u32 fileOffset;
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool()) {
return NWC24_ERR_LIB_NOT_OPENED;
}
result = GetCachedFLHeader(&header);
if (result != NWC24_OK) {
return result;
}
if (index >= header->infoCount) {
return NWC24_ERR_INVALID_VALUE;
}
if (header->friendIds[index] == 0) {
return NWC24_ERR_NULL;
}
tmpFriendInfo = (NWC24FriendInfo*)nwc24Work->mainWork;
Mail_memset(tmpFriendInfo, 0, sizeof(NWC24FriendInfo));
result = NWC24FOpen(&file, FLFilePath, NWC24_OPEN_RW);
if (result != NWC24_OK) {
return result;
}
fileOffset = (index * sizeof(NWC24FriendInfo)) + sizeof(NWC24FLHeader);
NWC24FSeek(&file, fileOffset, NWC24_SEEK_BEG);
resultWrite = NWC24FWrite(tmpFriendInfo, sizeof(NWC24FriendInfo), &file);
if (resultWrite == NWC24_OK) {
header->friendIds[index] = 0;
header->registeredCount--;
result = SetUnkFlag(index, 0);
if (result == NWC24_OK) {
NWC24FSeek(&file, 0, NWC24_SEEK_BEG);
resultWrite = NWC24FWrite(header, sizeof(NWC24FLHeader), &file);
}
}
result = NWC24FClose(&file);
if (resultWrite != NWC24_OK) {
result = resultWrite;
}
return result;
}
NWC24Err NWC24SwapFriendInfos(u32 index1, u32 index2) {
NWC24Err result;
NWC24Err resultFile;
@@ -750,7 +756,7 @@ static NWC24Err GetCachedFLHeader(NWC24FLHeader** header) {
return NWC24_OK;
}
NWC24Err NWC24CheckFriendInfo(const NWC24FriendInfo* friendInfo) {
static inline NWC24Err CheckFriendInfo(const NWC24FriendInfo* friendInfo) {
NWC24Err result;
if (friendInfo == NULL) {
@@ -775,8 +781,6 @@ NWC24Err NWC24CheckPublicMailAddr(const char* addr) {
int len;
BOOL readingDomain;
static const char specials[] = { '(', ')', '<', '>', '[', ']', ':', ';', '\\', ',', '"' };
// Check parameters
if (addr == NULL) {
return NWC24_ERR_NULL;
@@ -812,8 +816,8 @@ NWC24Err NWC24CheckPublicMailAddr(const char* addr) {
}
// If the character is special, invalid!
for (j = 0; j < sizeof(specials); j++) {
if (ch == specials[j]) {
for (j = 0; j < 11; j++) {
if (ch == g_SpecialsChars[j]) {
return NWC24_ERR_FORMAT;
}
}

View File

@@ -382,28 +382,6 @@ NWC24Err NWC24GetMsgType(const NWC24MsgObj* msg, NWC24MsgType* type) {
return NWC24_OK;
}
NWC24Err NWC24GetMsgAppId(const NWC24MsgObj* msg, u32* appId) {
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
*appId = msgObj->appId;
return NWC24_OK;
}
NWC24Err NWC24GetMsgGroupId(const NWC24MsgObj* msg, u16* groupId) {
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
*groupId = msgObj->groupId;
return NWC24_OK;
}
NWC24Err NWC24GetMsgNumAttached(const NWC24MsgObj* msg, u32* numAttach) {
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
u8 numAttached = msgObj->numAttached;
*numAttach = numAttached;
if (numAttached > NWC24_MSG_ATTACHMENT_MAX) {
return NWC24_ERR_BROKEN;
}
return NWC24_OK;
}
NWC24Err NWC24GetMsgSubjectSize(const NWC24MsgObj* msg, u32* subjectSize) {
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
u32 size = msgObj->subject.size;
@@ -431,6 +409,16 @@ NWC24Err NWC24GetMsgTextSize(const NWC24MsgObj* msg, u32* textSize) {
return NWC24_OK;
}
NWC24Err NWC24GetMsgNumAttached(const NWC24MsgObj* msg, u32* numAttach) {
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
u8 numAttached = msgObj->numAttached;
*numAttach = numAttached;
if (numAttached > NWC24_MSG_ATTACHMENT_MAX) {
return NWC24_ERR_BROKEN;
}
return NWC24_OK;
}
NWC24Err NWC24GetMsgAttachedSize(const NWC24MsgObj* msg, u32 attachIndex, u32* attachSize) {
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
@@ -463,6 +451,18 @@ NWC24Err NWC24GetMsgAttachedType(const NWC24MsgObj* msg, u32 attachIndex, NWC24M
return NWC24_OK;
}
NWC24Err NWC24GetMsgAppId(const NWC24MsgObj* msg, u32* appId) {
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
*appId = msgObj->appId;
return NWC24_OK;
}
NWC24Err NWC24GetMsgGroupId(const NWC24MsgObj* msg, u16* groupId) {
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
*groupId = msgObj->groupId;
return NWC24_OK;
}
NWC24Err NWC24GetMsgFromId(const NWC24MsgObj* msg, NWC24UserId* fromId) {
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;

View File

@@ -3,48 +3,91 @@
#include <ctype.h>
char* Mail_strcpy(char* dest, const char* src) {
char* pDest;
char cSrc;
for (pDest = dest; *src != 0; pDest++) {
cSrc = *src++;
*pDest = cSrc;
char* Mail_strcpy(char* pDst, const char* pSrc) {
char* pOrigin = pDst;
while (*pSrc != '\0') {
*pDst++ = *pSrc++;
}
*pDest = 0;
return dest;
*pDst = '\0';
return pOrigin;
}
int Mail_strlen(const char* str) {
int i;
for (i = 0; *str != 0; i++, str++) {
int Mail_strlen(const char* pStr) {
int len = 0;
while (pStr[len] != '\0') {
len++;
}
return i;
return len;
}
char* Mail_strcat(char* dest, const char* src) {
int i;
char* pDest;
int STD_strnlen(const char* pStr, size_t maxlen) {
size_t len = 0;
pDest = dest;
for (i = 0; *pDest != 0; pDest++, i++) {
}
pDest = dest + i;
while (*src != 0) {
*pDest++ = *src++;
}
*pDest = 0;
return dest;
}
int STD_strnlen(const char* str, u32 len) {
int i;
for (i = 0; i < len; i++, str++) {
if (*str == 0) {
for (; len < maxlen; len++) {
if (pStr[len] == '\0') {
break;
}
}
return i;
return len;
}
void* Mail_memcpy(void* pDst, const void* pSrc, u32 n) {
size_t i;
for (i = 0; i < n; i++) {
((u8*)pDst)[i] = ((u8*)pSrc)[i];
}
return pDst;
}
void* Mail_memset(void* pDst, int ch, u32 n) {
size_t i;
for (i = 0; i < n; i++) {
((u8*)pDst)[i] = ch;
}
return pDst;
}
char* Mail_strncpy(char* dest, const char* src, u32 len) {
u32 i;
i = 0;
for (; i < len; i++) {
dest[i] = src[i];
if (src[i] == 0) {
while (++i < len) {
dest[i] = 0;
}
return dest;
}
}
return dest;
}
char* Mail_strcat(char* pDst, const char* pSrc) {
Mail_strcpy(pDst + Mail_strlen(pDst), pSrc);
return pDst;
}
char* Mail_strncat(char* pDst, const char* pSrc, u32 maxlen) {
int len = Mail_strlen(pDst);
int i;
for (i = 0; i < maxlen && pSrc[i] != '\0'; i++) {
pDst[len + i] = pSrc[i];
}
pDst[len + i] = '\0';
return pDst;
}
int Mail_strncmp(const char* str1, const char* str2, u32 len) {
@@ -98,3 +141,271 @@ int Mail_tolower(int ch) {
}
return ch;
}
static void set_to_head(char* pStr, char ch) {
int i;
for (i = Mail_strlen(pStr); i >= 0; i--) {
pStr[i + 1] = pStr[i];
}
*pStr = ch;
}
static void set_to_tail(char* pStr, char ch) {
int i = Mail_strlen(pStr);
pStr[i++] = ch;
pStr[i] = '\0';
}
static s32 convNum(char* pDst, u32 number, s32 numberBase, char charBase,
BOOL isSigned, s32 width, char specifierChar,
char justifyChar) {
s32 charsWritten;
s32 digitsWritten;
char remainder;
if (isSigned && (number & 0x80000000)) {
isSigned = TRUE;
number = -number;
} else {
isSigned = FALSE;
number = number;
}
charsWritten = digitsWritten = 0;
while (number != 0) {
remainder = number % numberBase;
number /= numberBase;
set_to_head(pDst, remainder + (char)(remainder > 9 ? charBase : '0'));
digitsWritten++;
charsWritten++;
}
if (*pDst == '\0') {
set_to_head(pDst, '0');
digitsWritten++;
charsWritten++;
}
if (specifierChar != '0') {
specifierChar = ' ';
}
digitsWritten += isSigned;
while (digitsWritten < width) {
if (justifyChar == 'L') {
set_to_tail(pDst, ' ');
charsWritten++;
} else {
set_to_head(pDst, specifierChar);
charsWritten++;
}
digitsWritten++;
}
if (isSigned) {
set_to_head(pDst, '-');
}
return charsWritten;
}
int Mail_sprintf(char* pDst, char* pFmt, ...) {
va_list argv;
int ret;
va_start(argv, pFmt);
ret = Mail_vsprintf(pDst, pFmt, &argv);
va_end(argv);
return ret;
}
int Mail_vsprintf(char* pDst, char* pFmt, va_list* argv) {
int charsWritten;
BOOL isNumberFormat;
BOOL isSigned;
s32 stringLength;
s32 numberBase;
s32 width;
char formatChar;
char justifyChar;
char specifierChar;
char charBase;
char* pStrArg;
char longFlag;
u32 number;
*pDst = 0;
charsWritten = 0;
while ((formatChar = *pFmt++) != '\0') {
while (*pDst != '\0') {
pDst++;
}
if (formatChar == '%') {
formatChar = *pFmt++;
if (formatChar == '%') {
set_to_tail(pDst++, formatChar);
charsWritten++;
} else {
justifyChar = formatChar;
if (formatChar == '-') {
formatChar = *pFmt++;
}
specifierChar = formatChar;
isSigned = FALSE;
numberBase = 10;
charBase = '0';
isNumberFormat = FALSE;
if (formatChar == '*') {
width = va_arg(*argv, s32);
formatChar = *pFmt++;
} else {
width = 0;
while (formatChar >= '0' && formatChar <= '9') {
width = width * 10 + formatChar - '0';
formatChar = *pFmt++;
}
}
if ((longFlag = formatChar & (u8)~0x20) == 'L') {
formatChar = *pFmt++;
}
switch (formatChar) {
case 'd': {
isNumberFormat = TRUE;
isSigned = TRUE;
break;
}
case 'o': {
isNumberFormat = TRUE;
numberBase = 8;
break;
}
case 'u': {
isNumberFormat = TRUE;
break;
}
case 'x': {
isNumberFormat = TRUE;
numberBase = 16;
charBase = 'a' - 10;
break;
}
case 'X': {
isNumberFormat = TRUE;
numberBase = 16;
charBase = 'A' - 10;
break;
}
case 'c': {
formatChar = va_arg(*argv, s32);
set_to_tail(pDst++, formatChar);
charsWritten++;
break;
}
case 's': {
pStrArg = va_arg(*argv, char*);
if (pStrArg) {
stringLength = Mail_strlen(pStrArg);
Mail_strcat(pDst, pStrArg);
} else {
stringLength = 0;
}
charsWritten += stringLength;
while (stringLength < width) {
charsWritten++;
if (justifyChar == '-') {
set_to_tail(pDst, ' ');
} else {
set_to_head(pDst, ' ');
}
stringLength++;
}
break;
}
}
if (isNumberFormat) {
if (longFlag == 'L') {
number = va_arg(*argv, u32);
} else if (isSigned) {
number = va_arg(*argv, s32);
} else {
number = va_arg(*argv, u32);
}
charsWritten +=
convNum(pDst, number, numberBase, charBase, isSigned,
width, specifierChar, justifyChar);
}
}
} else {
set_to_tail(pDst++, formatChar);
charsWritten++;
}
}
return charsWritten;
}
int Mail_strnicmp(const char* str1, const char* str2, int len) {
int i;
int c2;
int c1;
int result;
result = 0;
for (i = 0; i < len; i++) {
c1 = *str1;
c2 = *str2;
if (c1 >= 'A') {
if (c1 <= 'Z') {
c1 += 0x20;
}
}
if (c2 >= 'A') {
if (c2 <= 'Z') {
c2 += 0x20;
}
}
result = c1 - c2;
if (result != 0) {
break;
}
if (c2 == 0) {
break;
}
str2++;
str1++;
}
return result;
}

View File

@@ -1,21 +1,79 @@
#include <private/nwc24.h>
#include <revolution/nwc24.h>
const u8 TtableInv[] = {13, 5, 9, 7, 0, 15, 10, 2, 12, 3, 14, 1, 8, 6, 11, 4};
const u8 ExcTable[] = {1, 5, 0, 4, 2, 3, 6, 7};
static const u8 TtableInv[] = {13, 5, 9, 7, 0, 15, 10, 2, 12, 3, 14, 1, 8, 6, 11, 4};
extern void _savegpr_27(void);
extern void _restgpr_27(void);
extern void __shr2u(void);
extern void __shl2i(void);
static u8 getbyte(NWC24UserId value, u8 index);
static NWC24UserId setbyte(NWC24UserId value, u8 index, u8 set);
NWC24UserId getUnScrambleId(NWC24UserId id);
static int checkCRC(NWC24UserId id);
static u8 getbyte(NWC24UserId value, u8 index) {
return (value >> (index * 8)) & 0xFF;
}
static NWC24UserId setbyte(NWC24UserId value, u8 index, u8 set) {
return (value & ~(((u64)0xFF << (index * 8)))) | (((u64)set << (index * 8)));
static NWC24UserId getUnScrambleId(NWC24UserId id);
asm NWC24Err NWC24CheckUserId(register NWC24UserId id) {
stwu r1,-0x30(r1)
mfspr r0,LR
stw r0,0x34(r1)
addi r11,r1,0x30
bl _savegpr_27
or r28,r3,r3
or r27,r4,r4
addi r3,r1,0x8
bl NWC24GetMyUserId
lwz r3,0x8(r1)
lwz r4,0xc(r1)
xor r0,r3,r28
xor r5,r4,r27
or. r0,r5,r0
bne NWC24CheckUserId_not_same
li r3,-0x23
b NWC24CheckUserId_return
NWC24CheckUserId_not_same:
bl getUnScrambleId
or r4,r27,r27
rlwinm r27,r3,0x11,0x1d,0x1f
or r3,r28,r28
bl getUnScrambleId
or r30,r4,r4
or r31,r3,r3
rlwinm r28,r3,0x11,0x1d,0x1f
li r29,0
NWC24CheckUserId_crc_loop:
addi r0,r29,1
or r3,r31,r31
or r4,r30,r30
subfic r5,r0,0x35
bl __shr2u
rlwinm. r0,r4,0,0x1f,0x1f
beq NWC24CheckUserId_crc_next
subfic r5,r29,0x2a
li r4,0x635
li r3,0
bl __shl2i
xor r30,r30,r4
xor r31,r31,r3
NWC24CheckUserId_crc_next:
addi r29,r29,1
cmpwi r29,0x2b
blt NWC24CheckUserId_crc_loop
or. r0,r30,r31
beq NWC24CheckUserId_crc_ok
li r3,-0x25
b NWC24CheckUserId_return
NWC24CheckUserId_crc_ok:
cmpwi r27,0
bne NWC24CheckUserId_return_ok
cmpwi r28,0
beq NWC24CheckUserId_return_ok
li r3,-0x7
b NWC24CheckUserId_return
NWC24CheckUserId_return_ok:
li r3,0
NWC24CheckUserId_return:
addi r11,r1,0x30
bl _restgpr_27
lwz r0,0x34(r1)
mtspr LR,r0
addi r1,r1,0x30
blr
}
NWC24Err NWC24iCheckUserIdCRC(NWC24UserId id) {
@@ -33,3 +91,167 @@ NWC24Err NWC24iCheckUserIdCRC(NWC24UserId id) {
}
return NWC24_OK;
}
static asm NWC24UserId getUnScrambleId(register NWC24UserId id) {
li r9,-1
lis r7,0x20
lis r6,0x5e5e
stwu r1,-0x20(r1)
subi r7,r7,1
and r8,r4,r9
addi r0,r6,0x5e5e
stw r31,0x1c(r1)
and r3,r3,r7
lis r5,-1
xor r8,r8,r0
stw r30,0x18(r1)
and r8,r8,r9
xori r3,r3,0x5e5e
rlwinm r0,r8,0x15,0xa,0xa
li r6,-0x100
and r3,r3,r7
rlwinm r8,r8,0x1f,0,0x1f
or r3,r3,r0
stw r29,0x14(r1)
rlwimi r8,r3,0x1f,0,0
lis r4,-0xff
rlwinm r7,r3,0x1f,1,0x1f
addi r5,r5,0xff
rlwinm r30,r8,0x18,0,0x1f
rlwinm r29,r3,0x17,0x18,0x1f
and r12,r7,r9
li r0,0
rlwimi r30,r3,0x17,0,7
and r31,r8,r6
rlwimi r31,r30,0,0x18,0x1f
rlwinm r11,r3,0x1f,0x10,0x17
and r30,r31,r5
and r12,r12,r9
rlwimi r0,r29,8,0x18,0x1f
subi r4,r4,1
or r12,r12,r0
or r11,r30,r11
and r30,r11,r4
rlwinm r31,r8,0,0x18,0x1f
li r0,0
rlwinm r11,r8,0x10,8,0xf
lis r10,0x100
and r12,r12,r9
rlwimi r0,r31,0x10,0x10,0x1f
or r30,r30,r11
or r29,r12,r0
rlwinm r12,r3,0x1f,0x18,0x1f
subi r0,r10,1
li r10,0
rlwimi r10,r12,0x18,8,0x1f
and r11,r29,r9
and r12,r30,r0
rlwinm r3,r3,0x17,0,7
or r3,r12,r3
or r12,r11,r10
and r10,r3,r9
lis r3,TtableInv@ha
and r31,r10,r9
rlwinm r30,r8,0x10,0,0x1f
rlwinm r11,r31,0x1c,0x1c,0x1f
addi r3,r3,TtableInv@l
rlwimi r30,r7,0x10,0,0xf
rlwinm r10,r31,0,0x1c,0x1f
and r29,r12,r6
rlwinm r12,r8,8,0,0x1f
lbzx r11,r3,r11
rlwimi r12,r7,8,0,0x17
lbzx r7,r3,r10
rlwimi r29,r30,0,0x18,0x1f
rlwinm r8,r11,4,0,0x1b
rlwinm r10,r12,8,0x10,0x17
and r11,r29,r5
or r10,r11,r10
or r7,r8,r7
and r11,r31,r6
li r8,0
rlwimi r11,r7,0,0x18,0x1f
and r12,r10,r9
rlwinm r10,r11,0x18,0,0x1f
li r7,0
rlwimi r10,r12,0x18,0,7
and r31,r11,r5
rlwinm r11,r10,0x1c,0x1c,0x1f
and r12,r12,r9
rlwinm r10,r10,0,0x1c,0x1f
lbzx r11,r3,r11
lbzx r10,r3,r10
rlwinm r11,r11,4,0,0x1b
or r10,r11,r10
rlwinm r11,r10,0,0x18,0x1f
rlwinm r10,r10,8,0x10,0x17
rlwimi r8,r11,8,0x18,0x1f
or r10,r31,r10
or r8,r12,r8
rlwinm r12,r10,0x10,0,0x1f
and r11,r10,r4
rlwimi r12,r8,0x10,0,0xf
and r10,r8,r9
rlwinm r8,r12,0x1c,0x1c,0x1f
rlwinm r4,r12,0,0x1c,0x1f
lbzx r8,r3,r8
lbzx r4,r3,r4
rlwinm r8,r8,4,0,0x1b
or r4,r8,r4
rlwinm r8,r4,0,0x18,0x1f
rlwinm r4,r4,0x10,8,0xf
or r29,r11,r4
rlwimi r7,r8,0x10,0x10,0x1f
or r11,r10,r7
lis r4,1
rlwinm r8,r29,8,0,0x1f
and r31,r29,r0
rlwimi r8,r11,8,0,0x17
and r12,r11,r9
rlwinm r10,r8,0x1c,0x1c,0x1f
subi r0,r4,0x4c4d
lbzx r11,r3,r10
rlwinm r8,r8,0,0x1c,0x1f
lbzx r10,r3,r8
li r8,0
rlwinm r11,r11,4,0,0x1b
lis r7,-0x4c4c
or r11,r11,r10
rlwinm r10,r11,0,0x18,0x1f
subi r7,r7,0x4c4d
rlwimi r8,r10,0x18,8,0x1f
rlwinm r4,r11,0x18,0,7
or r10,r12,r8
rlwinm r8,r10,0x1c,0x1c,0x1f
or r12,r31,r4
rlwinm r4,r10,0,0x1c,0x1f
lbzx r8,r3,r8
and r11,r10,r6
lbzx r4,r3,r4
rlwinm r6,r8,4,0,0x1b
and r8,r12,r9
or r4,r6,r4
rlwimi r11,r4,0,0x18,0x1f
and r10,r8,r9
rlwinm r6,r11,0x14,0x1c,0x1f
rlwinm r4,r11,0x18,0x1c,0x1f
lbzx r6,r3,r6
lbzx r3,r3,r4
and r8,r11,r5
rlwinm r5,r6,4,0,0x1b
and r4,r10,r9
or r3,r5,r3
rlwinm r3,r3,8,0x10,0x17
or r3,r8,r3
rlwinm r5,r3,0xa,0xb,0x15
rlwinm r3,r3,0x15,0x16,0x1f
rlwimi r5,r4,0xa,0x16,0x1f
rlwimi r3,r4,0xa,0,0x15
xor r4,r3,r7
xor r3,r5,r0
lwz r31,0x1c(r1)
lwz r30,0x18(r1)
lwz r29,0x14(r1)
addi r1,r1,0x20
blr
}

View File

@@ -0,0 +1,713 @@
#include <revolution/ncd.h>
#include <revolution/os.h>
#include <revolution/soex.h>
#include <private/ios.h>
#include <private/nwc24/NWC24Schedule.h>
#include <private/os/OSTime.h>
#include <string.h>
typedef struct SOSysWork {
SOAlloc allocFunc;
SOFree freeFunc;
s32 rmState;
s32 rmFd;
u32 unk10;
s32 allocCount;
} SOSysWork;
enum {
SO_INTERNAL_STATE_TERMINATED = 0,
SO_INTERNAL_STATE_READY = 1,
SO_INTERNAL_STATE_ACTIVE = 2,
};
enum {
SO_INTERNAL_RM_STATE_OPENED = 0,
SO_INTERNAL_RM_STATE_WORKING = -1,
SO_INTERNAL_RM_STATE_CLOSED = -2,
};
enum {
SO_SUCCESS = 0,
SO_EFATAL = (s32)0x80000000,
SO_EAGAIN = -6,
SO_EALREADY = -7,
SO_EBUSY = -10,
SO_EINPROGRESS = -26,
SO_EINVAL = -28,
SO_ENETRESET = -39,
SO_ENOENT = -45,
SO_ENOLINK = -48,
SO_ENOMEM = -49,
SO_ETIMEDOUT = -76,
};
enum {
SO_ERR_LINK_UP_TIMEOUT = -121,
};
enum {
NCD_LINKSTATUS_WORKING = 1,
NCD_LINKSTATUS_NONE = 2,
};
enum {
NET_SO_SOCKET = 0xF,
};
typedef struct NETSoSocket {
int af;
int type;
int protocol;
} NETSoSocket;
static s32 soRegistered;
static s32 soError;
static u8 soState;
static SOSysWork soWork;
const char* __SOVersion =
"<< RVL_SDK - SO \trelease build: Dec 12 2008 03:06:16 (0x4199_60831) >>";
static int soBufAddrCheck = 1;
static char NET_RM_SOCK[] = "/dev/net/ip/top";
extern OSTime __OSGetSystemTime(void);
static int SOStartupErr(s32 errNwc24, s32 exErr);
void* SOiAlloc(u32 name, s32 size);
void SOiFree(u32 name, void* ptr, s32 size);
int SOiPrepare(const char* funcName, s32* pRmId);
int SOiConclude(const char* funcName, int result);
int SOiWaitForDHCPEx(int timeout);
int SOCleanup(void);
int SOiConcludeTempRm(const char* funcName, int result, int isTempRm);
int SOInit(SOLibraryConfig* config) {
int result = 0;
int enabled;
void* ptr;
OSThread* cur;
SOSysWork* work;
enabled = OSDisableInterrupts();
if (!soRegistered) {
OSRegisterVersion(__SOVersion);
soRegistered = 1;
}
if (!((int)soState == 0 || (int)soState < 0 || (int)soState >= 3)) {
result = -7;
goto finish;
}
if (config == NULL || config->alloc == NULL || config->free == NULL) {
result = -28;
} else {
memset(&soWork, 0, sizeof(soWork));
soWork.allocFunc = config->alloc;
work = &soWork;
work->freeFunc = config->free;
work->allocCount = 0;
work->rmState = -2;
work->rmFd = -1;
ptr = SOiAlloc(0xB, 0x460);
soWork.unk10 = (u32)ptr;
if (ptr == NULL) {
result = -49;
} else {
soState = 1;
}
}
finish:
cur = OSGetCurrentThread();
if (cur != NULL)
cur->error = result;
else
soError = result;
OSRestoreInterrupts(enabled);
return result;
}
int SOFinish(void) {
int result = 0;
int enabled = OSDisableInterrupts();
OSThread* cur;
switch (soState) {
case SO_INTERNAL_STATE_TERMINATED:
result = SO_EALREADY;
break;
case SO_INTERNAL_STATE_READY:
if (soWork.rmState > SO_INTERNAL_RM_STATE_CLOSED) {
result = SO_EBUSY;
break;
} else if (soWork.allocCount > 1) {
result = SO_EAGAIN;
break;
}
soState = SO_INTERNAL_STATE_TERMINATED;
if (soWork.unk10 != 0 && soWork.freeFunc) {
soWork.allocCount--;
soWork.freeFunc(0x0b, (void*)soWork.unk10, 0x460);
}
break;
case SO_INTERNAL_STATE_ACTIVE:
result = SO_EINPROGRESS;
break;
}
cur = OSGetCurrentThread();
if (cur)
cur->error = result;
else
soError = result;
OSRestoreInterrupts(enabled);
return result;
}
int SOStartup(void) { return SOStartupEx(0x927c0); }
static int SOStartupErr(s32 errNwc24, s32 exErr) {
s32 result = -0x1c;
switch (errNwc24) {
case 0:
result = 0;
break;
case -0x16:
case -0xd:
result = -0x30;
break;
case -0x21:
case -2:
result = exErr;
break;
case -1:
result = -0x80000000;
break;
case -0x1d:
result = -0x1a;
break;
}
return result;
}
int SOStartupEx(int timeout) {
int result;
int enabled;
s32 exErr;
s64 limitTime;
s32 linkupRetryCount;
limitTime = 0;
if (timeout != 0)
limitTime = __OSGetSystemTime() + ((timeout) * ((__OSBusClock / 4) / 1000));
linkupRetryCount = 4;
begin_startup:
result = SO_SUCCESS;
enabled = OSDisableInterrupts();
switch (soState) {
case SO_INTERNAL_STATE_TERMINATED:
default:
result = SO_ENETRESET;
break;
case SO_INTERNAL_STATE_ACTIVE:
result = SO_EALREADY;
break;
case SO_INTERNAL_STATE_READY:
if (soWork.rmState > SO_INTERNAL_RM_STATE_CLOSED) {
result = SO_EBUSY;
break;
} else if (!OSGetCurrentThread()) {
result = SO_EFATAL;
break;
} else {
int resultNCD;
soWork.rmState = SO_INTERNAL_RM_STATE_WORKING;
(void)OSRestoreInterrupts(enabled);
while (1) {
resultNCD = NCDGetLinkStatus();
if (resultNCD != NCD_RESULT_INPROGRESS &&
resultNCD != NCD_LINKSTATUS_WORKING)
break;
OSSleepTicks((((s64)100) * ((__OSBusClock / 4) / 1000)));
if (limitTime != 0 && limitTime < __OSGetSystemTime()) {
if (resultNCD == NCD_LINKSTATUS_WORKING)
result = SO_ERR_LINK_UP_TIMEOUT;
else
result = SO_EFATAL;
goto change_state;
}
}
if (resultNCD < NCD_RESULT_SUCCESS) {
result = SO_EFATAL;
goto change_state;
} else if (resultNCD == NCD_LINKSTATUS_NONE) {
result = SO_ENOENT;
goto change_state;
}
while (1) {
soWork.rmFd = IOS_Open(NET_RM_SOCK, 0);
if (soWork.rmFd != -6)
break;
OSSleepTicks((((s64)100) * ((__OSBusClock / 4) / 1000)));
if (limitTime != 0 && limitTime < __OSGetSystemTime()) {
result = SO_EFATAL;
goto change_state;
}
};
if (soWork.rmFd < 0) {
result = SO_EFATAL;
goto change_state;
} else {
s32 errNwc24;
result = SO_SUCCESS;
exErr = SO_SUCCESS;
while (1) {
errNwc24 = NWC24iStartupSocket(&exErr);
if (errNwc24 != NWC24_ERR_INPROGRESS)
break;
OSSleepTicks((((s64)100) * ((__OSBusClock / 4) / 1000)));
if (limitTime != 0 && limitTime < __OSGetSystemTime()) {
result = SO_EFATAL;
break;
}
}
if (result == SO_SUCCESS)
result = SOStartupErr(errNwc24, exErr);
if (result != SO_SUCCESS) {
if (IOS_Close(soWork.rmFd) < 0) {
result = SO_EFATAL;
goto change_state;
} else {
soWork.rmFd = -1;
}
}
}
change_state:
enabled = OSDisableInterrupts();
if (result == SO_SUCCESS) {
soState = SO_INTERNAL_STATE_ACTIVE;
soWork.rmState = SO_INTERNAL_RM_STATE_OPENED;
} else {
soState = 1;
if (result != SO_EFATAL)
soWork.rmState = SO_INTERNAL_RM_STATE_CLOSED;
}
}
break;
}
{
OSThread* cur = OSGetCurrentThread();
if (cur)
cur->error = result;
else
soError = result;
}
(void)OSRestoreInterrupts(enabled);
if (result == 0) {
s64 dhcpTimeOutTicks;
if (limitTime != 0) {
dhcpTimeOutTicks = limitTime - __OSGetSystemTime();
} else {
dhcpTimeOutTicks = 0;
}
if (limitTime != 0 && dhcpTimeOutTicks <= 0) {
result = -76;
} else {
result = SOiWaitForDHCPEx(
(int)((dhcpTimeOutTicks) / ((__OSBusClock / 4) / 1000)));
}
if (result != 0) {
(void)SOCleanup();
}
}
{
OSThread* cur = OSGetCurrentThread();
if (cur)
cur->error = result;
else
soError = result;
}
if (result == -112) {
linkupRetryCount--;
if (linkupRetryCount >= 0) {
goto begin_startup;
}
}
return result;
}
int SOCleanup(void) {
int result = SO_SUCCESS;
int enabled = OSDisableInterrupts();
s32 exErr = SO_SUCCESS;
int errNwc24;
switch (soState) {
case SO_INTERNAL_STATE_TERMINATED:
default:
result = SO_ENETRESET;
break;
case SO_INTERNAL_STATE_READY:
result = SO_EALREADY;
break;
case SO_INTERNAL_STATE_ACTIVE:
if (soWork.rmState < SO_INTERNAL_RM_STATE_OPENED) {
result = SO_EBUSY;
break;
} else if (!OSGetCurrentThread()) {
result = SO_EFATAL;
break;
} else {
soWork.rmState = SO_INTERNAL_RM_STATE_WORKING;
(void)OSRestoreInterrupts(enabled);
errNwc24 = NWC24iCleanupSocket(&exErr);
result = SOStartupErr(errNwc24, exErr);
if (result != SO_SUCCESS) {
} else {
if (IOS_Close(soWork.rmFd) < 0)
result = SO_EFATAL;
else
soWork.rmFd = -1;
}
enabled = OSDisableInterrupts();
if (result == SO_SUCCESS) {
soState = SO_INTERNAL_STATE_READY;
soWork.rmState = SO_INTERNAL_RM_STATE_CLOSED;
} else {
if (result != SO_EFATAL) {
soState = SO_INTERNAL_STATE_ACTIVE;
soWork.rmState = SO_INTERNAL_RM_STATE_OPENED;
}
}
}
break;
}
{
OSThread* cur = OSGetCurrentThread();
if (cur)
cur->error = result;
else
soError = result;
}
OSRestoreInterrupts(enabled);
return result;
}
SOSysWork* SOiGetSysWork(void) { return &soWork; }
int SOiIsBufferAddrCheck(void) { return soBufAddrCheck; }
int SOiIsInitialized(void) {
int result = 0;
int enabled = OSDisableInterrupts();
switch (soState) {
case SO_INTERNAL_STATE_READY:
case SO_INTERNAL_STATE_ACTIVE:
result = 1;
break;
}
OSRestoreInterrupts(enabled);
return result;
}
void* SOiAlloc(u32 name, s32 size) {
if (size > 0 && soWork.allocFunc) {
void* ptr = soWork.allocFunc(name, size);
if (ptr) {
soWork.allocCount++;
if (SOiIsBufferAddrCheck() && !(((u32)ptr & 0x1fffffff) >= 0x10000000 &&
((u32)ptr & 0x1fffffff) < 0x18000000)) {
if (ptr != NULL && soWork.freeFunc != NULL) {
soWork.allocCount--;
soWork.freeFunc(name, ptr, size);
}
ptr = NULL;
}
}
return ptr;
}
return NULL;
}
void SOiFree(u32 name, void* ptr, s32 size) {
if ((ptr != NULL) && (soWork.freeFunc != NULL)) {
soWork.allocCount--;
soWork.freeFunc(name, ptr, size);
}
}
int SOiPrepare(const char*, s32* pRmId) {
int result = SO_SUCCESS;
int enabled = OSDisableInterrupts();
switch (soState) {
case SO_INTERNAL_STATE_TERMINATED:
result = SO_ENETRESET;
break;
case SO_INTERNAL_STATE_READY:
default:
result = SO_EINVAL;
break;
case SO_INTERNAL_STATE_ACTIVE:
if (soWork.rmState < SO_INTERNAL_RM_STATE_OPENED) {
result = SO_EBUSY;
break;
} else if (!OSGetCurrentThread()) {
result = SO_EFATAL;
break;
}
*pRmId = soWork.rmFd;
break;
}
if (result != SO_SUCCESS) {
OSThread* cur = OSGetCurrentThread();
if (cur)
cur->error = result;
else
soError = result;
}
(void)OSRestoreInterrupts(enabled);
return result;
}
int SOiConclude(const char*, int result) {
int enabled = OSDisableInterrupts();
OSThread* cur;
cur = OSGetCurrentThread();
if (cur)
cur->error = result;
else
soError = result;
(void)OSRestoreInterrupts(enabled);
return result;
}
int SOiPrepareTempRm(const char* funcName, s32* pRmId, int* pIsTempRm) {
int result = SO_SUCCESS;
int enabled = OSDisableInterrupts();
int errNwc24;
switch (soState) {
case SO_INTERNAL_STATE_TERMINATED:
result = SO_ENETRESET;
break;
case SO_INTERNAL_STATE_READY:
default:
if (soWork.rmState > SO_INTERNAL_RM_STATE_CLOSED) {
result = SO_EBUSY;
break;
} else if (!OSGetCurrentThread()) {
result = SO_EFATAL;
break;
}
soWork.rmState = SO_INTERNAL_RM_STATE_WORKING;
(void)OSRestoreInterrupts(enabled);
soWork.rmFd = IOS_Open(NET_RM_SOCK, 0);
if (soWork.rmFd < 0) {
enabled = OSDisableInterrupts();
if (soWork.rmFd == -6) {
result = SO_EINPROGRESS;
soWork.rmState = SO_INTERNAL_RM_STATE_CLOSED;
} else {
result = SO_EFATAL;
}
} else {
*pRmId = soWork.rmFd;
if ((errNwc24 = NWC24iLockSocket()) == NWC24_OK) {
s32 errNcd = NCDGetLinkStatus();
switch (errNcd) {
case 3:
case 4:
case 5:
result = (int)IOS_Ioctl(soWork.rmFd, 0x1f, NULL, 0, NULL, 0);
if (result == SO_SUCCESS) {
*pIsTempRm = 1;
} else {
result = SOiConcludeTempRm(funcName, result, 1);
}
break;
case -8:
result = SOiConcludeTempRm(funcName, SO_EINPROGRESS, 1);
break;
case -1:
case -2:
result = SOiConcludeTempRm(funcName, SO_EFATAL, 1);
break;
default:
result = SOiConcludeTempRm(funcName, SO_ENOLINK, 1);
}
enabled = OSDisableInterrupts();
} else {
switch (errNwc24) {
case NWC24_ERR_INPROGRESS:
result = SO_EINPROGRESS;
break;
case NWC24_ERR_FAILED:
result = SO_ENETRESET;
break;
case NWC24_ERR_DONE:
result = SO_ENOLINK;
break;
case NWC24_ERR_MUTEX:
case NWC24_ERR_FATAL:
default:
result = SO_EFATAL;
break;
}
if (IOS_Close(soWork.rmFd) < 0) {
result = SO_EFATAL;
}
enabled = OSDisableInterrupts();
if (result != SO_EFATAL) {
soWork.rmFd = -1;
soWork.rmState = SO_INTERNAL_RM_STATE_CLOSED;
}
}
}
break;
case SO_INTERNAL_STATE_ACTIVE:
if (soWork.rmState < SO_INTERNAL_RM_STATE_OPENED) {
result = SO_EBUSY;
break;
} else if (!OSGetCurrentThread()) {
result = SO_EFATAL;
break;
}
*pIsTempRm = 0;
*pRmId = soWork.rmFd;
break;
}
if (result != SO_SUCCESS) {
OSThread* cur = OSGetCurrentThread();
if (cur)
cur->error = result;
else
soError = result;
}
(void)OSRestoreInterrupts(enabled);
return result;
}
int SOiConcludeTempRm(const char*, int result, int isTempRm) {
int enabled;
OSThread* cur;
if (isTempRm == 1) {
switch (NWC24iUnlockSocket()) {
case NWC24_OK:
break;
case NWC24_ERR_INPROGRESS:
result = SO_EINPROGRESS;
break;
case NWC24_ERR_FATAL:
default:
result = SO_EFATAL;
}
if (IOS_Close(soWork.rmFd) < 0) {
result = SO_EFATAL;
}
enabled = OSDisableInterrupts();
if (result != SO_EFATAL) {
soWork.rmFd = -1;
soWork.rmState = SO_INTERNAL_RM_STATE_CLOSED;
}
} else {
enabled = OSDisableInterrupts();
}
cur = OSGetCurrentThread();
if (cur)
cur->error = result;
else
soError = result;
(void)OSRestoreInterrupts(enabled);
return result;
}
int SOiWaitForDHCPEx(int timeout) {
int result = SO_SUCCESS;
int gioResult;
int ifError;
int ifErrorSize;
s64 limitTime;
limitTime = 0;
if (timeout != 0)
limitTime = __OSGetSystemTime() + ((timeout) * ((__OSBusClock / 4) / 1000));
while (1) {
OSSleepTicks((((s64)10) * ((__OSBusClock / 4) / 1000)));
ifErrorSize = sizeof(ifError);
gioResult = SOGetInterfaceOpt(NULL, 0xfffe, 0x1003, &ifError, &ifErrorSize);
if (gioResult != SO_SUCCESS) {
result = gioResult;
break;
}
if (gioResult == SO_SUCCESS && ifError != SO_SUCCESS) {
result = ifError;
break;
}
if (SOGetHostID() != 0)
break;
if (limitTime != 0 && limitTime < __OSGetSystemTime()) {
result = SO_ETIMEDOUT;
break;
}
}
return result;
}
#pragma dont_inline on
int __SOCreateSocket(int pf, int type, int protocol) {
int result;
s32 rmId;
NETSoSocket* soc;
if ((result = SOiPrepare(0, &rmId)) == SO_SUCCESS) {
if (pf == 0x17) {
result = -5;
} else {
soc = (NETSoSocket*)SOiAlloc(0xC, 0x20);
if (soc == NULL) {
result = SO_ENOMEM;
} else {
soc->af = pf;
soc->type = type;
soc->protocol = protocol;
result = IOS_Ioctl(rmId, NET_SO_SOCKET, soc, 0xC, NULL, 0);
SOiFree(0xC, soc, 0x20);
}
}
result = SOiConclude(0, result);
}
return result;
}
#pragma dont_inline reset

View File

@@ -25,7 +25,7 @@ enum {
#define MAX_IOS_VECS 4
SDKDefineVersionEx(SSL, "Jun 21 2007", "13:10:10", 60726);
const char* __SSLVersion = "<< RVL_SDK - SSL \trelease build: Jun 21 2007 13:10:10 (0x4199_60726) >>";
static BOOL sslRegistered = FALSE;
static s32 l_initialized = 0;
@@ -547,3 +547,10 @@ static u32 SSL_strnlen(const char* s, u32 n) {
}
return t - s;
}
#pragma push
#pragma section data_type ".data"
#pragma pop
#pragma push
#pragma section data_type ".sdata"
#pragma pop

View File

@@ -385,7 +385,7 @@ VFErr VFSysSetSyncMode(s32 i_handle_idx, u32 i_mode) {
return VF_ERR_SYSTEM;
}
u32 VFSysGetSyncMode(s32 i_handle_idx) {
static u32 VFSysGetSyncMode(s32 i_handle_idx) {
VFSys_handle* handle_p = VFSysGetHandleP(i_handle_idx);
if (handle_p == NULL || handle_p->drive.pf_disk_p == NULL || handle_p->device_p == NULL) {
@@ -541,7 +541,7 @@ s32 VFSysHandleP2Idx(VFSys_handle* i_handle_p) {
return VF_ERR_SYSTEM;
}
VFSys_handle* VFSysVol2HandleP(PF_VOLUME* i_vol_p) {
static VFSys_handle* VFSysVol2HandleP(PF_VOLUME* i_vol_p) {
if (i_vol_p != NULL) {
VFSys_handle* handle_p = VFSysGetHandleP(0);
VFSys_handle* handle_end_p = &handle_p[l_vfsys_vol_max];
@@ -728,7 +728,7 @@ static void VFiSysClearDeviceSDDirect(VFSys_deviceSD* o_sd_p) {
o_sd_p->slotNo = -1;
}
VFSys_device* VFSysGetDeviceP(s32 i_idx) {
static VFSys_device* VFSysGetDeviceP(s32 i_idx) {
VFSys_handle* handle_p = VFSysGetHandleP(i_idx);
if (handle_p != NULL) {
return handle_p->device_p;
@@ -1170,7 +1170,7 @@ static VFErr VFiSysGetLastDeviceError_common(VFSys_handle* i_handle_p) {
return VF_ERR_SYSTEM;
}
void VFSysSetDevErrInfo(s32 i_handle_idx, VFErr i_err) {
static void VFSysSetDevErrInfo(s32 i_handle_idx, VFErr i_err) {
VFSys_handle* handle_p = VFSysGetHandleP(i_handle_idx);
if (handle_p != NULL) {
VFiSysSetDeviceErrInfo(handle_p, i_err);

View File

@@ -134,7 +134,7 @@ static u32 _EventFlagAddressToHandleIdx(u32* event /* r3 */) {
int i; // r31
for (i = 0; i < 0x1A; i++) {
if ((u32*)((u8*)l_event + (i << 5)) == event) {
if (&l_event[i].flag == event) {
return i;
}
}
@@ -157,12 +157,12 @@ SDDevIntrCallback _EventCallBack(u32 status /* r25 */, u32* data /* r27 */) {
handle_p = VFSysGetHandleP(handleIdx);
if ((u32)(status & 2) == 2) {
*data = 1;
if (handle_p != NULL) {
if ((u32)handle_p != 0) {
PDM_DISK* pf_disk_p = handle_p->drive.pf_disk_p; // r26
if (pf_disk_p != NULL) {
if ((u32)pf_disk_p != 0) {
VFSys_deviceSD* device_p = (VFSys_deviceSD*)VFSysPDMDisk2DeviceP(pf_disk_p); // r29
VFipdm_disk_notify_media_eject(pf_disk_p);
if ((device_p != NULL) && ((device_p->eventCallback) != NULL)) {
if (((u32)device_p != 0) && ((u32)device_p->eventCallback != 0)) {
device_p->eventCallback(2);
}
}
@@ -170,23 +170,23 @@ SDDevIntrCallback _EventCallBack(u32 status /* r25 */, u32* data /* r27 */) {
}
if ((u32)(status & 1) == 1) {
*data = 2;
if (handle_p != NULL) {
if ((u32)handle_p != 0) {
PDM_DISK* pf_disk_p = handle_p->drive.pf_disk_p; // r31+0x14
if (pf_disk_p != NULL) {
if ((u32)pf_disk_p != 0) {
VFSys_deviceSD* device_p = (VFSys_deviceSD*)VFSysPDMDisk2DeviceP(pf_disk_p); // r28
if ((device_p != NULL) && ((device_p->eventCallback) != NULL)) {
if (((u32)device_p != 0) && ((u32)device_p->eventCallback != 0)) {
device_p->eventCallback(1);
}
}
}
}
if (handle_p != NULL) {
if ((u32)handle_p != 0) {
PDM_DISK* pf_disk_p = handle_p->drive.pf_disk_p; // r31+0x10
if (pf_disk_p != NULL) {
if ((u32)pf_disk_p != 0) {
VFSys_deviceSD* device_p = (VFSys_deviceSD*)VFSysPDMDisk2DeviceP(pf_disk_p); // r31+0xC
if (device_p != NULL) {
if ((u32)device_p != 0) {
SDDev* dev_handle_p = (&device_p->drive); // r31+0x8
if (dev_handle_p != NULL) {
if ((u32)dev_handle_p != 0) {
IOSErr = ISD_RegisterDeviceIntrHandler(dev_handle_p, (SDDevIntrCallback)_EventCallBack, data);
if (IOSErr != 0) {
u32 stub = 0;
@@ -273,12 +273,12 @@ static s32 sddrv_init(PDM_DISK* p_disk /* r28 */) {
drive_p = NULL;
device_p = NULL;
dev_handle_p = NULL;
if (p_disk == NULL) {
if ((u32)p_disk == 0) {
return -0x14;
}
drive_p = VFSysPDMDisk2DriveP(p_disk);
device_p = (VFSys_deviceSD*)VFSysPDMDisk2DeviceP(p_disk);
if ((drive_p == NULL) || (device_p == NULL)) {
if (((u32)drive_p == 0) || ((u32)device_p == 0)) {
return -0x14;
}
dev_handle_p = &device_p->drive;
@@ -316,8 +316,8 @@ static s32 sddrv_init(PDM_DISK* p_disk /* r28 */) {
ISD_UnmountCard(dev_handle_p);
return IOSErr;
}
*(u32*)((u8*)l_event + (handleIdx << 5)) = 2;
IOSErr = ISD_RegisterDeviceIntrHandler(dev_handle_p, (SDDevIntrCallback)_EventCallBack, (u32*)((u8*)l_event + (handleIdx << 5)));
l_event[handleIdx].flag = 2;
IOSErr = ISD_RegisterDeviceIntrHandler(dev_handle_p, (SDDevIntrCallback)_EventCallBack, &l_event[handleIdx].flag);
if (IOSErr != 0) {
VFi_PrintInternalError(IOSErr, 0x1ED);
dCommon_setLastDeviceErrorToDisk(p_disk, IOSErr);

View File

@@ -8,6 +8,41 @@
#include <string.h>
#pragma push
#pragma section sconst_type ".sdata2"
const u8 lbl_81695060 = 0;
const u8 lbl_81695061 = 0x0F;
const u8 lbl_81695062 = 0xAC;
const u8 lbl_81695063 = 0;
const u8 lbl_81695064 = 0;
const u8 lbl_81695065 = 0x50;
const u8 lbl_81695066 = 0xF2;
const u8 lbl_81695067 = 0;
#pragma pop
#pragma push
#pragma section sconst_type ".sdata"
const u8 lbl_81697D70 = 0;
const u8 lbl_81697D71 = 0x50;
const u8 lbl_81697D72 = 0xF2;
const u8 lbl_81697D73 = 0;
const u8 lbl_81697D74 = 0;
const u8 lbl_81697D75 = 0;
const u8 lbl_81697D76 = 0;
const u8 lbl_81697D77 = 0;
#pragma pop
#define lbl_81695060 (*((volatile const u8*)&lbl_81695060))
#define lbl_81695061 (*((volatile const u8*)&lbl_81695061))
#define lbl_81695062 (*((volatile const u8*)&lbl_81695062))
#define lbl_81695064 (*((volatile const u8*)&lbl_81695064))
#define lbl_81695065 (*((volatile const u8*)&lbl_81695065))
#define lbl_81695066 (*((volatile const u8*)&lbl_81695066))
#define lbl_81697D70 (*((volatile const u8*)&lbl_81697D70))
#define lbl_81697D71 (*((volatile const u8*)&lbl_81697D71))
#define lbl_81697D72 (*((volatile const u8*)&lbl_81697D72))
extern void _savegpr_21();
extern void _restgpr_21();
#define WAIT_FOR_OPERATION(...) \
do { \
while ((__VA_ARGS__)) { \
@@ -134,56 +169,104 @@ s32 WDScanOnce(u8* scanBuffer, u32 scanBufferLen, WDScanParam* param) {
s32 WDGetPrivacyMode(WDBssDesc* bssDesc) {
WDVendorInfoElement* ieData;
u32 ieLength = 0;
WDVendorInfoElement readIE;
u8 readIE[8];
s32 result;
if (WDFindInformationElement((WDInfoElement**)&ieData, &ieLength, bssDesc, 0x30)) {
u8 data[WD_VENDOR_LENGTH] = {0, 0x0F, 0xAC};
u8 data[WD_VENDOR_LENGTH];
memcpy(&readIE, ieData, sizeof(WDVendorInfoElement) + 2 /*?*/);
if (memcmp(readIE.data, data, WD_VENDOR_LENGTH) == 0) {
switch (readIE.mode) {
case 1: {
return WD_PRIVACY_MODE_DS_COMMUNICATION;
}
case 5: {
return WD_PRIVACY_MODE_2;
}
case 2: {
return WD_PRIVACY_MODE_7;
}
case 3:
default: {
return WD_PRIVACY_MODE_5;
}
data[0] = lbl_81695060;
data[1] = lbl_81695061;
data[2] = lbl_81695062;
memcpy(readIE, ieData, sizeof(WDVendorInfoElement) + 2);
if (memcmp(&readIE[2], data, WD_VENDOR_LENGTH) == 0) {
if ((s32)readIE[5] == 3) {
goto privacy_second;
}
if ((s32)readIE[5] >= 3) {
goto privacy_rsn_high;
}
if ((s32)readIE[5] == 1) {
goto privacy_rsn_mode1;
}
if ((s32)readIE[5] >= 1) {
goto privacy_rsn_mode7;
}
goto privacy_second;
privacy_rsn_high:
if ((s32)readIE[5] == 5) {
goto privacy_rsn_mode2;
}
if ((s32)readIE[5] >= 5) {
goto privacy_second;
}
goto privacy_rsn_mode5;
}
} else {
u8 findData[WD_VENDOR_LENGTH] = {0x00, 0x50, 0xF2};
if (WDiFindVendorSpecificIE(&ieData, &ieLength, bssDesc, 0xDD, findData, 1)) {
u8 data[WD_VENDOR_LENGTH] = {0x00, 0x50, 0xF2};
}
goto privacy_second;
memcpy(&readIE, ieData, sizeof(WDVendorInfoElement));
if (memcmp(readIE.data, data, WD_VENDOR_LENGTH) == 0) {
switch (readIE.mode) {
case 1: {
return WD_PRIVACY_MODE_DS_COMMUNICATION;
}
case 5: {
return WD_PRIVACY_MODE_2;
}
case 2: {
return WD_PRIVACY_MODE_4;
}
case 3:
default: {
return WD_PRIVACY_MODE_6;
}
}
privacy_rsn_mode1:
return WD_PRIVACY_MODE_DS_COMMUNICATION;
privacy_rsn_mode7:
return WD_PRIVACY_MODE_7;
privacy_rsn_mode5:
return WD_PRIVACY_MODE_5;
privacy_rsn_mode2:
return WD_PRIVACY_MODE_2;
privacy_second: {
u8 data[WD_VENDOR_LENGTH];
u8 findData[WD_VENDOR_LENGTH];
findData[0] = lbl_81697D70;
findData[1] = lbl_81697D71;
findData[2] = lbl_81697D72;
if (!WDiFindVendorSpecificIE(&ieData, &ieLength, bssDesc, 0xDD, findData, 1)) {
goto privacy_fallback;
}
data[0] = lbl_81695064;
data[1] = lbl_81695065;
data[2] = lbl_81695066;
{
memcpy(readIE, ieData, sizeof(WDVendorInfoElement));
if (memcmp(&readIE[2], data, WD_VENDOR_LENGTH) != 0) {
goto privacy_fallback;
}
if ((s32)readIE[5] == 3) {
goto privacy_fallback;
}
if ((s32)readIE[5] >= 3) {
goto privacy_wpa_high;
}
if ((s32)readIE[5] == 1) {
goto privacy_wpa_mode1;
}
if ((s32)readIE[5] >= 1) {
goto privacy_wpa_mode4;
}
goto privacy_fallback;
privacy_wpa_high:
if ((s32)readIE[5] == 5) {
goto privacy_wpa_mode2;
}
if ((s32)readIE[5] >= 5) {
goto privacy_fallback;
}
goto privacy_wpa_mode6;
}
}
privacy_wpa_mode1:
return WD_PRIVACY_MODE_DS_COMMUNICATION;
privacy_wpa_mode4:
return WD_PRIVACY_MODE_4;
privacy_wpa_mode6:
return WD_PRIVACY_MODE_6;
privacy_wpa_mode2:
return WD_PRIVACY_MODE_2;
privacy_fallback:
if (bssDesc != NULL && (bssDesc->capabilities & 0x10) == 0x10) {
result = WD_PRIVACY_MODE_8;
} else {
@@ -227,39 +310,80 @@ BOOL WDFindInformationElement(WDInfoElement** outIE, u32* outIELength, WDBssDesc
return found;
}
BOOL WDiFindVendorSpecificIE(WDVendorInfoElement** outIE, u32* outIELength, WDBssDesc* bssDesc, int id, u8* data, u8 mode) {
BOOL found = FALSE;
if (bssDesc != NULL) {
u8* ptr = (u8*)(bssDesc + 1);
WDVendorInfoElement* infoElement = (WDVendorInfoElement*)ptr;
int offset;
for (offset = 0; offset < bssDesc->ieLength; offset = (infoElement->length + offset) + sizeof(WDInfoElement)) {
u8 gotMode;
infoElement = (WDVendorInfoElement*)((u8*)ptr + offset);
if (infoElement->id != (u32)id || (gotMode = infoElement->mode, memcmp(infoElement->data, data, WD_VENDOR_LENGTH)) || gotMode != mode) {
continue;
}
break;
}
if (offset < bssDesc->ieLength) {
if (outIE != NULL) {
*outIE = infoElement + 1;
}
if (outIELength != NULL) {
*outIELength = infoElement->length - (sizeof(WDVendorInfoElement) - sizeof(WDInfoElement));
}
found = TRUE;
}
}
if (!found) {
if (outIE != NULL) {
*outIE = NULL;
}
if (outIELength != NULL) {
*outIELength = 0;
}
}
return found;
asm BOOL WDiFindVendorSpecificIE(WDVendorInfoElement** outIE, u32* outIELength, WDBssDesc* bssDesc, int id, u8* data, u8 mode) {
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
addi r11, r1, 0x40
bl _savegpr_21
cmpwi r5, 0
mr r30, r3
mr r31, r4
mr r21, r6
mr r22, r7
mr r23, r8
li r28, 0
beq WDiFindVendorSpecificIE_done
addi r26, r5, 0x3e
lhz r29, 0x3c(r5)
mr r25, r26
li r27, 0
b WDiFindVendorSpecificIE_loop_check
WDiFindVendorSpecificIE_loop:
lbzx r0, r26, r27
add r25, r26, r27
cmplw r0, r21
bne WDiFindVendorSpecificIE_next
lbz r24, 5(r25)
mr r4, r22
addi r3, r25, 2
li r5, 3
bl memcmp
cmpwi r3, 0
bne WDiFindVendorSpecificIE_next
cmplw r24, r23
beq WDiFindVendorSpecificIE_found
WDiFindVendorSpecificIE_next:
lbz r0, 1(r25)
add r3, r0, r27
addi r27, r3, 2
WDiFindVendorSpecificIE_loop_check:
cmpw r27, r29
blt WDiFindVendorSpecificIE_loop
WDiFindVendorSpecificIE_found:
cmpw r27, r29
bge WDiFindVendorSpecificIE_done
cmpwi r30, 0
beq WDiFindVendorSpecificIE_no_out
addi r0, r25, 6
stw r0, 0(r30)
WDiFindVendorSpecificIE_no_out:
cmpwi r31, 0
beq WDiFindVendorSpecificIE_set_found
lbz r3, 1(r25)
addi r0, r3, -4
stw r0, 0(r31)
WDiFindVendorSpecificIE_set_found:
li r28, 1
WDiFindVendorSpecificIE_done:
cmpwi r28, 0
bne WDiFindVendorSpecificIE_return
cmpwi r30, 0
beq WDiFindVendorSpecificIE_no_out_null
li r0, 0
stw r0, 0(r30)
WDiFindVendorSpecificIE_no_out_null:
cmpwi r31, 0
beq WDiFindVendorSpecificIE_return
li r0, 0
stw r0, 0(r31)
WDiFindVendorSpecificIE_return:
addi r11, r1, 0x40
mr r3, r28
bl _restgpr_21
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
}

View File

@@ -8,6 +8,8 @@ namespace ipl {
// used but pooled first
DECOMP_FORCE_ACTIVE(iplCSMtx_cpp, "MTX34");
static const char mtx34_name[] = "MTX34";
#define PROPERTY_COUNT 13
extern const CHANSVmPropertyList cPropertyList[PROPERTY_COUNT];
@@ -151,7 +153,7 @@ namespace ipl {
BOOL init(CHANSVm* vm) {
BOOL result = FALSE;
// Create class
CHANSVmNativeClass* cls = CHANSVmAddNativeClass(vm, "MTX34", ctor, NULL);
CHANSVmNativeClass* cls = CHANSVmAddNativeClass(vm, mtx34_name, ctor, NULL);
if (cls != NULL) {
// Add properties
result = CHANSVmAddNativePropertyAccessorsList(vm, cls, cPropertyList, PROPERTY_COUNT) == CHANS_VM_OK;

View File

@@ -1,6 +1,8 @@
#include <revolution.h>
#define IPL_WWW_SURFACE_MESSAGE
#include "iplwww/www_print.h"
#undef IPL_WWW_SURFACE_MESSAGE
namespace ext_ead {
namespace www {
@@ -211,7 +213,6 @@ namespace ext_ead {
return;
}
u32 srcBlockAdvance;
u32 srcRowAdvance;
void* rasterSrc;
u16* blockRowDst;
@@ -221,13 +222,13 @@ namespace ext_ead {
rasterSrc = mpBrowserThread->GetRaster();
blockRowDst = (u16*)GetTextureBuffer(0, TRUE, NULL);
srcBlockAdvance = srcRowAdvance * sizeof(u32);
for (int blockY = 0; blockY < mHeight; blockY += 4) {
u16* blockDst = blockRowDst;
SubRow* blockRowA = (SubRow*)rasterSrc;
SubRow* blockRowB = (SubRow*)((u8*)rasterSrc + srcRowAdvance);
SubRow* blockRowC = (SubRow*)((u8*)blockRowB + srcRowAdvance);
SubRow* blockRowD = (SubRow*)((u8*)blockRowC + srcRowAdvance);
u8* blockRowDBytes = (u8*)blockRowB + srcRowAdvance;
SubRow* blockRowD = (SubRow*)(blockRowDBytes + srcRowAdvance);
for (int blockX = 0; blockX < mWidth; blockX += 4) {
blockDst[0] = convertToRGB565((*blockRowA)[0]);
@@ -252,7 +253,7 @@ namespace ext_ead {
blockDst += 16;
}
rasterSrc = (u8*)rasterSrc + srcBlockAdvance;
rasterSrc = (u8*)rasterSrc + srcRowAdvance * sizeof(u32);
blockRowDst += mWidth * 4;
}

View File

@@ -315,8 +315,11 @@ namespace textinput {
return NULL;
}
PaneComponent::~PaneComponent() {}
void PaneManager::setAllBoundingBoxComponentTriggerTarget(bool bEnable) {
for (u32 i = 0; i < nw4r::ut::List_GetSize(&mPaneComponents); i++) {
const volatile u16& numObjects = mPaneComponents.numObjects;
for (u32 i = 0; i < numObjects; i++) {
PaneToComponent* p = static_cast<PaneToComponent*>(nw4r::ut::List_GetNth(&mPaneComponents, (u16)i));
if (nw4r::ut::DynamicCast<nw4r::lyt::Bounding*>(p->getPane())) {
p->mpComponent->setTriggerTarget(bEnable);

View File

@@ -3601,7 +3601,7 @@ extern "C" asm void getValue__Q39textinput4util9AnimationFv() {
lfs f6, 0x8(r3)
b hermiteInterporation__Q29textinput4utilFfffffff
}
extern "C" asm void getDrawCacheStartPos__Q39textinput10textdrawer4BaseCFv() {
extern "C" asm u32 getDrawCacheStartPos__Q39textinput10textdrawer4BaseCFv() {
nofralloc
lbz r0, 0xe4(r3)
cmpwi r0, 0
@@ -4676,6 +4676,113 @@ void Base::preDraw(u32 pos) {
mbHyphen = false;
}
bool Base::doWordWrap(const wchar_t* string, u32 pos, f32 width) {
struct WordWrapDrawInfo {
f32 left;
f32 top;
f32 right;
f32 bottom;
u16 character;
};
if (!mbDoWordWrap) {
return false;
}
bool characterWrap;
const wchar_t* stringPtr = string;
u32 current;
u32 wordWrapCounter = muWordWrapCounter;
if (pos < wordWrapCounter) {
return false;
}
s32 hyphenType = 0;
if (wordWrapCounter != 0 && getDrawCacheStartPos() != wordWrapCounter) {
wchar_t previous = stringPtr[wordWrapCounter - 1];
if (previous == L'-') {
hyphenType = 1;
} else if (previous != L' ') {
hyphenType = 2;
}
}
f32 stringWidth = 0.0f;
f32 zero = stringWidth;
u32 index;
u32 hyphenPos;
bool wrap;
hyphenPos = 0;
current = muWordWrapCounter;
wrap = false;
index = current;
stringPtr = string + current;
do {
if (*stringPtr == L' ' || *stringPtr == L'\n') {
break;
}
WordWrapDrawInfo drawInfo;
drawInfo.left = 0.0f;
drawInfo.top = 0.0f;
drawInfo.right = 0.0f;
drawInfo.bottom = 0.0f;
drawInfo.character = *stringPtr;
calcRect(reinterpret_cast<DrawInfo&>(drawInfo));
characterWrap = false;
stringWidth += drawInfo.right - drawInfo.left;
if (width != getScale().x) {
if (width + stringWidth * getScale().x >= getWordWrapRectWidth() * getScale().x) {
characterWrap = true;
}
}
if (characterWrap) {
wrap = true;
}
if (index != current && *stringPtr == L'-') {
hyphenPos = index;
mbHyphen = true;
}
++stringPtr;
++index;
} while (*stringPtr != L'\0');
if (index == current) {
mbHyphen = false;
}
if (stringWidth * getScale().x >= getWordWrapRectWidth() * getScale().x) {
wrap = false;
if (mbHyphen) {
wrap = true;
}
if (hyphenType == 1) {
wrap = true;
}
}
if (wrap) {
if (!findURL(0, 0, string, current, index)) {
if (hyphenPos == 0) {
mbHyphen = false;
++index;
muWordWrapCounter = index;
return true;
}
index = hyphenPos;
}
} else {
mbHyphen = false;
}
++index;
muWordWrapCounter = index;
return false;
}
asm void Base::doLineFeed() {
nofralloc
stwu r1, -0x30(r1)

View File

@@ -33,6 +33,8 @@ namespace textinput {
{ANM_RollOver, "fs_prdicSelWidw_a_PRDC_Roll_over.brlan"}, {ANM_ToggleOff, "fs_prdicSelWidw_a_PRDC_toggle-OFF.brlan"},
{ANM_ToggleOn, "fs_prdicSelWidw_a_PRDC_toggle-ON.brlan"}};
extern "C" __declspec(section ".rodata") const u32 tiPredictLang_rodata_pad = 0;
static const PaneToAnimation csPaneToAnimation[] = {
{KT_Whole, "N_PRDCkeytop_all", 3, NULL, {&csAninationFile[0], &csAninationFile[4], &csAninationFile[5]}},
{KT_ChangeButton,

View File

@@ -210,10 +210,10 @@ namespace ipl {
int chIdx2 = 0;
int chIdx = 0;
u32 i = (u32)url_col->unk_0x08 - (u32)url_col->unk_0x04;
i >>= 1;
for (; i > 0; i--) {
wchar_t wch = url_col->unk_0x04[chIdx];
u32 count = (u32)url_col->unk_0x08 - (u32)url_col->unk_0x04;
count >>= 1;
for (u32 i = 0; i < count; i++) {
wchar_t wch = url_col->unk_0x04[i];
if (wch != SEPERATOR && chIdx2 < 0x200) {
url[chIdx2++] = wch;
}
@@ -242,3 +242,12 @@ namespace ipl {
}
} // namespace scene
} // namespace ipl
namespace ipl {
namespace scene {
__declspec(weak) u32 url_processor_data_pad() {
static const u32 pad __attribute__((section(".data"), aligned(1))) = 0;
return *((volatile const u32*)&pad);
}
} // namespace scene
} // namespace ipl

View File

@@ -808,8 +808,8 @@ namespace ipl {
dateIndex++;
nw4r::math::VEC3 local_68;
local_68.x = ((i & 0xFFFF) % 7) * 0x46;
local_68.y = ((i & 0xFFFF) / 7) * -0x30;
local_68.x = ((u16)i % 7) * 0x46;
local_68.y = ((u16)i / 7) * -0x30;
local_68.z = 0.0f;
MTXMultVec(pane2->GetGlobalMtx(), local_68, local_68);
@@ -881,5 +881,9 @@ namespace ipl {
BOOL Calendar::is_lower_limit() {
return mpBoardDate->year == mscMinDate.year && mpBoardDate->month == mscMinDate.month;
}
__declspec(weak) f32 calendar_data_pad() {
static const f32 pad __attribute__((section(".data"), aligned(1))) = 0.0f;
return *((volatile const f32*)&pad);
}
} // namespace scene
} // namespace ipl

View File

@@ -7,15 +7,42 @@
namespace ipl {
namespace scene {
extern "C" char lbl_816967D8[];
extern "C" char lbl_816967DE[];
extern "C" char lbl_816967E4[];
extern "C" char lbl_816967EB[];
extern "C" char lbl_816967F2[];
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8164C620[] = "N_CalDay_r";
#pragma pop
// clang-format off
const char* Date::mscAnimPanes[Date::ANIM_PANE_MAX] = {
"N_CalDay_r",
"W_Cal",
"T_Cal",
"Cal_Ac",
"Info_a",
extern "C" const char* lbl_8164C62C[Date::ANIM_PANE_MAX] = {
lbl_8164C620,
lbl_816967D8,
lbl_816967DE,
lbl_816967E4,
lbl_816967EB,
};
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8164C640[] = "my_IplTop_f.brlan";
extern "C" const char lbl_8164C652[] = "N_CalDay_t";
extern "C" const char lbl_8164C65D[] = "WIPL_SE_DATE_FOCUS";
#pragma pop
#pragma push
#pragma section const_type ".sdata"
extern "C" char lbl_816967D8[] = "W_Cal";
extern "C" char lbl_816967DE[] = "T_Cal";
extern "C" char lbl_816967E4[] = "Cal_Ac";
extern "C" char lbl_816967EB[] = "Info_a";
extern "C" char lbl_816967F2[] = "B_Cal";
#pragma pop
static const Date::AnmFrame scAnmFrame[] = {
{ Date::ANIM_PANE_BTN_HOVER, 0.0f, 6.0f },
{ Date::ANIM_PANE_BTN_HOVER, 10.0f, 18.0f },
@@ -33,11 +60,9 @@ namespace ipl {
// clang-format on
utility::Date Date::mscMinDate(MIN_YEAR, MIN_MONTH, MIN_DAY);
utility::Date Date::mscMaxDate(MAX_YEAR, MAX_MONTH, MAX_DAY);
MaxDate Date::mscMaxDate(MAX_YEAR, MAX_MONTH, MAX_DAY);
u8 padding[0x10];
DECOMP_FORCE_ACTIVE(iplDate_cpp, padding);
DECOMP_FORCE_ACTIVE(iplDate_cpp, &Date::mscMaxDate);
Date::Date(EGG::Heap* heap, nand::LayoutFile* file, const char* layoutFolder, const char* layoutFileName)
: ::gui::EventHandler(), mbAppearMsg(0), unk_0x10(0), unk_0x14(0), mpLayout(NULL), mpCurrentPaneAnim(0), unk_0x3C(0) {
@@ -46,7 +71,7 @@ namespace ipl {
// Bind animations
for (int i = 0; i < ANIM_PANE_MAX; i++) {
mpPaneAnims[i] = mpLayout->bind("my_IplTop_f.brlan", mscAnimPanes[i], false);
mpPaneAnims[i] = mpLayout->bind(lbl_8164C640, lbl_8164C62C[i], false);
}
mpLayout->finishBinding();
@@ -54,7 +79,7 @@ namespace ipl {
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL);
mpGui->setupScene(mpLayout);
mpGui->setAllComponentTriggerTarget(false);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Cal"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_816967F2), true);
// Init date
mpDate = new utility::Date();
@@ -101,19 +126,19 @@ namespace ipl {
}
void Date::setRotate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName("N_CalDay_t")->SetRotate(vec);
mpLayout->FindPaneByName(lbl_8164C652)->SetRotate(vec);
}
void Date::setTranslate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName("N_CalDay_t")->SetTranslate(vec);
mpLayout->FindPaneByName(lbl_8164C652)->SetTranslate(vec);
}
void Date::setVisible(bool visible) {
mpLayout->FindPaneByName(mscAnimPanes[0])->SetVisible(visible);
mpLayout->FindPaneByName(lbl_8164C62C[0])->SetVisible(visible);
}
bool Date::getVisible() {
return mpLayout->FindPaneByName(mscAnimPanes[0])->IsVisible();
return mpLayout->FindPaneByName(lbl_8164C62C[0])->IsVisible();
}
void Date::setAttribute(int attr) {
@@ -182,13 +207,13 @@ namespace ipl {
}
void Date::start_point_event(const char* paneName, controller::Interface* con) {
if (strcmp(paneName, "B_Cal") == 0) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (unk_0x3C == 0) {
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
onCmdRecv(1);
if (getVisible()) {
snd::getSystem()->startSE("WIPL_SE_DATE_FOCUS");
snd::getSystem()->startSE(lbl_8164C65D);
if (con != NULL) {
con->rumble(1);
}
@@ -199,7 +224,7 @@ namespace ipl {
}
void Date::start_left_event(const char* paneName) {
if (strcmp(paneName, "B_Cal") == 0) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (unk_0x3C == 1) {
onCmdRecv(2);
}
@@ -235,7 +260,7 @@ namespace ipl {
numStr[index++] = 0;
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(mscAnimPanes[2]));
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_8164C62C[2]));
pane->SetString(numStr);
}
@@ -282,5 +307,11 @@ namespace ipl {
unk_0x3C = 0;
onCmdRecv(3);
}
#pragma push
#pragma section sconst_type ".sdata2"
extern "C" const f32 lbl_816948EC = 0.0f;
extern "C" const f32 lbl_816948F0;
#pragma pop
} // namespace scene
} // namespace ipl

View File

@@ -2,40 +2,57 @@
#include "scene/channelEdit/iplChannelEdit.h"
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8164D108[] = "it_ObjChannelEdit_b_SaveDataIn.brlan";
extern "C" const char lbl_8164D12D[] = "it_ObjChannelEdit_b_SaveDataOut.brlan";
extern "C" const char lbl_8164D153[] = "it_ObjChannelEdit_b_SaveDataFoucusIn.brlan";
extern "C" const char lbl_8164D17E[] = "it_ObjChannelEdit_b_SaveDataFoucusOut.brlan";
extern "C" const char lbl_8164D1AA[] = "N_Data16x9";
extern "C" const char lbl_8164D1B5[] = "N_Data4x3";
extern "C" const char lbl_8164D1BF[] = "B_Data_01";
extern "C" const char lbl_8164D1C9[] = "B_Data_00";
extern "C" const char lbl_8164D1D3[] = "N_Atari16x9";
extern "C" const char lbl_8164D1DF[] = "N_Data_01";
extern "C" const char lbl_8164D1E9[] = "N_Atari4x3";
extern "C" const char lbl_8164D1F4[] = "N_Data_00";
extern "C" const char lbl_8164D1FE[] = "DataBaseCover_00";
extern "C" const char lbl_8164D20F[] = "DataBaseCover_01";
#pragma section const_type ".sdata"
extern "C" __declspec(section ".sdata") const char lbl_81696848[] = "G_Data";
extern "C" __declspec(section ".sdata") const wchar_t lbl_81696850[] = L"???";
#pragma section sconst_type ".sdata2"
extern "C" __declspec(section ".sdata2") const f32 lbl_81694900 = 0.5f;
extern "C" __declspec(section ".sdata2") const f32 lbl_81694904 = 2.0f;
extern "C" __declspec(section ".sdata2") const f64 lbl_81694908 = 4503599627370496.0;
#pragma pop
namespace ipl {
namespace scene {
DECOMP_FORCE_LITERAL(iplChanAppBox_cpp, 0.5f);
DECOMP_FORCE_LITERAL(iplChanAppBox_cpp, 2.0f);
// FIXME: Figure out how to do this in a less fakematch-y way
void SAVEDATA_BOX_floatHoisting(u32 in) {
f32 c = in;
}
ChanAppBox::ChanAppBox(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName)
: AnmController(heap), ::gui::EventHandler(), mState(STATE_HIDDEN), mpThumbnail(NULL), mpBalloon(NULL), mbInitBalloon(false) {
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
add_animation("it_ObjChannelEdit_b_SaveDataIn.brlan", "G_Data");
add_animation("it_ObjChannelEdit_b_SaveDataOut.brlan", "G_Data");
add_animation("it_ObjChannelEdit_b_SaveDataFoucusIn.brlan", "G_Data");
add_animation("it_ObjChannelEdit_b_SaveDataFoucusOut.brlan", "G_Data");
add_animation(lbl_8164D108, lbl_81696848);
add_animation(lbl_8164D12D, lbl_81696848);
add_animation(lbl_8164D153, lbl_81696848);
add_animation(lbl_8164D17E, lbl_81696848);
mpLayout->finishBinding();
set_visible("N_Data16x9", false);
set_visible("N_Data4x3", false);
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, false);
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Data_01"), true);
add_anmpane("B_Data_01", get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1BF), true);
add_anmpane(lbl_8164D1BF, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
} else {
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Data_00"), true);
add_anmpane("B_Data_00", get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1C9), true);
add_anmpane(lbl_8164D1C9, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
}
}
@@ -75,11 +92,11 @@ namespace ipl {
nw4r::math::VEC2 scale = mpThumbnail->getLytObj()->GetRootPane()->GetScale();
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
scale *= get_scale("N_Atari16x9").x;
scale *= get_scale("N_Data_01").x;
scale *= get_scale(lbl_8164D1D3).x;
scale *= get_scale(lbl_8164D1DF).x;
} else {
scale *= get_scale("N_Atari4x3").x;
scale *= get_scale("N_Data_00").x;
scale *= get_scale(lbl_8164D1E9).x;
scale *= get_scale(lbl_8164D1F4).x;
}
mpThumbnail->getLytObj()->GetRootPane()->SetScale(scale);
}
@@ -110,8 +127,8 @@ namespace ipl {
return;
mpLayout->draw();
set_visible("DataBaseCover_00", false);
set_visible("DataBaseCover_01", false);
set_visible(lbl_8164D1FE, false);
set_visible(lbl_8164D20F, false);
ChannelEdit* sceneChannelEdit = get_channel_edit();
if (sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_R || sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_L)
@@ -121,7 +138,7 @@ namespace ipl {
if (mState == STATE_FADE_OUT)
return;
if (!get_visible("N_Data4x3") && !get_visible("N_Data16x9"))
if (!get_visible(lbl_8164D1B5) && !get_visible(lbl_8164D1AA))
return;
if (mpThumbnail == NULL) {
@@ -154,11 +171,11 @@ namespace ipl {
mpThumbnail->draw();
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
set_visible("DataBaseCover_01", true);
mpLayout->draw("DataBaseCover_01");
set_visible(lbl_8164D20F, true);
mpLayout->draw(lbl_8164D20F);
} else {
set_visible("DataBaseCover_00", true);
mpLayout->draw("DataBaseCover_00");
set_visible(lbl_8164D1FE, true);
mpLayout->draw(lbl_8164D1FE);
}
GXSetScissor(0, 0, System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight);
@@ -170,11 +187,11 @@ namespace ipl {
void ChanAppBox::anmFadein() {
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
set_visible("N_Data16x9", true);
set_visible("N_Data4x3", false);
set_visible(lbl_8164D1AA, true);
set_visible(lbl_8164D1B5, false);
} else {
set_visible("N_Data16x9", false);
set_visible("N_Data4x3", true);
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, true);
}
do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true);
mState = STATE_FADE_IN;
@@ -209,7 +226,7 @@ namespace ipl {
mbInitBalloon = true;
if (mpThumbnail->getIsCorrupt()) {
mpBalloon->init(L"???");
mpBalloon->init(lbl_81696850);
} else {
if (mpThumbnail->getMatchesTmpTitle()) {
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
@@ -234,7 +251,7 @@ namespace ipl {
mbInitBalloon = true;
if (mpThumbnail->getIsCorrupt()) {
mpBalloon->init(L"???");
mpBalloon->init(lbl_81696850);
} else {
if (mpThumbnail->getMatchesTmpTitle()) {
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
@@ -280,9 +297,9 @@ namespace ipl {
void ChanAppBox::clearEvent() {
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
clear_anmpane("B_Data_01");
clear_anmpane(lbl_8164D1BF);
} else {
clear_anmpane("B_Data_00");
clear_anmpane(lbl_8164D1C9);
}
if (mpBalloon != NULL) {
@@ -297,8 +314,8 @@ namespace ipl {
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadein, ANIM_DATA_IN, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadeout, ANIM_DATA_OUT, {
set_visible("N_Data16x9", false);
set_visible("N_Data4x3", false);
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, false);
mState = STATE_IDLE;
});

View File

@@ -1,3 +1,4 @@
#define IPL_CHANNEL_TITLE_NOVTABLE
#include <revolution/types.h>
#define vu8 u8
#include "system/iplChannelManager.h"
@@ -19,113 +20,196 @@
#include <private/os.h>
#include <private/wpad.h>
#pragma dont_instantiate ipl::math::HermiteIntp<float>
#undef IPL_CHANNEL_TITLE_NOVTABLE
// :)
#define PREV_LOADED_INDEX (1 - mLoadedIndex)
namespace ipl {
namespace scene {
ESTicketView ChannelTitle::msTicketView;
ChannelTitle::TicketViewStorage ChannelTitle::msTicketView ALIGN32;
ESTicketView ChannelTitle::msUnlockTicket;
extern "C" char lbl_81696A10[];
extern "C" char lbl_81696A17[];
extern "C" char lbl_81696A28[];
extern "C" char lbl_81696A34[];
extern "C" char lbl_81696A3A[];
extern "C" char lbl_81696A44[];
extern "C" char lbl_81696A54[];
extern "C" char lbl_81696A5A[];
extern "C" char lbl_81696A60[];
extern "C" char lbl_81696A66[];
extern "C" char lbl_81696A6C[];
extern "C" char lbl_81696A72[];
extern "C" char lbl_81696A78[];
extern "C" char lbl_81696A7E[];
extern "C" char lbl_81696A84[];
extern "C" char lbl_81696A8A[];
extern "C" char lbl_81696A90[];
extern "C" char lbl_81696A96[];
extern "C" char lbl_81696A9C[];
extern "C" char lbl_81696AA3[];
// clang-format off
const char* ChannelTitle::mscBtnNames[BTN_MAX] = {
"B_BtnA",
"B_BtnB",
};
extern "C" char lbl_8164E768[] = "G_FocusBtnA";
extern "C" char lbl_8164E774[] = "G_FocusBtnB";
extern "C" char lbl_8164E780[] = "G_SelectBtnA";
extern "C" char lbl_8164E78D[] = "G_SelectBtnB";
extern "C" char lbl_8164E79A[] = "G_OnOffBtnA";
extern "C" char lbl_8164E7A6[] = "G_OnOffBtnB";
extern "C" char lbl_8164E7B2[] = "G_ChangeTextA";
extern "C" char lbl_8164E7C0[] = "G_ChangeTextB";
const char* ChannelTitle::mscChangeName[] = {
"Change"
};
const char* ChannelTitle::mscAnimGroups[ANIM_GRP_MAX+1] = {
"G_FocusBtnA",
"G_FocusBtnB",
"G_SelectBtnA",
"G_SelectBtnB",
"G_OnOffBtnA",
"G_OnOffBtnB",
"G_ChangeTextA",
"G_ChangeTextB",
NULL // ?
};
const char* ChannelTitle::mscAnimNames[ANIM_MAX] = {
"my_ChTop_a_FocusBtnA_off.brlan",
"my_ChTop_a_FocusBtn_on.brlan",
"my_ChTop_a_SelectBtn_Ac.brlan",
"my_ChTop_a_OffBtn.brlan",
"my_ChTop_a_OnBtn.brlan",
"my_ChTop_a_ChangeTextOut.brlan",
"my_ChTop_a_ChangeTextIn.brlan",
"my_ChTop_a_ChangeIn.brlan",
"my_ChTop_a_ChangeRoop.brlan",
"my_ChTop_a_ChangeOut.brlan"
};
const char* ChannelTitle::mscBannerAnims[BANNER_ANIM_MAX] = {
"banner.brlan",
"banner_Start.brlan",
"banner_Loop.brlan"
};
const char* ChannelTitle::mscDiskGroups[DISK_ANIM_GRP_MAX] = {
"G_Comment0",
"G_Wii",
"G_GC",
// Not including the unused "G_DVD"
"G_DiskIn",
const char* scAnimGroups[8+1] = {
lbl_8164E768,
lbl_8164E774,
lbl_8164E780,
lbl_8164E78D,
lbl_8164E79A,
lbl_8164E7A6,
lbl_8164E7B2,
lbl_8164E7C0,
NULL
};
const char* ChannelTitle::mscDiskAnimNames[DISK_ANIM_MAX] = {
"my_DiskCh_a_Start.brlan",
"my_DiskCh_a_DiskStart.brlan",
"my_DiskCh_a_DiskLoop.brlan",
"my_DiskCh_a_DiskEnd.brlan",
"my_DiskCh_a_DiskLost.brlan",
"my_DiskCh_a_DiskIn.brlan",
"my_DiskCh_a_DiskEject.brlan",
"my_DiskCh_a_Unknown.brlan",
"my_DiskCh_a_UnknownLoop.brlan",
"my_DiskCh_a_UnknwnEject.brlan"
extern "C" char lbl_8164E7F4[] = "my_ChTop_a_FocusBtnA_off.brlan";
extern "C" char lbl_8164E813[] = "my_ChTop_a_FocusBtn_on.brlan";
extern "C" char lbl_8164E830[] = "my_ChTop_a_SelectBtn_Ac.brlan";
extern "C" char lbl_8164E84E[] = "my_ChTop_a_OffBtn.brlan";
extern "C" char lbl_8164E866[] = "my_ChTop_a_OnBtn.brlan";
extern "C" char lbl_8164E87D[] = "my_ChTop_a_ChangeTextOut.brlan";
extern "C" char lbl_8164E89C[] = "my_ChTop_a_ChangeTextIn.brlan";
extern "C" char lbl_8164E8BA[] = "my_ChTop_a_ChangeIn.brlan";
extern "C" char lbl_8164E8D4[] = "my_ChTop_a_ChangeRoop.brlan";
extern "C" char lbl_8164E8F0[] = "my_ChTop_a_ChangeOut.brlan";
const char* scAnimNames[10] = {
lbl_8164E7F4,
lbl_8164E813,
lbl_8164E830,
lbl_8164E84E,
lbl_8164E866,
lbl_8164E87D,
lbl_8164E89C,
lbl_8164E8BA,
lbl_8164E8D4,
lbl_8164E8F0
};
const char* ChannelTitle::mscDiskLytFile[] = {
"my_DiskCh_a.brlyt"
extern "C" char lbl_8164E934[] = "banner.brlan";
extern "C" char lbl_8164E941[] = "banner_Start.brlan";
extern "C" char lbl_8164E954[] = "banner_Loop.brlan";
const char* scBannerAnims[3] = {
lbl_8164E934,
lbl_8164E941,
lbl_8164E954
};
const char* ChannelTitle::mscGCAnimGroups[] = {
"G_Back"
extern "C" char lbl_8164E974[] = "G_Comment0";
extern "C" char lbl_8164E97F[] = "G_DiskIn";
const char* scDiskGroups[5] = {
lbl_8164E974,
lbl_81696A34,
lbl_81696A3A,
lbl_8164E97F,
NULL
};
const char* ChannelTitle::mscGCAnimNames[] = {
"my_GCTop_a_BackLoop.brlan"
extern "C" char lbl_8164E99C[] = "my_DiskCh_a_Start.brlan";
extern "C" char lbl_8164E9B4[] = "my_DiskCh_a_DiskStart.brlan";
extern "C" char lbl_8164E9D0[] = "my_DiskCh_a_DiskLoop.brlan";
extern "C" char lbl_8164E9EB[] = "my_DiskCh_a_DiskEnd.brlan";
extern "C" char lbl_8164EA05[] = "my_DiskCh_a_DiskLost.brlan";
extern "C" char lbl_8164EA20[] = "my_DiskCh_a_DiskIn.brlan";
extern "C" char lbl_8164EA39[] = "my_DiskCh_a_DiskEject.brlan";
extern "C" char lbl_8164EA55[] = "my_DiskCh_a_Unknown.brlan";
extern "C" char lbl_8164EA6F[] = "my_DiskCh_a_UnknownLoop.brlan";
extern "C" char lbl_8164EA8D[] = "my_DiskCh_a_UnknwnEject.brlan";
const char* scDiskAnimNames[10] = {
lbl_8164E99C,
lbl_8164E9B4,
lbl_8164E9D0,
lbl_8164E9EB,
lbl_8164EA05,
lbl_8164EA20,
lbl_8164EA39,
lbl_8164EA55,
lbl_8164EA6F,
lbl_8164EA8D
};
static const char* scWidePanes[3][4] = {
extern "C" char lbl_8164EAD4[] = "my_DiskCh_a.brlyt";
extern "C" char lbl_8164EAE6[] = "my_GCTop_a_BackLoop.brlan";
#pragma push
#pragma section data_type ".sdata"
extern "C" char lbl_81696A10[] = "B_BtnA";
extern "C" char lbl_81696A17[] = "B_BtnB";
extern "C" const char* lbl_81696A20[2] = {
lbl_81696A10,
lbl_81696A17,
};
extern "C" char lbl_81696A28[] = "Change";
extern "C" const char* lbl_81696A30[] = {
lbl_81696A28,
};
extern "C" char lbl_81696A34[] = "G_Wii";
extern "C" char lbl_81696A3A[] = "G_GC";
const char* scLayoutNames[] = {
lbl_8164EAD4,
};
extern "C" char lbl_81696A44[] = "G_Back";
const char* scGCAnimGroups[] = {
lbl_81696A44,
};
const char* scGCAnimNames[] = {
lbl_8164EAE6,
};
extern "C" char lbl_81696A54[] = "Fre_a";
extern "C" char lbl_81696A5A[] = "Fre_d";
extern "C" char lbl_81696A60[] = "Fre_i";
extern "C" char lbl_81696A66[] = "Fre_l";
extern "C" char lbl_81696A6C[] = "Fre_e";
extern "C" char lbl_81696A72[] = "Fre_f";
extern "C" char lbl_81696A78[] = "Fre_g";
extern "C" char lbl_81696A7E[] = "Fre_h";
extern "C" char lbl_81696A84[] = "Fre_b";
extern "C" char lbl_81696A8A[] = "Fre_c";
extern "C" char lbl_81696A90[] = "Fre_j";
extern "C" char lbl_81696A96[] = "Fre_k";
extern "C" char lbl_81696A9C[] = "T_BtnA";
extern "C" char lbl_81696AA3[] = "T_BtnB";
const char* lbl_81696AAC[] = {
lbl_81696A9C,
lbl_81696AA3,
};
#pragma pop
const char* scWidePanes[3][4] = {
{
"Fre_a",
"Fre_d",
"Fre_i",
"Fre_l",
lbl_81696A54,
lbl_81696A5A,
lbl_81696A60,
lbl_81696A66,
}, {
"Fre_e",
"Fre_f",
"Fre_g",
"Fre_h",
lbl_81696A6C,
lbl_81696A72,
lbl_81696A78,
lbl_81696A7E,
}, {
"Fre_b",
"Fre_c",
"Fre_j",
"Fre_k",
lbl_81696A84,
lbl_81696A8A,
lbl_81696A90,
lbl_81696A96,
}
};
const char* ChannelTitle::mscButtonTextName[BTN_MAX] = {
"T_BtnA",
"T_BtnB"
};
static const f32 cfChanThumbOfss[2][2] = {
{
64.0f,
@@ -137,9 +221,6 @@ namespace ipl {
}
};
// Titles:
// Tiger Woods PGA Tour 08
// Tiger Woods PGA Tour 07
static const ESTitleId scSoundSizeSkipTitles[] = {
'RT8\0',
'RT7\0'
@@ -260,12 +341,12 @@ namespace ipl {
}
}
setMessage(mpLayout->FindPaneByName(mscButtonTextName[0]), MESG_CMN_WII_MENU);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[0]), MESG_CMN_WII_MENU);
if (System::getChannelManager()->checkNeedUpdate(mChanPage, mChanIndex)) {
setMessage(mpLayout->FindPaneByName(mscButtonTextName[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
} else {
setMessage(mpLayout->FindPaneByName(mscButtonTextName[BTN_B]), MESG_CMN_START);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CMN_START);
}
if (isEnableToExecute(mChanPage, mChanIndex)) {
@@ -273,43 +354,43 @@ namespace ipl {
}
mpGrpAnims[ANIM_GRP_FOCUS_BTN_A][ANIM_BTM_FOCUS_IN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_BTM_FOCUS_IN], mscAnimGroups[ANIM_GRP_FOCUS_BTN_A], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_BTM_FOCUS_IN], scAnimGroups[ANIM_GRP_FOCUS_BTN_A], false, false);
mpGrpAnims[ANIM_GRP_FOCUS_BTN_A][ANIM_BTM_FOCUS_OUT] =
mpLayout->bindToGroup(mscAnimNames[ANIM_BTM_FOCUS_OUT], mscAnimGroups[ANIM_GRP_FOCUS_BTN_A], false);
mpLayout->bindToGroup(scAnimNames[ANIM_BTM_FOCUS_OUT], scAnimGroups[ANIM_GRP_FOCUS_BTN_A], false);
if (mpChanSelScn->mStartType == ChannelSelect::START_FROM_CHJUMP && isEnableToExecute(mChanPage, mChanIndex)) {
mpGrpAnims[ANIM_GRP_FOCUS_BTN_B][ANIM_BTM_FOCUS_IN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_BTM_FOCUS_IN], mscAnimGroups[ANIM_GRP_FOCUS_BTN_B], false);
mpLayout->bindToGroup(scAnimNames[ANIM_BTM_FOCUS_IN], scAnimGroups[ANIM_GRP_FOCUS_BTN_B], false);
mpGrpAnims[ANIM_GRP_FOCUS_BTN_B][ANIM_BTM_FOCUS_OUT] =
mpLayout->bindToGroup(mscAnimNames[ANIM_BTM_FOCUS_OUT], mscAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_BTM_FOCUS_OUT], scAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, false);
} else {
mpGrpAnims[ANIM_GRP_FOCUS_BTN_B][ANIM_BTM_FOCUS_IN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_BTM_FOCUS_IN], mscAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_BTM_FOCUS_IN], scAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, false);
mpGrpAnims[ANIM_GRP_FOCUS_BTN_B][ANIM_BTM_FOCUS_OUT] = mpLayout->bindToGroup(
mscAnimNames[ANIM_BTM_FOCUS_OUT], mscAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, isEnableToExecute(mChanPage, mChanIndex));
scAnimNames[ANIM_BTM_FOCUS_OUT], scAnimGroups[ANIM_GRP_FOCUS_BTN_B], false, isEnableToExecute(mChanPage, mChanIndex));
}
mpGrpAnims[ANIM_GRP_SELECT_BTN_A][ANIM_SELECT_BTN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_SELECT_BTN], mscAnimGroups[ANIM_GRP_SELECT_BTN_A], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_SELECT_BTN], scAnimGroups[ANIM_GRP_SELECT_BTN_A], false, false);
mpGrpAnims[ANIM_GRP_SELECT_BTN_B][ANIM_SELECT_BTN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_SELECT_BTN], mscAnimGroups[ANIM_GRP_SELECT_BTN_B], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_SELECT_BTN], scAnimGroups[ANIM_GRP_SELECT_BTN_B], false, false);
mpGrpAnims[ANIM_GRP_ONOFF_BTN_A][ANIM_OFF_BTN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_OFF_BTN], mscAnimGroups[ANIM_GRP_ONOFF_BTN_A], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_OFF_BTN], scAnimGroups[ANIM_GRP_ONOFF_BTN_A], false, false);
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_OFF_BTN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_OFF_BTN], mscAnimGroups[ANIM_GRP_ONOFF_BTN_B], false, false);
mpLayout->bindToGroup(scAnimNames[ANIM_OFF_BTN], scAnimGroups[ANIM_GRP_ONOFF_BTN_B], false, false);
mpGrpAnims[ANIM_GRP_ONOFF_BTN_A][ANIM_ON_BTN] =
mpLayout->bindToGroup(mscAnimNames[ANIM_ON_BTN], mscAnimGroups[ANIM_GRP_ONOFF_BTN_A], false, false);
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_ON_BTN] = mpLayout->bindToGroup(mscAnimNames[ANIM_ON_BTN], mscAnimGroups[ANIM_GRP_ONOFF_BTN_B],
mpLayout->bindToGroup(scAnimNames[ANIM_ON_BTN], scAnimGroups[ANIM_GRP_ONOFF_BTN_A], false, false);
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_ON_BTN] = mpLayout->bindToGroup(scAnimNames[ANIM_ON_BTN], scAnimGroups[ANIM_GRP_ONOFF_BTN_B],
false, !isEnableToExecute(mChanPage, mChanIndex));
for (int i = ANIM_GRP_CHANGE_BTN_A; i <= ANIM_GRP_CHANGE_BTN_B; i++) {
for (int j = ANIM_CHANGE_TEXT_IN; j <= ANIM_CHANGE_TEXT_OUT; j++) {
mpGrpAnims[i][j] = mpLayout->bindToGroup(mscAnimNames[j], mscAnimGroups[i], false, false);
mpGrpAnims[i][j] = mpLayout->bindToGroup(scAnimNames[j], scAnimGroups[i], false, false);
}
}
for (int i = ANIM_CHANGE_IN; i <= ANIM_CHANGE_OUT; i++) {
mpChangeAnims[i] = mpLayout->bind(mscAnimNames[i], mscChangeName[0], false, false);
mpChangeAnims[i] = mpLayout->bind(scAnimNames[i], lbl_81696A30[0], false, false);
}
mpLayout->finishBinding();
@@ -319,8 +400,8 @@ namespace ipl {
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(mscBtnNames[BTN_A]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(mscBtnNames[BTN_B]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_A]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_B]))->setTriggerTarget(true);
mpLimitRemainLyt = new layout::Object(getSceneHeap(), mpLayoutFile, "arc", "my_Timer_a.brlyt");
mpLimitDoneLyt = new layout::Object(getSceneHeap(), mpLayoutFile, "arc", "my_Timer_b.brlyt");
@@ -336,7 +417,7 @@ namespace ipl {
updateLockedMsg(LOCKED_MSG_AUTO);
dispTimeLimitWindow();
mpDiskBnrLayout = new layout::Object(getSceneHeap(), mpDiskBnrFile, "arc", mscDiskLytFile[0]);
mpDiskBnrLayout = new layout::Object(getSceneHeap(), mpDiskBnrFile, "arc", scLayoutNames[0]);
bindDiskAnms();
@@ -773,7 +854,7 @@ namespace ipl {
nw4r::ut::Rect drawRect(mDispTrans.x - mpChanSelScn->mChanThumbOff_X, mDispTrans.y + mpChanSelScn->mChanThumbOff_Y,
mDispTrans.x + mpChanSelScn->mChanThumbOff_X, mDispTrans.y - mpChanSelScn->mChanThumbOff_Y);
GXColor textureColor = {255, 255, 255, 255};
GXColor textureColor = {255, 255, 255, 0};
textureColor.a = (u8)mpZoomAnim->get();
utility::Graphics::drawTexture(drawRect, mpCapture->getGXTex(), textureColor, 1);
@@ -952,7 +1033,7 @@ namespace ipl {
} else if (mpGCBannerFile != NULL && lytFile == mpGCBannerFile) {
if (mpGCBannerLyt == NULL) {
mpGCBannerLyt = layout::Object::create(System::getMem2App(), 0x40000, lytFile, "arc", "my_GCTop_a.brlyt");
mpGCBannerAnim = mpGCBannerLyt->bindToGroup(mscGCAnimNames[0], mscGCAnimGroups[0], false);
mpGCBannerAnim = mpGCBannerLyt->bindToGroup(scGCAnimNames[0], scGCAnimGroups[0], false);
mpGCBannerLyt->finishBinding();
mpGCBannerLyt->adjustHeap();
}
@@ -1106,9 +1187,9 @@ namespace ipl {
if (mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->getCurrentFrame() ==
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->getMaxFrame()) {
if (System::getChannelManager()->checkNeedUpdate(mChanPage, mChanIndex)) {
setMessage(mpLayout->FindPaneByName(mscButtonTextName[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
} else {
setMessage(mpLayout->FindPaneByName(mscButtonTextName[BTN_B]), MESG_CHAN_SEL_START_BTN, false);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_START_BTN, false);
}
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_OUT]->play();
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->initAnmFrame();
@@ -1771,18 +1852,18 @@ namespace ipl {
void ChannelTitle::bindChanBaseAnms() {
for (int i = 0; i < BANNER_ANIM_MAX; i++) {
if (mpChanBannerLyt->searchFile(mscBannerAnims[i])) {
if (mpChanBannerLyt->searchFile(scBannerAnims[i])) {
if (i == 0) {
mpChanBannerAnims[i] = mpChanBannerLyt->bind(mscBannerAnims[i]);
mpChanBannerAnims[i] = mpChanBannerLyt->bind(scBannerAnims[i]);
mpChanBannerAnims[i]->setAnmType(ANIM_TYPE_LOOP);
} else if (i == 1) {
mpChanBannerAnims[i] = mpChanBannerLyt->bind(mscBannerAnims[i]);
mpChanBannerAnims[i] = mpChanBannerLyt->bind(scBannerAnims[i]);
mpChanBannerAnims[i]->setAnmType(ANIM_TYPE_FORWARD);
} else {
if (mpChanBannerAnims[BANNER_ANIM_START] == NULL) {
mpChanBannerAnims[i] = mpChanBannerLyt->bind(mscBannerAnims[i], true);
mpChanBannerAnims[i] = mpChanBannerLyt->bind(scBannerAnims[i], true);
} else {
mpChanBannerAnims[i] = mpChanBannerLyt->bind(mscBannerAnims[i], false);
mpChanBannerAnims[i] = mpChanBannerLyt->bind(scBannerAnims[i], false);
}
mpChanBannerAnims[i]->setAnmType(ANIM_TYPE_LOOP);
}
@@ -1795,9 +1876,9 @@ namespace ipl {
void ChannelTitle::bindDiskAnms() {
memset(mpDiskBnrAnims, 0, sizeof(mpDiskBnrAnims));
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][DISK_ANIM_START] = mpDiskBnrLayout->bind(mscDiskAnimNames[DISK_ANIM_START]);
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][DISK_ANIM_START] = mpDiskBnrLayout->bind(scDiskAnimNames[DISK_ANIM_START]);
mpDiskBnrAnims[DISK_ANIM_GRP_COMMENT][DISK_ANIM_START] =
mpDiskBnrLayout->bindToGroup(mscDiskAnimNames[DISK_ANIM_START], mscDiskGroups[DISK_ANIM_GRP_COMMENT], false, false);
mpDiskBnrLayout->bindToGroup(scDiskAnimNames[DISK_ANIM_START], scDiskGroups[DISK_ANIM_GRP_COMMENT], false, false);
for (int i = DISK_ANIM_GRP_COMMENT; i <= DISK_ANIM_GRP_GC; i++) {
for (int j = DISK_ANIM_DISK_START; j <= DISK_ANIM_DISK_IN; j++) {
@@ -1805,16 +1886,16 @@ namespace ipl {
break;
}
mpDiskBnrAnims[i][j] = mpDiskBnrLayout->bindToGroup(mscDiskAnimNames[j], mscDiskGroups[i], false, false);
mpDiskBnrAnims[i][j] = mpDiskBnrLayout->bindToGroup(scDiskAnimNames[j], scDiskGroups[i], false, false);
}
}
for (int i = DISK_ANIM_DISK_EJECT; i <= DISK_ANIM_UNKNOWN_EJECT; i++) {
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][i] = mpDiskBnrLayout->bind(mscDiskAnimNames[i], false);
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][i] = mpDiskBnrLayout->bind(scDiskAnimNames[i], false);
}
mpDiskBnrAnims[DISK_ANIM_GRP_DISK_IN][DISK_ANIM_DISK_IN] =
mpDiskBnrLayout->bindToGroup(mscDiskAnimNames[DISK_ANIM_DISK_IN], mscDiskGroups[DISK_ANIM_GRP_DISK_IN], false, false);
mpDiskBnrLayout->bindToGroup(scDiskAnimNames[DISK_ANIM_DISK_IN], scDiskGroups[DISK_ANIM_GRP_DISK_IN], false, false);
}
void ChannelTitle::updateDiskState(int page, int index) {
@@ -1847,8 +1928,9 @@ namespace ipl {
bool noDisk = BS2State == bs2::IPL_STATE_NO_DISK;
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(mscDiskGroups[DISK_ANIM_GRP_COMMENT]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(scDiskGroups[DISK_ANIM_GRP_COMMENT]);
nw4r::lyt::Group*& groupAlias = group;
for (nw4r::lyt::PaneLinkList::Iterator it = groupAlias->GetPaneList().GetBeginIter(); it != groupAlias->GetPaneList().GetEndIter();
it++) {
it->mTarget->SetVisible(noDisk);
}
@@ -1867,9 +1949,10 @@ namespace ipl {
!mpDiskBnrAnims[DISK_ANIM_GRP_COMMENT][DISK_ANIM_START]->isPlaying()) {
mDiskState = DISK_STATE_IDLE;
if (BS2State == bs2::IPL_STATE_NO_DISK) {
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(mscDiskGroups[DISK_ANIM_GRP_COMMENT]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter();
it != group->GetPaneList().GetEndIter(); it++) {
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(scDiskGroups[DISK_ANIM_GRP_COMMENT]);
nw4r::lyt::Group*& groupAlias = group;
for (nw4r::lyt::PaneLinkList::Iterator it = groupAlias->GetPaneList().GetBeginIter();
it != groupAlias->GetPaneList().GetEndIter(); it++) {
it->mTarget->SetVisible(true);
}
}
@@ -1927,8 +2010,9 @@ namespace ipl {
case DISK_STATE_INTERRUPT_EJECT: {
if (!mpDiskBnrAnims[DISK_ANIM_GRP_WII][DISK_ANIM_DISK_END]->isPlaying() &&
!mpDiskBnrAnims[DISK_ANIM_GRP_GC][DISK_ANIM_DISK_END]->isPlaying()) {
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(mscDiskGroups[DISK_ANIM_GRP_COMMENT]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(scDiskGroups[DISK_ANIM_GRP_COMMENT]);
nw4r::lyt::Group*& groupAlias = group;
for (nw4r::lyt::PaneLinkList::Iterator it = groupAlias->GetPaneList().GetBeginIter(); it != groupAlias->GetPaneList().GetEndIter();
it++) {
it->mTarget->SetVisible(true);
}
@@ -2039,8 +2123,9 @@ namespace ipl {
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][DISK_ANIM_UNKNOWN_LOOP]->stop();
mpDiskBnrAnims[DISK_ANIM_GRP_ALL][DISK_ANIM_UNKNOWN_EJECT]->play();
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(mscDiskGroups[DISK_ANIM_GRP_COMMENT]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
nw4r::lyt::Group* group = mpDiskBnrLayout->FindGroupByName(scDiskGroups[DISK_ANIM_GRP_COMMENT]);
nw4r::lyt::Group*& groupAlias = group;
for (nw4r::lyt::PaneLinkList::Iterator it = groupAlias->GetPaneList().GetBeginIter(); it != groupAlias->GetPaneList().GetEndIter();
it++) {
it->mTarget->SetVisible(true);
}
@@ -2379,7 +2464,7 @@ namespace ipl {
if (unk_0x8C == 0) {
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_OFF_BTN]->stop();
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_ON_BTN]->play();
mpGui->initPane(mpLayout->FindPaneByName(mscBtnNames[BTN_B]));
mpGui->initPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_B]));
mbHovered[BTN_B] = FALSE;
}
unk_0x8C = 1;
@@ -2417,11 +2502,9 @@ namespace ipl {
}
void ChannelTitle::setMessage(nw4r::lyt::Pane* targetPane, u32 msgId, bool alloc) {
static const int LENGTH = 255;
wchar_t msg[LENGTH + 1];
wcsncpy(msg, System::getMessage(msgId), LENGTH + 1);
msg[LENGTH] = 0;
wchar_t msg[255 + 1];
wcsncpy(msg, System::getMessage(msgId), 255 + 1);
msg[255] = 0;
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(targetPane);
if (alloc) {
@@ -2602,12 +2685,12 @@ namespace ipl {
ESTitleId titleId = System::getChannelManager()->getTitleID(chanTtl->mChanPage, chanTtl->mChanIndex);
int ticketIdx = System::getChannelManager()->getChannel(chanTtl->mChanPage, chanTtl->mChanIndex).ticketIdx;
ESError err = utility::ESMisc::GetTicketView(System::getMem2App(), titleId, &msTicketView, ticketIdx);
ESError err = utility::ESMisc::GetTicketView(System::getMem2App(), titleId, &msTicketView.view, ticketIdx);
if (err != ES_ERR_OK) {
IPLErrorLogAndDisplay(MESG_ERR_FILE, "ES", err, 4789);
}
if (chanTtl->isTimeLimitedTicket(&msTicketView, &chanTtl->mTimeLimitRemain)) {
if (chanTtl->isTimeLimitedTicket(&msTicketView.view, &chanTtl->mTimeLimitRemain)) {
chanTtl->mLimitType = LIMIT_TYPE_TIME;
} else {
chanTtl->mLimitType = LIMIT_TYPE_COUNT;
@@ -2739,12 +2822,12 @@ namespace ipl {
break;
}
if (con->downTrg(controller::BTN_INTERACT)) {
if (strcmp(paneName, ChannelTitle::mscBtnNames[ChannelTitle::BTN_A]) == 0) {
if (strcmp(paneName, lbl_81696A20[ChannelTitle::BTN_A]) == 0) {
mpInstance->mpGrpAnims[ChannelTitle::ANIM_GRP_SELECT_BTN_A][ChannelTitle::ANIM_SELECT_BTN]->play();
snd::getSystem()->startSE("WIPL_SE_BT_PUSH");
mpInstance->mState = ChannelTitle::STATE_START_ZOOM_OUT;
mpInstance->tryToGoBackward();
} else if (strcmp(paneName, ChannelTitle::mscBtnNames[ChannelTitle::BTN_B]) == 0) {
} else if (strcmp(paneName, lbl_81696A20[ChannelTitle::BTN_B]) == 0) {
if (mpInstance->unk_0x8C != 2) {
snd::getSystem()->startSE("WIPL_SE_GRAY_BUTTON");
} else {
@@ -2758,7 +2841,7 @@ namespace ipl {
}
case ::gui::EventHandler::ON_POINT: {
for (int i = 0; i < ChannelTitle::BTN_MAX; i++) {
if (strcmp(paneName, ChannelTitle::mscBtnNames[i]) == 0) {
if (strcmp(paneName, lbl_81696A20[i]) == 0) {
if (i == 0 || mpInstance->unk_0x8C > 0) {
mpInstance->mbHovered[i]++;
if (mpInstance->mbHovered[i] <= TRUE) {
@@ -2774,7 +2857,7 @@ namespace ipl {
}
case ::gui::EventHandler::ON_LEFT: {
for (int i = 0; i < ChannelTitle::BTN_MAX; i++) {
if (strcmp(paneName, ChannelTitle::mscBtnNames[i]) == 0) {
if (strcmp(paneName, lbl_81696A20[i]) == 0) {
if (i == 0 || mpInstance->unk_0x8C > 0) {
mpInstance->mbHovered[i]--;
if (mpInstance->mbHovered[i] <= FALSE) {

View File

@@ -63,6 +63,8 @@ namespace ipl {
void KitayamaTest::calcCommon() {
}
#pragma push
#pragma ppc_iro_level 2
FaderSceneCommand KitayamaTest::calcNormal() {
FaderSceneCommand command = FADER_SCN_CONTINUE;
controller::Interface* controller = System::getMasterController();
@@ -268,6 +270,7 @@ namespace ipl {
return command;
}
#pragma pop
FaderSceneCommand KitayamaTest::calcFadeout() {
if (mOption == KITAYAMA_OPT_INIT_NAND) {

View File

@@ -14,6 +14,10 @@
namespace ipl {
namespace scene {
static inline wchar_t* letterWriterCaption(wchar_t* caption) {
return caption;
}
extern "C" char lbl_81650380[0x19] = "my_IplTopBalloon_a.brlyt";
LetterWriter::LetterWriter(EGG::Heap* heap, int type)
@@ -143,7 +147,7 @@ namespace ipl {
Address* address = static_cast<Address*>(System::getScene(SCENE_ADDRESS));
memcpy(&mFriendInfo, &address->getFriendCache()->getInfo(address->getChosenFriendIndex()), sizeof(NWC24FriendInfo));
const wchar_t* caption = makeHeaderCaption((const wchar_t*)mFriendInfo.attr.name);
const wchar_t* caption = letterWriterCaption(makeHeaderCaption((const wchar_t*)mFriendInfo.attr.name));
getLetterInputForm()->setHeaderCaption(caption);
mbToFriend = true;

View File

@@ -38,7 +38,7 @@ namespace ipl {
}
BOOL Manager::createNewRecord(const char* recordName, const char* recordFileType, const OSCalendarTime* dateTime, u32* gameCode,
u16* makerCode, const math::VEC2& recordPos, u32 recordFlags, const NWC24FriendAddr& addr, u16 addrType,
u16* makerCode, const math::VEC2& recordPos, u32 recordFlags, const NWC24FriendAddr& addr, NWC24FriendType addrType,
u16 noReplyFlag, const wchar_t* titleText, const wchar_t* bodyText, const void* faceData,
const void** attachData, u32* attachSize, RBRAttachmentType* attachType) {
BOOL result = FALSE;

View File

@@ -559,7 +559,7 @@ namespace ipl {
memset(msgFriendName, 0, sizeof(msgFriendName));
// Get message data
NWC24MsgObj msgObj ALIGN32;
NWC24MsgObj msgObj ATTRIBUTE_ALIGN(16);
NWC24MsgType msgType;
if (!getMsgObj(&msgObj, NWC24_MBOX_TYPE_RECV, mMsgIdsTbl[i]) || !getMsgType(&msgObj, &msgType)) {
continue;
@@ -569,7 +569,7 @@ namespace ipl {
NWC24FriendAddr msgFriendAddr;
memset(&msgFriendAddr, 0, sizeof(msgFriendAddr));
u16 msgFriendType;
NWC24FriendType msgFriendType;
// Get friend data
if (msgType == NWC24_MSGTYPE_PUBLIC) {
@@ -579,7 +579,7 @@ namespace ipl {
}
msgFriendType = NWC24_FRIENDTYPE_EMAIL;
if (searchFriendInfo(&msgFriendAddr, &index)) {
NWC24FriendInfo friendInfo;
NWC24FriendInfo friendInfo ALIGN32;
readFriendInfo(&friendInfo, index);
wcsncpy(msgFriendName, (wchar_t*)friendInfo.attr.name, 12);
}
@@ -588,7 +588,7 @@ namespace ipl {
getMsgFromId(&msgObj, &msgFriendAddr.wiiId);
msgFriendType = msgFriendAddr.wiiId == myUserId ? NWC24_FRIENDTYPE_NONE : NWC24_FRIENDTYPE_WII;
if (searchFriendInfo(msgFriendAddr.wiiId, &index)) {
NWC24FriendInfo friendInfo;
NWC24FriendInfo friendInfo ALIGN32;
readFriendInfo(&friendInfo, index);
wcsncpy(msgFriendName, (wchar_t*)friendInfo.attr.name, 12);
}
@@ -596,6 +596,7 @@ namespace ipl {
// Get app and group ID
u32 msgAppId;
u16 msgOptOutAppId;
u16 msgGroupId;
getMsgAppId(&msgObj, &msgAppId);
getMsgGroupId(&msgObj, &msgGroupId);
@@ -613,9 +614,9 @@ namespace ipl {
// Get opt out flag (display "Opt Out" button)
BOOL msgMbOptOutFlag = FALSE;
u32 msgOptOutAppId = 0;
bool msgBoardUpdateSW = (result & (bool)msgMbUpdateSW);
result = readMsgMBOptOutFlag(&msgObj, &msgMbOptOutFlag, &msgOptOutAppId);
*(u32*)&msgOptOutAppId = 0;
result = readMsgMBOptOutFlag(&msgObj, &msgMbOptOutFlag, (u32*)&msgOptOutAppId);
if (!FILE_ERROR_OK) {
goto out;
}

View File

@@ -1,4 +1,6 @@
#define IPL_SYSTEM_COLOR_ALIGNMENT
#include "iplSystem.h"
#undef IPL_SYSTEM_COLOR_ALIGNMENT
#include "iplSound.h"
#include "system/iplCdbWrapper.h"
@@ -37,9 +39,12 @@
extern "C" ipl::System::Arg smArg__Q23ipl6System;
extern "C" ipl::snd::System sSystem__Q23ipl3snd;
extern "C" void initOnMemory__Q33ipl3snd6SystemFPCvPQ23EGG4HeapUl();
extern "C" const f32 lbl_81694410;
extern "C" const f64 lbl_81694418;
extern "C" const f32 lbl_81694420;
extern "C" const f32 lbl_81694424;
extern "C" const f32 lbl_81694428;
extern "C" const f32 lbl_8169442C;
extern "C" const f32 lbl_81694430;
extern "C" const f32 lbl_81694434;
extern "C" const f32 lbl_81694438;
extern "C" void* m_handle__Q23ipl11TVRCManager;
extern "C" void _savegpr_27();
extern "C" void _restgpr_27();
@@ -556,7 +561,6 @@ namespace ipl {
// Default values for initial setup
if (!SCGetConfigDoneFlag() && !SCGetConfigDoneFlag2()) {
struct BlankNameStorage {
u16 padding;
SCOwnerNickname blankName;
} blankNameStorage;
memset(&blankNameStorage.blankName, 0, sizeof(blankNameStorage.blankName));
@@ -1135,7 +1139,7 @@ namespace ipl {
bl VISetBlack
lwz r3, 0xb0(r28)
li r0, 1
lfd f31, lbl_81694418
lfd f31, lbl_81694424-0xc
lis r30, 0x4330
lbz r29, 0x3d(r3)
lis r31, sSystem__Q23ipl3snd@ha
@@ -1158,7 +1162,7 @@ namespace ipl {
bl makeRawData__Q33ipl7utility11JpegDecoderFv
warning_run_no_jpeg:
lwz r3, 0x74(r28)
lfs f1, lbl_81694410
lfs f1, lbl_81694424-0x14
lwz r27, 0(r3)
stw r30, 8(r1)
fmr f2, f1
@@ -1166,7 +1170,7 @@ namespace ipl {
fmr f5, f1
lhz r0, 6(r27)
stw r3, 0xc(r1)
lfs f6, lbl_81694420
lfs f6, lbl_81694424-0x4
lfd f0, 8(r1)
stw r0, 0x14(r1)
fsubs f3, f0, f31
@@ -1358,17 +1362,17 @@ namespace ipl {
}
void System::getProjectionRect4x3(nw4r::ut::Rect* rect) {
rect->left = -304.0;
rect->right = 304.0;
rect->bottom = 228.0;
rect->top = -228.0;
rect->left = *((volatile const f32*)&lbl_81694424);
rect->right = *((volatile const f32*)&lbl_81694428);
rect->bottom = *((volatile const f32*)&lbl_8169442C);
rect->top = *((volatile const f32*)&lbl_81694430);
}
void System::getProjectionRect16x9(nw4r::ut::Rect* rect) {
rect->left = -416.0;
rect->right = 416.0;
rect->bottom = 228.0;
rect->top = -228.0;
rect->left = *((volatile const f32*)&lbl_81694434);
rect->right = *((volatile const f32*)&lbl_81694438);
rect->bottom = *((volatile const f32*)&lbl_8169442C);
rect->top = *((volatile const f32*)&lbl_81694430);
}
GXRenderModeObj* System::getRenderModeObj() {
@@ -1509,3 +1513,14 @@ namespace ipl {
}
}
} // namespace ipl
#ifdef __MWERKS__
#pragma force_active on
extern "C" const f32 lbl_81694424 = -304.0f;
extern "C" const f32 lbl_81694428 = 304.0f;
extern "C" const f32 lbl_8169442C = 228.0f;
extern "C" const f32 lbl_81694430 = -228.0f;
extern "C" const f32 lbl_81694434 = -416.0f;
extern "C" const f32 lbl_81694438 = 416.0f;
#pragma force_active off
#endif

View File

@@ -96,6 +96,8 @@ namespace ipl {
#include <revolution/enc.h>
extern "C" ipl::math::VEC2* __ct__Q33ipl4math4VEC2Fff(ipl::math::VEC2*, f32, f32);
namespace ipl {
namespace utility {
const char* Language::mLangPath[10] = {"jpn", "eng", "ger", "fra", "spa", "ita", "ned", "chn", "eng", "kor"};
@@ -553,7 +555,13 @@ namespace ipl {
nw4r::ut::Rect rect4x3;
System::getProjectionRect4x3(&rect4x3);
return math::VEC2(basePos.x * (rect4x3.GetWidth() / rect16x9.GetWidth()), -basePos.y);
math::VEC2 result;
math::VEC2 pos;
math::VEC2* posPtr = &pos;
posPtr = __ct__Q33ipl4math4VEC2Fff(posPtr, basePos.x * (rect4x3.GetWidth() / rect16x9.GetWidth()), -basePos.y);
((u32*)&result)[1] = ((u32*)posPtr)[1];
((u32*)&result)[0] = ((u32*)posPtr)[0];
return result;
}
tpl_validity::tpl_validity(TPLPalette* pal, u32 palSize) {