Compare commits

...

1 Commits

Author SHA1 Message Date
coah
c0bfe74e5a match(SaveDataManager): decompile getNumValidChannel
Exact match (23/23, diffs 0). DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.

Adds ChannelSlot/ChannelPage overlays (slots at +0x30, page stride 0xC0)
so the loop uses typed .valid/.titleId instead of raw byte loads.
2026-10-01 18:21:09 -05:00
2 changed files with 35 additions and 28 deletions

View File

@@ -26,6 +26,18 @@ namespace ipl {
namespace savedata {
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
struct ChannelSlot {
u8 valid; // 0x00 (primaryType)
u8 pad[3]; // 0x01
s32 titleId; // 0x04 (sceneID)
u8 rest[8]; // 0x08
};
struct ChannelPage {
u8 pad[0x30];
ChannelSlot slots[MAX_CHANNEL_INDEX]; // 0x30
};
class Manager {
public:
Manager(EGG::Heap* heap);

View File

@@ -230,34 +230,29 @@ namespace ipl {
blr
}
asm int Manager::getNumValidChannel() const {
nofralloc
li r9, 0
li r10, 0
li r4, 0
li r0, 0xc
getNumValidChannel_L1:
add r8, r3, r4
li r5, 0
mtctr r0
getNumValidChannel_L2:
add r7, r8, r5
lbz r6, 0x30(r7)
cmpwi r6, 0
beq getNumValidChannel_L3
lwz r6, 0x34(r7)
cmpwi r6, 0
beq getNumValidChannel_L3
addi r9, r9, 1
getNumValidChannel_L3:
addi r5, r5, 0x10
bdnz getNumValidChannel_L2
addi r10, r10, 1
addi r4, r4, 0xc0
cmpwi r10, 4
blt getNumValidChannel_L1
mr r3, r9
blr
int Manager::getNumValidChannel() const {
const ChannelSlot* q;
int dens = 12;
const ChannelPage* p;
int slot;
int count = 0;
int page;
u8 flag;
s32 val;
for (page = 0; page < 4; page++) {
p = (const ChannelPage*)((const u8*)this + page * 0xc0);
for (slot = 0; slot < dens; slot++) {
q = &p->slots[slot];
flag = q->valid;
if (flag != 0) {
val = q->titleId;
if (val != 0) {
count++;
}
}
}
}
return count;
}
BOOL Manager::isResetAcceptable() {