Compare commits

...

1 Commits

9 changed files with 767 additions and 696 deletions

View File

@@ -16049,7 +16049,7 @@ mscClockPaneNames__Q33ipl5scene13ChannelSelect = .data:0x8164DCA8; // type:objec
@23740 = .data:0x8164DE49; // type:object size:0x1B scope:local data:string
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
@24295 = .data:0x8164DE80; // type:object size:0x1C scope:local
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
@24254 = .data:0x8164DEA7; // type:object size:0x10 scope:local data:string
@24282 = .data:0x8164DEB7; // type:object size:0x12 scope:local data:string

View File

@@ -12,6 +12,9 @@
namespace ipl {
namespace scene {
#ifdef IPL_BUTTON_IMPLEMENTATION
extern "C" BOOL push_button_queue(void*, const void*);
#endif
class ButtonEventHandlerBase;
class OptOutButtonEventHandlerBase;
class SDMenuEventHandlerBase;
@@ -314,6 +317,9 @@ namespace ipl {
}
protected:
#ifdef IPL_BUTTON_IMPLEMENTATION
friend BOOL push_button_queue(void*, const void*);
#endif
typedef struct Command {
enum {
TYPE_ANIM = 0,

View File

@@ -8,7 +8,6 @@
namespace textinput {
namespace gui {
extern "C" void drawLine___Q29textinput3guiFfffffUcR8_GXColor();
extern "C" const f32 scGuiZeroF;
void drawLine_(f32 x0, f32 y0, f32 x1, f32 y1, f32 z, u8 width, GXColor& color) {
GXClearVtxDesc();
@@ -31,7 +30,7 @@ namespace textinput {
GXSetBlendMode(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_NOOP);
Mtx mtx;
MTXTrans(mtx, scGuiZeroF, scGuiZeroF, scGuiZeroF);
MTXTrans(mtx, 0.0f, 0.0f, 0.0f);
GXLoadPosMtxImm(mtx, 0);
GXSetLineWidth(width, GX_TO_ZERO);
@@ -334,7 +333,7 @@ namespace textinput {
MTXInverse(mpPane->GetGlobalMtx(), globalMtx);
nw4r::math::VEC3 pos;
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, scGuiZeroF), pos);
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, 0.0f), pos);
nw4r::ut::Rect rect = mpPane->GetPaneRect(*drawInfo);
@@ -346,124 +345,27 @@ namespace textinput {
}
}
#pragma push
#pragma section sconst_type ".sdata2"
extern "C" const f32 scGuiZeroF = 0.0f;
extern "C" const u8 scGuiLineColorR = 0xFF;
extern "C" const u8 scGuiLineColorG = 0x00;
extern "C" const u8 scGuiLineColorB = 0x00;
extern "C" const u8 scGuiLineColorA = 0xFF;
extern "C" const f32 scGuiHalfF = 0.5f;
#pragma pop
extern "C" asm void draw__Q39textinput3gui13PaneComponentFv() {
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
stfd f31, 0x30(r1)
psq_st f31, 0x38(r1), 0, 0
stfd f30, 0x20(r1)
psq_st f30, 0x28(r1), 0, 0
stw r31, 0x1c(r1)
mr r31, r3
lwz r3, 0x94(r3)
lwz r12, 0(r3)
lwz r12, 0x50(r12)
mtctr r12
bctrl
cmpwi r3, 0
beq pane_component_draw_done
lwz r5, 0x9c(r31)
mr r3, r31
lbz r7, scGuiLineColorR
li r4, 0
lfs f1, 0x4c(r5)
lfs f0, 0x50(r5)
lfs f31, 0x90(r5)
lfs f30, 0xa0(r5)
lbz r6, scGuiLineColorG
lbz r5, scGuiLineColorB
lbz r0, scGuiLineColorA
stb r7, 8(r1)
stb r6, 9(r1)
stb r5, 0xa(r1)
stb r0, 0xb(r1)
lwz r12, 0(r31)
stfs f1, 0x10(r1)
lwz r12, 0x24(r12)
stfs f0, 0x14(r1)
mtctr r12
bctrl
cmpwi r3, 0
beq pane_component_draw_lines
li r3, 0
li r0, 0xff
stb r3, 8(r1)
stb r0, 0xa(r1)
pane_component_draw_lines:
lfs f1, scGuiHalfF
addi r4, r1, 8
lfs f0, 0x14(r1)
li r3, 8
lfs f2, 0x10(r1)
fmuls f0, f0, f1
lfs f5, scGuiZeroF
fmuls f3, f2, f1
fsubs f2, f30, f0
fsubs f1, f31, f3
fadds f3, f31, f3
fmr f4, f2
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
lfs f1, 0x10(r1)
addi r4, r1, 8
lfs f2, scGuiHalfF
li r3, 8
lfs f0, 0x14(r1)
fmuls f1, f1, f2
lfs f5, scGuiZeroF
fmuls f0, f0, f2
fadds f1, f31, f1
fsubs f2, f30, f0
fadds f4, f30, f0
fmr f3, f1
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
lfs f1, scGuiHalfF
addi r4, r1, 8
lfs f0, 0x14(r1)
li r3, 8
lfs f2, 0x10(r1)
fmuls f0, f0, f1
lfs f5, scGuiZeroF
fmuls f3, f2, f1
fadds f2, f30, f0
fadds f1, f31, f3
fsubs f3, f31, f3
fmr f4, f2
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
lfs f1, 0x10(r1)
addi r4, r1, 8
lfs f2, scGuiHalfF
li r3, 8
lfs f0, 0x14(r1)
fmuls f1, f1, f2
lfs f5, scGuiZeroF
fmuls f0, f0, f2
fsubs f1, f31, f1
fadds f2, f30, f0
fsubs f4, f30, f0
fmr f3, f1
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
pane_component_draw_done:
psq_l f31, 0x38(r1), 0, 0
lfd f31, 0x30(r1)
psq_l f30, 0x28(r1), 0, 0
lfd f30, 0x20(r1)
lwz r0, 0x44(r1)
lwz r31, 0x1c(r1)
mtlr r0
addi r1, r1, 0x40
blr
void PaneComponent::draw() {
if (static_cast<PaneManager*>(mpManager)->getDrawInfo() == NULL) {
return;
}
nw4r::lyt::Size size = mpPane->GetSize();
f32 x = mpPane->GetGlobalMtx()._03;
f32 y = mpPane->GetGlobalMtx()._13;
GXColor color = {255, 0, 0, 255};
if (isPointed(0)) {
color.r = 0;
color.b = 255;
}
drawLine_(x - size.width / 2.0f, y - size.height / 2.0f,
x + size.width / 2.0f, y - size.height / 2.0f, 0.0f, 8, color);
drawLine_(x + size.width / 2.0f, y - size.height / 2.0f,
x + size.width / 2.0f, y + size.height / 2.0f, 0.0f, 8, color);
drawLine_(x + size.width / 2.0f, y + size.height / 2.0f,
x - size.width / 2.0f, y + size.height / 2.0f, 0.0f, 8, color);
drawLine_(x - size.width / 2.0f, y + size.height / 2.0f,
x - size.width / 2.0f, y - size.height / 2.0f, 0.0f, 8, color);
}
static bool is_visible(nw4r::lyt::Pane* pane) {

View File

@@ -1597,81 +1597,37 @@ void Base::init() {
mfDrawScrollY = mfScrollY;
}
extern "C" asm void create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer() {
nofralloc
stwu r1, -0x20(r1)
mflr r0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
mr r31, r3
stw r30, 0x18(r1)
mr r30, r5
stw r29, 0x14(r1)
mr r29, r4
stw r4, 0x1d0(r3)
addi r3, r3, 0x10
bl create__Q39textinput10textdrawer4BaseFP12MEMAllocator
lwz r0, 4(r30)
mr r3, r29
lhz r4, 0x1fc(r31)
stw r0, 0x164(r31)
addi r0, r4, 2
lwz r5, 8(r30)
slwi r4, r0, 3
stw r5, 0x168(r31)
lwz r0, 0xc(r30)
stw r0, 0x16c(r31)
stw r29, 0x200(r31)
bl MEMAllocFromAllocator
stw r3, 0x1f8(r31)
addi r3, r31, 0x1f8
bl init__Q49textinput9inputform4Base14RowInfoManagerFv
lhz r0, 0x1fc(r31)
lwz r6, 0x1f8(r31)
slwi r0, r0, 3
add r3, r6, r0
lhz r0, 2(r3)
slwi r0, r0, 3
add r5, r6, r0
lhzx r8, r6, r0
lhz r7, 2(r5)
slwi r0, r8, 3
slwi r4, r7, 3
lhzx r9, r6, r4
add r3, r6, r0
sthx r8, r6, r4
cmplw r9, r9
sth r7, 2(r3)
sth r9, 0(r5)
sth r9, 2(r5)
lhz r3, 0x1fc(r31)
lwz r6, 0x1f8(r31)
addi r0, r3, 1
clrlslwi r0, r0, 16, 3
lhzx r0, r6, r0
slwi r0, r0, 3
add r4, r6, r0
bne create_L1
lhz r7, 2(r4)
slwi r3, r7, 3
lhzx r0, r6, r3
sth r0, 0(r5)
sth r7, 2(r5)
sth r9, 2(r4)
sthx r9, r6, r3
create_L1:
li r3, 0
li r0, 1
sth r3, 4(r5)
sth r0, 6(r5)
stw r5, 0x204(r31)
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
lwz r29, 0x14(r1)
lwz r0, 0x24(r1)
mtlr r0
addi r1, r1, 0x20
blr
void Base::create(MEMAllocator* allocator, EditBuffer* editBuffer) {
mpAllocator = allocator;
textdrawer::Base::create(allocator);
mpString = static_cast<tistring::Decolated*>(editBuffer->mpString);
mpUnfixString = static_cast<tistring::WithAtok*>(editBuffer->mpUnfixString);
mpZiString = static_cast<tistring::WithZi*>(editBuffer->mpZiString);
mriManager.mpAllocator = allocator;
mriManager.mpInfo = static_cast<Info_*>(MEMAllocFromAllocator(allocator, (mriManager.mMaxLength + 2) * sizeof(Info_)));
mriManager.init();
Info_* rows = mriManager.mpInfo;
struct RowCursor { Info_* row; };
RowCursor cursor = { &rows[rows[mriManager.mMaxLength].Next] };
u16 next = cursor.row->Next;
u16 previous = cursor.row->Back;
u16 selectedIndex = rows[next].Back;
rows[next].Back = previous;
rows[previous].Next = next;
cursor.row->Back = selectedIndex;
cursor.row->Next = selectedIndex;
RowCursor listEnd = { &mriManager.mpInfo[mriManager.mpInfo[static_cast<u16>(mriManager.mMaxLength + 1)].Back] };
rows = mriManager.mpInfo;
if (cursor.row->Back == cursor.row->Next) {
next = listEnd.row->Next;
cursor.row->Back = rows[next].Back;
cursor.row->Next = next;
listEnd.row->Next = selectedIndex;
rows[next].Back = selectedIndex;
}
cursor.row->StrCount = 0;
cursor.row->DispRowCount = 1;
mpCursorLine = cursor.row;
}
tistring::Decolated* Base::getCurrentString(bool inputting) {

View File

@@ -1,3 +1,4 @@
#define IPL_BUTTON_IMPLEMENTATION
#include "scene/button/iplButton.h"
#include "iplSceneUI.h"
@@ -968,38 +969,19 @@ namespace ipl {
void OptOutButtonEventHandlerBase::onEventDerived(u32 compId, u32 event, const controller::Interface* con) {
}
extern "C" asm void push_button_queue() {
nofralloc
lwz r5, 0x60(r3)
lwz r0, 0x64(r3)
cmpw r5, r0
bne push_not_full
li r3, 0
blr
push_not_full:
lwz r0, 0x6C(r3)
lwz r6, 0(r4)
mulli r7, r0, 0xC
lwz r5, 4(r4)
lwz r0, 8(r4)
stwx r6, r3, r7
add r4, r3, r7
stw r5, 4(r4)
stw r0, 8(r4)
lwz r4, 0x6C(r3)
lwz r0, 0x60(r3)
addi r4, r4, 1
cmpw r4, r0
stw r4, 0x6C(r3)
blt push_pushed
li r0, 0
stw r0, 0x6C(r3)
push_pushed:
lwz r4, 0x64(r3)
addi r0, r4, 1
stw r0, 0x64(r3)
li r3, 1
blr
extern "C" BOOL push_button_queue(void* storage, const void* item) {
typedef utility::Queue<Button::Command, 8> CommandQueue;
CommandQueue* queue = static_cast<CommandQueue*>(storage);
const Button::Command* command = static_cast<const Button::Command*>(item);
if (queue->count == queue->current) {
return FALSE;
}
queue->items[queue->pushed] = *command;
if (++queue->pushed >= queue->count) {
queue->pushed = 0;
}
queue->current++;
return TRUE;
}
} // namespace scene

View File

@@ -93,7 +93,6 @@ 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 getCurrentChannel__Q33ipl7channel7ManagerFPiPi();
extern "C" void calcNormalRestart__Q33ipl5scene13ChannelSelectFv();
extern "C" void _savegpr_28();
@@ -108,7 +107,6 @@ namespace ipl {
extern "C" void animation__Q33ipl5scene6ButtonFi();
extern "C" void toggle_insert__Q33ipl5scene12SDMenuButtonFi();
extern "C" void calc__Q33ipl6layout6ObjectFv();
extern "C" void updateDiskState__Q33ipl5scene13ChannelSelectFv();
extern "C" void calcChannelModules__Q33ipl5scene13ChannelSelectFv();
extern "C" void calcChannelThumbnails__Q33ipl5scene13ChannelSelectFv();
extern "C" asm void calc__Q33ipl5scene5clockFv();
@@ -858,15 +856,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] = {
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x284),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x2C8),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x30C),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x328),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x358)
};
void ChannelSelect::createChannelThumbnails() {
ChannelObj* chanObj = NULL;
@@ -1333,258 +1323,98 @@ namespace ipl {
}
}
extern "C" asm void updateDiskState__Q33ipl5scene13ChannelSelectFv() {
nofralloc
stwu r1, -0x20(r1)
mflr r0
stw r0, 0x24(r1)
addi r11, r1, 0x20
bl _savegpr_27
lis r28, smArg__Q23ipl6System@ha
lwz r0, 0xf0(r3)
addi r28, r28, smArg__Q23ipl6System@l
mr r31, r3
lwz r4, 0xa8(r28)
cmplwi r0, 0x6
lwz r27, 0x4(r4)
bgt updateDiskState_done
lis r4, updateDiskState_jumptable@ha
slwi r0, r0, 2
addi r4, r4, updateDiskState_jumptable@l
lwzx r4, r4, r0
mtctr r4
bctr
updateDiskState_case0:
lwz r4, 0xa4(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_done
lwz r3, 0x94(r3)
lis r29, scPaneName_N_GCIcon@ha
addi r4, r29, scPaneName_N_GCIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
lwz r12, 0x3c(r12)
mtctr r12
bctrl
li r4, 0x1
bl SetVisible__Q34nw4r3lyt4PaneFb
lwz r3, 0x94(r31)
lis r30, scPaneName_N_DiscUpdateIcon@ha
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
lwz r12, 0x3c(r12)
mtctr r12
bctrl
li r4, 0x0
bl SetVisible__Q34nw4r3lyt4PaneFb
cmpwi r27, 0x5
bne updateDiskState_case0_diskState3
lwz r4, 0xc0(r31)
lwz r3, 0x84(r28)
subi r4, r4, 0xf
subic r0, r4, 0x1
subfe r4, r0, r4
bl getDiskThumbnail__Q33ipl7channel7ManagerFb
lwz r0, 0xc0(r31)
mr r27, r3
cmpwi r0, 0xf
bne updateDiskState_case0_afterThumb
lwz r3, 0xa8(r28)
addi r4, r31, 0xf8
addi r5, r31, 0xfc
bl getDiskInfo__Q33ipl3bs27ManagerFPPcPPc
updateDiskState_case0_afterThumb:
cmpwi r27, 0x0
beq updateDiskState_case0_afterLayout
lwz r3, 0x90(r31)
mr r4, r27
bl createDiskLayout__Q33ipl5scene10ChannelObjFPv
updateDiskState_case0_afterLayout:
lbz r0, 0xf4(r31)
cmpwi r0, 0x0
bne updateDiskState_case0_afterDiskIn
mr r3, r31
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
updateDiskState_case0_afterDiskIn:
li r3, 0x0
li r0, 0x1
stb r3, 0xf4(r31)
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case0_diskState3:
cmpwi r27, 0x3
bne updateDiskState_case0_diskState6
lwz r3, 0x84(r28)
li r0, 0x0
addi r4, r29, scPaneName_N_GCIcon@l
li r5, 0x1
stb r0, 0x1b81(r3)
lwz r3, 0x94(r31)
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
lwz r12, 0x3c(r12)
mtctr r12
bctrl
li r4, 0x0
bl SetVisible__Q34nw4r3lyt4PaneFb
lwz r3, 0x94(r31)
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
lwz r12, 0x3c(r12)
mtctr r12
bctrl
li r4, 0x1
bl SetVisible__Q34nw4r3lyt4PaneFb
lwz r3, 0x94(r31)
bl setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object
lwz r3, 0x98(r31)
cmpwi r3, 0x0
beq updateDiskState_case0_state3_afterAnim
li r0, 0x2
stw r0, 0x18(r3)
lwz r28, 0x98(r31)
mr r3, r28
bl initFrame__Q33ipl7utility15FrameControllerFv
li r0, 0x1
stw r0, 0x14(r28)
updateDiskState_case0_state3_afterAnim:
lbz r0, 0xf4(r31)
cmpwi r0, 0x0
bne updateDiskState_case0_state3_afterDiskIn
mr r3, r31
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
updateDiskState_case0_state3_afterDiskIn:
li r3, 0x0
li r0, 0x1
stb r3, 0xf4(r31)
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case0_diskState6:
cmpwi r27, 0x6
bne updateDiskState_done
lbz r0, 0xf4(r31)
cmpwi r0, 0x0
bne updateDiskState_case0_state6_afterDiskIn
mr r3, r31
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
updateDiskState_case0_state6_afterDiskIn:
li r3, 0x0
li r0, 0x4
stb r3, 0xf4(r31)
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case1:
lwz r4, 0x8c(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_done
lwz r3, 0x90(r3)
bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv
cmpwi r27, 0x5
bne updateDiskState_case1_setState3
lwz r3, 0x90(r31)
lwz r3, 0x34(r3)
cmpwi r3, 0x0
beq updateDiskState_case1_setState2
li r0, 0x2
stw r0, 0x18(r3)
lwz r3, 0x90(r31)
lwz r27, 0x34(r3)
mr r3, r27
bl initFrame__Q33ipl7utility15FrameControllerFv
li r0, 0x1
stw r0, 0x14(r27)
updateDiskState_case1_setState2:
li r0, 0x2
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case1_setState3:
li r0, 0x3
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case2:
cmpwi r27, 0x5
bne updateDiskState_case2_doOut
lwz r4, 0x84(r28)
lbz r0, 0x1b81(r4)
cmpwi r0, 0x0
beq updateDiskState_done
updateDiskState_case2_doOut:
lwz r3, 0xa0(r3)
lwz r0, 0x14(r3)
cmpwi r0, 0x1
beq updateDiskState_done
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:
cmpwi r27, 0x3
bne updateDiskState_case3_doOut
lwz r4, 0x84(r28)
lbz r0, 0x1b81(r4)
cmpwi r0, 0x0
beq updateDiskState_done
updateDiskState_case3_doOut:
lwz r3, 0xa0(r3)
lwz r0, 0x14(r3)
cmpwi r0, 0x1
beq updateDiskState_done
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:
lwz r4, 0x8c(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_done
li r0, 0x5
stw r0, 0xf0(r3)
b updateDiskState_done
updateDiskState_case5:
cmpwi r27, 0x6
beq updateDiskState_done
lwz r4, 0xa0(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_done
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
lwz r3, 0x90(r31)
bl changeDisk__Q33ipl5scene10ChannelObjFv
li r0, 0x6
stw r0, 0xf0(r31)
b updateDiskState_done
updateDiskState_case6:
lwz r4, 0x8c(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_done
lwz r3, 0x90(r3)
bl destroyDiskLayout__Q33ipl5scene10ChannelObjFv
lwz r3, 0x90(r31)
bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv
li r0, 0x0
stw r0, 0xf0(r31)
updateDiskState_done:
addi r11, r1, 0x20
bl _restgpr_27
lwz r0, 0x24(r1)
mtlr r0
addi r1, r1, 0x20
blr
void ChannelSelect::updateDiskState() {
int diskState = System::getBS2Manager()->getIPLState();
switch (mDiskState) {
case DISK_STATE_READ:
if (!mpDiskOutAnim->isPlaying()) {
mpDiskLayout->FindPaneByName(scPaneName_N_GCIcon)->SetVisible(true);
mpDiskLayout->FindPaneByName(scPaneName_N_DiscUpdateIcon)->SetVisible(false);
if (diskState == bs2::IPL_STATE_RVL_GAME) {
void* thumbnail = System::getChannelManager()->getDiskThumbnail(mState != STATE_INACTIVE);
if (mState == STATE_INACTIVE) {
System::getBS2Manager()->getDiskInfo(&mspDiskID, &mspDiskMaker);
}
if (thumbnail != NULL) {
mpDiskChanObj->createDiskLayout(thumbnail);
}
if (!mbDiskInserted) {
startDiskInEvent();
}
mbDiskInserted = false;
mDiskState = DISK_STATE_PLAY_THUMB;
} else if (diskState == bs2::IPL_STATE_DISK_UPDATE) {
System::getChannelManager()->setDiskChannelReady(false);
mpDiskLayout->FindPaneByName(scPaneName_N_GCIcon)->SetVisible(false);
mpDiskLayout->FindPaneByName(scPaneName_N_DiscUpdateIcon)->SetVisible(true);
ChannelObj::setLangPane(mpDiskLayout);
if (mpDiskAnim != NULL) {
mpDiskAnim->setAnmType(ANIM_TYPE_LOOP);
mpDiskAnim->play();
}
if (!mbDiskInserted) {
startDiskInEvent();
}
mbDiskInserted = false;
mDiskState = DISK_STATE_PLAY_THUMB;
} else if (diskState == bs2::IPL_STATE_GC_GAME) {
if (!mbDiskInserted) {
startDiskInEvent();
}
mbDiskInserted = false;
mDiskState = DISK_STATE_GC_GAME_WAIT;
}
}
break;
case DISK_STATE_PLAY_THUMB:
if (!mpDiskFadeAnim->isPlaying()) {
mpDiskChanObj->resetDiskTitleName();
if (diskState == bs2::IPL_STATE_RVL_GAME) {
if (mpDiskChanObj->mpThumbAnim != NULL) {
mpDiskChanObj->mpThumbAnim->setAnmType(ANIM_TYPE_LOOP);
layout::Animator* thumbnailAnim = mpDiskChanObj->mpThumbAnim;
thumbnailAnim->play();
}
mDiskState = DISK_STATE_RVL_GAME;
} else {
mDiskState = DISK_STATE_DISK_UPDATE;
}
}
break;
case DISK_STATE_RVL_GAME:
if ((diskState != bs2::IPL_STATE_RVL_GAME || System::getChannelManager()->isDiskChannelReady()) && !mpDiskInAnim->isPlaying()) {
startDiskOutEvent();
mpDiskChanObj->changeDisk();
mDiskState = DISK_STATE_DESTROY;
}
break;
case DISK_STATE_DISK_UPDATE:
if ((diskState != bs2::IPL_STATE_DISK_UPDATE || System::getChannelManager()->isDiskChannelReady()) && !mpDiskInAnim->isPlaying()) {
startDiskOutEvent();
mpDiskChanObj->changeDisk();
mDiskState = DISK_STATE_DESTROY;
}
break;
case DISK_STATE_GC_GAME_WAIT:
if (!mpDiskFadeAnim->isPlaying()) {
mDiskState = DISK_STATE_GC_GAME;
}
break;
case DISK_STATE_GC_GAME:
if (diskState != bs2::IPL_STATE_GC_GAME && !mpDiskInAnim->isPlaying()) {
startDiskOutEvent();
mpDiskChanObj->changeDisk();
mDiskState = DISK_STATE_DESTROY;
}
break;
case DISK_STATE_DESTROY:
if (!mpDiskFadeAnim->isPlaying()) {
mpDiskChanObj->destroyDiskLayout();
mpDiskChanObj->resetDiskTitleName();
mDiskState = DISK_STATE_READ;
}
break;
}
}

View File

@@ -338,79 +338,24 @@ namespace ipl {
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_C, frame);
}
extern "C" asm void resetAllSound__Q33ipl3snd6SystemFv() {
nofralloc
stwu r1, -0x20(r1)
mflr r0
stw r0, 0x24(r1)
addi r11, r1, 0x20
bl _savegpr_26
li r26, 0
lis r28, _seBlk__Q23ipl3snd@ha
lis r3, 1
li r31, 0
mr r29, r26
addi r28, r28, _seBlk__Q23ipl3snd@l
subi r30, r3, 1
resetAllSound_loop:
lwzx r3, r28, r31
add r27, r28, r31
cmpwi r3, 0
beq resetAllSound_clear
lwz r12, 0(r3)
li r4, 0
lwz r12, 0x18(r12)
mtctr r12
bctrl
resetAllSound_clear:
stw r29, 0x4(r27)
addi r26, r26, 1
cmpwi r26, 0x10
addi r31, r31, 0xc
stw r30, 0x8(r27)
blt resetAllSound_loop
lwz r3, _mainBGMHandle__Q23ipl3snd
cmpwi r3, 0
beq resetAllSound_banner
lwz r0, 0(r3)
cmpwi r0, 0
beq resetAllSound_banner
lwz r3, 0(r3)
li r4, 0
lwz r12, 0(r3)
lwz r12, 0x18(r12)
mtctr r12
bctrl
resetAllSound_banner:
lis r31, sBannerSoundPlayer__Q23ipl3snd@ha
li r4, 0
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
bl stop__17BannerSoundPlayerFUl
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
li r4, 0
li r5, 0
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
li r4, 1
li r5, 0
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
li r4, 2
li r5, 0
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
lfs f1, scSoundZeroF
li r4, 0
bl SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi
lfs f1, scSoundZeroF
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
bl setMasterVolume__17BannerSoundPlayerFf
addi r11, r1, 0x20
bl _restgpr_26
lwz r0, 0x24(r1)
mtlr r0
addi r1, r1, 0x20
blr
int System::resetAllSound() {
tagSSeInfo* block;
int i = 0;
for (; i < 16; i++) {
block = &_seBlk[i];
block->handle.Stop(0);
block->name = NULL;
block->id = 0xFFFF;
}
if (_mainBGMHandle != NULL && _mainBGMHandle->IsAttachedSound()) {
_mainBGMHandle->detail_GetAttachedSound()->Stop(0);
}
sBannerSoundPlayer.stop(0);
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_A, 0);
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_B, 0);
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_C, 0);
nw4r::snd::detail::AxManager::GetInstance().SetMasterVolume(scSoundZeroF, 0);
sBannerSoundPlayer.setMasterVolume(scSoundZeroF);
}
}

View File

@@ -433,138 +433,47 @@ TVRCSendStartAsync_exit:
blr
}
extern "C" asm void __FTVRCLoop0Handler__7LibTVRCFP7OSAlarmP9OSContext() {
nofralloc
stwu r1, -0x10(r1)
mflr r0
stw r0, 0x14(r1)
stw r31, 0xc(r1)
mr r31, r4
stw r30, 0x8(r1)
mr r30, r3
lwz r0, _isActive__7LibTVRC
cmpwi r0, 0
bne TVRCLoop0_active
li r0, 2
stw r0, _func0state__7LibTVRC
TVRCLoop0_active:
lwz r0, _func0state__7LibTVRC
cmpwi r0, 1
bne TVRCLoop0_check_state
li r0, 0
stw r0, _func0state__7LibTVRC
b TVRCLoop0_prepare
TVRCLoop0_check_state:
cmpwi r0, 0
bne TVRCLoop0_check_stop
lwz r4, _loop0count__7LibTVRC
li r0, 0
lwz r3, _isOnOff__7LibTVRC
addi r4, r4, 1
stw r0, _func0state__7LibTVRC
stw r4, _loop0count__7LibTVRC
stw r3, _isLastOnOff__7LibTVRC
b TVRCLoop0_prepare
TVRCLoop0_check_stop:
cmpwi r0, 2
bne TVRCLoop0_prepare
lwz r0, _isReserveDeactive__7LibTVRC
cmpwi r0, 0
bne TVRCLoop0_stop
bl OSGetTime
lis r5, 0x8000
lwz r6, _totalStartTime__7LibTVRC+4
lwz r5, 0xf8(r5)
li r0, 0x3e8
subfc r4, r6, r4
lwz r7, _totalStartTime__7LibTVRC
srwi r6, r5, 2
li r5, 0
divwu r6, r6, r0
subfe r3, r7, r3
bl __div2i
lwz r7, _limitMilli__7LibTVRC
li r6, 0
xoris r5, r3, 0x8000
xoris r0, r6, 0x8000
subfc r3, r4, r7
subfe r5, r5, r0
subfe r5, r0, r0
neg. r5, r5
beq TVRCLoop0_continue
TVRCLoop0_stop:
li r3, 1
bl WPADSetSensorBarPower
li r0, 0
stw r0, _isActive__7LibTVRC
b TVRCLoop0_exit
TVRCLoop0_continue:
lwz r4, _isUseRepeatCode__7LibTVRC
lwz r3, _repeatBitLength__7LibTVRC
lwz r0, _repeatBitArray__7LibTVRC
stw r4, _isRepeatActive__7LibTVRC
stw r3, _bitLength__7LibTVRC
stw r0, _bitArray__7LibTVRC
stw r6, _isOnOff__7LibTVRC
stw r6, _isLastOnOff__7LibTVRC
stw r6, _func0state__7LibTVRC
stw r6, _loop0count__7LibTVRC
TVRCLoop0_prepare:
li r3, 0
lwz r7, _bitArray__7LibTVRC
stw r3, _ctCombo__7LibTVRC
lwz r8, _bitLength__7LibTVRC
lwz r4, _loop0count__7LibTVRC
lwz r0, _isLastOnOff__7LibTVRC
b TVRCLoop0_check_bits
TVRCLoop0_bit_loop:
srawi r5, r4, 3
addi r3, r3, 1
addze r6, r5
srawi r5, r4, 3
lbzx r6, r7, r6
addze r5, r5
slwi r5, r5, 3
stw r3, _ctCombo__7LibTVRC
subf r5, r5, r4
subfic r5, r5, 7
sraw r5, r6, r5
clrlwi r5, r5, 31
cmpw r0, r5
stw r5, _isOnOff__7LibTVRC
beq TVRCLoop0_bit_match
li r3, -1
li r0, 0
stw r3, _func1state__7LibTVRC
mr r3, r30
mr r4, r31
stw r0, _func0state__7LibTVRC
bl __FTVRCLoop1Handler__7LibTVRCFP7OSAlarmP9OSContext
b TVRCLoop0_exit
TVRCLoop0_bit_match:
addi r4, r4, 1
stw r5, _isLastOnOff__7LibTVRC
mr r0, r5
stw r4, _loop0count__7LibTVRC
TVRCLoop0_check_bits:
cmpw r4, r8
blt TVRCLoop0_bit_loop
addi r3, r3, 1
li r5, -1
li r0, 2
stw r3, _ctCombo__7LibTVRC
mr r3, r30
mr r4, r31
stw r5, _func1state__7LibTVRC
stw r0, _func0state__7LibTVRC
bl __FTVRCLoop1Handler__7LibTVRCFP7OSAlarmP9OSContext
TVRCLoop0_exit:
lwz r0, 0x14(r1)
lwz r31, 0xc(r1)
lwz r30, 0x8(r1)
mtlr r0
addi r1, r1, 0x10
blr
void LibTVRC::__FTVRCLoop0Handler(OSAlarm* alarm, OSContext* ctx) {
if (!_isActive) {
_func0state = 2;
}
if (_func0state == 1) {
_func0state = 0;
} else if (_func0state == 0) {
_loop0count++;
_isLastOnOff = _isOnOff;
_func0state = 0;
} else if (_func0state == 2) {
if (_isReserveDeactive || OSTicksToMilliseconds(OSGetTime() - _totalStartTime) > _limitMilli) {
WPADSetSensorBarPower(TRUE);
_isActive = FALSE;
return;
}
_isRepeatActive = _isUseRepeatCode;
_bitLength = _repeatBitLength;
_bitArray = _repeatBitArray;
_isOnOff = FALSE;
_isLastOnOff = FALSE;
_func0state = 0;
_loop0count = 0;
}
_ctCombo = 0;
while (_loop0count < (int)_bitLength) {
_isOnOff = (((u8*)_bitArray)[_loop0count / 8] >> (7 - _loop0count % 8)) & 1;
_ctCombo++;
if (_isLastOnOff != _isOnOff) {
_func1state = -1;
_func0state = 0;
__FTVRCLoop1Handler(alarm, ctx);
return;
}
_loop0count++;
_isLastOnOff = _isOnOff;
}
_ctCombo++;
_func1state = -1;
_func0state = 2;
__FTVRCLoop1Handler(alarm, ctx);
}
namespace LibTVRC {

View File

@@ -0,0 +1,541 @@
# da7 de-asm attempts
Worktree w0929-fix-board, branch agent/w1005/da7. Starting commit 5e7b5ad045a8cf930106fab1a6c3294b0015e38b.
All 12 assigned functions still contain placeholder asm. Prior trials read in da5.attempts.md and asm-conversions.attempts.md; retain only exact C/C++ conversions.
Scratch source snapshots, Ghidra exports, trial records, and gate outputs live in build/da7/. The local exporter copy only redirects its project directory into this worktree.
- src/system/iplChannelManager getTitleName__Q33ipl7channel7ManagerCFiii title-01-direct-array: 94.84507%; src 0x124 base 0x11c insns 73/71 | --- replace mine 14:15 base 14:15 | POOL IDENTICAL up to 9 (mine=9 base=9)
- src/system/iplChannelManager getTitleName__Q33ipl7channel7ManagerCFiii title-02-language-pointer: 98.943665%; src 0x11c base 0x11c insns 71/71 | diffs 12: [17, 18, 19, 20, 38, 41, 42, 43, 44, 45, 54, 59] | POOL IDENTICAL up to 9 (mine=9 base=9)
- src/system/iplChannelManager getTitleName__Q33ipl7channel7ManagerCFiii title-03-character-helper: COMPILE FAIL ne\iplSceneManager.h:14
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\system\iplSystem.h:15
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\iplSystem.h:9
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\src\system\iplChannelManager.cpp:6)
### mwcceppc.exe Compiler:
# File: src\system\iplChannelManager.cpp
# -----------------------------------------
# 472: static inline bool hasTitleName(const SMetaHdr* header, int language, int nameIndex) {
# Warning: ^^^^^^^^
# (10349) implicit 'int' is no longer supported in C++
### mwcceppc.exe Compiler:
# 472: static inline bool hasTitleName(const SMetaHdr* header, int language, int nameIndex) {
# Error: ^
# (10115) ')' expected
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
- src/system/iplChannelManager getTitleName__Q33ipl7channel7ManagerCFiii title-03b-character-helper: 92.1831%; src 0x128 base 0x11c insns 74/71 | --- delete mine 7:8 base 7:7 | POOL IDENTICAL up to 9 (mine=9 base=9)
- src/system/iplChannelManager getTitleName__Q33ipl7channel7ManagerCFiii title-04-name-walk: 96.19718%; src 0x11c base 0x11c insns 71/71 | diffs 12: [17, 18, 19, 20, 38, 41, 42, 43, 44, 45, 54, 59] | POOL IDENTICAL up to 9 (mine=9 base=9)
- src/scene/button/iplButton push__Q33ipl7utility36Queue<Q43ipl5scene6Button7Command,8>FRCQ43ipl5scene6Button7Command queue-01-template: 100.0%; src 0x70 base 0x70 insns 28/28 | diffs 0: [] | POOL IDENTICAL up to 32 (mine=32 base=32)
- src/system/TVRC TVRCSendStartAsync tvrc-send-01-typed-records: 98.93939%; src 0x31c base 0x318 insns 199/198 | --- replace mine 16:17 base 16:17 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-send-02-entry-reference: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/sound/iplSound resetAllSound__Q33ipl3snd6SystemFv reset-01-block-local: COMPILE FAIL -ipl-workers\w0929-fix-
# board\include\scene\iplSceneBase.h:6
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\iplSceneManager.h:14
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\system\iplSystem.h:15
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\build\da7\trials\reset-01-block-local\iplSound.cpp:9)
### mwcceppc.exe Compiler:
# File: build\da7\trials\reset-01-block-local\iplSound.cpp
# -----------------------------------------------------------
# 341: void System::resetAllSound() {
# Error: ^
# (10563) identifier 'ipl::snd::System::resetAllSound()' redeclared as 'void
# ()'
# Too many errors printed, aborting program
User break, cancelled...
- src/system/TVRC TVRCSendStartAsync tvrc-send-03-entry-pointer: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/sound/iplSound resetAllSound__Q33ipl3snd6SystemFv reset-01b-block-local: 97.94118%; insns 69/68 diffs 40 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/scene/button/iplButton push__Q33ipl7utility36Queue<Q43ipl5scene6Button7Command,8>FRCQ43ipl5scene6Button7Command queue-02-specialization: COMPILE FAIL ted
# (included from:
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\iplSceneBase.h:6
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\iplFaderSceneBase.h:4
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\iplSceneUIHeader.h:5
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\button\iplButton.h:4
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\src\scene\button\iplButton.cpp:1)
### mwcceppc.exe Compiler:
# File: src\scene\button\iplButton.cpp
# ---------------------------------------
# 10: extern namespace ipl {
# Warning: ^^^^^^^^^
# (10349) implicit 'int' is no longer supported in C++
### mwcceppc.exe Compiler:
# 10: extern namespace ipl {
# Error: ^^^^^^^^^
# (10121) declaration syntax error
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
- src/system/TVRC TVRCSendStartAsync tvrc-send-04-current-file-local: 97.72222%; insns 196/198 diffs 158 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/scene/button/iplButton push__Q33ipl7utility36Queue<Q43ipl5scene6Button7Command,8>FRCQ43ipl5scene6Button7Command queue-02b-specialization: COMPILE FAIL .cpp
# ---------------------------------------
# 40: }
# Warning: ^
# (10184) return value expected
# (included from:
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\iplSceneBase.h:6
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\iplFaderSceneBase.h:4
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\iplSceneUIHeader.h:5
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\button\iplButton.h:4
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\src\scene\button\iplButton.cpp:1)
### mwcceppc.exe Compiler:
# File: src\scene\button\iplButton.cpp
# ---------------------------------------
# 27: char scPaneName_T_Stop[];
# Error: ^
# (10145) data type is incomplete
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
- src/sound/iplSound resetAllSound__Q33ipl3snd6SystemFv reset-02-loop-local-order: 100.0%; insns 68/68 diffs 0 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/scene/button/iplButton push__Q33ipl7utility36Queue<Q43ipl5scene6Button7Command,8>FRCQ43ipl5scene6Button7Command queue-02c-tail-specialization: COMPILE FAIL drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\iplSceneBase.h:6
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\iplFaderSceneBase.h:4
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\iplSceneUIHeader.h:5
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\button\iplButton.h:4
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\src\scene\button\iplButton.cpp:1)
### mwcceppc.exe Compiler:
# File: src\scene\button\iplButton.cpp
# ---------------------------------------
# 985: ::Button::Command, 8>::push(const scene::Button::Command& item) {
# Error: ^
# (10333) object 'ipl::utility::Queue<ipl::scene::Button::Command,
# 8>::push(const ipl::scene::Button::Command &)' redefined
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
- src/system/TVRC TVRCSendStartAsync tvrc-send-05-timing-helper: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/scene/button/iplButton push_button_queue queue-03-typed-wrapper: COMPILE FAIL ects\wii-ipl-workers\w0929-fix-
# board\include\iplSceneUIHeader.h:5
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\button\iplButton.h:4
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\build\da7\trials\queue-03-typed-wrapper\iplButton.cpp:1)
### mwcceppc.exe Compiler:
# File: build\da7\trials\queue-03-typed-wrapper\iplButton.cpp
# --------------------------------------------------------------
# 974: const Button::Command* command = static_cast<const Button::Command*>(item);
# Error: ^
# (10412) illegal access from 'ipl::scene::Button' to protected/private
# member 'ipl::scene::Button::Command'
# Too many errors printed, aborting program
User break, cancelled...
- src/system/TVRC TVRCSendStartAsync tvrc-send-06-declaration-order: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/sound/iplSound resetAllSound__Q33ipl3snd6SystemFv reset-03-void-return: 100.0%; src 0x110 base 0x110 insns 68/68 | diffs 0: [] | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-send-07-entry-helper: 99.36869%; insns 199/198 diffs 145 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-send-08-entry-helper: 99.36869%; insns 199/198 diffs 145 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/sound/iplSound resetAllSound__Q33ipl3snd6SystemFv reset-04-existing-zero-constant: 100.0%; insns 68/68 diffs 0 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-send-09-entry-helper: 99.36869%; insns 199/198 diffs 145 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-send-10-entry-helper: 99.36869%; insns 199/198 diffs 145 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/keyboard/tiGUIManager draw__Q39textinput3gui13PaneComponentFv draw-01-size-color-locals: 96.92308%; insns 104/104 diffs 14 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/keyboard/tiGUIManager draw__Q39textinput3gui13PaneComponentFv draw-02-half-literal: 96.92308%; insns 104/104 diffs 14 | POOL IDENTICAL up to 0 (mine=0 base=0)
resetAllSound return ABI: existing header declares int and HomeButtonMenu callback returns it. The target final call is BannerSoundPlayer::setMasterVolume, declared void, followed only by callee-save/LR restoration and blr. No return value is assigned. Changing the public declaration to void breaks that callback and was restored. Preserve the original int signature with no invented return assignment; the target proves the indeterminate return path. Reuse scSoundZeroF to avoid adding a literal to .sdata2.
- src/keyboard/tiGUIManager draw__Q39textinput3gui13PaneComponentFv draw-03-half-expression: 96.92308%; insns 104/104 diffs 14 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/keyboard/tiGUIManager draw__Q39textinput3gui13PaneComponentFv draw-04-division: 100.0%; insns 104/104 diffs 0 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC __FTVRCLoop0Handler__7LibTVRCFP7OSAlarmP9OSContext tvrc-loop-01-state-branches: 94.916664%; insns 119/120 diffs 56 | POOL IDENTICAL up to 0 (mine=0 base=0)
## resetAllSound accepted
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/sound/iplSound] pool: IDENTICAL
[src/sound/iplSound] objdiff: code 5576/5576 data 3316/3316 functions 57/57 fuzzy 100.0000 linked code 5576
[src/sound/iplSound] instruction-exact functions: 56/57
[src/sound/iplSound] section .bss size 3128 match 100.0
[src/sound/iplSound] section .ctors size 4 match 100.0
[src/sound/iplSound] section .data size 120 match 100.0
[src/sound/iplSound] section .rodata size 24 match 100.0
[src/sound/iplSound] section .sbss size 16 match 100.0
[src/sound/iplSound] section .sdata2 size 24 match 100.0
[src/sound/iplSound] section .text size 5576 match 99.49785
[src/sound/iplSound] baseline: code 5576/5576 data 3316 functions 57 fuzzy 100.0000
regressions vs baseline: 0
global matched_code_percent: 92.78013 -> 92.78013
global fuzzy_match_percent: 99.78155 -> 99.78155
global complete_code_percent: 76.40339 -> 76.40339
global matched_data_percent: 99.99410 -> 99.99410
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
- src/keyboard/tiGUIManager draw__Q39textinput3gui13PaneComponentFv draw-05-compiler-half-constant: 100.0%; insns 104/104 diffs 0 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC __FTVRCLoop0Handler__7LibTVRCFP7OSAlarmP9OSContext tvrc-loop-02-state-store-order: 95.333336%; insns 119/120 diffs 49 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC __FTVRCLoop0Handler__7LibTVRCFP7OSAlarmP9OSContext tvrc-loop-03-for-loop: 95.333336%; insns 119/120 diffs 49 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/keyboard/tiGUIManager draw__Q39textinput3gui13PaneComponentFv draw-06-natural-color: 100.0%; insns 104/104 diffs 0 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/keyboard/tiGUIManager draw__Q39textinput3gui13PaneComponentFv draw-07-natural-constants: 100.0%; insns 104/104 diffs 0 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC __FTVRCLoop0Handler__7LibTVRCFP7OSAlarmP9OSContext tvrc-loop-04-bit-read-before-count: 100.0%; insns 120/120 diffs 0 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/scene/button/iplButton push_button_queue queue-04-friend-wrapper: COMPILE FAIL rd\include\scene\iplSceneBase.h:6
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\iplFaderSceneBase.h:4
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\iplSceneUIHeader.h:5
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\button\iplButton.h:4
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\build\da7\trials\queue-04-friend-wrapper\iplButton.cpp:2)
### mwcceppc.exe Compiler:
# In: include\scene\button\iplButton.h
# -----------------------------------------
# 322: friend BOOL ::push_button_queue(void*, const void*);
# Error: ^^^^
# (10121) declaration syntax error
# Too many errors printed, aborting program
User break, cancelled...
- src/scene/channelSelect/iplChannelSelect updateDiskState__Q33ipl5scene13ChannelSelectFv disk-01-state-switch: COMPILE FAIL e\scene\iplSceneBase.h:6
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\scene\iplSceneManager.h:14
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\include\iplSceneUI.h:11
# Z:\mnt\drive2\projects\wii-ipl-workers\w0929-fix-
# board\build\da7\trials\disk-01-state-switch\iplChannelSelect.cpp:4)
### mwcceppc.exe Compiler:
# File: build\da7\trials\disk-01-state-switch\iplChannelSelect.cpp
# -------------------------------------------------------------------
# 1373: if (mpDiskChanObj->mpThumbnailAnim != NULL) {
# Error: ^^^^^^^^^^^^^^^
# (10140) undefined identifier 'mpThumbnailAnim'
# Too many errors printed, aborting program
User break, cancelled...
## PaneComponent::draw accepted
The size division by 2.0f matches the target multiplication scheduling. Replacing the assembly-only color/float objects with ordinary literals removes duplicate constants. All code and data match and the linked DOL passes.
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/keyboard/tiGUIManager] pool: IDENTICAL
[src/keyboard/tiGUIManager] objdiff: code 5916/5916 data 392/392 functions 42/42 fuzzy 100.0000 linked code 5916
[src/keyboard/tiGUIManager] instruction-exact functions: 42/42
[src/keyboard/tiGUIManager] section .data size 376 match 100.0
[src/keyboard/tiGUIManager] section .sdata2 size 16 match 100.0
[src/keyboard/tiGUIManager] section .text size 5916 match 100.0
[src/keyboard/tiGUIManager] baseline: code 5916/5916 data 392 functions 42 fuzzy 100.0000
regressions vs baseline: 0
global matched_code_percent: 92.78013 -> 92.78013
global fuzzy_match_percent: 99.78155 -> 99.78155
global complete_code_percent: 76.40339 -> 76.40339
global matched_data_percent: 99.99410 -> 99.99410
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
- src/scene/button/iplButton push_button_queue queue-05-namespace-friend: None%; insns 28/28 diffs 0 | POOL IDENTICAL up to 32 (mine=32 base=32)
- src/scene/channelSelect/iplChannelSelect updateDiskState__Q33ipl5scene13ChannelSelectFv disk-01b-state-switch: 99.38261%; insns 230/230 diffs 7 | POOL IDENTICAL up to 98 (mine=98 base=98)
## FTVRCLoop0Handler accepted
The target reads the signal byte before storing the incremented combo count. Moving the byte read before that increment preserves the initial zero store and matches all 120 instructions. No volatility change was needed.
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/system/TVRC] pool: IDENTICAL
[src/system/TVRC] objdiff: code 2312/2312 data 280/280 functions 9/9 fuzzy 100.0000 linked code 2312
[src/system/TVRC] instruction-exact functions: 9/9
[src/system/TVRC] section .bss size 96 match 100.0
[src/system/TVRC] section .sbss size 120 match 100.0
[src/system/TVRC] section .sdata size 32 match 100.0
[src/system/TVRC] section .sdata2 size 32 match 100.0
[src/system/TVRC] section .text size 2312 match 100.0
[src/system/TVRC] baseline: code 2312/2312 data 280 functions 9 fuzzy 100.0000
regressions vs baseline: 0
global matched_code_percent: 92.78013 -> 92.78013
global fuzzy_match_percent: 99.78155 -> 99.78155
global complete_code_percent: 76.40339 -> 76.40339
global matched_data_percent: 99.99410 -> 99.99410
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
- src/scene/channelSelect/iplChannelSelect updateDiskState__Q33ipl5scene13ChannelSelectFv disk-02-inactive-thumbnail: 99.934784%; insns 230/230 diffs 3 | POOL IDENTICAL up to 98 (mine=98 base=98)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-01-row-manager-body: 97.708336%; insns 72/72 diffs 26 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/system/TVRC TVRCSendStartAsync tvrc-send-11-separate-command-locals: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-send-12-const-file: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-send-13-signed-repeat-offset: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-send-14-command-offset-local: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/scene/channelSelect/iplChannelSelect updateDiskState__Q33ipl5scene13ChannelSelectFv disk-03-thumbnail-anim-local: 98.195656%; insns 228/230 diffs 87 | POOL IDENTICAL up to 98 (mine=98 base=98)
Source-search setup: the provided global limiter did not start the first title-name search while manual work continued. A local copy uses one worker-local slot and cached compiler commands/target objects so clean gates cannot delete its inputs. Its definition matcher excludes calls/prototypes and accepts a qualified member name. Mutation rules are unchanged. Run only one local source search at a time.
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-02-row-selection-helper: COMPILE FAIL ### mwcceppc.exe Compiler:
# File: build\da7\trials\form-02-row-selection-helper\tiInputForm.cpp
# ----------------------------------------------------------------------
# 1601: Info_* selected = &rows[rows[capacity].Next];
# Error: ^^^^^
# (10140) undefined identifier 'Info_'
# Too many errors printed, aborting program
User break, cancelled...
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-03-const-row-reference: COMPILE FAIL ### mwcceppc.exe Compiler:
# File: build\da7\trials\form-03-const-row-reference\tiInputForm.cpp
# ---------------------------------------------------------------------
# 1601: Info_* selected = &rows[rows[capacity].Next];
# Error: ^^^^^
# (10140) undefined identifier 'Info_'
# Too many errors printed, aborting program
User break, cancelled...
## push_button_queue accepted
The normal Queue template matched its instructions but moved the weak definition ahead of reserveText, changing the DOL. The final ordinary C-linkage wrapper uses the real Queue<Button::Command, 8> and retains the original function location. A guarded friend grants access to Command without changing the class layout or other translation units. Source push_button_queue and the target Queue::push are both 28 instructions with zero differences.
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/scene/button/iplButton] pool: IDENTICAL
[src/scene/button/iplButton] objdiff: code 7624/7624 data 1744/1744 functions 42/42 fuzzy 100.0000 linked code 7624
[src/scene/button/iplButton] instruction-exact functions: 41/42
[src/scene/button/iplButton] section .data size 944 match 100.0
[src/scene/button/iplButton] section .rodata size 552 match 100.0
[src/scene/button/iplButton] section .sdata size 192 match 100.0
[src/scene/button/iplButton] section .sdata2 size 56 match 100.0
[src/scene/button/iplButton] section .text size 7624 match 98.53095
[src/scene/button/iplButton] baseline: code 7624/7624 data 1744 functions 42 fuzzy 100.0000
regressions vs baseline: 0
global matched_code_percent: 92.78013 -> 92.78013
global fuzzy_match_percent: 99.78155 -> 99.78155
global complete_code_percent: 76.40339 -> 76.40339
global matched_data_percent: 99.99410 -> 99.99410
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-02b-row-helper: 91.31944%; insns 74/72 diffs 41 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-03b-row-helper: 91.31944%; insns 74/72 diffs 41 | POOL IDENTICAL up to 20 (mine=20 base=20)
- libs/RVL_SDK/src/cntcache/cntcache _CNTCACHEIsTitleRemovable removable-01-copy-boundary: 89.60976%; insns 80/82 diffs 67 | POOL IDENTICAL up to 9 (mine=9 base=9)
- libs/RVL_SDK/src/cntcache/cntcache _CNTCACHEIsTitleRemovable removable-02-copy-boundary: 89.60976%; insns 80/82 diffs 67 | POOL IDENTICAL up to 9 (mine=9 base=9)
- src/scene/channelSelect/iplChannelSelect updateDiskState__Q33ipl5scene13ChannelSelectFv disk-04-play-local: 100.0%; insns 230/230 diffs 0 | POOL IDENTICAL up to 98 (mine=98 base=98)
- libs/RVL_SDK/src/cntcache/cntcache _CNTCACHEIsTitleRemovable removable-03-copy-boundary: 91.31707%; insns 80/82 diffs 64 | POOL IDENTICAL up to 9 (mine=9 base=9)
- src/scene/channelSelect/iplChannelSelect updateDiskState__Q33ipl5scene13ChannelSelectFv disk-05-play-inline-helper: 99.934784%; insns 230/230 diffs 3 | POOL IDENTICAL up to 98 (mine=98 base=98)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-04-detach-inline-helper: 97.708336%; insns 72/72 diffs 26 | POOL IDENTICAL up to 20 (mine=20 base=20)
- libs/RVL_SDK/src/cntcache/cntcache _CNTCACHEDeleteContent content-01-usage-helper: 95.793106%; insns 143/145 diffs 88 | POOL IDENTICAL up to 9 (mine=9 base=9)
- libs/RVL_SDK/src/cntcache/cntcache _CNTCACHEDeleteContent content-02-usage-helper: 95.793106%; insns 143/145 diffs 88 | POOL IDENTICAL up to 9 (mine=9 base=9)
- libs/RVL_SDK/src/cntcache/cntcache _CNTCACHEDeleteContent content-03-usage-helper: COMPILE FAIL ### mwcceppc.exe Compiler:
# File: build\da7\trials\content-03-usage-helper\cntcache.c
# ------------------------------------------------------------
# 407: result = ES_GetTmdView(titleId, tmdBuffer, &tmdSize);
# Error: ^
# (10209) illegal implicit conversion from '__aligned(32) unsigned
# char[8288]' to
# 'struct ESTmdView *'
# Too many errors printed, aborting program
User break, cancelled...
- libs/RVL_SDK/src/sdi/sdi_api ISD_GetCardSize sdi-01-geometry-shape: 98.15476%; insns 84/84 diffs 23 | POOL IDENTICAL up to 4 (mine=4 base=4)
- libs/RVL_SDK/src/sdi/sdi_api ISD_GetCardSize sdi-02-geometry-shape: 98.39286%; insns 84/84 diffs 20 | POOL IDENTICAL up to 4 (mine=4 base=4)
- libs/RVL_SDK/src/sdi/sdi_api ISD_GetCardSize sdi-03-geometry-shape: 98.39286%; insns 84/84 diffs 20 | POOL IDENTICAL up to 4 (mine=4 base=4)
- libs/RVL_SDK/src/cntcache/cntcache _CNTCACHEDeleteContent content-03b-const-tmd: 95.76552%; insns 143/145 diffs 88 | POOL IDENTICAL up to 9 (mine=9 base=9)
- libs/RVL_SDK/src/cntcache/cntcache CNTCACHEClear clear-01-line-walk: 51.145695%; insns 166/151 diffs 137 | POOL IDENTICAL up to 9 (mine=13 base=9)
- libs/RVL_SDK/src/cntcache/cntcache CNTCACHEClear clear-02-line-walk: 50.278145%; insns 157/151 diffs 138 | POOL IDENTICAL up to 9 (mine=13 base=9)
- libs/RVL_SDK/src/cntcache/cntcache CNTCACHEClear clear-03-line-walk: 42.668873%; insns 160/151 diffs 137 | POOL IDENTICAL up to 9 (mine=13 base=9)
- libs/RVL_SDK/src/cntcache/cntcache _CNTCACHEIsTitleRemovable removable-04-return-object: 91.31707%; insns 80/82 diffs 64 | POOL IDENTICAL up to 9 (mine=9 base=9)
updateDiskState candidate: full build and DOL SHA1 pass, all 102 unit functions are exact. Gate fails only matched_data 2336 -> 192. The generated jump table and target both begin at .data+0x508, contain 7 entries, and relocate to updateDiskState + [0x4c, 0x21c, 0x284, 0x2c8, 0x30c, 0x328, 0x358]. Diagnostic target copies under build/da7/diag-table-* only test symbol-name handling; they are never used by gate.py or installed over original objects.
Jump-table metadata: both a source-generated anonymous name and @0 made the diagnostic section score 100%; a descriptive jumptable name did not. Replace the artificial assembly-era updateDiskState_jumptable name in symbols.txt with the compiler-generated local name @24295. Address, size, scope, seven relocation targets, and DOL bytes are unchanged. No source table or pinned offsets remain. Rebuild the original object from the unmodified retail DOL and run the full gate to validate this metadata correction.
updateDiskState accepted: full clean gate PASS; unit code 25668/25668, data 2336/2336, functions 102/102; fresh ctxdiff 230/230 diffs 0; pool 98/98 identical. DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Gate rebuilt the target from retail data after the anonymous jump-table metadata correction. Evidence: build/da7/disk-final-gate.log.
_CNTCACHEIsTitleRemovable source search: 212 compiled trials, no improvement beyond 91.31707%, 80/82 instructions. Evidence: build/da7/search-removable.log. Original exact asm retained.
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-05-search-result: 98.125%; insns 72/72 diffs 23 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-declarations-selected: 98.125%; insns 72/72 diffs 23 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-declarations-rows: 98.125%; insns 72/72 diffs 23 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-insert-helper: 98.125%; insns 72/72 diffs 23 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-insert-helper-const: 98.125%; insns 72/72 diffs 23 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-insert-helper-ref: 98.125%; insns 72/72 diffs 23 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-direct-manager: 91.31944%; insns 74/72 diffs 41 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-row-holder: 98.125%; insns 72/72 diffs 23 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-selected-holder: 99.236115%; insns 72/72 diffs 9 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-separate-next: 98.333336%; insns 72/72 diffs 22 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-separate-rows: 98.125%; insns 72/72 diffs 23 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/system/TVRC TVRCSendStartAsync tvrc-index-holder: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-index-local: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-entry-ref-holder: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/system/TVRC TVRCSendStartAsync tvrc-file-holder: 99.747475%; insns 198/198 diffs 9 | POOL IDENTICAL up to 0 (mine=0 base=0)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-cursor-early-rows: 99.236115%; insns 72/72 diffs 9 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-cursor-active-rows: 99.583336%; insns 72/72 diffs 5 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-cursor-separate-next: 99.44444%; insns 72/72 diffs 7 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-cursor-end-holder: 100.0%; insns 72/72 diffs 0 | POOL IDENTICAL up to 20 (mine=20 base=20)
- src/keyboard/tiInputForm create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer form-cursor-no-rows-reload: 98.19444%; insns 71/72 diffs 25 | POOL IDENTICAL up to 20 (mine=20 base=20)
Base::create: a one-pointer RowCursor models the selected node and insertion position. Both cursor objects together match all 72 target instructions. The pointers, indices, link updates, and initialization order preserve the prior C candidate behavior; the self-link check is the target cmplw r9,r9 and conditional branch. Pool remains 20/20. No header or other function change. Lever 18a recovered the iterator register boundaries. Full gate required before acceptance.
Base::create accepted: full non-quick gate over all nine assigned units PASS. Fresh rebuilt function 72/72 instructions, diffs 0; pool 20/20 identical. Unit instruction-exact count remains 219/221, code 47928/50656, data 3772/3772, with zero regressions. DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Evidence: build/da7/final-gate-six.log.
- src/system/iplChannelManager getTitleName__Q33ipl7channel7ManagerCFiii title-language-cursor: 98.80282%; insns 71/71 diffs 13 | POOL IDENTICAL up to 9 (mine=9 base=9)
- src/system/iplChannelManager getTitleName__Q33ipl7channel7ManagerCFiii title-name-index-holder: 98.943665%; insns 71/71 diffs 12 | POOL IDENTICAL up to 9 (mine=9 base=9)
- src/system/iplChannelManager getTitleName__Q33ipl7channel7ManagerCFiii title-loop-index-holder: 98.943665%; insns 71/71 diffs 12 | POOL IDENTICAL up to 9 (mine=9 base=9)
- src/system/iplChannelManager getTitleName__Q33ipl7channel7ManagerCFiii title-language-pointer-walk: 94.985916%; insns 71/71 diffs 16 | POOL IDENTICAL up to 9 (mine=9 base=9)
## Final retained placeholders
- TVRCSendStartAsync: best C 99.747475%, 198/198 instructions, nine r6/r7 register differences. Typed command records, reference/pointer lookup helpers, separate pointer lifetimes, const/types, declaration order, and four one-field views did not resolve the tie. Source search completed 166 trials with no gain. Existing exact asm retained.
- channel::Manager::getTitleName: best C 98.943665%, 71/71 instructions, 12 address-operand/register differences. Direct member access, language-table pointer, character helper, node/name walking, local cursor/index types, and a two-trial exhausted source search did not match. Original exact asm retained. The initial search stalled at the shared limiter; its owned process was stopped after the local search finished.
- CNTCACHEClear: three new compiled shapes (line scanner, line-length updates, read-state struct) produce 13 pooled strings against nine because the existing assembly string blob duplicates ordinary literals. Prior da5 removal of that blob left only five strings: unused cache-writing routines account for four missing literals. Do not tune registers until the pool is reconstructed; no invented dead routines or offset references into the blob were added. Existing exact asm retained.
- _CNTCACHEIsTitleRemovable: best C 91.31707%, 80/82 instructions. Assignment reuse, primitive parameter, one-field result, and aggregate return did not reproduce the two missing copies. Source search over the usage helper completed 212 trials without gain. Existing exact asm retained.
- _CNTCACHEDeleteContent: best C 95.793106%, 143/145 instructions. Usage-helper lifetime variants, assigned result parameter, const TMD view and declaration ordering did not recover the missing copy/reload. Source search completed 241 trials without gain. Existing exact asm retained.
- ISD_GetCardSize: best C 98.39286%, 84/84 instructions, 20 register differences. Output geometry struct, separate scaling value and expression grouping, and primitive width spellings did not improve the prior result. Source search exhausted one legal variant without improvement. Existing exact asm retained.
Every retained function has at least three distinct compiled source-level attempts in this run. Ghidra exports were checked for every assigned function. Definition-level volatile was considered only where the target shows repeated flag loads; none of the unresolved differences establishes a missing volatile declaration. No volatile or diagnostic pragma was retained. Prior-art GitHub searches for the SDK functions failed with HTTP 401; public web searches for the exact names returned no results.
## Final validation
Six of twelve assigned placeholders were replaced with C/C++; six remain as exact assembly. All twelve live symbols independently report objdiff 100.0% and identical instructions after the final clean build. The converted functions are:
| Function | Instructions | Conversion commit |
| --- | --- | --- |
| snd::System::resetAllSound | 68/68, diffs 0 | d47f9fea |
| gui::PaneComponent::draw | 104/104, diffs 0 | 38f6f578 |
| LibTVRC::__FTVRCLoop0Handler | 120/120, diffs 0 | 0b1d74f7 |
| push_button_queue | 28/28, diffs 0 | 05363f2b |
| ChannelSelect::updateDiskState | 230/230, diffs 0 | 467eb0a2 |
| inputform::Base::create | 72/72, diffs 0 | 8c40bbde |
The resetAllSound return declaration remains the existing int declaration; the target does not define a return value, as recorded above. The jump table metadata correction changes only its anonymous local name; byte extent and relocation targets are unchanged. Both details require parent source review.
| Unit | Instruction-exact before -> after | Exact code before -> after | Data before -> after |
| --- | --- | --- | --- |
| TVRC | 9/9 -> 9/9 | 2312/2312 -> 2312/2312 | 280/280 -> 280/280 |
| iplChannelManager | 74/74 -> 74/74 | 12552/12552 -> 12552/12552 | 1080/1080 -> 1080/1080 |
| iplSound | 56/57 -> 56/57 | 5576/5576 -> 5576/5576 | 3316/3316 -> 3316/3316 |
| iplChannelSelect | 102/102 -> 102/102 | 25668/25668 -> 25668/25668 | 2336/2336 -> 2336/2336 |
| iplButton | 41/42 -> 41/42 | 7624/7624 -> 7624/7624 | 1744/1744 -> 1744/1744 |
| tiGUIManager | 42/42 -> 42/42 | 5916/5916 -> 5916/5916 | 392/392 -> 392/392 |
| tiInputForm | 219/221 -> 219/221 | 47928/50656 -> 47928/50656 | 3772/3772 -> 3772/3772 |
| cntcache | 5/5 -> 5/5 | 1828/1828 -> 1828/1828 | 280/280 -> 280/280 |
| sdi_api | 22/22 -> 22/22 | 5948/5948 -> 5948/5948 | 248/248 -> 248/248 |
The existing alias differences account for the sound and button instruction-exact counters. tiInputForm retains its two pre-existing non-exact functions and remains unlinked. Converted function counts do not raise the exact totals because their previous asm bodies were already exact.
Final full non-quick gate: build/da7/final-gate-six.log. All nine pools identical; zero regressions, forbidden-pattern additions, or readability warnings. Every assigned data section remains exact. Independent twelve-symbol audit: build/da7/final-audit.txt.
GATE PASS
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d.
Local conversion commits only; no push, PR, merge, rebase, worker spawn, or other-worktree edit. Scratch trials and exported evidence remain under build/da7/.
Integration boundary: the leaf is agent/w1005/da7, based on 5e7b5ad0. At the first handoff check, the shared origin/main ref had advanced by four commits to 66ff3a4331e21dc76b13a9f3314def947c4616dd. Those four reviewed commits do not replace an assigned source file, but 02fe1755 changes configure.py and the shared nw4r/lyt/pane.h. Main continued advancing during the final status checks, so this is a recorded checkpoint, not a claim that the leaf is synchronized. The six conversions were built and gated on this leaf; the parent must independently verify them on current main. No merge or rebase was attempted. No owned source-search process remains running.