Compare commits

..

1 Commits

Author SHA1 Message Date
coah
1c42679f0e cleanup(SDChannelObj): name address-suffixed C helpers
Rename iplSDChannelObj_813E* helpers to semantic names (setHeaps,
createBaseLayout, getLocalizedName, etc.) across the unit, callers,
header, and symbols.txt. Byte-identical: ok + sha1
26116613f624061ba99c8d1a299aaa6efa85670d; unit still ~90% code /
~99.99% fuzzy.
2026-10-01 18:29:30 -05:00
8 changed files with 625 additions and 624 deletions

View File

@@ -7284,7 +7284,7 @@ Zi8_814834AC = .text:0x814834AC; // type:function size:0x55C
Zi8GetKOcandidates = .text:0x81483A08; // type:function size:0xA74
Zi8LogError = .text:0x8148447C; // type:function size:0x4
Zi8ReplaceLastError = .text:0x81484480; // type:function size:0x4
Zi8MapKeyCode = .text:0x81484484; // type:function size:0x80
Zi8_81484484 = .text:0x81484484; // type:function size:0x80
ziNumKeysWithChars = .text:0x81484504; // type:function size:0xC4 scope:local
Zi8getKeyLayout = .text:0x814845C8; // type:function size:0x2D8
Zi8ChangeCharCase = .text:0x814848A0; // type:function size:0x48C
@@ -15942,7 +15942,7 @@ lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
updateDiskState_jumptable = .data:0x8164DE80; // type:object size:0x1C scope:local
jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
lbl_8164DEA7 = .data:0x8164DEA7; // type:object size:0x10 data:string
lbl_8164DEB7 = .data:0x8164DEB7; // type:object size:0x114
@@ -20622,7 +20622,7 @@ scInputForm640F = .sdata2:0x81694D2C; // type:object size:0x4 align:4 data:float
scInputFormF32ConvertMagic = .sdata2:0x81694D30; // type:object size:0x8 align:8 data:double
scInputFormOneF = .sdata2:0x81694D38; // type:object size:0x4 align:4 data:float
scInputFormHalfF = .sdata2:0x81694D3C; // type:object size:0x4 align:4 data:float
scInputFormDegToFIdxF = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
scInputForm0_7111111F = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
scInputForm150F = .sdata2:0x81694D44; // type:object size:0x4 align:4 data:float
scInputForm30F = .sdata2:0x81694D48; // type:object size:0x4 align:4 data:float
scInputForm50F = .sdata2:0x81694D4C; // type:object size:0x4 align:4 data:float

View File

