Compare commits
9 Commits
agent/link
...
agent/asm2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e69930c819 | ||
|
|
1802d45758 | ||
|
|
130cc9e88e | ||
|
|
a801d1c5d6 | ||
|
|
8ab07fbb20 | ||
|
|
f68fcc0f9b | ||
|
|
5ad481ae40 | ||
|
|
713951c551 | ||
|
|
b47507aa3f |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.71% | 62.05% | 92.06% |
|
||||
| 99.37% | 87.72% | 62.05% | 92.06% |
|
||||
|
||||
units 918/1027 complete, functions 12214/12563 matched.
|
||||
units 918/1027 complete, functions 12215/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
|
||||
.rodata start:0x81610608 end:0x81610918
|
||||
.data start:0x81654B38 end:0x81654F98
|
||||
.sdata2 start:0x81694B18 end:0x81694B60
|
||||
.sdata start:0x81696DD0 end:0x81696E40
|
||||
.sdata start:0x81696DD0 end:0x81696E30
|
||||
|
||||
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
|
||||
.text start:0x813E4BBC end:0x813E947C
|
||||
.rodata start:0x81610918 end:0x81610948
|
||||
.data start:0x81654F98 end:0x81655638
|
||||
.sdata2 start:0x81694B60 end:0x81694B88
|
||||
.sdata start:0x81696E40 end:0x81696EF0
|
||||
.sdata start:0x81696E30 end:0x81696EF0
|
||||
|
||||
src/scene/sdButton/iplSDButton.cpp:
|
||||
.text start:0x813E947C end:0x813EA88C
|
||||
|
||||
@@ -18664,7 +18664,7 @@ __vt__Q34nw4r3lyt7Picture = .data:0x816717F4; // type:object size:0x6C
|
||||
@5574 = .data:0x816718E8; // type:object size:0x41 scope:local data:string
|
||||
__vt__Q34nw4r3lyt7TextBox = .data:0x8167192C; // type:object size:0x74
|
||||
flipInfos$7849 = .data:0x816719A0; // type:object size:0x3C scope:local
|
||||
lbl_816719DC = .data:0x816719DC; // type:object size:0x41 data:string
|
||||
scLytFatalMsg = .data:0x816719DC; // type:object size:0x41 data:string
|
||||
__vt__Q34nw4r3lyt6Window = .data:0x81671A20; // type:object size:0x7C
|
||||
__vt__Q34nw4r3lyt8Bounding = .data:0x81671AA0; // type:object size:0x64
|
||||
kColSels$4880 = .data:0x81671B08; // type:object size:0x20 scope:local data:4byte
|
||||
@@ -21025,10 +21025,10 @@ lbl_8169553B = .sdata2:0x8169553B; // type:object size:0x1 data:byte
|
||||
lbl_8169553C = .sdata2:0x8169553C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81695540 = .sdata2:0x81695540; // type:object size:0x8 align:8 data:double
|
||||
lbl_81695548 = .sdata2:0x81695548; // type:object size:0x8 align:8 data:double
|
||||
lbl_81695550 = .sdata2:0x81695550; // type:object size:0x1 data:byte
|
||||
lbl_81695551 = .sdata2:0x81695551; // type:object size:0x1 data:byte
|
||||
lbl_81695552 = .sdata2:0x81695552; // type:object size:0x1 data:byte
|
||||
lbl_81695553 = .sdata2:0x81695553; // type:object size:0x5 data:byte
|
||||
scLytFatalColorR = .sdata2:0x81695550; // type:object size:0x1 data:byte
|
||||
scLytFatalColorG = .sdata2:0x81695551; // type:object size:0x1 data:byte
|
||||
scLytFatalColorB = .sdata2:0x81695552; // type:object size:0x1 data:byte
|
||||
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x5 data:byte
|
||||
@6184 = .sdata2:0x81695558; // type:object size:0x4 scope:local align:4 data:float
|
||||
@6185 = .sdata2:0x8169555C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@6186 = .sdata2:0x81695560; // type:object size:0x4 scope:local align:4 data:float
|
||||
|
||||
@@ -247,7 +247,7 @@ config.asflags = [
|
||||
"-I include",
|
||||
f"-I build/{config.version}/include",
|
||||
f"--defsym BUILD_VERSION={version_num}",
|
||||
f"--defsym VERSION_{config.version}=1",
|
||||
f"--defsym VERSION_{config.version}",
|
||||
]
|
||||
config.ldflags = [
|
||||
"-fp hardware",
|
||||
@@ -1908,7 +1908,7 @@ config.libs = [
|
||||
[
|
||||
Object(Matching, "core/eggAllocator.cpp"),
|
||||
Object(Matching, "core/eggAudioArcPlayerMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioExpMgr.cpp", source="core/eggAudioExpMgr.s"),
|
||||
Object(Equivalent, "core/eggAudioExpMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioFxMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioHeapMgr.cpp"),
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
// Matching build uses core/eggAudioExpMgr.s (C++ emits extra weak inlines that break DOL layout).
|
||||
#include <egg/core.h>
|
||||
|
||||
namespace EGG {
|
||||
|
||||
@@ -1,218 +0,0 @@
|
||||
.include "macros.inc"
|
||||
.file "eggAudioExpMgr.cpp"
|
||||
|
||||
# 0x815F6150..0x815F635C | size: 0x20C
|
||||
.text
|
||||
.balign 4
|
||||
|
||||
# .text:0x0 | 0x815F6150 | size: 0x54
|
||||
# EGG::SimpleAudioMgrWithFx::SimpleAudioMgrWithFx()
|
||||
.fn __ct__Q23EGG20SimpleAudioMgrWithFxFv, global
|
||||
/* 815F6150 002C6670 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 815F6154 002C6674 7C 08 02 A6 */ mflr r0
|
||||
/* 815F6158 002C6678 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 815F615C 002C667C 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 815F6160 002C6680 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 815F6164 002C6684 48 00 0B 39 */ bl __ct__Q23EGG14SimpleAudioMgrFv
|
||||
/* 815F6168 002C6688 38 7F 05 D8 */ addi r3, r31, 0x5d8
|
||||
/* 815F616C 002C668C 48 00 09 55 */ bl __ct__Q23EGG10AudioFxMgrFv
|
||||
/* 815F6170 002C6690 3C A0 81 69 */ lis r5, __vt__Q23EGG20SimpleAudioMgrWithFx@ha
|
||||
/* 815F6174 002C6694 7F E3 FB 78 */ mr r3, r31
|
||||
/* 815F6178 002C6698 38 A5 34 A8 */ addi r5, r5, __vt__Q23EGG20SimpleAudioMgrWithFx@l
|
||||
/* 815F617C 002C669C 38 85 00 10 */ addi r4, r5, 0x10
|
||||
/* 815F6180 002C66A0 90 BF 00 00 */ stw r5, 0x0(r31)
|
||||
/* 815F6184 002C66A4 38 05 00 20 */ addi r0, r5, 0x20
|
||||
/* 815F6188 002C66A8 90 9F 00 04 */ stw r4, 0x4(r31)
|
||||
/* 815F618C 002C66AC 90 1F 00 34 */ stw r0, 0x34(r31)
|
||||
/* 815F6190 002C66B0 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 815F6194 002C66B4 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 815F6198 002C66B8 7C 08 03 A6 */ mtlr r0
|
||||
/* 815F619C 002C66BC 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 815F61A0 002C66C0 4E 80 00 20 */ blr
|
||||
.endfn __ct__Q23EGG20SimpleAudioMgrWithFxFv
|
||||
|
||||
# .text:0x54 | 0x815F61A4 | size: 0x68
|
||||
# EGG::SimpleAudioMgrWithFx::~SimpleAudioMgrWithFx()
|
||||
.fn __dt__Q23EGG20SimpleAudioMgrWithFxFv, global
|
||||
/* 815F61A4 002C66C4 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 815F61A8 002C66C8 7C 08 02 A6 */ mflr r0
|
||||
/* 815F61AC 002C66CC 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 815F61B0 002C66D0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 815F61B4 002C66D4 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 815F61B8 002C66D8 7C 9F 23 78 */ mr r31, r4
|
||||
/* 815F61BC 002C66DC 93 C1 00 08 */ stw r30, 0x8(r1)
|
||||
/* 815F61C0 002C66E0 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 815F61C4 002C66E4 41 82 00 2C */ beq .L_815F61F0
|
||||
/* 815F61C8 002C66E8 38 80 00 00 */ li r4, 0x0
|
||||
/* 815F61CC 002C66EC 38 63 05 D8 */ addi r3, r3, 0x5d8
|
||||
/* 815F61D0 002C66F0 48 00 09 39 */ bl __dt__Q23EGG10AudioFxMgrFv
|
||||
/* 815F61D4 002C66F4 7F C3 F3 78 */ mr r3, r30
|
||||
/* 815F61D8 002C66F8 38 80 00 00 */ li r4, 0x0
|
||||
/* 815F61DC 002C66FC 48 00 0B D5 */ bl __dt__Q23EGG14SimpleAudioMgrFv
|
||||
/* 815F61E0 002C6700 2C 1F 00 00 */ cmpwi r31, 0x0
|
||||
/* 815F61E4 002C6704 40 81 00 0C */ ble .L_815F61F0
|
||||
/* 815F61E8 002C6708 7F C3 F3 78 */ mr r3, r30
|
||||
/* 815F61EC 002C670C 48 00 1E F9 */ bl __dl__FPv
|
||||
.L_815F61F0:
|
||||
/* 815F61F0 002C6710 7F C3 F3 78 */ mr r3, r30
|
||||
/* 815F61F4 002C6714 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 815F61F8 002C6718 83 C1 00 08 */ lwz r30, 0x8(r1)
|
||||
/* 815F61FC 002C671C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 815F6200 002C6720 7C 08 03 A6 */ mtlr r0
|
||||
/* 815F6204 002C6724 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 815F6208 002C6728 4E 80 00 20 */ blr
|
||||
.endfn __dt__Q23EGG20SimpleAudioMgrWithFxFv
|
||||
|
||||
# .text:0xBC | 0x815F620C | size: 0x48
|
||||
# EGG::SimpleAudioMgrWithFx::ArgWithFx::ArgWithFx()
|
||||
.fn __ct__Q33EGG20SimpleAudioMgrWithFx9ArgWithFxFv, global
|
||||
/* 815F620C 002C672C 94 21 FF C0 */ stwu r1, -0x40(r1)
|
||||
/* 815F6210 002C6730 7C 08 02 A6 */ mflr r0
|
||||
/* 815F6214 002C6734 90 01 00 44 */ stw r0, 0x44(r1)
|
||||
/* 815F6218 002C6738 93 E1 00 3C */ stw r31, 0x3c(r1)
|
||||
/* 815F621C 002C673C 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 815F6220 002C6740 48 00 0A 41 */ bl __ct__Q33EGG14SimpleAudioMgr17SimpleAudioMgrArgFv
|
||||
/* 815F6224 002C6744 38 7F 00 18 */ addi r3, r31, 0x18
|
||||
/* 815F6228 002C6748 48 00 00 2D */ bl __ct__Q33EGG10AudioFxMgr13AudioFxMgrArgFv
|
||||
/* 815F622C 002C674C 38 61 00 14 */ addi r3, r1, 0x14
|
||||
/* 815F6230 002C6750 48 00 0A 31 */ bl __ct__Q33EGG14SimpleAudioMgr17SimpleAudioMgrArgFv
|
||||
/* 815F6234 002C6754 38 61 00 08 */ addi r3, r1, 0x8
|
||||
/* 815F6238 002C6758 48 00 00 1D */ bl __ct__Q33EGG10AudioFxMgr13AudioFxMgrArgFv
|
||||
/* 815F623C 002C675C 7F E3 FB 78 */ mr r3, r31
|
||||
/* 815F6240 002C6760 83 E1 00 3C */ lwz r31, 0x3c(r1)
|
||||
/* 815F6244 002C6764 80 01 00 44 */ lwz r0, 0x44(r1)
|
||||
/* 815F6248 002C6768 7C 08 03 A6 */ mtlr r0
|
||||
/* 815F624C 002C676C 38 21 00 40 */ addi r1, r1, 0x40
|
||||
/* 815F6250 002C6770 4E 80 00 20 */ blr
|
||||
.endfn __ct__Q33EGG20SimpleAudioMgrWithFx9ArgWithFxFv
|
||||
|
||||
# .text:0x104 | 0x815F6254 | size: 0x24
|
||||
# EGG::AudioFxMgr::AudioFxMgrArg::AudioFxMgrArg()
|
||||
.fn __ct__Q33EGG10AudioFxMgr13AudioFxMgrArgFv, global
|
||||
/* 815F6254 002C6774 3C 80 00 02 */ lis r4, 0x2
|
||||
/* 815F6258 002C6778 38 00 00 03 */ li r0, 0x3
|
||||
/* 815F625C 002C677C 38 A4 58 00 */ addi r5, r4, 0x5800
|
||||
/* 815F6260 002C6780 38 80 00 00 */ li r4, 0x0
|
||||
/* 815F6264 002C6784 7C 09 03 A6 */ mtctr r0
|
||||
.L_815F6268:
|
||||
/* 815F6268 002C6788 7C A3 21 2E */ stwx r5, r3, r4
|
||||
/* 815F626C 002C678C 38 84 00 04 */ addi r4, r4, 0x4
|
||||
/* 815F6270 002C6790 42 00 FF F8 */ bdnz .L_815F6268
|
||||
/* 815F6274 002C6794 4E 80 00 20 */ blr
|
||||
.endfn __ct__Q33EGG10AudioFxMgr13AudioFxMgrArgFv
|
||||
|
||||
# .text:0x128 | 0x815F6278 | size: 0x84
|
||||
# EGG::SimpleAudioMgrWithFx::initialize(EGG::IAudioMgr::Arg*)
|
||||
.fn initialize__Q23EGG20SimpleAudioMgrWithFxFPQ33EGG9IAudioMgr3Arg, global
|
||||
/* 815F6278 002C6798 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 815F627C 002C679C 7C 08 02 A6 */ mflr r0
|
||||
/* 815F6280 002C67A0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 815F6284 002C67A4 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 815F6288 002C67A8 7C 9F 23 78 */ mr r31, r4
|
||||
/* 815F628C 002C67AC 93 C1 00 08 */ stw r30, 0x8(r1)
|
||||
/* 815F6290 002C67B0 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 815F6294 002C67B4 48 00 0B 85 */ bl initialize__Q23EGG14SimpleAudioMgrFPQ33EGG9IAudioMgr3Arg
|
||||
/* 815F6298 002C67B8 2C 1F 00 00 */ cmpwi r31, 0x0
|
||||
/* 815F629C 002C67BC 41 82 00 08 */ beq .L_815F62A4
|
||||
/* 815F62A0 002C67C0 3B FF 00 18 */ addi r31, r31, 0x18
|
||||
.L_815F62A4:
|
||||
/* 815F62A4 002C67C4 7F E5 FB 78 */ mr r5, r31
|
||||
/* 815F62A8 002C67C8 38 7E 05 D8 */ addi r3, r30, 0x5d8
|
||||
/* 815F62AC 002C67CC 38 9E 00 08 */ addi r4, r30, 0x8
|
||||
/* 815F62B0 002C67D0 48 00 08 BD */ bl initializeFx__Q23EGG10AudioFxMgrFPQ34nw4r3snd9SoundHeapPQ33EGG10AudioFxMgr13AudioFxMgrArg
|
||||
/* 815F62B4 002C67D4 48 00 09 75 */ bl getDefaultFxReverbHi__Q23EGG10AudioFxMgrFv
|
||||
/* 815F62B8 002C67D8 7C 65 1B 78 */ mr r5, r3
|
||||
/* 815F62BC 002C67DC 38 7E 05 D8 */ addi r3, r30, 0x5d8
|
||||
/* 815F62C0 002C67E0 38 80 00 00 */ li r4, 0x0
|
||||
/* 815F62C4 002C67E4 48 00 09 45 */ bl setFxReverbHi__Q23EGG10AudioFxMgrFQ34nw4r3snd6AuxBusPCQ44nw4r3snd10FxReverbHi13ReverbHiParam
|
||||
/* 815F62C8 002C67E8 48 00 09 6D */ bl getDefaultFxChorus__Q23EGG10AudioFxMgrFv
|
||||
/* 815F62CC 002C67EC 7C 65 1B 78 */ mr r5, r3
|
||||
/* 815F62D0 002C67F0 38 7E 05 D8 */ addi r3, r30, 0x5d8
|
||||
/* 815F62D4 002C67F4 38 80 00 01 */ li r4, 0x1
|
||||
/* 815F62D8 002C67F8 48 00 09 41 */ bl setFxChorus__Q23EGG10AudioFxMgrFQ34nw4r3snd6AuxBusPCQ44nw4r3snd8FxChorus11ChorusParam
|
||||
/* 815F62DC 002C67FC 38 7E 00 08 */ addi r3, r30, 0x8
|
||||
/* 815F62E0 002C6800 48 00 00 1D */ bl SaveState__Q34nw4r3snd9SoundHeapFv
|
||||
/* 815F62E4 002C6804 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 815F62E8 002C6808 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 815F62EC 002C680C 83 C1 00 08 */ lwz r30, 0x8(r1)
|
||||
/* 815F62F0 002C6810 7C 08 03 A6 */ mtlr r0
|
||||
/* 815F62F4 002C6814 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 815F62F8 002C6818 4E 80 00 20 */ blr
|
||||
.endfn initialize__Q23EGG20SimpleAudioMgrWithFxFPQ33EGG9IAudioMgr3Arg
|
||||
|
||||
# .text:0x1AC | 0x815F62FC | size: 0x50
|
||||
# nw4r::snd::SoundHeap::SaveState()
|
||||
.fn SaveState__Q34nw4r3snd9SoundHeapFv, global
|
||||
/* 815F62FC 002C681C 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 815F6300 002C6820 7C 08 02 A6 */ mflr r0
|
||||
/* 815F6304 002C6824 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 815F6308 002C6828 93 E1 00 1C */ stw r31, 0x1c(r1)
|
||||
/* 815F630C 002C682C 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 815F6310 002C6830 38 61 00 08 */ addi r3, r1, 0x8
|
||||
/* 815F6314 002C6834 38 9F 00 04 */ addi r4, r31, 0x4
|
||||
/* 815F6318 002C6838 4B D7 5F 91 */ bl "__ct__Q44nw4r2ut6detail18AutoLock<7OSMutex>FR7OSMutex"
|
||||
/* 815F631C 002C683C 38 7F 00 1C */ addi r3, r31, 0x1c
|
||||
/* 815F6320 002C6840 4B F0 97 11 */ bl SaveState__Q44nw4r3snd6detail9FrameHeapFv
|
||||
/* 815F6324 002C6844 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 815F6328 002C6848 38 61 00 08 */ addi r3, r1, 0x8
|
||||
/* 815F632C 002C684C 38 80 FF FF */ li r4, -0x1
|
||||
/* 815F6330 002C6850 4B D7 5F B1 */ bl "__dt__Q44nw4r2ut6detail18AutoLock<7OSMutex>Fv"
|
||||
/* 815F6334 002C6854 7F E3 FB 78 */ mr r3, r31
|
||||
/* 815F6338 002C6858 83 E1 00 1C */ lwz r31, 0x1c(r1)
|
||||
/* 815F633C 002C685C 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 815F6340 002C6860 7C 08 03 A6 */ mtlr r0
|
||||
/* 815F6344 002C6864 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 815F6348 002C6868 4E 80 00 20 */ blr
|
||||
.endfn SaveState__Q34nw4r3snd9SoundHeapFv
|
||||
|
||||
# .text:0x1FC | 0x815F634C | size: 0x8
|
||||
.fn "@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv", global
|
||||
/* 815F634C 002C686C 38 63 FF CC */ subi r3, r3, 0x34
|
||||
/* 815F6350 002C6870 4B FF FE 54 */ b __dt__Q23EGG20SimpleAudioMgrWithFxFv
|
||||
.endfn "@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv"
|
||||
|
||||
# .text:0x204 | 0x815F6354 | size: 0x8
|
||||
# EGG::SimpleAudioMgr::@52@calc()
|
||||
.fn "@52@calc__Q23EGG14SimpleAudioMgrFv", global
|
||||
/* 815F6354 002C6874 38 63 FF CC */ subi r3, r3, 0x34
|
||||
/* 815F6358 002C6878 48 00 0B 4C */ b calc__Q23EGG14SimpleAudioMgrFv
|
||||
.endfn "@52@calc__Q23EGG14SimpleAudioMgrFv"
|
||||
|
||||
# 0x816934A8..0x81693520 | size: 0x78
|
||||
.data
|
||||
.balign 8
|
||||
|
||||
# .data:0x0 | 0x816934A8 | size: 0x78
|
||||
# EGG::SimpleAudioMgrWithFx::__vtable
|
||||
.obj __vt__Q23EGG20SimpleAudioMgrWithFx, global
|
||||
.4byte 0x00000000
|
||||
.4byte 0x00000000
|
||||
.4byte initialize__Q23EGG20SimpleAudioMgrWithFxFPQ33EGG9IAudioMgr3Arg
|
||||
.4byte calc__Q23EGG14SimpleAudioMgrFv
|
||||
.4byte 0x00000000
|
||||
.4byte 0x00000000
|
||||
.4byte loadState__Q23EGG12SoundHeapMgrFl
|
||||
.4byte getCurrentLevel__Q23EGG12SoundHeapMgrFv
|
||||
.4byte 0x00000000
|
||||
.4byte 0x00000000
|
||||
.4byte "@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv"
|
||||
.4byte openArchive__Q23EGG9ArcPlayerFPCcPQ34nw4r3snd9SoundHeapQ23EGG12SARC_STORAGE
|
||||
.4byte openDvdArchive__Q23EGG9ArcPlayerFPCcPQ34nw4r3snd9SoundHeap
|
||||
.4byte openNandArchive__Q23EGG9ArcPlayerFPCcPQ34nw4r3snd9SoundHeap
|
||||
.4byte setupMemoryArchive__Q23EGG9ArcPlayerFPCvPQ34nw4r3snd9SoundHeap
|
||||
.4byte closeArchive__Q23EGG9ArcPlayerFv
|
||||
.4byte loadGroup__Q23EGG9ArcPlayerFUiPQ34nw4r3snd9SoundHeap
|
||||
.4byte loadGroup__Q23EGG9ArcPlayerFiPQ34nw4r3snd9SoundHeap
|
||||
.4byte loadGroup__Q23EGG9ArcPlayerFPCcPQ34nw4r3snd9SoundHeap
|
||||
.4byte "@52@calc__Q23EGG14SimpleAudioMgrFv"
|
||||
.4byte startSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUl
|
||||
.4byte startSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUi
|
||||
.4byte startSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandlePCc
|
||||
.4byte prepareSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUl
|
||||
.4byte prepareSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUi
|
||||
.4byte prepareSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandlePCc
|
||||
.4byte holdSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUl
|
||||
.4byte holdSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUi
|
||||
.4byte holdSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandlePCc
|
||||
.4byte __dt__Q23EGG20SimpleAudioMgrWithFxFv
|
||||
.endobj __vt__Q23EGG20SimpleAudioMgrWithFx
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <nw4r/db/assert.h>
|
||||
|
||||
extern "C" const u8 lbl_81695550 = 255;
|
||||
extern "C" const u8 lbl_81695551 = 255;
|
||||
extern "C" const u8 lbl_81695552 = 255;
|
||||
extern "C" const u8 lbl_81695553 = 0;
|
||||
extern "C" char lbl_816719DC[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" const u8 scLytFatalColorR = 255;
|
||||
extern "C" const u8 scLytFatalColorG = 255;
|
||||
extern "C" const u8 scLytFatalColorB = 255;
|
||||
extern "C" const u8 scLytFatalColorA = 0;
|
||||
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
#undef NW4R_ASSERT
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
|
||||
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ typedef struct CXUncompContextHuffman {
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data);
|
||||
|
||||
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
|
||||
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);
|
||||
|
||||
@@ -40,7 +40,7 @@ ISD_Error ISD_ProbeCard(u32 slot);
|
||||
ISD_Error ISD_MountCard(u32 slot, SDDev** dev);
|
||||
ISD_Error ISD_UnmountCard(SDDev* dev);
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) NO_INLINE;
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) NO_INLINE;
|
||||
|
||||
ISD_Error ISD_ReadBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
ISD_Error ISD_WriteBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
|
||||
@@ -1180,20 +1180,24 @@ s32 PFFAT_GetClusterSpecified(PFFAT_FFD* file, u32 chainIndex,
|
||||
s32 PFFAT_GetClusterAllocated(PFFAT_FFD* file, u32 chainIndex,
|
||||
u32 numClusters, u32* cluster)
|
||||
{
|
||||
u32* start;
|
||||
PF_VOLUME* vol;
|
||||
PFFAT_HINT* hint;
|
||||
u32 fatType;
|
||||
u32 locateStart;
|
||||
u32 locateEnd;
|
||||
s32 error;
|
||||
|
||||
fatType = file->p_vol->bpb.fat_type;
|
||||
start = file->p_start_cluster;
|
||||
vol = file->p_vol;
|
||||
fatType = vol->bpb.fat_type;
|
||||
hint = file->p_hint;
|
||||
if (*file->p_start_cluster == 1) {
|
||||
if (*start == 1) {
|
||||
if (fatType <= FAT_16) {
|
||||
*cluster = -1;
|
||||
return 0;
|
||||
}
|
||||
*file->p_start_cluster = file->p_vol->bpb.root_dir_cluster;
|
||||
*start = vol->bpb.root_dir_cluster;
|
||||
}
|
||||
*cluster = -1;
|
||||
error = find_cluster_in_chain(file, chainIndex, 2, numClusters, 1, cluster);
|
||||
|
||||
@@ -55,17 +55,17 @@ enum {
|
||||
|
||||
static IOSFd sduOpenFD(u32 slot);
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg);
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg);
|
||||
|
||||
static ISD_Error sduDatabuswidth(SDDev* dev, u32 buswidth);
|
||||
static ISD_Error sduGetSCR(SDDev* dev, u32* data) NO_INLINE;
|
||||
static ISD_Error sduGetOCR(SDDev* dev, u32* data);
|
||||
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
|
||||
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4);
|
||||
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
|
||||
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize);
|
||||
|
||||
IOSError __sdCb(s32 result, void* arg) {
|
||||
__sdCbArg* data = (__sdCbArg*)arg;
|
||||
@@ -106,33 +106,33 @@ IOSError __sdCb(s32 result, void* arg) {
|
||||
return result;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) {
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) {
|
||||
IOSError ret;
|
||||
|
||||
if (__sdHeapId[0] < 0) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
__sdReg[0] = param_2;
|
||||
__sdReg[3] = param_4;
|
||||
__sdReg[0] = reg;
|
||||
__sdReg[3] = size;
|
||||
__sdReg[4] = 0;
|
||||
|
||||
if (param_3 != NULL) {
|
||||
if (outValue != NULL) {
|
||||
ret = IOS_Ioctl(dev->SDDevFd, SD_IOCTL_2, __sdReg, 0x18, __sdCmdBuffer, 4);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
*param_3 = *__sdCmdBuffer;
|
||||
*outValue = *__sdCmdBuffer;
|
||||
return ret;
|
||||
}
|
||||
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* status) {
|
||||
IOSError ret = SD_ERROR_FATAL;
|
||||
|
||||
if (__sdHeapId[0] >= 0 && param_2 != NULL) {
|
||||
if (__sdHeapId[0] >= 0 && status != NULL) {
|
||||
OSLockMutex(&__reqMutex);
|
||||
|
||||
if (__sdReq != 0) {
|
||||
@@ -145,7 +145,7 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
} else {
|
||||
*param_2 = *__sdCmdBuffer;
|
||||
*status = *__sdCmdBuffer;
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -154,13 +154,13 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
IOSError ret;
|
||||
u32 readCount, writeCount;
|
||||
u32* sdCmd;
|
||||
|
||||
if (param_9 != 0) {
|
||||
if (dma != 0) {
|
||||
readCount = 2;
|
||||
writeCount = 1;
|
||||
} else {
|
||||
@@ -216,7 +216,7 @@ static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
ISD_Error ret;
|
||||
u32* sdCmd;
|
||||
@@ -232,7 +232,7 @@ static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
sdCmd[6] = buffer;
|
||||
sdCmd[4] = blockCount;
|
||||
sdCmd[5] = sectorSize;
|
||||
sdCmd[7] = param_9;
|
||||
sdCmd[7] = dma;
|
||||
|
||||
if (resp != NULL) {
|
||||
if (cb != NULL) {
|
||||
@@ -365,7 +365,7 @@ ISD_Error ISD_WriteMultiBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSi
|
||||
return ISD_WriteMultiBlockAsync(dev, offset, cmdResp, cmdRespSize, 0, 0);
|
||||
}
|
||||
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ret;
|
||||
u32 status;
|
||||
|
||||
@@ -435,12 +435,12 @@ ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRe
|
||||
|
||||
DCInvalidateRange(cmdResp, cmdRespSize << 9);
|
||||
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (param_5 == 0) {
|
||||
if (callback == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -449,7 +449,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ret;
|
||||
u32 status;
|
||||
|
||||
@@ -519,12 +519,12 @@ ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdR
|
||||
|
||||
DCFlushRange(cmdResp, cmdRespSize << 9);
|
||||
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (param_5 == 0) {
|
||||
if (callback == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -782,7 +782,7 @@ static ISD_Error sduGetOCR(SDDev* dev, u32* data) {
|
||||
}
|
||||
|
||||
#ifdef __MWERKS__
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* param_2, register u32* param_3, register u32* param_4) {
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* outSize, register u32* outSize2, register u32* outSectorSize) {
|
||||
nofralloc
|
||||
|
||||
stwu r1, -0x30(r1)
|
||||
@@ -859,13 +859,13 @@ ISD_GetCardSize_store:
|
||||
stw r5, 0x18(r28)
|
||||
stw r0, 0x1c(r28)
|
||||
stw r3, 0x20(r28)
|
||||
beq ISD_GetCardSize_no_param2
|
||||
beq ISD_GetCardSize_no_outSize
|
||||
stw r3, 0(r29)
|
||||
ISD_GetCardSize_no_param2:
|
||||
ISD_GetCardSize_no_outSize:
|
||||
cmpwi r30, 0
|
||||
beq ISD_GetCardSize_no_param3
|
||||
beq ISD_GetCardSize_no_outSize2
|
||||
stw r3, 0(r30)
|
||||
ISD_GetCardSize_no_param3:
|
||||
ISD_GetCardSize_no_outSize2:
|
||||
cmpwi r31, 0
|
||||
beq ISD_GetCardSize_success_return
|
||||
li r0, 0x200
|
||||
@@ -884,7 +884,7 @@ ISD_GetCardSize_return:
|
||||
blr
|
||||
}
|
||||
#else
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4) {
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize) {
|
||||
ISD_Error ret;
|
||||
u32 out0;
|
||||
u32 out1;
|
||||
@@ -915,14 +915,14 @@ ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4)
|
||||
dev->SDSectorNum = out1;
|
||||
dev->SDDevSize = out2;
|
||||
|
||||
if (param_2 != NULL) {
|
||||
*param_2 = out2;
|
||||
if (outSize != NULL) {
|
||||
*outSize = out2;
|
||||
}
|
||||
if (param_3 != NULL) {
|
||||
*param_3 = out2;
|
||||
if (outSize2 != NULL) {
|
||||
*outSize2 = out2;
|
||||
}
|
||||
if (param_4 != NULL) {
|
||||
*param_4 = 512;
|
||||
if (outSectorSize != NULL) {
|
||||
*outSectorSize = 512;
|
||||
}
|
||||
|
||||
return SD_ERROR_SUCCESS;
|
||||
|
||||
@@ -206,47 +206,19 @@ CDBErr CDBDatabasePrivateCreateRecordAtOnce(CDBDatabase* database, CDBRecord* re
|
||||
return result;
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize) {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x40(r1)
|
||||
mflr r0
|
||||
stw r0, 0x44(r1)
|
||||
addi r11, r1, 0x40
|
||||
bl _savegpr_22
|
||||
lhz r28, 0x0(r3)
|
||||
mr r22, r3
|
||||
lwz r29, 0x4(r3)
|
||||
mr r23, r4
|
||||
mr r24, r5
|
||||
mr r25, r6
|
||||
mr r26, r7
|
||||
mr r27, r8
|
||||
bl OSGetTime
|
||||
mr r30, r4
|
||||
mr r31, r3
|
||||
bl CDBLock
|
||||
stw r26, 0x8(r1)
|
||||
mr r3, r22
|
||||
mr r4, r23
|
||||
mr r5, r24
|
||||
stw r27, 0xc(r1)
|
||||
mr r6, r25
|
||||
mr r8, r30
|
||||
mr r7, r31
|
||||
mr r9, r29
|
||||
mr r10, r28
|
||||
bl CDBDatabaseCreateRecordImAtOnce_
|
||||
mr r28, r3
|
||||
bl CDBUnlock
|
||||
addi r11, r1, 0x40
|
||||
mr r3, r28
|
||||
bl _restgpr_22
|
||||
lwz r0, 0x44(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x40
|
||||
blr
|
||||
#endif
|
||||
CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize) {
|
||||
OSTime time;
|
||||
u32 gameCode;
|
||||
u16 makerCode;
|
||||
CDBErr result;
|
||||
|
||||
makerCode = database->makerCode;
|
||||
gameCode = database->gameCode;
|
||||
time = OSGetTime();
|
||||
CDBLock();
|
||||
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCode, makerCode, recordData, recordDataSize);
|
||||
CDBUnlock();
|
||||
return result;
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, int year, int month, int day, int hour, int min, int sec) {
|
||||
|
||||
@@ -2604,8 +2604,8 @@ namespace ipl {
|
||||
|
||||
wcscpy(limitStr, System::getMessage(MESG_CHAN_SEL_TIME_LIMIT));
|
||||
|
||||
wchar_t local_38[16] = L"";
|
||||
wchar_t local_58[16] = L"";
|
||||
wchar_t hourStr[16] = L"";
|
||||
wchar_t minuteStr[16] = L"";
|
||||
|
||||
if (hour == 0 && minute == 0) {
|
||||
swprintf(limitStr, 65, L"%ls %ls", limitStr, System::getMessage(MESG_CHAN_SEL_LIMIT_UNDER_60));
|
||||
@@ -2616,42 +2616,42 @@ namespace ipl {
|
||||
if (System::getLanguage() == SC_LANG_JAPANESE || System::getLanguage() == SC_LANG_KOREAN ||
|
||||
System::getLanguage() == SC_LANG_GERMAN) {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
} else if (System::getLanguage() == SC_LANG_FRENCH || System::getLanguage() == SC_LANG_ITALIAN) {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
} else {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
}
|
||||
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, local_38, local_58);
|
||||
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, hourStr, minuteStr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,10 +86,7 @@ static inline void setMemoryTitleLists(SDMemory* memory, SDMemory::TitleRange sd
|
||||
memory->setTitleLists(sdRange, nandRange);
|
||||
}
|
||||
|
||||
extern "C" char lbl_81696E30[];
|
||||
extern "C" char lbl_81696E37[];
|
||||
|
||||
static const char* sButtonNames[2] = {lbl_81696E30, lbl_81696E37};
|
||||
static const char* sButtonNames[2] = {"B_BtnA", "B_BtnB"};
|
||||
|
||||
static const int sCaptureSizes[2][2] = {{128, 96}, {176, 96}};
|
||||
|
||||
|
||||
@@ -1003,39 +1003,21 @@ namespace ipl {
|
||||
return count - 1;
|
||||
}
|
||||
|
||||
asm int Manager::getAvailableInList(register const ESTitleId* titleIds, register u32 titleCount) {
|
||||
nofralloc
|
||||
li r8, 0
|
||||
li r6, 0
|
||||
li r7, 0xc
|
||||
mtctr r5
|
||||
cmplwi r5, 0
|
||||
ble getAvailableInList_L3
|
||||
getAvailableInList_L1:
|
||||
add r5, r4, r6
|
||||
lwzx r0, r4, r6
|
||||
lwz r5, 4(r5)
|
||||
or. r0, r5, r0
|
||||
bne getAvailableInList_L2
|
||||
divw r5, r8, r7
|
||||
mullw r0, r5, r7
|
||||
mulli r5, r5, 0xc0
|
||||
subf r0, r0, r8
|
||||
add r5, r3, r5
|
||||
slwi r0, r0, 4
|
||||
add r5, r5, r0
|
||||
lbz r0, 0x30(r5)
|
||||
cmplwi r0, 1
|
||||
beq getAvailableInList_L2
|
||||
mr r3, r8
|
||||
blr
|
||||
getAvailableInList_L2:
|
||||
addi r8, r8, 1
|
||||
addi r6, r6, 8
|
||||
bdnz getAvailableInList_L1
|
||||
getAvailableInList_L3:
|
||||
li r3, -1
|
||||
blr
|
||||
int Manager::getAvailableInList(const ESTitleId* titleIds, u32 titleCount) {
|
||||
int dens = 12;
|
||||
u32 i;
|
||||
for (i = 0; i < titleCount; i++) {
|
||||
if (titleIds[i] == 0) {
|
||||
int page = (int)i / dens;
|
||||
int slot = (int)i % dens;
|
||||
u8* p = (u8*)this + page * 0xc0;
|
||||
p += slot * 16;
|
||||
if (*(p + 0x30) != 1) {
|
||||
return (int)i;
|
||||
}
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
asm int Manager::isEqualChannel(register ESTitleId titleId0, register ESTitleId titleId1) {
|
||||
|
||||
Reference in New Issue
Block a user