Decompile func0f0e2ee8

This commit is contained in:
Ryan Dwyer committed 2022-01-21 19:53:56 +10:00
1 parent e46d175242
commit 5f6f75480a
6 files changed
+45 -70

No files matched your search

+15 -40
View File
@@ -2677,7 +2677,7 @@ glabel func0f0e1fac
/* f0e22f4: afb80014 */ sw $t8,0x14($sp)
/* f0e22f8: 8fa70074 */ lw $a3,0x74($sp)
/* f0e22fc: 8fa50064 */ lw $a1,0x64($sp)
/* f0e2300: 0fc389bb */ jal renderLine
/* f0e2300: 0fc389bb */ jal gfxDrawLine
/* f0e2304: 8fa40060 */ lw $a0,0x60($sp)
/* f0e2308: 340bffff */ dli $t3,0xffff
/* f0e230c: 340cffff */ dli $t4,0xffff
@@ -2688,7 +2688,7 @@ glabel func0f0e1fac
/* f0e2320: 8fa50074 */ lw $a1,0x74($sp)
/* f0e2324: 8fa60070 */ lw $a2,0x70($sp)
/* f0e2328: 8fa7006c */ lw $a3,0x6c($sp)
/* f0e232c: 0fc389bb */ jal renderLine
/* f0e232c: 0fc389bb */ jal gfxDrawLine
/* f0e2330: afb00010 */ sw $s0,0x10($sp)
/* f0e2334: 8fbf002c */ lw $ra,0x2c($sp)
/* f0e2338: 8fb00024 */ lw $s0,0x24($sp)
@@ -2827,7 +2827,7 @@ glabel func0f0e258c
/* f0e26e8: 27bd0030 */ addiu $sp,$sp,0x30
);
Gfx *renderLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 arg5, s32 arg6)
Gfx *gfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 arg5, s32 arg6)
{
gdl = func0f0e2498(gdl);
gdl = func0f0e258c(gdl, x1, y1, x2, y2, arg5, arg6, 0);
@@ -3367,50 +3367,25 @@ glabel func0f0e2aa4
/* f0e2ee4: 27bd0048 */ addiu $sp,$sp,0x48
);
GLOBAL_ASM(
glabel func0f0e2ee8
/* f0e2ee8: 27bdffd0 */ addiu $sp,$sp,-48
/* f0e2eec: 8fae0040 */ lw $t6,0x40($sp)
/* f0e2ef0: 8faf0044 */ lw $t7,0x44($sp)
/* f0e2ef4: 8fb80048 */ lw $t8,0x48($sp)
/* f0e2ef8: afbf002c */ sw $ra,0x2c($sp)
/* f0e2efc: afa50034 */ sw $a1,0x34($sp)
/* f0e2f00: afa60038 */ sw $a2,0x38($sp)
/* f0e2f04: afa7003c */ sw $a3,0x3c($sp)
/* f0e2f08: afae0010 */ sw $t6,0x10($sp)
/* f0e2f0c: afaf0014 */ sw $t7,0x14($sp)
/* f0e2f10: 0fc389bb */ jal renderLine
/* f0e2f14: afb80018 */ sw $t8,0x18($sp)
/* f0e2f18: 8fb90040 */ lw $t9,0x40($sp)
/* f0e2f1c: 8fa80044 */ lw $t0,0x44($sp)
/* f0e2f20: 2409000a */ addiu $t1,$zero,0xa
/* f0e2f24: afa9001c */ sw $t1,0x1c($sp)
/* f0e2f28: 00402025 */ or $a0,$v0,$zero
/* f0e2f2c: 8fa50034 */ lw $a1,0x34($sp)
/* f0e2f30: 8fa60038 */ lw $a2,0x38($sp)
/* f0e2f34: 8fa7003c */ lw $a3,0x3c($sp)
/* f0e2f38: afa00018 */ sw $zero,0x18($sp)
/* f0e2f3c: afa00020 */ sw $zero,0x20($sp)
/* f0e2f40: afb90010 */ sw $t9,0x10($sp)
/* f0e2f44: 0fc38aa9 */ jal func0f0e2aa4
/* f0e2f48: afa80014 */ sw $t0,0x14($sp)
/* f0e2f4c: 8fbf002c */ lw $ra,0x2c($sp)
/* f0e2f50: 27bd0030 */ addiu $sp,$sp,0x30
/* f0e2f54: 03e00008 */ jr $ra
/* f0e2f58: 00000000 */ nop
);
Gfx *func0f0e2ee8(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2)
{
gdl = gfxDrawLine(gdl, x1, y1, x2, y2, colour1, colour2);
gdl = func0f0e2aa4(gdl, x1, y1, x2, y2, colour1, 0, 10, 0);
Gfx *renderFilledRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colourleft, u32 colourright)
return gdl;
}
Gfx *gfxDrawFilledRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2)
{
gdl = func0f0e2498(gdl);
gdl = func0f0e2744(gdl, x1, y1, x2, y2, colourleft, colourright);
gdl = func0f0e2aa4(gdl, x1, y1, x2, y2, colourleft, 0, 10, 0);
gdl = func0f0e2744(gdl, x1, y1, x2, y2, colour1, colour2);
gdl = func0f0e2aa4(gdl, x1, y1, x2, y2, colour1, 0, 10, 0);
return gdl;
}
GLOBAL_ASM(
glabel menuRenderCarouselArrow
glabel gfxDrawChevron
/* f0e2fe4: 27bdffa0 */ addiu $sp,$sp,-96
/* f0e2fe8: afa40060 */ sw $a0,0x60($sp)
/* f0e2fec: 8fa40070 */ lw $a0,0x70($sp)
@@ -3937,7 +3912,7 @@ glabel func0f0e3324
);
GLOBAL_ASM(
glabel renderCheckbox
glabel gfxDrawSquare
/* f0e37b0: 27bdffb8 */ addiu $sp,$sp,-72
/* f0e37b4: 8fae0058 */ lw $t6,0x58($sp)
/* f0e37b8: afb10018 */ sw $s1,0x18($sp)
+4 -4
View File
@@ -12558,7 +12558,7 @@ glabel func0f0f5360
/* f0f65a0: 8fab01d4 */ lw $t3,0x1d4($sp)
/* f0f65a4: afb80014 */ sw $t8,0x14($sp)
/* f0f65a8: afb80018 */ sw $t8,0x18($sp)
/* f0f65ac: 0fc38bd7 */ jal renderFilledRect
/* f0f65ac: 0fc38bd7 */ jal gfxDrawFilledRect
/* f0f65b0: afab0010 */ sw $t3,0x10($sp)
/* f0f65b4: afa201e8 */ sw $v0,0x1e8($sp)
.L0f0f65b8:
@@ -12685,7 +12685,7 @@ glabel func0f0f5360
/* f0f677c: afa30014 */ sw $v1,0x14($sp)
/* f0f6780: afa30018 */ sw $v1,0x18($sp)
/* f0f6784: 02002825 */ or $a1,$s0,$zero
/* f0f6788: 0fc38bd7 */ jal renderFilledRect
/* f0f6788: 0fc38bd7 */ jal gfxDrawFilledRect
/* f0f678c: 020e3821 */ addu $a3,$s0,$t6
/* f0f6790: afa201e8 */ sw $v0,0x1e8($sp)
.L0f0f6794:
@@ -14774,7 +14774,7 @@ glabel func0f0f5360
/* f0f2f5c: 8fab01d4 */ lw $t3,0x1d4($sp)
/* f0f2f60: afad0014 */ sw $t5,0x14($sp)
/* f0f2f64: afad0018 */ sw $t5,0x18($sp)
/* f0f2f68: 0fc380fc */ jal renderFilledRect
/* f0f2f68: 0fc380fc */ jal gfxDrawFilledRect
/* f0f2f6c: afab0010 */ sw $t3,0x10($sp)
/* f0f2f70: afa201e8 */ sw $v0,0x1e8($sp)
.NB0f0f2f74:
@@ -14900,7 +14900,7 @@ glabel func0f0f5360
/* f0f3134: afa30014 */ sw $v1,0x14($sp)
/* f0f3138: afa30018 */ sw $v1,0x18($sp)
/* f0f313c: 02002825 */ or $a1,$s0,$zero
/* f0f3140: 0fc380fc */ jal renderFilledRect
/* f0f3140: 0fc380fc */ jal gfxDrawFilledRect
/* f0f3144: 020f3821 */ addu $a3,$s0,$t7
/* f0f3148: afa201e8 */ sw $v0,0x1e8($sp)
.NB0f0f314c:
+4 -4
View File
@@ -1232,10 +1232,10 @@ Gfx *hudmsgRenderBox(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, f32 bgopacity, u3
gdl = func0f0d479c(gdl);
gdl = renderFilledRect(gdl, x1, y1, x2, y1 + 1, bordercolour, bordercolour);
gdl = renderFilledRect(gdl, x1, y2, x2, y2 + 1, bordercolour, bordercolour);
gdl = renderFilledRect(gdl, x1, y1 + 1, x1 + 1, y2, bordercolour, bordercolour);
gdl = renderFilledRect(gdl, x2, y1, x2 + 1, y2 + 1, bordercolour, bordercolour);
gdl = gfxDrawFilledRect(gdl, x1, y1, x2, y1 + 1, bordercolour, bordercolour);
gdl = gfxDrawFilledRect(gdl, x1, y2, x2, y2 + 1, bordercolour, bordercolour);
gdl = gfxDrawFilledRect(gdl, x1, y1 + 1, x1 + 1, y2, bordercolour, bordercolour);
gdl = gfxDrawFilledRect(gdl, x2, y1, x2 + 1, y2 + 1, bordercolour, bordercolour);
gdl = func0f0d49c8(gdl);
+15 -15
View File
@@ -1750,7 +1750,7 @@ glabel menuRenderItemList
/* f0e73a4: afae0018 */ sw $t6,0x18($sp)
/* f0e73a8: afb00014 */ sw $s0,0x14($sp)
/* f0e73ac: afac0010 */ sw $t4,0x10($sp)
/* f0e73b0: 0fc38dec */ jal renderCheckbox
/* f0e73b0: 0fc38dec */ jal gfxDrawSquare
/* f0e73b4: 24070006 */ addiu $a3,$zero,0x6
/* f0e73b8: 00409025 */ or $s2,$v0,$zero
.L0f0e73bc:
@@ -2817,7 +2817,7 @@ glabel menuRenderItemList
/* f0e4538: afac0018 */ sw $t4,0x18($sp)
/* f0e453c: afb00014 */ sw $s0,0x14($sp)
/* f0e4540: afaa0010 */ sw $t2,0x10($sp)
/* f0e4544: 0fc38311 */ jal renderCheckbox
/* f0e4544: 0fc38311 */ jal gfxDrawSquare
/* f0e4548: 24070006 */ addiu $a3,$zero,0x6
/* f0e454c: 0040a025 */ or $s4,$v0,$zero
.NB0f0e4550:
@@ -4212,7 +4212,7 @@ Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *context)
// Render horizontal grid lines
for (row = 0; row < 6; row++) {
gdl = renderFilledRect(gdl, context->x + 4, context->y + row * 11 + 13,
gdl = gfxDrawFilledRect(gdl, context->x + 4, context->y + row * 11 + 13,
context->x + 124, context->y + row * 11 + 14, 0x00ffff7f, 0x00ffff7f);
}
@@ -4224,7 +4224,7 @@ Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *context)
rowspan = 4;
}
gdl = renderFilledRect(gdl, context->x + col * 12 + 4, context->y + 13,
gdl = gfxDrawFilledRect(gdl, context->x + col * 12 + 4, context->y + 13,
context->x + col * 12 + 5, context->y + rowspan * 11 + 14, 0x00ffff7f, 0x00ffff7f);
}
@@ -4380,10 +4380,10 @@ Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *context)
}
}
gdl = renderLine(gdl, x1, y1, x2, y1 + 1, -1, -1); // top
gdl = renderLine(gdl, x2, y1, x2 + 1, y2 + 1, -1, -1); // right
gdl = renderLine(gdl, x1, y2, x2, y2 + 1, -1, -1); // bottom
gdl = renderLine(gdl, x1, y1, x1 + 1, y2 + 1, -1, -1); // left
gdl = gfxDrawLine(gdl, x1, y1, x2, y1 + 1, -1, -1); // top
gdl = gfxDrawLine(gdl, x2, y1, x2 + 1, y2 + 1, -1, -1); // right
gdl = gfxDrawLine(gdl, x1, y2, x2, y2 + 1, -1, -1); // bottom
gdl = gfxDrawLine(gdl, x1, y1, x1 + 1, y2 + 1, -1, -1); // left
}
return gdl;
@@ -4639,7 +4639,7 @@ Gfx *menuRenderItemSeparator(Gfx *gdl, struct menurendercontext *context)
colour = (colour & 0xffffff00) | 0x3f;
return renderFilledRect(gdl,
return gfxDrawFilledRect(gdl,
context->x, context->y + 2, context->x + context->width, context->y + 3,
colour, colour);
}
@@ -8256,10 +8256,10 @@ Gfx *menuRenderItemCarousel(Gfx *gdl, struct menurendercontext *context)
}
// Left arrow
gdl = menuRenderCarouselArrow(gdl, context->x, context->y + context->height / 2, 8, 1, -1, colour);
gdl = gfxDrawChevron(gdl, context->x, context->y + context->height / 2, 8, 1, -1, colour);
// Right arrow
gdl = menuRenderCarouselArrow(gdl, context->x + context->width, context->y + context->height / 2, 8, 3, -1, colour);
gdl = gfxDrawChevron(gdl, context->x + context->width, context->y + context->height / 2, 8, 3, -1, colour);
// This part of the function is unused because param2 is always zero.
// Setting it to 0x7b causes a crash.
@@ -8694,7 +8694,7 @@ glabel menuRenderItemCheckbox
/* f0ecb74: 24070006 */ addiu $a3,$zero,0x6
/* f0ecb78: 24c60002 */ addiu $a2,$a2,0x2
/* f0ecb7c: afb90010 */ sw $t9,0x10($sp)
/* f0ecb80: 0fc38dec */ jal renderCheckbox
/* f0ecb80: 0fc38dec */ jal gfxDrawSquare
/* f0ecb84: afa80018 */ sw $t0,0x18($sp)
/* f0ecb88: 86290000 */ lh $t1,0x0($s1)
/* f0ecb8c: 8fac0054 */ lw $t4,0x54($sp)
@@ -8835,7 +8835,7 @@ glabel menuRenderItemCheckbox
// fillcolour = 0x7f002faf;
// }
//
// gdl = renderCheckbox(gdl, context->x + context->width - 16, context->y + 2, 6,
// gdl = gfxDrawSquare(gdl, context->x + context->width - 16, context->y + 2, 6,
// checked, maincolour, fillcolour);
//
// x = context->x + 10;
@@ -10117,7 +10117,7 @@ Gfx *menuRenderItemRanking(Gfx *gdl, struct menurendercontext *context)
linecolour2 = func0f153e94(context->x + context->width, context->y + 2, -129) & 0xff | linecolour2 & 0xffffff00;
// Horizontal line between header and body
gdl = renderFilledRect(gdl,
gdl = gfxDrawFilledRect(gdl,
context->x, context->y + 9,
context->x + context->width, context->y + 10,
linecolour1, linecolour1);
@@ -10505,7 +10505,7 @@ glabel menuRenderItemRanking
/* f0eafb0: afb20014 */ sw $s2,0x14($sp)
/* f0eafb4: 8fa401b0 */ lw $a0,0x1b0($sp)
/* f0eafb8: 24660009 */ addiu $a2,$v1,0x9
/* f0eafbc: 0fc380fc */ jal renderFilledRect
/* f0eafbc: 0fc380fc */ jal gfxDrawFilledRect
/* f0eafc0: 00ac3821 */ addu $a3,$a1,$t4
/* f0eafc4: 3c0de700 */ lui $t5,0xe700
/* f0eafc8: 3c038008 */ lui $v1,0x8008
+1 -1
View File
@@ -821,7 +821,7 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
// Render lines between the score table and the target texture
// Horizontal lines - bottom left
gdl = renderFilledRect(gdl, renderdata->x + 45, renderdata->y + 36, renderdata->x + 81, renderdata->y + 37, linecolourtex, linecolourmid);
gdl = gfxDrawFilledRect(gdl, renderdata->x + 45, renderdata->y + 36, renderdata->x + 81, renderdata->y + 37, linecolourtex, linecolourmid);
gdl = func0f0e2ee8(gdl, renderdata->x + 52, renderdata->y + 44, renderdata->x + 84, renderdata->y + 45, linecolourtex, linecolourmid);
gdl = func0f0e2ee8(gdl, renderdata->x + 62, renderdata->y + 50, renderdata->x + 87, renderdata->y + 51, linecolourtex, linecolourmid);
gdl = func0f0e2ee8(gdl, renderdata->x + 70, renderdata->y + 60, renderdata->x + 90, renderdata->y + 61, linecolourtex, linecolourmid);
+6 -6
View File
@@ -14,14 +14,14 @@ u32 func0f0e1fac(void);
Gfx *func0f0e2348(Gfx *gdl);
Gfx *func0f0e2498(Gfx *gdl);
Gfx *func0f0e258c(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 arg5, s32 arg6, s32 arg7);
Gfx *renderLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 arg5, s32 arg6);
Gfx *func0f0e2744(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colourleft, u32 colourright);
Gfx *gfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 arg5, s32 arg6);
Gfx *func0f0e2744(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2);
Gfx *func0f0e2aa4(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colourleft, u32 arg6, u32 arg7, u32 arg8);
Gfx *func0f0e2ee8(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colourleft, u32 colourright);
Gfx *renderFilledRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colourleft, u32 colourright);
Gfx *menuRenderCarouselArrow(Gfx *gdl, s32 x, s32 y, u32 arg3, u32 arg4, s32 arg5, u32 colour);
Gfx *func0f0e2ee8(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2);
Gfx *gfxDrawFilledRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2);
Gfx *gfxDrawChevron(Gfx *gdl, s32 x, s32 y, u32 arg3, u32 arg4, s32 arg5, u32 colour);
u32 func0f0e3324(void);
Gfx *renderCheckbox(Gfx *gdl, s32 x, s32 y, s32 size, s32 checked, s32 bordercolour, s32 fillcolour);
Gfx *gfxDrawSquare(Gfx *gdl, s32 x, s32 y, s32 size, s32 checked, s32 bordercolour, s32 fillcolour);
u32 func0f0e39d0(void);
Gfx *func0f0e4190(Gfx *gdl);
void func0f0e4fd4(void);