@@ -8,7 +8,7 @@ ziU16 Zi8GetTableCount(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
ziU32 Zi8GetTableAddress(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
ziU8 Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data);
ziBool Zi8MapKeyCode(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
ziBool Zi8_81484484(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
if (character == 0xeffa) {
*output = 0;
} else if ((character >= 0xeff1) && (character <= 0xeff9)) {
@@ -58,7 +58,7 @@ ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, zi
*chars = 0;
if (ZI_WORK->userKeys[language] != 0) {
customTable = ZI_WORK->userKeys[language];
if (!Zi8MapKeyCode(key, &key, __zi8_work_data)) {
if (!Zi8_81484484(key, &key, __zi8_work_data)) {
return 0;
}
keyChars = customTable->lower[key];
@@ -87,7 +87,7 @@ tables_ready:
Zi8ReplaceLastError(0x962, __zi8_work_data);
return 0;
}
if (!Zi8MapKeyCode(key, &key, __zi8_work_data) || (key >= numKeys)) {
if (!Zi8_81484484(key, &key, __zi8_work_data) || (key >= numKeys)) {
Zi8ReplaceLastError(300, __zi8_work_data);
return 0;
}

File diff suppressed because it is too large Load Diff

View File

@@ -313,18 +313,18 @@ asm void __div2u() {
cmpwi r3, 0x0
cntlzw r0, r3
cntlzw r9, r4
bne __div2u_L_815F9538
bne L_815F9538
addi r0, r9, 0x20
__div2u_L_815F9538:
L_815F9538:
cmpwi r5, 0x0
cntlzw r9, r5
cntlzw r10, r6
bne __div2u_L_815F954C
bne L_815F954C
addi r9, r10, 0x20
__div2u_L_815F954C:
L_815F954C:
cmpw r0, r9
subfic r10, r0, 0x40
bgt __div2u_L_815F9604
bgt L_815F9604
addi r9, r9, 0x1
subfic r9, r9, 0x40
add r0, r0, r9
@@ -332,49 +332,49 @@ __div2u_L_815F954C:
mtctr r9
cmpwi r9, 0x20
subi r7, r9, 0x20
blt __div2u_L_815F9584
blt L_815F9584
srw r8, r3, r7
li r7, 0x0
b __div2u_L_815F9598
__div2u_L_815F9584:
b L_815F9598
L_815F9584:
srw r8, r4, r9
subfic r7, r9, 0x20
slw r7, r3, r7
or r8, r8, r7
srw r7, r3, r9
__div2u_L_815F9598:
L_815F9598:
cmpwi r0, 0x20
subic r9, r0, 0x20
blt __div2u_L_815F95B0
blt L_815F95B0
slw r3, r4, r9
li r4, 0x0
b __div2u_L_815F95C4
__div2u_L_815F95B0:
b L_815F95C4
L_815F95B0:
slw r3, r3, r0
subfic r9, r0, 0x20
srw r9, r4, r9
or r3, r3, r9
slw r4, r4, r0
__div2u_L_815F95C4:
L_815F95C4:
li r10, -0x1
addic r7, r7, 0x0
__div2u_L_815F95CC:
L_815F95CC:
adde r4, r4, r4
adde r3, r3, r3
adde r8, r8, r8
adde r7, r7, r7
subfc r0, r6, r8
subfe. r9, r5, r7
blt __div2u_L_815F95F4
blt L_815F95F4
mr r8, r0
mr r7, r9
addic r0, r10, 0x1
__div2u_L_815F95F4:
bdnz __div2u_L_815F95CC
L_815F95F4:
bdnz L_815F95CC
adde r4, r4, r4
adde r3, r3, r3
blr
__div2u_L_815F9604:
L_815F9604:
li r4, 0x0
li r3, 0x0
blr
@@ -385,32 +385,32 @@ asm void __div2i() {
#ifdef __MWERKS__
stwu r1, -0x10(r1)
clrrwi. r9, r3, 31
beq __div2i_L_815F9624
beq L_815F9624
subfic r4, r4, 0x0
subfze r3, r3
__div2i_L_815F9624:
L_815F9624:
stw r9, 0x8(r1)
clrrwi. r10, r5, 31
beq __div2i_L_815F9638
beq L_815F9638
subfic r6, r6, 0x0
subfze r5, r5
__div2i_L_815F9638:
L_815F9638:
stw r10, 0xc(r1)
cmpwi r3, 0x0
cntlzw r0, r3
cntlzw r9, r4
bne __div2i_L_815F9650
bne L_815F9650
addi r0, r9, 0x20
__div2i_L_815F9650:
L_815F9650:
cmpwi r5, 0x0
cntlzw r9, r5
cntlzw r10, r6
bne __div2i_L_815F9664
bne L_815F9664
addi r9, r10, 0x20
__div2i_L_815F9664:
L_815F9664:
cmpw r0, r9
subfic r10, r0, 0x40
bgt __div2i_L_815F9738
bgt L_815F9738
addi r9, r9, 0x1
subfic r9, r9, 0x40
add r0, r0, r9
@@ -418,60 +418,60 @@ __div2i_L_815F9664:
mtctr r9
cmpwi r9, 0x20
subi r7, r9, 0x20
blt __div2i_L_815F969C
blt L_815F969C
srw r8, r3, r7
li r7, 0x0
b __div2i_L_815F96B0
__div2i_L_815F969C:
b L_815F96B0
L_815F969C:
srw r8, r4, r9
subfic r7, r9, 0x20
slw r7, r3, r7
or r8, r8, r7
srw r7, r3, r9
__div2i_L_815F96B0:
L_815F96B0:
cmpwi r0, 0x20
subic r9, r0, 0x20
blt __div2i_L_815F96C8
blt L_815F96C8
slw r3, r4, r9
li r4, 0x0
b __div2i_L_815F96DC
__div2i_L_815F96C8:
b L_815F96DC
L_815F96C8:
slw r3, r3, r0
subfic r9, r0, 0x20
srw r9, r4, r9
or r3, r3, r9
slw r4, r4, r0
__div2i_L_815F96DC:
L_815F96DC:
li r10, -0x1
addic r7, r7, 0x0
__div2i_L_815F96E4:
L_815F96E4:
adde r4, r4, r4
adde r3, r3, r3
adde r8, r8, r8
adde r7, r7, r7
subfc r0, r6, r8
subfe. r9, r5, r7
blt __div2i_L_815F970C
blt L_815F970C
mr r8, r0
mr r7, r9
addic r0, r10, 0x1
__div2i_L_815F970C:
bdnz __div2i_L_815F96E4
L_815F970C:
bdnz L_815F96E4
adde r4, r4, r4
adde r3, r3, r3
lwz r9, 0x8(r1)
lwz r10, 0xc(r1)
xor. r7, r9, r10
beq __div2i_L_815F9734
beq L_815F9734
cmpwi r9, 0x0
subfic r4, r4, 0x0
subfze r3, r3
__div2i_L_815F9734:
b __div2i_L_815F9740
__div2i_L_815F9738:
L_815F9734:
b L_815F9740
L_815F9738:
li r4, 0x0
li r3, 0x0
__div2i_L_815F9740:
L_815F9740:
addi r1, r1, 0x10
blr
#endif
@@ -482,18 +482,18 @@ asm void __mod2u() {
cmpwi r3, 0x0
cntlzw r0, r3
cntlzw r9, r4
bne __mod2u_L_815F975C
bne L_815F975C
addi r0, r9, 0x20
__mod2u_L_815F975C:
L_815F975C:
cmpwi r5, 0x0
cntlzw r9, r5
cntlzw r10, r6
bne __mod2u_L_815F9770
bne L_815F9770
addi r9, r10, 0x20
__mod2u_L_815F9770:
L_815F9770:
cmpw r0, r9
subfic r10, r0, 0x40
bgt __mod2u_L_815F9828
bgt L_815F9828
addi r9, r9, 0x1
subfic r9, r9, 0x40
add r0, r0, r9
@@ -501,49 +501,49 @@ __mod2u_L_815F9770:
mtctr r9
cmpwi r9, 0x20
subi r7, r9, 0x20
blt __mod2u_L_815F97A8
blt L_815F97A8
srw r8, r3, r7
li r7, 0x0
b __mod2u_L_815F97BC
__mod2u_L_815F97A8:
b L_815F97BC
L_815F97A8:
srw r8, r4, r9
subfic r7, r9, 0x20
slw r7, r3, r7
or r8, r8, r7
srw r7, r3, r9
__mod2u_L_815F97BC:
L_815F97BC:
cmpwi r0, 0x20
subic r9, r0, 0x20
blt __mod2u_L_815F97D4
blt L_815F97D4
slw r3, r4, r9
li r4, 0x0
b __mod2u_L_815F97E8
__mod2u_L_815F97D4:
b L_815F97E8
L_815F97D4:
slw r3, r3, r0
subfic r9, r0, 0x20
srw r9, r4, r9
or r3, r3, r9
slw r4, r4, r0
__mod2u_L_815F97E8:
L_815F97E8:
li r10, -0x1
addic r7, r7, 0x0
__mod2u_L_815F97F0:
L_815F97F0:
adde r4, r4, r4
adde r3, r3, r3
adde r8, r8, r8
adde r7, r7, r7
subfc r0, r6, r8
subfe. r9, r5, r7
blt __mod2u_L_815F9818
blt L_815F9818
mr r8, r0
mr r7, r9
addic r0, r10, 0x1
__mod2u_L_815F9818:
bdnz __mod2u_L_815F97F0
L_815F9818:
bdnz L_815F97F0
mr r4, r8
mr r3, r7
blr
__mod2u_L_815F9828:
L_815F9828:
blr
#endif
}
@@ -551,30 +551,30 @@ __mod2u_L_815F9828:
asm void __mod2i() {
#ifdef __MWERKS__
cmpwi cr7, r3, 0x0
bge cr7, __mod2i_L_815F983C
bge cr7, L_815F983C
subfic r4, r4, 0x0
subfze r3, r3
__mod2i_L_815F983C:
L_815F983C:
cmpwi r5, 0x0
bge __mod2i_L_815F984C
bge L_815F984C
subfic r6, r6, 0x0
subfze r5, r5
__mod2i_L_815F984C:
L_815F984C:
cmpwi r3, 0x0
cntlzw r0, r3
cntlzw r9, r4
bne __mod2i_L_815F9860
bne L_815F9860
addi r0, r9, 0x20
__mod2i_L_815F9860:
L_815F9860:
cmpwi r5, 0x0
cntlzw r9, r5
cntlzw r10, r6
bne __mod2i_L_815F9874
bne L_815F9874
addi r9, r10, 0x20
__mod2i_L_815F9874:
L_815F9874:
cmpw r0, r9
subfic r10, r0, 0x40
bgt __mod2i_L_815F9928
bgt L_815F9928
addi r9, r9, 0x1
subfic r9, r9, 0x40
add r0, r0, r9
@@ -582,52 +582,52 @@ __mod2i_L_815F9874:
mtctr r9
cmpwi r9, 0x20
subi r7, r9, 0x20
blt __mod2i_L_815F98AC
blt L_815F98AC
srw r8, r3, r7
li r7, 0x0
b __mod2i_L_815F98C0
__mod2i_L_815F98AC:
b L_815F98C0
L_815F98AC:
srw r8, r4, r9
subfic r7, r9, 0x20
slw r7, r3, r7
or r8, r8, r7
srw r7, r3, r9
__mod2i_L_815F98C0:
L_815F98C0:
cmpwi r0, 0x20
subic r9, r0, 0x20
blt __mod2i_L_815F98D8
blt L_815F98D8
slw r3, r4, r9
li r4, 0x0
b __mod2i_L_815F98EC
__mod2i_L_815F98D8:
b L_815F98EC
L_815F98D8:
slw r3, r3, r0
subfic r9, r0, 0x20
srw r9, r4, r9
or r3, r3, r9
slw r4, r4, r0
__mod2i_L_815F98EC:
L_815F98EC:
li r10, -0x1
addic r7, r7, 0x0
__mod2i_L_815F98F4:
L_815F98F4:
adde r4, r4, r4
adde r3, r3, r3
adde r8, r8, r8
adde r7, r7, r7
subfc r0, r6, r8
subfe. r9, r5, r7
blt __mod2i_L_815F991C
blt L_815F991C
mr r8, r0
mr r7, r9
addic r0, r10, 0x1
__mod2i_L_815F991C:
bdnz __mod2i_L_815F98F4
L_815F991C:
bdnz L_815F98F4
mr r4, r8
mr r3, r7
__mod2i_L_815F9928:
bge cr7, __mod2i_L_815F9934
L_815F9928:
bge cr7, L_815F9934
subfic r4, r4, 0x0
subfze r3, r3
__mod2i_L_815F9934:
L_815F9934:
blr
#endif
}
@@ -668,9 +668,9 @@ asm void __shr2i() {
slw r10, r3, r8
or r4, r4, r10
sraw r10, r3, r9
ble __shr2i_L_815F99A0
ble L_815F99A0
or r4, r4, r10
__shr2i_L_815F99A0:
L_815F99A0:
sraw r3, r3, r5
blr
#endif
@@ -680,13 +680,13 @@ asm void __cvt_sll_dbl() {
#ifdef __MWERKS__
stwu r1, -0x10(r1)
clrrwi. r5, r3, 31
beq __cvt_sll_dbl_L_815F99BC
beq L_815F99BC
subfic r4, r4, 0x0
subfze r3, r3
__cvt_sll_dbl_L_815F99BC:
L_815F99BC:
or. r7, r3, r4
li r6, 0x0
beq __cvt_sll_dbl_L_815F9A44
beq L_815F9A44
cntlzw r7, r3
cntlzw r8, r4
extlwi r9, r7, 5, 26
@@ -705,22 +705,22 @@ __cvt_sll_dbl_L_815F99BC:
clrlwi r7, r4, 21
cmpwi r7, 0x400
addi r6, r6, 0x43e
blt __cvt_sll_dbl_L_815F9A2C
bgt __cvt_sll_dbl_L_815F9A20
blt L_815F9A2C
bgt L_815F9A20
rlwinm. r7, r4, 0, 20, 20
beq __cvt_sll_dbl_L_815F9A2C
__cvt_sll_dbl_L_815F9A20:
beq L_815F9A2C
L_815F9A20:
addic r4, r4, 0x800
addze r3, r3
addze r6, r6
__cvt_sll_dbl_L_815F9A2C:
L_815F9A2C:
rotrwi r4, r4, 11
rlwimi r4, r3, 21, 0, 10
extrwi r3, r3, 20, 1
slwi r6, r6, 20
or r3, r6, r3
or r3, r5, r3
__cvt_sll_dbl_L_815F9A44:
L_815F9A44:
stw r3, 0x8(r1)
stw r4, 0xc(r1)
lfd f1, 0x8(r1)
@@ -734,7 +734,7 @@ asm void __cvt_ull_dbl() {
stwu r1, -0x10(r1)
or. r7, r3, r4
li r6, 0x0
beq __cvt_ull_dbl_L_815F9AE0
beq L_815F9AE0
cntlzw r7, r3
cntlzw r8, r4
extlwi r9, r7, 5, 26
@@ -753,21 +753,21 @@ asm void __cvt_ull_dbl() {
clrlwi r7, r4, 21
cmpwi r7, 0x400
addi r6, r6, 0x43e
blt __cvt_ull_dbl_L_815F9ACC
bgt __cvt_ull_dbl_L_815F9AC0
blt L_815F9ACC
bgt L_815F9AC0
rlwinm. r7, r4, 0, 20, 20
beq __cvt_ull_dbl_L_815F9ACC
__cvt_ull_dbl_L_815F9AC0:
beq L_815F9ACC
L_815F9AC0:
addic r4, r4, 0x800
addze r3, r3
addze r6, r6
__cvt_ull_dbl_L_815F9ACC:
L_815F9ACC:
rotrwi r4, r4, 11
rlwimi r4, r3, 21, 0, 10
extrwi r3, r3, 20, 1
slwi r6, r6, 20
or r3, r6, r3
__cvt_ull_dbl_L_815F9AE0:
L_815F9AE0:
stw r3, 0x8(r1)
stw r4, 0xc(r1)
lfd f1, 0x8(r1)
@@ -781,7 +781,7 @@ asm void __cvt_ull_flt() {
stwu r1, -0x10(r1)
or. r7, r3, r4
li r6, 0x0
beq __cvt_ull_flt_L_815F9B7C
beq L_815F9B7C
cntlzw r7, r3
cntlzw r8, r4
extlwi r9, r7, 5, 26
@@ -800,21 +800,21 @@ asm void __cvt_ull_flt() {
clrlwi r7, r4, 21
cmpwi r7, 0x400
addi r6, r6, 0x43e
blt __cvt_ull_flt_L_815F9B68
bgt __cvt_ull_flt_L_815F9B5C
blt L_815F9B68
bgt L_815F9B5C
rlwinm. r7, r4, 0, 20, 20
beq __cvt_ull_flt_L_815F9B68
__cvt_ull_flt_L_815F9B5C:
beq L_815F9B68
L_815F9B5C:
addic r4, r4, 0x800
addze r3, r3
addze r6, r6
__cvt_ull_flt_L_815F9B68:
L_815F9B68:
rotrwi r4, r4, 11
rlwimi r4, r3, 21, 0, 10
extrwi r3, r3, 20, 1
slwi r6, r6, 20
or r3, r6, r3
__cvt_ull_flt_L_815F9B7C:
L_815F9B7C:
stw r3, 0x8(r1)
stw r4, 0xc(r1)
lfd f1, 0x8(r1)
@@ -832,17 +832,17 @@ asm void __cvt_dbl_usll() {
lwz r4, 0xc(r1)
extrwi r5, r3, 11, 1
cmplwi r5, 0x3ff
bge __cvt_dbl_usll_L_815F9BBC
bge L_815F9BBC
li r3, 0x0
li r4, 0x0
b __cvt_dbl_usll_L_815F9C58
__cvt_dbl_usll_L_815F9BBC:
b L_815F9C58
L_815F9BBC:
mr r6, r3
clrlwi r3, r3, 12
oris r3, r3, 0x10
subi r5, r5, 0x433
cmpwi r5, 0x0
bge __cvt_dbl_usll_L_815F9BFC
bge L_815F9BFC
neg r5, r5
subfic r8, r5, 0x20
subic r9, r5, 0x20
@@ -852,21 +852,21 @@ __cvt_dbl_usll_L_815F9BBC:
srw r10, r3, r9
or r4, r4, r10
srw r3, r3, r5
b __cvt_dbl_usll_L_815F9C48
__cvt_dbl_usll_L_815F9BFC:
b L_815F9C48
L_815F9BFC:
cmpwi r5, 0xa
ble+ __cvt_dbl_usll_L_815F9C28
ble+ L_815F9C28
clrrwi. r6, r6, 31
beq __cvt_dbl_usll_L_815F9C18
beq L_815F9C18
lis r3, 0x8000
li r4, 0x0
b __cvt_dbl_usll_L_815F9C58
__cvt_dbl_usll_L_815F9C18:
b L_815F9C58
L_815F9C18:
lis r3, 0x7fff
ori r3, r3, 0xffff
li r4, -0x1
b __cvt_dbl_usll_L_815F9C58
__cvt_dbl_usll_L_815F9C28:
b L_815F9C58
L_815F9C28:
subfic r8, r5, 0x20
subic r9, r5, 0x20
slw r3, r3, r5
@@ -875,12 +875,12 @@ __cvt_dbl_usll_L_815F9C28:
slw r10, r4, r9
or r3, r3, r10
slw r4, r4, r5
__cvt_dbl_usll_L_815F9C48:
L_815F9C48:
clrrwi. r6, r6, 31
beq __cvt_dbl_usll_L_815F9C58
beq L_815F9C58
subfic r4, r4, 0x0
subfze r3, r3
__cvt_dbl_usll_L_815F9C58:
L_815F9C58:
addi r1, r1, 0x10
blr
#endif
@@ -894,19 +894,19 @@ asm void __cvt_dbl_ull() {
lwz r4, 0xc(r1)
extrwi r5, r3, 11, 1
cmplwi r5, 0x3ff
bge __cvt_dbl_ull_L_815F9C88
__cvt_dbl_ull_L_815F9C7C:
bge L_815F9C88
L_815F9C7C:
li r3, 0x0
li r4, 0x0
b __cvt_dbl_ull_L_815F9D00
__cvt_dbl_ull_L_815F9C88:
b L_815F9D00
L_815F9C88:
clrrwi. r6, r3, 31
bne __cvt_dbl_ull_L_815F9C7C
bne L_815F9C7C
clrlwi r3, r3, 12
oris r3, r3, 0x10
subi r5, r5, 0x433
cmpwi r5, 0x0
bge __cvt_dbl_ull_L_815F9CCC
bge L_815F9CCC
neg r5, r5
subfic r8, r5, 0x20
subic r9, r5, 0x20
@@ -916,14 +916,14 @@ __cvt_dbl_ull_L_815F9C88:
srw r10, r3, r9
or r4, r4, r10
srw r3, r3, r5
b __cvt_dbl_ull_L_815F9D00
__cvt_dbl_ull_L_815F9CCC:
b L_815F9D00
L_815F9CCC:
cmpwi r5, 0xb
ble+ __cvt_dbl_ull_L_815F9CE0
ble+ L_815F9CE0
li r3, -0x1
li r4, -0x1
b __cvt_dbl_ull_L_815F9D00
__cvt_dbl_ull_L_815F9CE0:
b L_815F9D00
L_815F9CE0:
subfic r8, r5, 0x20
subic r9, r5, 0x20
slw r3, r3, r5
@@ -932,7 +932,7 @@ __cvt_dbl_ull_L_815F9CE0:
slw r10, r4, r9
or r3, r3, r10
slw r4, r4, r5
__cvt_dbl_ull_L_815F9D00:
L_815F9D00:
addi r1, r1, 0x10
blr
#endif

View File

@@ -391,7 +391,7 @@ extern "C" const f32 scInputForm640F = 640.0f;
extern "C" const f64 scInputFormF32ConvertMagic = 4503601774854144.0;
extern "C" const f32 scInputFormOneF = 1.0f;
extern "C" const f32 scInputFormHalfF = 0.5f;
extern "C" const f32 scInputFormDegToFIdxF = 0.7111111f;
extern "C" const f32 scInputForm0_7111111F = 0.7111111f;
extern "C" const f32 scInputForm150F = 150.0f;
extern "C" const f32 scInputForm30F = 30.0f;
extern "C" const f32 scInputForm50F = 50.0f;

View File

@@ -92,7 +92,7 @@ namespace ipl {
extern "C" void List_GetNth__Q24nw4r2utFPCQ34nw4r2ut4ListUs();
extern "C" void getChannelBasePane__Q33ipl5scene13ChannelSelectFi();
extern "C" void initPane__Q33ipl3gui11PaneManagerFPQ34nw4r3lyt4Pane();
extern "C" void* updateDiskState_jumptable[];
extern "C" void* jumptable_8164DE80[];
extern "C" void getCurrentChannel__Q33ipl7channel7ManagerFPiPi();
extern "C" void calcNormalRestart__Q33ipl5scene13ChannelSelectFv();
extern "C" void _savegpr_28();
@@ -857,7 +857,7 @@ namespace ipl {
extern "C" char scPaneName_N_GCIcon[] = "N_GCIcon";
extern "C" char scPaneName_N_DiscUpdateIcon[] = "N_DiscUpdateIcon";
extern "C" void* updateDiskState_jumptable[7] = {
extern "C" void* jumptable_8164DE80[7] = {
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x284),
@@ -1346,18 +1346,18 @@ namespace ipl {
lwz r4, 0xa8(r28)
cmplwi r0, 0x6
lwz r27, 0x4(r4)
bgt updateDiskState_done
lis r4, updateDiskState_jumptable@ha
bgt updateDiskState_813AD2C8
lis r4, jumptable_8164DE80@ha
slwi r0, r0, 2
addi r4, r4, updateDiskState_jumptable@l
addi r4, r4, jumptable_8164DE80@l
lwzx r4, r4, r0
mtctr r4
bctr
updateDiskState_case0:
updateDiskState_813ACF94:
lwz r4, 0xa4(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_done
beq updateDiskState_813AD2C8
lwz r3, 0x94(r3)
lis r29, scPaneName_N_GCIcon@ha
addi r4, r29, scPaneName_N_GCIcon@l
@@ -1381,7 +1381,7 @@ namespace ipl {
li r4, 0x0
bl SetVisible__Q34nw4r3lyt4PaneFb
cmpwi r27, 0x5
bne updateDiskState_case0_diskState3
bne updateDiskState_813AD078
lwz r4, 0xc0(r31)
lwz r3, 0x84(r28)
subi r4, r4, 0xf
@@ -1391,32 +1391,32 @@ namespace ipl {
lwz r0, 0xc0(r31)
mr r27, r3
cmpwi r0, 0xf
bne updateDiskState_case0_afterThumb
bne updateDiskState_813AD03C
lwz r3, 0xa8(r28)
addi r4, r31, 0xf8
addi r5, r31, 0xfc
bl getDiskInfo__Q33ipl3bs27ManagerFPPcPPc
updateDiskState_case0_afterThumb:
updateDiskState_813AD03C:
cmpwi r27, 0x0
beq updateDiskState_case0_afterLayout
beq updateDiskState_813AD050
lwz r3, 0x90(r31)
mr r4, r27
bl createDiskLayout__Q33ipl5scene10ChannelObjFPv
updateDiskState_case0_afterLayout:
updateDiskState_813AD050:
lbz r0, 0xf4(r31)
cmpwi r0, 0x0
bne updateDiskState_case0_afterDiskIn
bne updateDiskState_813AD064
mr r3, r31
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
updateDiskState_case0_afterDiskIn:
updateDiskState_813AD064:
li r3, 0x0
li r0, 0x1
stb r3, 0xf4(r31)
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case0_diskState3:
b updateDiskState_813AD2C8
updateDiskState_813AD078:
cmpwi r27, 0x3
bne updateDiskState_case0_diskState6
bne updateDiskState_813AD134
lwz r3, 0x84(r28)
li r0, 0x0
addi r4, r29, scPaneName_N_GCIcon@l
@@ -1444,7 +1444,7 @@ namespace ipl {
bl setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object
lwz r3, 0x98(r31)
cmpwi r3, 0x0
beq updateDiskState_case0_state3_afterAnim
beq updateDiskState_813AD10C
li r0, 0x2
stw r0, 0x18(r3)
lwz r28, 0x98(r31)
@@ -1452,45 +1452,45 @@ namespace ipl {
bl initFrame__Q33ipl7utility15FrameControllerFv
li r0, 0x1
stw r0, 0x14(r28)
updateDiskState_case0_state3_afterAnim:
updateDiskState_813AD10C:
lbz r0, 0xf4(r31)
cmpwi r0, 0x0
bne updateDiskState_case0_state3_afterDiskIn
bne updateDiskState_813AD120
mr r3, r31
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
updateDiskState_case0_state3_afterDiskIn:
updateDiskState_813AD120:
li r3, 0x0
li r0, 0x1
stb r3, 0xf4(r31)
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case0_diskState6:
b updateDiskState_813AD2C8
updateDiskState_813AD134:
cmpwi r27, 0x6
bne updateDiskState_done
bne updateDiskState_813AD2C8
lbz r0, 0xf4(r31)
cmpwi r0, 0x0
bne updateDiskState_case0_state6_afterDiskIn
bne updateDiskState_813AD150
mr r3, r31
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
updateDiskState_case0_state6_afterDiskIn:
updateDiskState_813AD150:
li r3, 0x0
li r0, 0x4
stb r3, 0xf4(r31)
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case1:
b updateDiskState_813AD2C8
updateDiskState_813AD164:
lwz r4, 0x8c(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_done
beq updateDiskState_813AD2C8
lwz r3, 0x90(r3)
bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv
cmpwi r27, 0x5
bne updateDiskState_case1_setState3
bne updateDiskState_813AD1C0
lwz r3, 0x90(r31)
lwz r3, 0x34(r3)
cmpwi r3, 0x0
beq updateDiskState_case1_setState2
beq updateDiskState_813AD1B4
li r0, 0x2
stw r0, 0x18(r3)
lwz r3, 0x90(r31)
@@ -1499,85 +1499,85 @@ namespace ipl {
bl initFrame__Q33ipl7utility15FrameControllerFv
li r0, 0x1
stw r0, 0x14(r27)
updateDiskState_case1_setState2:
updateDiskState_813AD1B4:
li r0, 0x2
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case1_setState3:
b updateDiskState_813AD2C8
updateDiskState_813AD1C0:
li r0, 0x3
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case2:
b updateDiskState_813AD2C8
updateDiskState_813AD1CC:
cmpwi r27, 0x5
bne updateDiskState_case2_doOut
bne updateDiskState_813AD1E4
lwz r4, 0x84(r28)
lbz r0, 0x1b81(r4)
cmpwi r0, 0x0
beq updateDiskState_done
updateDiskState_case2_doOut:
beq updateDiskState_813AD2C8
updateDiskState_813AD1E4:
lwz r3, 0xa0(r3)
lwz r0, 0x14(r3)
cmpwi r0, 0x1
beq updateDiskState_done
beq updateDiskState_813AD2C8
mr r3, r31
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
lwz r3, 0x90(r31)
bl changeDisk__Q33ipl5scene10ChannelObjFv
li r0, 0x6
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case3:
b updateDiskState_813AD2C8
updateDiskState_813AD210:
cmpwi r27, 0x3
bne updateDiskState_case3_doOut
bne updateDiskState_813AD228
lwz r4, 0x84(r28)
lbz r0, 0x1b81(r4)
cmpwi r0, 0x0
beq updateDiskState_done
updateDiskState_case3_doOut:
beq updateDiskState_813AD2C8
updateDiskState_813AD228:
lwz r3, 0xa0(r3)
lwz r0, 0x14(r3)
cmpwi r0, 0x1
beq updateDiskState_done
beq updateDiskState_813AD2C8
mr r3, r31
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
lwz r3, 0x90(r31)
bl changeDisk__Q33ipl5scene10ChannelObjFv
li r0, 0x6
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case4:
b updateDiskState_813AD2C8
updateDiskState_813AD254:
lwz r4, 0x8c(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_done
beq updateDiskState_813AD2C8
li r0, 0x5
stw r0, 0xf0(r3)
b updateDiskState_done
updateDiskState_case5:
b updateDiskState_813AD2C8
updateDiskState_813AD270:
cmpwi r27, 0x6
beq updateDiskState_done
beq updateDiskState_813AD2C8
lwz r4, 0xa0(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_done
beq updateDiskState_813AD2C8
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
lwz r3, 0x90(r31)
bl changeDisk__Q33ipl5scene10ChannelObjFv
li r0, 0x6
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case6:
b updateDiskState_813AD2C8
updateDiskState_813AD2A0:
lwz r4, 0x8c(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_done
beq updateDiskState_813AD2C8
lwz r3, 0x90(r3)
bl destroyDiskLayout__Q33ipl5scene10ChannelObjFv
lwz r3, 0x90(r31)
bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv
li r0, 0x0
stw r0, 0xf0(r31)
updateDiskState_done:
updateDiskState_813AD2C8:
addi r11, r1, 0x20
bl _restgpr_27
lwz r0, 0x24(r1)

View File

@@ -107,6 +107,11 @@ namespace ipl {
extern "C" bool iplSDChannelSelect_813DD240(
SDChannelSelect* scene, const s32* requiredBytes, const s32* requiredBlocks,
ESTitleId* titleIds, char* titleNames, u32* titleCount);
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, int enabled);

View File

@@ -1,7 +1,3 @@
#define IPL_CONTROLLER_TRIVIAL_RECT_DTOR
#include <nw4r/ut/Rect.h>
#undef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
#include "system/iplSystem.h"
#include "system/iplNand.h"
#include "utility/iplGraphics.h"