From 25865549071b00065a6711a9c9d017ccbaa4938a Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 5 Feb 2022 10:36:51 +1000 Subject: [PATCH] Rename game_0e0770.c to menugfx.c, game_0f09f0.c to menu.c, menu/items.c to menuitem.c --- ld/gamefiles.ntsc-beta.inc | 6 +- ld/gamefiles.ntsc-final.inc | 6 +- ld/gamefiles.pal-final.inc | 6 +- src/game/activemenu/activemenu.c | 2 +- src/game/camdraw.c | 2 +- src/game/credits.c | 6 +- src/game/endscreen.c | 20 +-- src/game/filemgr.c | 2 +- src/game/game_01bea0.c | 6 +- src/game/game_0b63b0.c | 2 +- src/game/game_0b69d0.c | 2 +- src/game/game_10c9c0.c | 2 +- src/game/game_1a7560.c | 4 +- src/game/hudmsg.c | 10 +- src/game/lv.c | 2 +- src/game/mainmenu.c | 2 +- src/game/{game_0f09f0.c => menu.c} | 98 +++++----- src/game/{game_0e0770.c => menugfx.c} | 86 ++++----- src/game/{menu/items.c => menuitem.c} | 168 +++++++++--------- src/game/mplayer/ingame.c | 2 +- src/game/mplayer/mplayer.c | 2 +- src/game/mplayer/scenarios.c | 2 +- src/game/mplayer/setup.c | 2 +- src/game/music.c | 2 +- src/game/pak/pak.c | 2 +- src/game/propobj.c | 2 +- src/game/training/menus.c | 28 +-- src/game/training/training.c | 2 +- src/include/game/{game_0f09f0.h => menu.h} | 4 +- src/include/game/{game_0e0770.h => menugfx.h} | 28 +-- src/include/game/{menu/items.h => menuitem.h} | 4 +- src/lib/boot.c | 2 +- src/lib/sched.c | 4 +- 33 files changed, 259 insertions(+), 259 deletions(-) rename src/game/{game_0f09f0.c => menu.c} (99%) rename src/game/{game_0e0770.c => menugfx.c} (98%) rename src/game/{menu/items.c => menuitem.c} (99%) rename src/include/game/{game_0f09f0.h => menu.h} (98%) rename src/include/game/{game_0e0770.h => menugfx.h} (60%) rename src/include/game/{menu/items.h => menuitem.h} (98%) diff --git a/ld/gamefiles.ntsc-beta.inc b/ld/gamefiles.ntsc-beta.inc index c05c22cfc..8368b0f42 100644 --- a/ld/gamefiles.ntsc-beta.inc +++ b/ld/gamefiles.ntsc-beta.inc @@ -118,9 +118,9 @@ build/ROMID/game/healthbar.o (section); \ build/ROMID/game/sight.o (section); \ build/ROMID/game/hudmsg.o (section); \ - build/ROMID/game/game_0e0770.o (section); \ - build/ROMID/game/menu/items.o (section); \ - build/ROMID/game/game_0f09f0.o (section); \ + build/ROMID/game/menugfx.o (section); \ + build/ROMID/game/menuitem.o (section); \ + build/ROMID/game/menu.o (section); \ build/ROMID/game/activemenu/activemenu.o (section); \ build/ROMID/game/stubs/game_102230.o (section); \ build/ROMID/game/mainmenu.o (section); \ diff --git a/ld/gamefiles.ntsc-final.inc b/ld/gamefiles.ntsc-final.inc index 79aaf6a6d..f189aeff2 100644 --- a/ld/gamefiles.ntsc-final.inc +++ b/ld/gamefiles.ntsc-final.inc @@ -118,9 +118,9 @@ build/ROMID/game/healthbar.o (section); \ build/ROMID/game/sight.o (section); \ build/ROMID/game/hudmsg.o (section); \ - build/ROMID/game/game_0e0770.o (section); \ - build/ROMID/game/menu/items.o (section); \ - build/ROMID/game/game_0f09f0.o (section); \ + build/ROMID/game/menugfx.o (section); \ + build/ROMID/game/menuitem.o (section); \ + build/ROMID/game/menu.o (section); \ build/ROMID/game/activemenu/activemenu.o (section); \ build/ROMID/game/stubs/game_102230.o (section); \ build/ROMID/game/mainmenu.o (section); \ diff --git a/ld/gamefiles.pal-final.inc b/ld/gamefiles.pal-final.inc index 79aaf6a6d..f189aeff2 100644 --- a/ld/gamefiles.pal-final.inc +++ b/ld/gamefiles.pal-final.inc @@ -118,9 +118,9 @@ build/ROMID/game/healthbar.o (section); \ build/ROMID/game/sight.o (section); \ build/ROMID/game/hudmsg.o (section); \ - build/ROMID/game/game_0e0770.o (section); \ - build/ROMID/game/menu/items.o (section); \ - build/ROMID/game/game_0f09f0.o (section); \ + build/ROMID/game/menugfx.o (section); \ + build/ROMID/game/menuitem.o (section); \ + build/ROMID/game/menu.o (section); \ build/ROMID/game/activemenu/activemenu.o (section); \ build/ROMID/game/stubs/game_102230.o (section); \ build/ROMID/game/mainmenu.o (section); \ diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index 313b16786..48f7b986c 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -6,7 +6,7 @@ #include "game/game_0b0fd0.h" #include "game/game_0b3350.h" #include "game/savebuffer.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/inventory/inventory.h" #include "game/game_1531a0.h" #include "game/file.h" diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 9ea4730f6..a68445f6f 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -2,7 +2,7 @@ #include "constants.h" #include "game/camdraw.h" #include "game/game_0b3350.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/stubs/game_102230.h" #include "game/bg.h" #include "game/lang.h" diff --git a/src/game/credits.c b/src/game/credits.c index bd8f7ea4e..6c0980883 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -5,8 +5,8 @@ #include "game/game_0b3350.h" #include "game/game_0b69d0.h" #include "game/savebuffer.h" -#include "game/game_0e0770.h" -#include "game/game_0f09f0.h" +#include "game/menugfx.h" +#include "game/menu.h" #include "game/credits.h" #include "game/game_1531a0.h" #include "game/file.h" @@ -197,7 +197,7 @@ Gfx *creditsRenderBackgroundLayer(Gfx *gdl, u8 type, u8 layernum, f32 arg3, u32 f32 c; f32 d; - gdl = func0f0e2498(gdl); + gdl = menugfx0f0e2498(gdl); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); diff --git a/src/game/endscreen.c b/src/game/endscreen.c index ba198731e..7cef22566 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -9,8 +9,8 @@ #include "game/game_0b0fd0.h" #include "game/game_0b69d0.h" #include "game/savebuffer.h" -#include "game/game_0e0770.h" -#include "game/game_0f09f0.h" +#include "game/menugfx.h" +#include "game/menu.h" #include "game/mainmenu.h" #include "game/filemgr.h" #include "game/endscreen.h" @@ -411,17 +411,17 @@ glabel func0f10d730 void func0f10d770(void) { - func0f0f8bb4(&g_Menus[0].unk840, bgunCalculateGunMemCapacity() - func0f0e4fe0(), 0); - g_Menus[0].unk840.unk004 = bgunGetGunMem() + func0f0e4fe0(); + func0f0f8bb4(&g_Menus[0].unk840, bgunCalculateGunMemCapacity() - menugfx0f0e4fe0(), 0); + g_Menus[0].unk840.unk004 = bgunGetGunMem() + menugfx0f0e4fe0(); - func0f0f8bb4(&g_Menus[1].unk840, bgunCalculateGunMemCapacity() - func0f0e4fe0(), 0); - g_Menus[1].unk840.unk004 = bgunGetGunMem() + func0f0e4fe0(); + func0f0f8bb4(&g_Menus[1].unk840, bgunCalculateGunMemCapacity() - menugfx0f0e4fe0(), 0); + g_Menus[1].unk840.unk004 = bgunGetGunMem() + menugfx0f0e4fe0(); - func0f0f8bb4(&g_Menus[2].unk840, bgunCalculateGunMemCapacity() - func0f0e4fe0(), 0); - g_Menus[2].unk840.unk004 = bgunGetGunMem() + func0f0e4fe0(); + func0f0f8bb4(&g_Menus[2].unk840, bgunCalculateGunMemCapacity() - menugfx0f0e4fe0(), 0); + g_Menus[2].unk840.unk004 = bgunGetGunMem() + menugfx0f0e4fe0(); - func0f0f8bb4(&g_Menus[3].unk840, bgunCalculateGunMemCapacity() - func0f0e4fe0(), 0); - g_Menus[3].unk840.unk004 = bgunGetGunMem() + func0f0e4fe0(); + func0f0f8bb4(&g_Menus[3].unk840, bgunCalculateGunMemCapacity() - menugfx0f0e4fe0(), 0); + g_Menus[3].unk840.unk004 = bgunGetGunMem() + menugfx0f0e4fe0(); } #if VERSION >= VERSION_NTSC_1_0 diff --git a/src/game/filemgr.c b/src/game/filemgr.c index 02b36f743..d25c62d10 100644 --- a/src/game/filemgr.c +++ b/src/game/filemgr.c @@ -3,7 +3,7 @@ #include "game/filelist.h" #include "game/game_0b3350.h" #include "game/savebuffer.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/filemgr.h" #include "game/bossfile.h" #include "game/game_1531a0.h" diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index a0c8f08ee..4655b5dc2 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -6,8 +6,8 @@ #include "game/game_01bea0.h" #include "game/bondgun.h" #include "game/game_0b69d0.h" -#include "game/game_0e0770.h" -#include "game/game_0f09f0.h" +#include "game/menugfx.h" +#include "game/menu.h" #include "game/filelist.h" #include "game/mainmenu.h" #include "game/endscreen.h" @@ -186,7 +186,7 @@ void menuTick(void) } if (g_MenuData.bg == MENUBG_6) { - func0f0e4fd4(); + menugfx0f0e4fd4(); g_MenuData.bg = MENUBG_BLUR; g_MenuData.nextbg = MENUBG_8; } diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index da71d313a..e97931322 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -22,7 +22,7 @@ #include "game/game_0b63b0.h" #include "game/healthbar.h" #include "game/hudmsg.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/mainmenu.h" #include "game/filemgr.h" #include "game/inventory/inventory.h" diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c index dffc8ca60..a81f6f8f6 100644 --- a/src/game/game_0b69d0.c +++ b/src/game/game_0b69d0.c @@ -25,7 +25,7 @@ #include "game/game_1a7560.h" #include "game/healthbar.h" #include "game/hudmsg.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/mainmenu.h" #include "game/filemgr.h" #include "game/inventory/inventory.h" diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index e53c65d90..0d8adc95d 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -1,6 +1,6 @@ #include #include "constants.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/filemgr.h" #include "game/game_10c9c0.h" #include "game/mainmenu.h" diff --git a/src/game/game_1a7560.c b/src/game/game_1a7560.c index 99a8a7f2f..122483b6e 100644 --- a/src/game/game_1a7560.c +++ b/src/game/game_1a7560.c @@ -5,8 +5,8 @@ #include "game/bondgun.h" #include "game/game_0b0fd0.h" #include "game/game_0b3350.h" -#include "game/game_0e0770.h" -#include "game/game_0f09f0.h" +#include "game/menugfx.h" +#include "game/menu.h" #include "game/mainmenu.h" #include "game/inventory/inventory.h" #include "game/game_1531a0.h" diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c index 1a24f8ed1..86a01c0b4 100644 --- a/src/game/hudmsg.c +++ b/src/game/hudmsg.c @@ -6,7 +6,7 @@ #include "game/game_0b69d0.h" #include "game/savebuffer.h" #include "game/hudmsg.h" -#include "game/game_0e0770.h" +#include "game/menugfx.h" #include "game/game_127910.h" #include "game/game_1531a0.h" #include "game/lv.h" @@ -1232,10 +1232,10 @@ Gfx *hudmsgRenderBox(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, f32 bgopacity, u3 gdl = func0f0d479c(gdl); - 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 = menugfxDrawFilledRect(gdl, x1, y1, x2, y1 + 1, bordercolour, bordercolour); + gdl = menugfxDrawFilledRect(gdl, x1, y2, x2, y2 + 1, bordercolour, bordercolour); + gdl = menugfxDrawFilledRect(gdl, x1, y1 + 1, x1 + 1, y2, bordercolour, bordercolour); + gdl = menugfxDrawFilledRect(gdl, x2, y1, x2 + 1, y2 + 1, bordercolour, bordercolour); gdl = func0f0d49c8(gdl); diff --git a/src/game/lv.c b/src/game/lv.c index b77b71b50..ce7b27e13 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -59,7 +59,7 @@ #include "game/game_0b69d0.h" #include "game/savebuffer.h" #include "game/hudmsg.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/filemgr.h" #include "game/game_10c9c0.h" #include "game/game_11f000.h" diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c index 214545f7a..209aa536c 100644 --- a/src/game/mainmenu.c +++ b/src/game/mainmenu.c @@ -10,7 +10,7 @@ #include "game/game_0b0fd0.h" #include "game/game_0b3350.h" #include "game/game_0b69d0.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/mainmenu.h" #include "game/filemgr.h" #include "game/inventory/inventory.h" diff --git a/src/game/game_0f09f0.c b/src/game/menu.c similarity index 99% rename from src/game/game_0f09f0.c rename to src/game/menu.c index 1f0688c53..299e7214f 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/menu.c @@ -12,9 +12,9 @@ #include "game/game_0b69d0.h" #include "game/game_1a7560.h" #include "game/savebuffer.h" -#include "game/game_0e0770.h" -#include "game/menu/items.h" -#include "game/game_0f09f0.h" +#include "game/menugfx.h" +#include "game/menuitem.h" +#include "game/menu.h" #include "game/filemgr.h" #include "game/credits.h" #include "game/game_1531a0.h" @@ -4129,7 +4129,7 @@ glabel var7f1b3c40pf /* f0f4e5c: 0c0055e4 */ jal mtx4MultMtx4 /* f0f4e60: 27a50204 */ addiu $a1,$sp,0x204 .PF0f0f4e64: -/* f0f4e64: 0fc38a89 */ jal func0f0e2348 +/* f0f4e64: 0fc38a89 */ jal menugfx0f0e2348 /* f0f4e68: 8fa40440 */ lw $a0,0x440($sp) /* f0f4e6c: 8fae0448 */ lw $t6,0x448($sp) /* f0f4e70: afa20440 */ sw $v0,0x440($sp) @@ -5742,7 +5742,7 @@ glabel var7f1b2948 /* f0f472c: 0c005680 */ jal mtx4MultMtx4 /* f0f4730: 27a50204 */ addiu $a1,$sp,0x204 .L0f0f4734: -/* f0f4734: 0fc388d2 */ jal func0f0e2348 +/* f0f4734: 0fc388d2 */ jal menugfx0f0e2348 /* f0f4738: 8fa40440 */ lw $a0,0x440($sp) /* f0f473c: 8fad0448 */ lw $t5,0x448($sp) /* f0f4740: afa20440 */ sw $v0,0x440($sp) @@ -7376,7 +7376,7 @@ glabel var7f1b2948 /* f0f12d0: 0c005a3c */ jal mtx4MultMtx4 /* f0f12d4: 27a50208 */ addiu $a1,$sp,0x208 .NB0f0f12d8: -/* f0f12d8: 0fc37df7 */ jal func0f0e2348 +/* f0f12d8: 0fc37df7 */ jal menugfx0f0e2348 /* f0f12dc: 8fa40468 */ lw $a0,0x468($sp) /* f0f12e0: 8faa0470 */ lw $t2,0x470($sp) /* f0f12e4: afa20468 */ sw $v0,0x468($sp) @@ -8407,7 +8407,7 @@ glabel var7f1b2948 // mtx4MultMtx4(&sp244, &sp204, &thing->unk014); // } // -// gdl = func0f0e2348(gdl); +// gdl = menugfx0f0e2348(gdl); // // if (arg2 < 3) { // if (arg2 != 0) { @@ -9615,7 +9615,7 @@ glabel dialogRender /* f0f6194: 02a03025 */ or $a2,$s5,$zero /* f0f6198: 02203825 */ or $a3,$s1,$zero /* f0f619c: afb20014 */ sw $s2,0x14($sp) -/* f0f61a0: 0fc38bba */ jal menugfxRenderDialogBorderLine +/* f0f61a0: 0fc38bba */ jal menugfxDrawDialogBorderLine /* f0f61a4: afa80018 */ sw $t0,0x18($sp) /* f0f61a8: afa201e8 */ sw $v0,0x1e8($sp) /* f0f61ac: 8fa201ec */ lw $v0,0x1ec($sp) @@ -9894,7 +9894,7 @@ glabel dialogRender /* f0f65a0: 8fab01d4 */ lw $t3,0x1d4($sp) /* f0f65a4: afb80014 */ sw $t8,0x14($sp) /* f0f65a8: afb80018 */ sw $t8,0x18($sp) -/* f0f65ac: 0fc38bd7 */ jal gfxDrawFilledRect +/* f0f65ac: 0fc38bd7 */ jal menugfxDrawFilledRect /* f0f65b0: afab0010 */ sw $t3,0x10($sp) /* f0f65b4: afa201e8 */ sw $v0,0x1e8($sp) .L0f0f65b8: @@ -10021,7 +10021,7 @@ glabel dialogRender /* f0f677c: afa30014 */ sw $v1,0x14($sp) /* f0f6780: afa30018 */ sw $v1,0x18($sp) /* f0f6784: 02002825 */ or $a1,$s0,$zero -/* f0f6788: 0fc38bd7 */ jal gfxDrawFilledRect +/* f0f6788: 0fc38bd7 */ jal menugfxDrawFilledRect /* f0f678c: 020e3821 */ addu $a3,$s0,$t6 /* f0f6790: afa201e8 */ sw $v0,0x1e8($sp) .L0f0f6794: @@ -10178,7 +10178,7 @@ glabel dialogRender /* f0f69c4: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f69c8: 0040a025 */ or $s4,$v0,$zero /* f0f69cc: 24510008 */ addiu $s1,$v0,0x8 -/* f0f69d0: 0fc38926 */ jal func0f0e2498 +/* f0f69d0: 0fc38926 */ jal menugfx0f0e2498 /* f0f69d4: 004ff021 */ addu $s8,$v0,$t7 /* f0f69d8: 8fa30120 */ lw $v1,0x120($sp) /* f0f69dc: 2615ffff */ addiu $s5,$s0,-1 @@ -10190,7 +10190,7 @@ glabel dialogRender /* f0f69f4: afb00010 */ sw $s0,0x10($sp) /* f0f69f8: afa0001c */ sw $zero,0x1c($sp) /* f0f69fc: afa30014 */ sw $v1,0x14($sp) -/* f0f6a00: 0fc38963 */ jal gfxDrawTri2 +/* f0f6a00: 0fc38963 */ jal menugfxDrawTri2 /* f0f6a04: afa30018 */ sw $v1,0x18($sp) /* f0f6a08: 8fac0120 */ lw $t4,0x120($sp) /* f0f6a0c: 240bffff */ addiu $t3,$zero,-1 @@ -10201,7 +10201,7 @@ glabel dialogRender /* f0f6a20: 02203825 */ or $a3,$s1,$zero /* f0f6a24: afb00010 */ sw $s0,0x10($sp) /* f0f6a28: afa0001c */ sw $zero,0x1c($sp) -/* f0f6a2c: 0fc38963 */ jal gfxDrawTri2 +/* f0f6a2c: 0fc38963 */ jal menugfxDrawTri2 /* f0f6a30: afac0014 */ sw $t4,0x14($sp) /* f0f6a34: 8fa30120 */ lw $v1,0x120($sp) /* f0f6a38: 26130001 */ addiu $s3,$s0,0x1 @@ -10213,7 +10213,7 @@ glabel dialogRender /* f0f6a50: 02403825 */ or $a3,$s2,$zero /* f0f6a54: afa0001c */ sw $zero,0x1c($sp) /* f0f6a58: afa30014 */ sw $v1,0x14($sp) -/* f0f6a5c: 0fc38963 */ jal gfxDrawTri2 +/* f0f6a5c: 0fc38963 */ jal menugfxDrawTri2 /* f0f6a60: afa30018 */ sw $v1,0x18($sp) /* f0f6a64: 8fb90120 */ lw $t9,0x120($sp) /* f0f6a68: 240dffff */ addiu $t5,$zero,-1 @@ -10224,7 +10224,7 @@ glabel dialogRender /* f0f6a7c: 02203825 */ or $a3,$s1,$zero /* f0f6a80: afb60010 */ sw $s6,0x10($sp) /* f0f6a84: afa0001c */ sw $zero,0x1c($sp) -/* f0f6a88: 0fc38963 */ jal gfxDrawTri2 +/* f0f6a88: 0fc38963 */ jal menugfxDrawTri2 /* f0f6a8c: afb90014 */ sw $t9,0x14($sp) /* f0f6a90: 8faf0078 */ lw $t7,0x78($sp) /* f0f6a94: 00402025 */ or $a0,$v0,$zero @@ -10234,7 +10234,7 @@ glabel dialogRender /* f0f6aa4: afb30010 */ sw $s3,0x10($sp) /* f0f6aa8: afb70018 */ sw $s7,0x18($sp) /* f0f6aac: afa0001c */ sw $zero,0x1c($sp) -/* f0f6ab0: 0fc38963 */ jal gfxDrawTri2 +/* f0f6ab0: 0fc38963 */ jal menugfxDrawTri2 /* f0f6ab4: afaf0014 */ sw $t7,0x14($sp) /* f0f6ab8: 8fb80118 */ lw $t8,0x118($sp) /* f0f6abc: afa201e8 */ sw $v0,0x1e8($sp) @@ -10257,7 +10257,7 @@ glabel dialogRender /* f0f6b00: afb00010 */ sw $s0,0x10($sp) /* f0f6b04: afa80014 */ sw $t0,0x14($sp) /* f0f6b08: afa80018 */ sw $t0,0x18($sp) -/* f0f6b0c: 0fc38963 */ jal gfxDrawTri2 +/* f0f6b0c: 0fc38963 */ jal menugfxDrawTri2 /* f0f6b10: afa0001c */ sw $zero,0x1c($sp) /* f0f6b14: 8fad0120 */ lw $t5,0x120($sp) /* f0f6b18: 26320003 */ addiu $s2,$s1,0x3 @@ -10269,7 +10269,7 @@ glabel dialogRender /* f0f6b30: 02a03025 */ or $a2,$s5,$zero /* f0f6b34: afb00010 */ sw $s0,0x10($sp) /* f0f6b38: afa0001c */ sw $zero,0x1c($sp) -/* f0f6b3c: 0fc38963 */ jal gfxDrawTri2 +/* f0f6b3c: 0fc38963 */ jal menugfxDrawTri2 /* f0f6b40: afad0018 */ sw $t5,0x18($sp) /* f0f6b44: 8faf0120 */ lw $t7,0x120($sp) /* f0f6b48: 00402025 */ or $a0,$v0,$zero @@ -10279,7 +10279,7 @@ glabel dialogRender /* f0f6b58: afb60010 */ sw $s6,0x10($sp) /* f0f6b5c: afa0001c */ sw $zero,0x1c($sp) /* f0f6b60: afaf0014 */ sw $t7,0x14($sp) -/* f0f6b64: 0fc38963 */ jal gfxDrawTri2 +/* f0f6b64: 0fc38963 */ jal menugfxDrawTri2 /* f0f6b68: afaf0018 */ sw $t7,0x18($sp) /* f0f6b6c: 8fae0120 */ lw $t6,0x120($sp) /* f0f6b70: 2418ffff */ addiu $t8,$zero,-1 @@ -10290,7 +10290,7 @@ glabel dialogRender /* f0f6b84: 02403825 */ or $a3,$s2,$zero /* f0f6b88: afb60010 */ sw $s6,0x10($sp) /* f0f6b8c: afa0001c */ sw $zero,0x1c($sp) -/* f0f6b90: 0fc38963 */ jal gfxDrawTri2 +/* f0f6b90: 0fc38963 */ jal menugfxDrawTri2 /* f0f6b94: afae0018 */ sw $t6,0x18($sp) /* f0f6b98: 8fac0078 */ lw $t4,0x78($sp) /* f0f6b9c: 00402025 */ or $a0,$v0,$zero @@ -10300,7 +10300,7 @@ glabel dialogRender /* f0f6bac: afb30010 */ sw $s3,0x10($sp) /* f0f6bb0: afb70014 */ sw $s7,0x14($sp) /* f0f6bb4: afa0001c */ sw $zero,0x1c($sp) -/* f0f6bb8: 0fc38963 */ jal gfxDrawTri2 +/* f0f6bb8: 0fc38963 */ jal menugfxDrawTri2 /* f0f6bbc: afac0018 */ sw $t4,0x18($sp) /* f0f6bc0: afa201e8 */ sw $v0,0x1e8($sp) .L0f0f6bc4: @@ -11828,7 +11828,7 @@ glabel dialogRender /* f0f2b44: 02a03025 */ or $a2,$s5,$zero /* f0f2b48: 02203825 */ or $a3,$s1,$zero /* f0f2b4c: afb20014 */ sw $s2,0x14($sp) -/* f0f2b50: 0fc380df */ jal menugfxRenderDialogBorderLine +/* f0f2b50: 0fc380df */ jal menugfxDrawDialogBorderLine /* f0f2b54: afa80018 */ sw $t0,0x18($sp) /* f0f2b58: afa201e8 */ sw $v0,0x1e8($sp) /* f0f2b5c: 8fa201ec */ lw $v0,0x1ec($sp) @@ -12110,7 +12110,7 @@ glabel dialogRender /* f0f2f5c: 8fab01d4 */ lw $t3,0x1d4($sp) /* f0f2f60: afad0014 */ sw $t5,0x14($sp) /* f0f2f64: afad0018 */ sw $t5,0x18($sp) -/* f0f2f68: 0fc380fc */ jal gfxDrawFilledRect +/* f0f2f68: 0fc380fc */ jal menugfxDrawFilledRect /* f0f2f6c: afab0010 */ sw $t3,0x10($sp) /* f0f2f70: afa201e8 */ sw $v0,0x1e8($sp) .NB0f0f2f74: @@ -12236,7 +12236,7 @@ glabel dialogRender /* f0f3134: afa30014 */ sw $v1,0x14($sp) /* f0f3138: afa30018 */ sw $v1,0x18($sp) /* f0f313c: 02002825 */ or $a1,$s0,$zero -/* f0f3140: 0fc380fc */ jal gfxDrawFilledRect +/* f0f3140: 0fc380fc */ jal menugfxDrawFilledRect /* f0f3144: 020f3821 */ addu $a3,$s0,$t7 /* f0f3148: afa201e8 */ sw $v0,0x1e8($sp) .NB0f0f314c: @@ -12375,7 +12375,7 @@ glabel dialogRender /* f0f333c: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f3340: 0040a025 */ or $s4,$v0,$zero /* f0f3344: 24510008 */ addiu $s1,$v0,0x8 -/* f0f3348: 0fc37e4b */ jal func0f0e2498 +/* f0f3348: 0fc37e4b */ jal menugfx0f0e2498 /* f0f334c: 0059f021 */ addu $s8,$v0,$t9 /* f0f3350: 8fa30120 */ lw $v1,0x120($sp) /* f0f3354: 2615ffff */ addiu $s5,$s0,-1 @@ -12387,7 +12387,7 @@ glabel dialogRender /* f0f336c: afb00010 */ sw $s0,0x10($sp) /* f0f3370: afa0001c */ sw $zero,0x1c($sp) /* f0f3374: afa30014 */ sw $v1,0x14($sp) -/* f0f3378: 0fc37e88 */ jal gfxDrawTri2 +/* f0f3378: 0fc37e88 */ jal menugfxDrawTri2 /* f0f337c: afa30018 */ sw $v1,0x18($sp) /* f0f3380: 8fac0120 */ lw $t4,0x120($sp) /* f0f3384: 240effff */ addiu $t6,$zero,-1 @@ -12398,7 +12398,7 @@ glabel dialogRender /* f0f3398: 02203825 */ or $a3,$s1,$zero /* f0f339c: afb00010 */ sw $s0,0x10($sp) /* f0f33a0: afa0001c */ sw $zero,0x1c($sp) -/* f0f33a4: 0fc37e88 */ jal gfxDrawTri2 +/* f0f33a4: 0fc37e88 */ jal menugfxDrawTri2 /* f0f33a8: afac0014 */ sw $t4,0x14($sp) /* f0f33ac: 8fa30120 */ lw $v1,0x120($sp) /* f0f33b0: 26130001 */ addiu $s3,$s0,0x1 @@ -12410,7 +12410,7 @@ glabel dialogRender /* f0f33c8: 02403825 */ or $a3,$s2,$zero /* f0f33cc: afa0001c */ sw $zero,0x1c($sp) /* f0f33d0: afa30014 */ sw $v1,0x14($sp) -/* f0f33d4: 0fc37e88 */ jal gfxDrawTri2 +/* f0f33d4: 0fc37e88 */ jal menugfxDrawTri2 /* f0f33d8: afa30018 */ sw $v1,0x18($sp) /* f0f33dc: 8fab0120 */ lw $t3,0x120($sp) /* f0f33e0: 240fffff */ addiu $t7,$zero,-1 @@ -12421,7 +12421,7 @@ glabel dialogRender /* f0f33f4: 02203825 */ or $a3,$s1,$zero /* f0f33f8: afb60010 */ sw $s6,0x10($sp) /* f0f33fc: afa0001c */ sw $zero,0x1c($sp) -/* f0f3400: 0fc37e88 */ jal gfxDrawTri2 +/* f0f3400: 0fc37e88 */ jal menugfxDrawTri2 /* f0f3404: afab0014 */ sw $t3,0x14($sp) /* f0f3408: 8fb90078 */ lw $t9,0x78($sp) /* f0f340c: 00402025 */ or $a0,$v0,$zero @@ -12431,7 +12431,7 @@ glabel dialogRender /* f0f341c: afb30010 */ sw $s3,0x10($sp) /* f0f3420: afb70018 */ sw $s7,0x18($sp) /* f0f3424: afa0001c */ sw $zero,0x1c($sp) -/* f0f3428: 0fc37e88 */ jal gfxDrawTri2 +/* f0f3428: 0fc37e88 */ jal menugfxDrawTri2 /* f0f342c: afb90014 */ sw $t9,0x14($sp) /* f0f3430: 8fad0118 */ lw $t5,0x118($sp) /* f0f3434: afa201e8 */ sw $v0,0x1e8($sp) @@ -12454,7 +12454,7 @@ glabel dialogRender /* f0f3478: afb00010 */ sw $s0,0x10($sp) /* f0f347c: afa80014 */ sw $t0,0x14($sp) /* f0f3480: afa80018 */ sw $t0,0x18($sp) -/* f0f3484: 0fc37e88 */ jal gfxDrawTri2 +/* f0f3484: 0fc37e88 */ jal menugfxDrawTri2 /* f0f3488: afa0001c */ sw $zero,0x1c($sp) /* f0f348c: 8faf0120 */ lw $t7,0x120($sp) /* f0f3490: 26320003 */ addiu $s2,$s1,0x3 @@ -12466,7 +12466,7 @@ glabel dialogRender /* f0f34a8: 02a03025 */ or $a2,$s5,$zero /* f0f34ac: afb00010 */ sw $s0,0x10($sp) /* f0f34b0: afa0001c */ sw $zero,0x1c($sp) -/* f0f34b4: 0fc37e88 */ jal gfxDrawTri2 +/* f0f34b4: 0fc37e88 */ jal menugfxDrawTri2 /* f0f34b8: afaf0018 */ sw $t7,0x18($sp) /* f0f34bc: 8fb90120 */ lw $t9,0x120($sp) /* f0f34c0: 00402025 */ or $a0,$v0,$zero @@ -12476,7 +12476,7 @@ glabel dialogRender /* f0f34d0: afb60010 */ sw $s6,0x10($sp) /* f0f34d4: afa0001c */ sw $zero,0x1c($sp) /* f0f34d8: afb90014 */ sw $t9,0x14($sp) -/* f0f34dc: 0fc37e88 */ jal gfxDrawTri2 +/* f0f34dc: 0fc37e88 */ jal menugfxDrawTri2 /* f0f34e0: afb90018 */ sw $t9,0x18($sp) /* f0f34e4: 8fb80120 */ lw $t8,0x120($sp) /* f0f34e8: 240dffff */ addiu $t5,$zero,-1 @@ -12487,7 +12487,7 @@ glabel dialogRender /* f0f34fc: 02403825 */ or $a3,$s2,$zero /* f0f3500: afb60010 */ sw $s6,0x10($sp) /* f0f3504: afa0001c */ sw $zero,0x1c($sp) -/* f0f3508: 0fc37e88 */ jal gfxDrawTri2 +/* f0f3508: 0fc37e88 */ jal menugfxDrawTri2 /* f0f350c: afb80018 */ sw $t8,0x18($sp) /* f0f3510: 8fac0078 */ lw $t4,0x78($sp) /* f0f3514: 00402025 */ or $a0,$v0,$zero @@ -12497,7 +12497,7 @@ glabel dialogRender /* f0f3524: afb30010 */ sw $s3,0x10($sp) /* f0f3528: afb70014 */ sw $s7,0x14($sp) /* f0f352c: afa0001c */ sw $zero,0x1c($sp) -/* f0f3530: 0fc37e88 */ jal gfxDrawTri2 +/* f0f3530: 0fc37e88 */ jal menugfxDrawTri2 /* f0f3534: afac0018 */ sw $t4,0x18($sp) /* f0f3538: afa201e8 */ sw $v0,0x1e8($sp) .NB0f0f353c: @@ -13354,7 +13354,7 @@ u32 var800714d4 = (u32)&var7f1b2664; // // // No dialog has this flag, so this branch is unused // if (dialog->definition->flags & MENUDIALOGFLAG_DISABLETITLEBAR) { -// gdl = menugfxRenderDialogBorderLine(gdl, dialogleft + 1, dialogtop + 11, dialogleft + dialogwidth - 1, dialogtop + 12, GETCOLOUR(unk00), GETCOLOUR(unk08)); +// gdl = menugfxDrawDialogBorderLine(gdl, dialogleft + 1, dialogtop + 11, dialogleft + dialogwidth - 1, dialogtop + 12, GETCOLOUR(unk00), GETCOLOUR(unk08)); // } // } // @@ -13463,7 +13463,7 @@ u32 var800714d4 = (u32)&var7f1b2664; // colindex = dialog->colstart + i; // // if (i != 0 && (dialog->definition->flags & MENUDIALOGFLAG_0400) == 0) { -// gdl = gfxDrawFilledRect(gdl, curx - 1, dialogtop + 12, curx, dialogbottom, sp120, sp120); +// gdl = menugfxDrawFilledRect(gdl, curx - 1, dialogtop + 12, curx, dialogbottom, sp120, sp120); // } // // colwidth = menu->cols[colindex].width; @@ -13520,7 +13520,7 @@ u32 var800714d4 = (u32)&var7f1b2664; // context.dialog = dialog; // // if (prevwaslist) { -// gdl = gfxDrawFilledRect(gdl, context.x, context.y - 1, context.x + context.width, context.y, sp120, sp120); +// gdl = menugfxDrawFilledRect(gdl, context.x, context.y - 1, context.x + context.width, context.y, sp120, sp120); // prevwaslist = false; // } // @@ -13569,12 +13569,12 @@ u32 var800714d4 = (u32)&var7f1b2664; // s32 x4 = context.x + context.width / 3; // // // Left side -// gdl = func0f0e2498(gdl); -// gdl = gfxDrawTri2(gdl, x1, liney - 1, x3 - 3, liney, sp120, sp120, 0); -// gdl = gfxDrawTri2(gdl, x3 - 3, liney - 1, x3, liney, sp120, 0xffffffff, 0); -// gdl = gfxDrawTri2(gdl, x1, liney + 1, x3 - 3, liney + 2, sp120, sp120, 0); -// gdl = gfxDrawTri2(gdl, x3 - 3, liney + 1, x3, liney + 2, sp120, 0xffffffff, 0); -// gdl = gfxDrawTri2(gdl, x3 - 2, liney, x4, liney + 1, (sp120 & 0xffffff00) | 0x2f, sp120 & 0xffffff00, 0); +// gdl = menugfx0f0e2498(gdl); +// gdl = menugfxDrawTri2(gdl, x1, liney - 1, x3 - 3, liney, sp120, sp120, 0); +// gdl = menugfxDrawTri2(gdl, x3 - 3, liney - 1, x3, liney, sp120, 0xffffffff, 0); +// gdl = menugfxDrawTri2(gdl, x1, liney + 1, x3 - 3, liney + 2, sp120, sp120, 0); +// gdl = menugfxDrawTri2(gdl, x3 - 3, liney + 1, x3, liney + 2, sp120, 0xffffffff, 0); +// gdl = menugfxDrawTri2(gdl, x3 - 2, liney, x4, liney + 1, (sp120 & 0xffffff00) | 0x2f, sp120 & 0xffffff00, 0); // // if (item->flags & MENUITEMFLAG_00000020) { // // Right side @@ -13582,11 +13582,11 @@ u32 var800714d4 = (u32)&var7f1b2664; // x3 = context.x + context.width - 8; // x4 = context.x + context.width - context.width / 3; // -// gdl = gfxDrawTri2(gdl, x1 - 5, liney - 1, x1, liney, sp120, sp120, 0); -// gdl = gfxDrawTri2(gdl, x3, liney - 1, x3 + 3, liney, -1, sp120, 0); -// gdl = gfxDrawTri2(gdl, x3 + 3, liney + 1, x1, liney + 2, sp120, sp120, 0); -// gdl = gfxDrawTri2(gdl, x3, liney + 1, x3 + 3, liney + 2, -1, sp120, 0); -// gdl = gfxDrawTri2(gdl, x4, liney, x3 + 2, liney + 1, sp120 & 0xffffff00, (sp120 & 0xffffff00) | 0x2f, 0); +// gdl = menugfxDrawTri2(gdl, x1 - 5, liney - 1, x1, liney, sp120, sp120, 0); +// gdl = menugfxDrawTri2(gdl, x3, liney - 1, x3 + 3, liney, -1, sp120, 0); +// gdl = menugfxDrawTri2(gdl, x3 + 3, liney + 1, x1, liney + 2, sp120, sp120, 0); +// gdl = menugfxDrawTri2(gdl, x3, liney + 1, x3 + 3, liney + 2, -1, sp120, 0); +// gdl = menugfxDrawTri2(gdl, x4, liney, x3 + 2, liney + 1, sp120 & 0xffffff00, (sp120 & 0xffffff00) | 0x2f, 0); // } // } // } diff --git a/src/game/game_0e0770.c b/src/game/menugfx.c similarity index 98% rename from src/game/game_0e0770.c rename to src/game/menugfx.c index 1f9828ab2..3c9b73c70 100644 --- a/src/game/game_0e0770.c +++ b/src/game/menugfx.c @@ -4,8 +4,8 @@ #include "game/bondgun.h" #include "game/game_0b3350.h" #include "game/savebuffer.h" -#include "game/game_0e0770.h" -#include "game/game_0f09f0.h" +#include "game/menugfx.h" +#include "game/menu.h" #include "game/game_1531a0.h" #include "game/gfxmemory.h" #include "game/file.h" @@ -20,7 +20,7 @@ #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel menuCreateBlur +glabel menugfxCreateBlur /* f0e0db0: 27bdff80 */ addiu $sp,$sp,-128 /* f0e0db4: afbf003c */ sw $ra,0x3c($sp) /* f0e0db8: afbe0038 */ sw $s8,0x38($sp) @@ -191,7 +191,7 @@ glabel menuCreateBlur ); #else GLOBAL_ASM( -glabel menuCreateBlur +glabel menugfxCreateBlur /* f0e0770: 27bdff80 */ addiu $sp,$sp,-128 /* f0e0774: afbf003c */ sw $ra,0x3c($sp) /* f0e0778: afbe0038 */ sw $s8,0x38($sp) @@ -366,7 +366,7 @@ u32 var80071180 = 1; * It's a simple fade between the source framebuffer and the blurred image. * Only one blurred image is made. */ -//void menuCreateBlur(void) +//void menugfxCreateBlur(void) //{ //#if VERSION >= VERSION_PAL_FINAL // // Mismatch: Different codegen @@ -953,9 +953,9 @@ Gfx *menugfxRenderDialogBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, str } // Right, left, bottom border - gdl = menugfxRenderDialogBorderLine(gdl, x2 - 1, y1, x2, y2, rightcolour, rightcolour); - gdl = menugfxRenderDialogBorderLine(gdl, x1, y1, x1 + 1, y2, leftcolour, leftcolour); - gdl = menugfxRenderDialogBorderLine(gdl, x1, y2 - 1, x2, y2, leftcolour, rightcolour); + gdl = menugfxDrawDialogBorderLine(gdl, x2 - 1, y1, x2, y2, rightcolour, rightcolour); + gdl = menugfxDrawDialogBorderLine(gdl, x1, y1, x1 + 1, y2, leftcolour, leftcolour); + gdl = menugfxDrawDialogBorderLine(gdl, x1, y2 - 1, x2, y2, leftcolour, rightcolour); return gdl; } @@ -1548,7 +1548,7 @@ glabel var7f1adf18 //} GLOBAL_ASM( -glabel func0f0e1668 +glabel menugfx0f0e1668 /* f0e1668: 27bdff88 */ addiu $sp,$sp,-120 /* f0e166c: afbf002c */ sw $ra,0x2c($sp) /* f0e1670: afa40078 */ sw $a0,0x78($sp) @@ -2408,15 +2408,15 @@ Gfx *menugfxRenderSlider(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 markerx, gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); // Line to the left of the marker: blue -> white gradient - gdl = gfxDrawLine(gdl, x1, y2, markerx, y2 + 1, 0x0000ffff, 0xffffffff); + gdl = menugfxDrawLine(gdl, x1, y2, markerx, y2 + 1, 0x0000ffff, 0xffffffff); // Line to the right of the marker: solid blue - gdl = gfxDrawLine(gdl, markerx, y2, x2, y2 + 1, 0x0000ffff, 0x0000ffff); + gdl = menugfxDrawLine(gdl, markerx, y2, x2, y2 + 1, 0x0000ffff, 0x0000ffff); return gdl; } -Gfx *func0f0e2348(Gfx *gdl) +Gfx *menugfx0f0e2348(Gfx *gdl) { gSPSetGeometryMode(gdl++, G_CULL_BACK); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -2437,7 +2437,7 @@ Gfx *func0f0e2348(Gfx *gdl) return gdl; } -Gfx *func0f0e2498(Gfx *gdl) +Gfx *menugfx0f0e2498(Gfx *gdl) { gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -2452,7 +2452,7 @@ Gfx *func0f0e2498(Gfx *gdl) return gdl; } -Gfx *gfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, bool arg7) +Gfx *menugfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, bool arg7) { struct gfxvtx *vertices; u32 *colours; @@ -2498,16 +2498,16 @@ Gfx *gfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colo return gdl; } -Gfx *gfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) +Gfx *menugfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) { - gdl = func0f0e2498(gdl); - gdl = gfxDrawTri2(gdl, x1, y1, x2, y2, colour1, colour2, false); + gdl = menugfx0f0e2498(gdl); + gdl = menugfxDrawTri2(gdl, x1, y1, x2, y2, colour1, colour2, false); return gdl; } GLOBAL_ASM( -glabel gfxDrawTessellatedRect +glabel menugfxDrawTessellatedRect /* f0e2744: 27bdff68 */ addiu $sp,$sp,-152 /* f0e2748: afbf004c */ sw $ra,0x4c($sp) /* f0e274c: afbe0048 */ sw $s8,0x48($sp) @@ -2595,7 +2595,7 @@ glabel gfxDrawTessellatedRect /* f0e2880: afb20010 */ sw $s2,0x10($sp) /* f0e2884: afb00018 */ sw $s0,0x18($sp) /* f0e2888: afa0001c */ sw $zero,0x1c($sp) -/* f0e288c: 0fc38963 */ jal gfxDrawTri2 +/* f0e288c: 0fc38963 */ jal menugfxDrawTri2 /* f0e2890: afb90014 */ sw $t9,0x14($sp) /* f0e2894: 8fa80094 */ lw $t0,0x94($sp) /* f0e2898: 26940001 */ addiu $s4,$s4,0x1 @@ -2618,7 +2618,7 @@ glabel gfxDrawTessellatedRect /* f0e28d8: afb70010 */ sw $s7,0x10($sp) /* f0e28dc: afa20018 */ sw $v0,0x18($sp) /* f0e28e0: afa0001c */ sw $zero,0x1c($sp) -/* f0e28e4: 0fc38963 */ jal gfxDrawTri2 +/* f0e28e4: 0fc38963 */ jal menugfxDrawTri2 /* f0e28e8: afa90014 */ sw $t1,0x14($sp) /* f0e28ec: 10000060 */ b .L0f0e2a70 /* f0e28f0: afa20098 */ sw $v0,0x98($sp) @@ -2685,7 +2685,7 @@ glabel gfxDrawTessellatedRect /* f0e29cc: afb70010 */ sw $s7,0x10($sp) /* f0e29d0: afb00018 */ sw $s0,0x18($sp) /* f0e29d4: afa0001c */ sw $zero,0x1c($sp) -/* f0e29d8: 0fc38963 */ jal gfxDrawTri2 +/* f0e29d8: 0fc38963 */ jal menugfxDrawTri2 /* f0e29dc: afae0014 */ sw $t6,0x14($sp) /* f0e29e0: 8faf0074 */ lw $t7,0x74($sp) /* f0e29e4: 26940001 */ addiu $s4,$s4,0x1 @@ -2708,7 +2708,7 @@ glabel gfxDrawTessellatedRect /* f0e2a24: afb70010 */ sw $s7,0x10($sp) /* f0e2a28: afa20018 */ sw $v0,0x18($sp) /* f0e2a2c: afa0001c */ sw $zero,0x1c($sp) -/* f0e2a30: 0fc38963 */ jal gfxDrawTri2 +/* f0e2a30: 0fc38963 */ jal menugfxDrawTri2 /* f0e2a34: afb80014 */ sw $t8,0x14($sp) /* f0e2a38: 1000000d */ b .L0f0e2a70 /* f0e2a3c: afa20098 */ sw $v0,0x98($sp) @@ -2722,7 +2722,7 @@ glabel gfxDrawTessellatedRect /* f0e2a58: afb50018 */ sw $s5,0x18($sp) /* f0e2a5c: afa0001c */ sw $zero,0x1c($sp) /* f0e2a60: afb70010 */ sw $s7,0x10($sp) -/* f0e2a64: 0fc38963 */ jal gfxDrawTri2 +/* f0e2a64: 0fc38963 */ jal menugfxDrawTri2 /* f0e2a68: afb90014 */ sw $t9,0x14($sp) /* f0e2a6c: afa20098 */ sw $v0,0x98($sp) .L0f0e2a70: @@ -2742,7 +2742,7 @@ glabel gfxDrawTessellatedRect ); // Mismatch: Uses callee-save registers differently -//Gfx *gfxDrawTessellatedRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) +//Gfx *menugfxDrawTessellatedRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) //{ // if (func0f153e58()) { // if (y2 - y1 > x2 - x1) { @@ -2771,14 +2771,14 @@ glabel gfxDrawTessellatedRect // nextcolour = func0f153e94(y1, thisy, nextcolour); // } // -// gdl = gfxDrawTri2(gdl, x1, thisy, x2, nexty, thiscolour, nextcolour, false); +// gdl = menugfxDrawTri2(gdl, x1, thisy, x2, nexty, thiscolour, nextcolour, false); // // thisy = nexty; // thiscolour = nextcolour; // } // // nextcolour = func0f153e94(x2, y2, colour2); -// gdl = gfxDrawTri2(gdl, x1, thisy, x2, y2, thiscolour, nextcolour, false); +// gdl = menugfxDrawTri2(gdl, x1, thisy, x2, y2, thiscolour, nextcolour, false); // } else { // // Landscape // // 8f4 @@ -2805,18 +2805,18 @@ glabel gfxDrawTessellatedRect // nextcolour = func0f153e94(thisx, y1, nextcolour); // } // -// gdl = gfxDrawTri2(gdl, thisx, y1, nextx, y2, thiscolour, nextcolour, false); +// gdl = menugfxDrawTri2(gdl, thisx, y1, nextx, y2, thiscolour, nextcolour, false); // // thisx = nextx; // thiscolour = nextcolour; // } // // nextcolour = func0f153e94(x2, y2, colour2); -// gdl = gfxDrawTri2(gdl, thisx, y1, x2, y2, thiscolour, nextcolour, false); +// gdl = menugfxDrawTri2(gdl, thisx, y1, x2, y2, thiscolour, nextcolour, false); // } // } else { // // a40 -// gdl = gfxDrawTri2(gdl, x1, y1, x2, y2, colour1, colour2, false); +// gdl = menugfxDrawTri2(gdl, x1, y1, x2, y2, colour1, colour2, false); // } // // return gdl; @@ -2883,17 +2883,17 @@ Gfx *menugfxDrawShimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bo if (x1 <= shimmerright && x2 >= shimmerleft) { if (arg6) { - gdl = func0f0e2498(gdl); + gdl = menugfx0f0e2498(gdl); } tailcolour = ((((colour & 0xff) * (0xff - alpha)) / 255) & 0xff) | 0xffffff00; if (reverse) { // Left to right - gdl = gfxDrawTri2(gdl, shimmerleft, y1, shimmerright, y2, 0xffffff00, tailcolour, 0); + gdl = menugfxDrawTri2(gdl, shimmerleft, y1, shimmerright, y2, 0xffffff00, tailcolour, 0); } else { // Right to left - gdl = gfxDrawTri2(gdl, shimmerleft, y1, shimmerright, y2, tailcolour, 0xffffff00, 0); + gdl = menugfxDrawTri2(gdl, shimmerleft, y1, shimmerright, y2, tailcolour, 0xffffff00, 0); } } } else { @@ -2925,17 +2925,17 @@ Gfx *menugfxDrawShimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bo if (y1 <= shimmerbottom && y2 >= shimmertop) { if (arg6) { - gdl = func0f0e2498(gdl); + gdl = menugfx0f0e2498(gdl); } tailcolour = ((((colour & 0xff) * (0xff - alpha)) / 255) & 0xff) | 0xffffff00; if (reverse) { // Top to bottom - gdl = gfxDrawTri2(gdl, x1, shimmertop, x2, shimmerbottom, 0xffffff00, tailcolour, 1); + gdl = menugfxDrawTri2(gdl, x1, shimmertop, x2, shimmerbottom, 0xffffff00, tailcolour, 1); } else { // Bottom to top - gdl = gfxDrawTri2(gdl, x1, shimmertop, x2, shimmerbottom, tailcolour, 0xffffff00, 1); + gdl = menugfxDrawTri2(gdl, x1, shimmertop, x2, shimmerbottom, tailcolour, 0xffffff00, 1); } } } @@ -2943,18 +2943,18 @@ Gfx *menugfxDrawShimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bo return gdl; } -Gfx *menugfxRenderDialogBorderLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) +Gfx *menugfxDrawDialogBorderLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) { - gdl = gfxDrawLine(gdl, x1, y1, x2, y2, colour1, colour2); + gdl = menugfxDrawLine(gdl, x1, y1, x2, y2, colour1, colour2); gdl = menugfxDrawShimmer(gdl, x1, y1, x2, y2, colour1, 0, 10, false); return gdl; } -Gfx *gfxDrawFilledRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) +Gfx *menugfxDrawFilledRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) { - gdl = func0f0e2498(gdl); - gdl = gfxDrawTessellatedRect(gdl, x1, y1, x2, y2, colour1, colour2); + gdl = menugfx0f0e2498(gdl); + gdl = menugfxDrawTessellatedRect(gdl, x1, y1, x2, y2, colour1, colour2); gdl = menugfxDrawShimmer(gdl, x1, y1, x2, y2, colour1, 0, 10, false); return gdl; @@ -3136,7 +3136,7 @@ Gfx *menugfxDrawDialogChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u return gdl; } -Gfx *gfxDrawSquare(Gfx *gdl, s32 x, s32 y, s32 size, bool fill, u32 bordercolour, u32 fillcolour) +Gfx *menugfxDrawCheckbox(Gfx *gdl, s32 x, s32 y, s32 size, bool fill, u32 bordercolour, u32 fillcolour) { if (fill) { gdl = gfxSetPrimColour(gdl, fillcolour); @@ -3866,12 +3866,12 @@ Gfx *menugfxRenderBgFailureCopy(Gfx *gdl) return gdl; } -void func0f0e4fd4(void) +void menugfx0f0e4fd4(void) { var80071184 = 0; } -u32 func0f0e4fe0(void) +u32 menugfx0f0e4fe0(void) { return align16(0xd20); } diff --git a/src/game/menu/items.c b/src/game/menuitem.c similarity index 99% rename from src/game/menu/items.c rename to src/game/menuitem.c index 63c2c8657..7fdd7edf3 100644 --- a/src/game/menu/items.c +++ b/src/game/menuitem.c @@ -4,9 +4,9 @@ #include "game/game_006900.h" #include "game/game_095320.h" #include "game/game_0b3350.h" -#include "game/game_0e0770.h" -#include "game/menu/items.h" -#include "game/game_0f09f0.h" +#include "game/menugfx.h" +#include "game/menuitem.h" +#include "game/menu.h" #include "game/mainmenu.h" #include "game/game_1531a0.h" #include "game/lv.h" @@ -854,7 +854,7 @@ glabel menuitemListRender /* f0e6694: 00ca6821 */ addu $t5,$a2,$t2 /* f0e6698: afad0010 */ sw $t5,0x10($sp) /* f0e669c: 02002825 */ or $a1,$s0,$zero -/* f0e66a0: 0fc3859a */ jal func0f0e1668 +/* f0e66a0: 0fc3859a */ jal menugfx0f0e1668 /* f0e66a4: 020b3821 */ addu $a3,$s0,$t3 /* f0e66a8: 86300000 */ lh $s0,0x0($s1) /* f0e66ac: 86260002 */ lh $a2,0x2($s1) @@ -1750,7 +1750,7 @@ glabel menuitemListRender /* f0e73a4: afae0018 */ sw $t6,0x18($sp) /* f0e73a8: afb00014 */ sw $s0,0x14($sp) /* f0e73ac: afac0010 */ sw $t4,0x10($sp) -/* f0e73b0: 0fc38dec */ jal gfxDrawSquare +/* f0e73b0: 0fc38dec */ jal menugfxDrawCheckbox /* f0e73b4: 24070006 */ addiu $a3,$zero,0x6 /* f0e73b8: 00409025 */ or $s2,$v0,$zero .L0f0e73bc: @@ -2047,7 +2047,7 @@ glabel menuitemListRender /* f0e39f0: 00cfc021 */ addu $t8,$a2,$t7 /* f0e39f4: afb80010 */ sw $t8,0x10($sp) /* f0e39f8: 02002825 */ or $a1,$s0,$zero -/* f0e39fc: 0fc37aaa */ jal func0f0e1668 +/* f0e39fc: 0fc37aaa */ jal menugfx0f0e1668 /* f0e3a00: 020e3821 */ addu $a3,$s0,$t6 /* f0e3a04: 86300000 */ lh $s0,0x0($s1) /* f0e3a08: 86260002 */ lh $a2,0x2($s1) @@ -2817,7 +2817,7 @@ glabel menuitemListRender /* f0e4538: afac0018 */ sw $t4,0x18($sp) /* f0e453c: afb00014 */ sw $s0,0x14($sp) /* f0e4540: afaa0010 */ sw $t2,0x10($sp) -/* f0e4544: 0fc38311 */ jal gfxDrawSquare +/* f0e4544: 0fc38311 */ jal menugfxDrawCheckbox /* f0e4548: 24070006 */ addiu $a3,$zero,0x6 /* f0e454c: 0040a025 */ or $s4,$v0,$zero .NB0f0e4550: @@ -4212,7 +4212,7 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) // Render horizontal grid lines for (row = 0; row < 6; row++) { - gdl = gfxDrawFilledRect(gdl, context->x + 4, context->y + row * 11 + 13, + gdl = menugfxDrawFilledRect(gdl, context->x + 4, context->y + row * 11 + 13, context->x + 124, context->y + row * 11 + 14, 0x00ffff7f, 0x00ffff7f); } @@ -4224,7 +4224,7 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) rowspan = 4; } - gdl = gfxDrawFilledRect(gdl, context->x + col * 12 + 4, context->y + 13, + gdl = menugfxDrawFilledRect(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 *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) } } - 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 + gdl = menugfxDrawLine(gdl, x1, y1, x2, y1 + 1, -1, -1); // top + gdl = menugfxDrawLine(gdl, x2, y1, x2 + 1, y2 + 1, -1, -1); // right + gdl = menugfxDrawLine(gdl, x1, y2, x2, y2 + 1, -1, -1); // bottom + gdl = menugfxDrawLine(gdl, x1, y1, x1 + 1, y2 + 1, -1, -1); // left } return gdl; @@ -4639,7 +4639,7 @@ Gfx *menuitemSeparatorRender(Gfx *gdl, struct menurendercontext *context) colour = (colour & 0xffffff00) | 0x3f; - return gfxDrawFilledRect(gdl, + return menugfxDrawFilledRect(gdl, context->x, context->y + 2, context->x + context->width, context->y + 3, colour, colour); } @@ -5021,7 +5021,7 @@ glabel menuitemObjectiveRender /* f0e9e3c: 0000c012 */ mflo $t8 /* f0e9e40: 0158c821 */ addu $t9,$t2,$t8 /* f0e9e44: 27290013 */ addiu $t1,$t9,0x13 -/* f0e9e48: 0fc38926 */ jal func0f0e2498 +/* f0e9e48: 0fc38926 */ jal menugfx0f0e2498 /* f0e9e4c: afa90098 */ sw $t1,0x98($sp) /* f0e9e50: 8fa3012c */ lw $v1,0x12c($sp) /* f0e9e54: 8fa600b0 */ lw $a2,0xb0($sp) @@ -5036,7 +5036,7 @@ glabel menuitemObjectiveRender /* f0e9e78: afac0054 */ sw $t4,0x54($sp) /* f0e9e7c: 00402025 */ or $a0,$v0,$zero /* f0e9e80: 87a50142 */ lh $a1,0x142($sp) -/* f0e9e84: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9e84: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9e88: 8fa700b4 */ lw $a3,0xb4($sp) /* f0e9e8c: 8fa500b4 */ lw $a1,0xb4($sp) /* f0e9e90: 8fab00ac */ lw $t3,0xac($sp) @@ -5046,7 +5046,7 @@ glabel menuitemObjectiveRender /* f0e9ea0: 8fa600b0 */ lw $a2,0xb0($sp) /* f0e9ea4: afb00014 */ sw $s0,0x14($sp) /* f0e9ea8: afb00018 */ sw $s0,0x18($sp) -/* f0e9eac: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9eac: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9eb0: afab0010 */ sw $t3,0x10($sp) /* f0e9eb4: 8fa600ac */ lw $a2,0xac($sp) /* f0e9eb8: 8fa7005c */ lw $a3,0x5c($sp) @@ -5059,7 +5059,7 @@ glabel menuitemObjectiveRender /* f0e9ed4: 00402025 */ or $a0,$v0,$zero /* f0e9ed8: 87a50142 */ lh $a1,0x142($sp) /* f0e9edc: afb00018 */ sw $s0,0x18($sp) -/* f0e9ee0: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9ee0: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9ee4: afa30014 */ sw $v1,0x14($sp) /* f0e9ee8: 8fa50058 */ lw $a1,0x58($sp) /* f0e9eec: 8fa80048 */ lw $t0,0x48($sp) @@ -5070,7 +5070,7 @@ glabel menuitemObjectiveRender /* f0e9f00: 8fa7004c */ lw $a3,0x4c($sp) /* f0e9f04: afb00014 */ sw $s0,0x14($sp) /* f0e9f08: afb00018 */ sw $s0,0x18($sp) -/* f0e9f0c: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9f0c: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9f10: afa80010 */ sw $t0,0x10($sp) /* f0e9f14: 8fa300a8 */ lw $v1,0xa8($sp) /* f0e9f18: 8fa50058 */ lw $a1,0x58($sp) @@ -5081,7 +5081,7 @@ glabel menuitemObjectiveRender /* f0e9f2c: 8fa600ac */ lw $a2,0xac($sp) /* f0e9f30: afb00014 */ sw $s0,0x14($sp) /* f0e9f34: afb00018 */ sw $s0,0x18($sp) -/* f0e9f38: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9f38: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9f3c: 24a70001 */ addiu $a3,$a1,0x1 /* f0e9f40: 8fa50058 */ lw $a1,0x58($sp) /* f0e9f44: 8fae00a8 */ lw $t6,0xa8($sp) @@ -5092,7 +5092,7 @@ glabel menuitemObjectiveRender /* f0e9f58: 8fa70054 */ lw $a3,0x54($sp) /* f0e9f5c: afb00014 */ sw $s0,0x14($sp) /* f0e9f60: afb00018 */ sw $s0,0x18($sp) -/* f0e9f64: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9f64: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9f68: afae0010 */ sw $t6,0x10($sp) /* f0e9f6c: 8fa600a8 */ lw $a2,0xa8($sp) /* f0e9f70: 8fa7005c */ lw $a3,0x5c($sp) @@ -5104,7 +5104,7 @@ glabel menuitemObjectiveRender /* f0e9f88: afa30048 */ sw $v1,0x48($sp) /* f0e9f8c: 00402025 */ or $a0,$v0,$zero /* f0e9f90: afb00014 */ sw $s0,0x14($sp) -/* f0e9f94: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9f94: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9f98: afb00018 */ sw $s0,0x18($sp) /* f0e9f9c: 8fa300a8 */ lw $v1,0xa8($sp) /* f0e9fa0: 00402025 */ or $a0,$v0,$zero @@ -5115,7 +5115,7 @@ glabel menuitemObjectiveRender /* f0e9fb4: 8fa6004c */ lw $a2,0x4c($sp) /* f0e9fb8: 8fa70054 */ lw $a3,0x54($sp) /* f0e9fbc: afb00014 */ sw $s0,0x14($sp) -/* f0e9fc0: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9fc0: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9fc4: afb00018 */ sw $s0,0x18($sp) /* f0e9fc8: 8fad0048 */ lw $t5,0x48($sp) /* f0e9fcc: 00402025 */ or $a0,$v0,$zero @@ -5124,7 +5124,7 @@ glabel menuitemObjectiveRender /* f0e9fd8: 8fa70098 */ lw $a3,0x98($sp) /* f0e9fdc: afb00014 */ sw $s0,0x14($sp) /* f0e9fe0: afb00018 */ sw $s0,0x18($sp) -/* f0e9fe4: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9fe4: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9fe8: afad0010 */ sw $t5,0x10($sp) /* f0e9fec: 8faf0044 */ lw $t7,0x44($sp) /* f0e9ff0: 00402025 */ or $a0,$v0,$zero @@ -5133,7 +5133,7 @@ glabel menuitemObjectiveRender /* f0e9ffc: 8fa70098 */ lw $a3,0x98($sp) /* f0ea000: afb00014 */ sw $s0,0x14($sp) /* f0ea004: afb00018 */ sw $s0,0x18($sp) -/* f0ea008: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea008: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea00c: afaf0010 */ sw $t7,0x10($sp) /* f0ea010: 8fa300c8 */ lw $v1,0xc8($sp) /* f0ea014: 8fa50098 */ lw $a1,0x98($sp) @@ -5149,7 +5149,7 @@ glabel menuitemObjectiveRender /* f0ea03c: afa9005c */ sw $t1,0x5c($sp) /* f0ea040: 00402025 */ or $a0,$v0,$zero /* f0ea044: 8fa600a8 */ lw $a2,0xa8($sp) -/* f0ea048: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea048: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea04c: afb90010 */ sw $t9,0x10($sp) /* f0ea050: 8fa7009c */ lw $a3,0x9c($sp) /* f0ea054: 8faa004c */ lw $t2,0x4c($sp) @@ -5160,7 +5160,7 @@ glabel menuitemObjectiveRender /* f0ea068: 8fa60048 */ lw $a2,0x48($sp) /* f0ea06c: afb00014 */ sw $s0,0x14($sp) /* f0ea070: afb00018 */ sw $s0,0x18($sp) -/* f0ea074: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea074: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea078: afaa0010 */ sw $t2,0x10($sp) /* f0ea07c: 8fab005c */ lw $t3,0x5c($sp) /* f0ea080: 8fac004c */ lw $t4,0x4c($sp) @@ -5171,7 +5171,7 @@ glabel menuitemObjectiveRender /* f0ea094: 8fa60048 */ lw $a2,0x48($sp) /* f0ea098: 8fa7009c */ lw $a3,0x9c($sp) /* f0ea09c: afb00014 */ sw $s0,0x14($sp) -/* f0ea0a0: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea0a0: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea0a4: afac0010 */ sw $t4,0x10($sp) /* f0ea0a8: 10000074 */ b .L0f0ea27c /* f0ea0ac: afa20130 */ sw $v0,0x130($sp) @@ -5201,7 +5201,7 @@ glabel menuitemObjectiveRender /* f0ea108: 25f90019 */ addiu $t9,$t7,0x19 /* f0ea10c: 0fc54de0 */ jal func0f153780 /* f0ea110: afb9006c */ sw $t9,0x6c($sp) -/* f0ea114: 0fc38926 */ jal func0f0e2498 +/* f0ea114: 0fc38926 */ jal menugfx0f0e2498 /* f0ea118: 00402025 */ or $a0,$v0,$zero /* f0ea11c: 8fa3012c */ lw $v1,0x12c($sp) /* f0ea120: 8fa6007c */ lw $a2,0x7c($sp) @@ -5216,7 +5216,7 @@ glabel menuitemObjectiveRender /* f0ea144: afa90054 */ sw $t1,0x54($sp) /* f0ea148: 00402025 */ or $a0,$v0,$zero /* f0ea14c: 87a50142 */ lh $a1,0x142($sp) -/* f0ea150: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea150: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea154: 8fa70080 */ lw $a3,0x80($sp) /* f0ea158: 8fa50080 */ lw $a1,0x80($sp) /* f0ea15c: 8fac0078 */ lw $t4,0x78($sp) @@ -5226,7 +5226,7 @@ glabel menuitemObjectiveRender /* f0ea16c: 8fa6007c */ lw $a2,0x7c($sp) /* f0ea170: afb00014 */ sw $s0,0x14($sp) /* f0ea174: afb00018 */ sw $s0,0x18($sp) -/* f0ea178: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea178: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea17c: afac0010 */ sw $t4,0x10($sp) /* f0ea180: 87ab0142 */ lh $t3,0x142($sp) /* f0ea184: 8fa60078 */ lw $a2,0x78($sp) @@ -5248,7 +5248,7 @@ glabel menuitemObjectiveRender .L0f0ea1c4: /* f0ea1c4: 25a7ffff */ addiu $a3,$t5,-1 /* f0ea1c8: afa70058 */ sw $a3,0x58($sp) -/* f0ea1cc: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea1cc: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea1d0: afa30014 */ sw $v1,0x14($sp) /* f0ea1d4: 8fa50058 */ lw $a1,0x58($sp) /* f0ea1d8: 8fa8004c */ lw $t0,0x4c($sp) @@ -5259,7 +5259,7 @@ glabel menuitemObjectiveRender /* f0ea1ec: 8fa7005c */ lw $a3,0x5c($sp) /* f0ea1f0: afb00014 */ sw $s0,0x14($sp) /* f0ea1f4: afb00018 */ sw $s0,0x18($sp) -/* f0ea1f8: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea1f8: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea1fc: afa80010 */ sw $t0,0x10($sp) /* f0ea200: 8faf0074 */ lw $t7,0x74($sp) /* f0ea204: 8fa50058 */ lw $a1,0x58($sp) @@ -5269,7 +5269,7 @@ glabel menuitemObjectiveRender /* f0ea214: 8fa60078 */ lw $a2,0x78($sp) /* f0ea218: afb00014 */ sw $s0,0x14($sp) /* f0ea21c: afb00018 */ sw $s0,0x18($sp) -/* f0ea220: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea220: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea224: 24a70001 */ addiu $a3,$a1,0x1 /* f0ea228: 8fa50058 */ lw $a1,0x58($sp) /* f0ea22c: 8fb80074 */ lw $t8,0x74($sp) @@ -5280,7 +5280,7 @@ glabel menuitemObjectiveRender /* f0ea240: 8fa70054 */ lw $a3,0x54($sp) /* f0ea244: afb00014 */ sw $s0,0x14($sp) /* f0ea248: afb00018 */ sw $s0,0x18($sp) -/* f0ea24c: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea24c: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea250: afb80010 */ sw $t8,0x10($sp) /* f0ea254: 8fa60074 */ lw $a2,0x74($sp) /* f0ea258: 8fa50044 */ lw $a1,0x44($sp) @@ -5289,7 +5289,7 @@ glabel menuitemObjectiveRender /* f0ea264: afaa0010 */ sw $t2,0x10($sp) /* f0ea268: 8fa7006c */ lw $a3,0x6c($sp) /* f0ea26c: afb00014 */ sw $s0,0x14($sp) -/* f0ea270: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea270: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea274: afb00018 */ sw $s0,0x18($sp) /* f0ea278: afa20130 */ sw $v0,0x130($sp) .L0f0ea27c: @@ -5674,7 +5674,7 @@ glabel menuitemObjectiveRender /* f0e9e3c: 0000c012 */ mflo $t8 /* f0e9e40: 0158c821 */ addu $t9,$t2,$t8 /* f0e9e44: 27290013 */ addiu $t1,$t9,0x13 -/* f0e9e48: 0fc38926 */ jal func0f0e2498 +/* f0e9e48: 0fc38926 */ jal menugfx0f0e2498 /* f0e9e4c: afa90098 */ sw $t1,0x98($sp) /* f0e9e50: 8fa3012c */ lw $v1,0x12c($sp) /* f0e9e54: 8fa600b0 */ lw $a2,0xb0($sp) @@ -5689,7 +5689,7 @@ glabel menuitemObjectiveRender /* f0e9e78: afac0054 */ sw $t4,0x54($sp) /* f0e9e7c: 00402025 */ or $a0,$v0,$zero /* f0e9e80: 87a50142 */ lh $a1,0x142($sp) -/* f0e9e84: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9e84: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9e88: 8fa700b4 */ lw $a3,0xb4($sp) /* f0e9e8c: 8fa500b4 */ lw $a1,0xb4($sp) /* f0e9e90: 8fab00ac */ lw $t3,0xac($sp) @@ -5699,7 +5699,7 @@ glabel menuitemObjectiveRender /* f0e9ea0: 8fa600b0 */ lw $a2,0xb0($sp) /* f0e9ea4: afb00014 */ sw $s0,0x14($sp) /* f0e9ea8: afb00018 */ sw $s0,0x18($sp) -/* f0e9eac: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9eac: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9eb0: afab0010 */ sw $t3,0x10($sp) /* f0e9eb4: 8fa600ac */ lw $a2,0xac($sp) /* f0e9eb8: 8fa7005c */ lw $a3,0x5c($sp) @@ -5712,7 +5712,7 @@ glabel menuitemObjectiveRender /* f0e9ed4: 00402025 */ or $a0,$v0,$zero /* f0e9ed8: 87a50142 */ lh $a1,0x142($sp) /* f0e9edc: afb00018 */ sw $s0,0x18($sp) -/* f0e9ee0: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9ee0: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9ee4: afa30014 */ sw $v1,0x14($sp) /* f0e9ee8: 8fa50058 */ lw $a1,0x58($sp) /* f0e9eec: 8fa80048 */ lw $t0,0x48($sp) @@ -5723,7 +5723,7 @@ glabel menuitemObjectiveRender /* f0e9f00: 8fa7004c */ lw $a3,0x4c($sp) /* f0e9f04: afb00014 */ sw $s0,0x14($sp) /* f0e9f08: afb00018 */ sw $s0,0x18($sp) -/* f0e9f0c: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9f0c: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9f10: afa80010 */ sw $t0,0x10($sp) /* f0e9f14: 8fa300a8 */ lw $v1,0xa8($sp) /* f0e9f18: 8fa50058 */ lw $a1,0x58($sp) @@ -5734,7 +5734,7 @@ glabel menuitemObjectiveRender /* f0e9f2c: 8fa600ac */ lw $a2,0xac($sp) /* f0e9f30: afb00014 */ sw $s0,0x14($sp) /* f0e9f34: afb00018 */ sw $s0,0x18($sp) -/* f0e9f38: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9f38: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9f3c: 24a70001 */ addiu $a3,$a1,0x1 /* f0e9f40: 8fa50058 */ lw $a1,0x58($sp) /* f0e9f44: 8fae00a8 */ lw $t6,0xa8($sp) @@ -5745,7 +5745,7 @@ glabel menuitemObjectiveRender /* f0e9f58: 8fa70054 */ lw $a3,0x54($sp) /* f0e9f5c: afb00014 */ sw $s0,0x14($sp) /* f0e9f60: afb00018 */ sw $s0,0x18($sp) -/* f0e9f64: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9f64: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9f68: afae0010 */ sw $t6,0x10($sp) /* f0e9f6c: 8fa600a8 */ lw $a2,0xa8($sp) /* f0e9f70: 8fa7005c */ lw $a3,0x5c($sp) @@ -5757,7 +5757,7 @@ glabel menuitemObjectiveRender /* f0e9f88: afa30048 */ sw $v1,0x48($sp) /* f0e9f8c: 00402025 */ or $a0,$v0,$zero /* f0e9f90: afb00014 */ sw $s0,0x14($sp) -/* f0e9f94: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9f94: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9f98: afb00018 */ sw $s0,0x18($sp) /* f0e9f9c: 8fa300a8 */ lw $v1,0xa8($sp) /* f0e9fa0: 00402025 */ or $a0,$v0,$zero @@ -5768,7 +5768,7 @@ glabel menuitemObjectiveRender /* f0e9fb4: 8fa6004c */ lw $a2,0x4c($sp) /* f0e9fb8: 8fa70054 */ lw $a3,0x54($sp) /* f0e9fbc: afb00014 */ sw $s0,0x14($sp) -/* f0e9fc0: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9fc0: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9fc4: afb00018 */ sw $s0,0x18($sp) /* f0e9fc8: 8fad0048 */ lw $t5,0x48($sp) /* f0e9fcc: 00402025 */ or $a0,$v0,$zero @@ -5777,7 +5777,7 @@ glabel menuitemObjectiveRender /* f0e9fd8: 8fa70098 */ lw $a3,0x98($sp) /* f0e9fdc: afb00014 */ sw $s0,0x14($sp) /* f0e9fe0: afb00018 */ sw $s0,0x18($sp) -/* f0e9fe4: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0e9fe4: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0e9fe8: afad0010 */ sw $t5,0x10($sp) /* f0e9fec: 8faf0044 */ lw $t7,0x44($sp) /* f0e9ff0: 00402025 */ or $a0,$v0,$zero @@ -5786,7 +5786,7 @@ glabel menuitemObjectiveRender /* f0e9ffc: 8fa70098 */ lw $a3,0x98($sp) /* f0ea000: afb00014 */ sw $s0,0x14($sp) /* f0ea004: afb00018 */ sw $s0,0x18($sp) -/* f0ea008: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea008: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea00c: afaf0010 */ sw $t7,0x10($sp) /* f0ea010: 8fa300c8 */ lw $v1,0xc8($sp) /* f0ea014: 8fa50098 */ lw $a1,0x98($sp) @@ -5802,7 +5802,7 @@ glabel menuitemObjectiveRender /* f0ea03c: afa9005c */ sw $t1,0x5c($sp) /* f0ea040: 00402025 */ or $a0,$v0,$zero /* f0ea044: 8fa600a8 */ lw $a2,0xa8($sp) -/* f0ea048: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea048: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea04c: afb90010 */ sw $t9,0x10($sp) /* f0ea050: 8fa7009c */ lw $a3,0x9c($sp) /* f0ea054: 8faa004c */ lw $t2,0x4c($sp) @@ -5813,7 +5813,7 @@ glabel menuitemObjectiveRender /* f0ea068: 8fa60048 */ lw $a2,0x48($sp) /* f0ea06c: afb00014 */ sw $s0,0x14($sp) /* f0ea070: afb00018 */ sw $s0,0x18($sp) -/* f0ea074: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea074: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea078: afaa0010 */ sw $t2,0x10($sp) /* f0ea07c: 8fab005c */ lw $t3,0x5c($sp) /* f0ea080: 8fac004c */ lw $t4,0x4c($sp) @@ -5824,7 +5824,7 @@ glabel menuitemObjectiveRender /* f0ea094: 8fa60048 */ lw $a2,0x48($sp) /* f0ea098: 8fa7009c */ lw $a3,0x9c($sp) /* f0ea09c: afb00014 */ sw $s0,0x14($sp) -/* f0ea0a0: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea0a0: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea0a4: afac0010 */ sw $t4,0x10($sp) /* f0ea0a8: 10000074 */ b .L0f0ea27c /* f0ea0ac: afa20130 */ sw $v0,0x130($sp) @@ -5854,7 +5854,7 @@ glabel menuitemObjectiveRender /* f0ea108: 25f90019 */ addiu $t9,$t7,0x19 /* f0ea10c: 0fc54de0 */ jal func0f153780 /* f0ea110: afb9006c */ sw $t9,0x6c($sp) -/* f0ea114: 0fc38926 */ jal func0f0e2498 +/* f0ea114: 0fc38926 */ jal menugfx0f0e2498 /* f0ea118: 00402025 */ or $a0,$v0,$zero /* f0ea11c: 8fa3012c */ lw $v1,0x12c($sp) /* f0ea120: 8fa6007c */ lw $a2,0x7c($sp) @@ -5869,7 +5869,7 @@ glabel menuitemObjectiveRender /* f0ea144: afa90054 */ sw $t1,0x54($sp) /* f0ea148: 00402025 */ or $a0,$v0,$zero /* f0ea14c: 87a50142 */ lh $a1,0x142($sp) -/* f0ea150: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea150: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea154: 8fa70080 */ lw $a3,0x80($sp) /* f0ea158: 8fa50080 */ lw $a1,0x80($sp) /* f0ea15c: 8fac0078 */ lw $t4,0x78($sp) @@ -5879,7 +5879,7 @@ glabel menuitemObjectiveRender /* f0ea16c: 8fa6007c */ lw $a2,0x7c($sp) /* f0ea170: afb00014 */ sw $s0,0x14($sp) /* f0ea174: afb00018 */ sw $s0,0x18($sp) -/* f0ea178: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea178: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea17c: afac0010 */ sw $t4,0x10($sp) /* f0ea180: 87ab0142 */ lh $t3,0x142($sp) /* f0ea184: 8fa60078 */ lw $a2,0x78($sp) @@ -5901,7 +5901,7 @@ glabel menuitemObjectiveRender .L0f0ea1c4: /* f0ea1c4: 25a7ffff */ addiu $a3,$t5,-1 /* f0ea1c8: afa70058 */ sw $a3,0x58($sp) -/* f0ea1cc: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea1cc: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea1d0: afa30014 */ sw $v1,0x14($sp) /* f0ea1d4: 8fa50058 */ lw $a1,0x58($sp) /* f0ea1d8: 8fa8004c */ lw $t0,0x4c($sp) @@ -5912,7 +5912,7 @@ glabel menuitemObjectiveRender /* f0ea1ec: 8fa7005c */ lw $a3,0x5c($sp) /* f0ea1f0: afb00014 */ sw $s0,0x14($sp) /* f0ea1f4: afb00018 */ sw $s0,0x18($sp) -/* f0ea1f8: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea1f8: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea1fc: afa80010 */ sw $t0,0x10($sp) /* f0ea200: 8faf0074 */ lw $t7,0x74($sp) /* f0ea204: 8fa50058 */ lw $a1,0x58($sp) @@ -5922,7 +5922,7 @@ glabel menuitemObjectiveRender /* f0ea214: 8fa60078 */ lw $a2,0x78($sp) /* f0ea218: afb00014 */ sw $s0,0x14($sp) /* f0ea21c: afb00018 */ sw $s0,0x18($sp) -/* f0ea220: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea220: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea224: 24a70001 */ addiu $a3,$a1,0x1 /* f0ea228: 8fa50058 */ lw $a1,0x58($sp) /* f0ea22c: 8fb80074 */ lw $t8,0x74($sp) @@ -5933,7 +5933,7 @@ glabel menuitemObjectiveRender /* f0ea240: 8fa70054 */ lw $a3,0x54($sp) /* f0ea244: afb00014 */ sw $s0,0x14($sp) /* f0ea248: afb00018 */ sw $s0,0x18($sp) -/* f0ea24c: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea24c: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea250: afb80010 */ sw $t8,0x10($sp) /* f0ea254: 8fa60074 */ lw $a2,0x74($sp) /* f0ea258: 8fa50044 */ lw $a1,0x44($sp) @@ -5942,7 +5942,7 @@ glabel menuitemObjectiveRender /* f0ea264: afaa0010 */ sw $t2,0x10($sp) /* f0ea268: 8fa7006c */ lw $a3,0x6c($sp) /* f0ea26c: afb00014 */ sw $s0,0x14($sp) -/* f0ea270: 0fc389d1 */ jal gfxDrawTessellatedRect +/* f0ea270: 0fc389d1 */ jal menugfxDrawTessellatedRect /* f0ea274: afb00018 */ sw $s0,0x18($sp) /* f0ea278: afa20130 */ sw $v0,0x130($sp) .L0f0ea27c: @@ -6327,7 +6327,7 @@ glabel menuitemObjectiveRender /* f0e6fb0: 0000c012 */ mflo $t8 /* f0e6fb4: 0158c821 */ addu $t9,$t2,$t8 /* f0e6fb8: 27290013 */ addiu $t1,$t9,0x13 -/* f0e6fbc: 0fc37e4b */ jal func0f0e2498 +/* f0e6fbc: 0fc37e4b */ jal menugfx0f0e2498 /* f0e6fc0: afa90098 */ sw $t1,0x98($sp) /* f0e6fc4: 8fa3012c */ lw $v1,0x12c($sp) /* f0e6fc8: 8fa600b0 */ lw $a2,0xb0($sp) @@ -6342,7 +6342,7 @@ glabel menuitemObjectiveRender /* f0e6fec: afac0054 */ sw $t4,0x54($sp) /* f0e6ff0: 00402025 */ or $a0,$v0,$zero /* f0e6ff4: 87a50142 */ lh $a1,0x142($sp) -/* f0e6ff8: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e6ff8: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e6ffc: 8fa700b4 */ lw $a3,0xb4($sp) /* f0e7000: 8fa500b4 */ lw $a1,0xb4($sp) /* f0e7004: 8fab00ac */ lw $t3,0xac($sp) @@ -6352,7 +6352,7 @@ glabel menuitemObjectiveRender /* f0e7014: 8fa600b0 */ lw $a2,0xb0($sp) /* f0e7018: afb00014 */ sw $s0,0x14($sp) /* f0e701c: afb00018 */ sw $s0,0x18($sp) -/* f0e7020: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e7020: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e7024: afab0010 */ sw $t3,0x10($sp) /* f0e7028: 8fa600ac */ lw $a2,0xac($sp) /* f0e702c: 8fa7005c */ lw $a3,0x5c($sp) @@ -6365,7 +6365,7 @@ glabel menuitemObjectiveRender /* f0e7048: 00402025 */ or $a0,$v0,$zero /* f0e704c: 87a50142 */ lh $a1,0x142($sp) /* f0e7050: afb00018 */ sw $s0,0x18($sp) -/* f0e7054: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e7054: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e7058: afa30014 */ sw $v1,0x14($sp) /* f0e705c: 8fa50058 */ lw $a1,0x58($sp) /* f0e7060: 8fa80048 */ lw $t0,0x48($sp) @@ -6376,7 +6376,7 @@ glabel menuitemObjectiveRender /* f0e7074: 8fa7004c */ lw $a3,0x4c($sp) /* f0e7078: afb00014 */ sw $s0,0x14($sp) /* f0e707c: afb00018 */ sw $s0,0x18($sp) -/* f0e7080: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e7080: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e7084: afa80010 */ sw $t0,0x10($sp) /* f0e7088: 8fa300a8 */ lw $v1,0xa8($sp) /* f0e708c: 8fa50058 */ lw $a1,0x58($sp) @@ -6387,7 +6387,7 @@ glabel menuitemObjectiveRender /* f0e70a0: 8fa600ac */ lw $a2,0xac($sp) /* f0e70a4: afb00014 */ sw $s0,0x14($sp) /* f0e70a8: afb00018 */ sw $s0,0x18($sp) -/* f0e70ac: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e70ac: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e70b0: 24a70001 */ addiu $a3,$a1,0x1 /* f0e70b4: 8fa50058 */ lw $a1,0x58($sp) /* f0e70b8: 8fae00a8 */ lw $t6,0xa8($sp) @@ -6398,7 +6398,7 @@ glabel menuitemObjectiveRender /* f0e70cc: 8fa70054 */ lw $a3,0x54($sp) /* f0e70d0: afb00014 */ sw $s0,0x14($sp) /* f0e70d4: afb00018 */ sw $s0,0x18($sp) -/* f0e70d8: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e70d8: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e70dc: afae0010 */ sw $t6,0x10($sp) /* f0e70e0: 8fa600a8 */ lw $a2,0xa8($sp) /* f0e70e4: 8fa7005c */ lw $a3,0x5c($sp) @@ -6410,7 +6410,7 @@ glabel menuitemObjectiveRender /* f0e70fc: afa30048 */ sw $v1,0x48($sp) /* f0e7100: 00402025 */ or $a0,$v0,$zero /* f0e7104: afb00014 */ sw $s0,0x14($sp) -/* f0e7108: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e7108: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e710c: afb00018 */ sw $s0,0x18($sp) /* f0e7110: 8fa300a8 */ lw $v1,0xa8($sp) /* f0e7114: 00402025 */ or $a0,$v0,$zero @@ -6421,7 +6421,7 @@ glabel menuitemObjectiveRender /* f0e7128: 8fa6004c */ lw $a2,0x4c($sp) /* f0e712c: 8fa70054 */ lw $a3,0x54($sp) /* f0e7130: afb00014 */ sw $s0,0x14($sp) -/* f0e7134: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e7134: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e7138: afb00018 */ sw $s0,0x18($sp) /* f0e713c: 8fad0048 */ lw $t5,0x48($sp) /* f0e7140: 00402025 */ or $a0,$v0,$zero @@ -6430,7 +6430,7 @@ glabel menuitemObjectiveRender /* f0e714c: 8fa70098 */ lw $a3,0x98($sp) /* f0e7150: afb00014 */ sw $s0,0x14($sp) /* f0e7154: afb00018 */ sw $s0,0x18($sp) -/* f0e7158: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e7158: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e715c: afad0010 */ sw $t5,0x10($sp) /* f0e7160: 8faf0044 */ lw $t7,0x44($sp) /* f0e7164: 00402025 */ or $a0,$v0,$zero @@ -6439,7 +6439,7 @@ glabel menuitemObjectiveRender /* f0e7170: 8fa70098 */ lw $a3,0x98($sp) /* f0e7174: afb00014 */ sw $s0,0x14($sp) /* f0e7178: afb00018 */ sw $s0,0x18($sp) -/* f0e717c: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e717c: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e7180: afaf0010 */ sw $t7,0x10($sp) /* f0e7184: 8fa300c8 */ lw $v1,0xc8($sp) /* f0e7188: 8fa50098 */ lw $a1,0x98($sp) @@ -6455,7 +6455,7 @@ glabel menuitemObjectiveRender /* f0e71b0: afa9005c */ sw $t1,0x5c($sp) /* f0e71b4: 00402025 */ or $a0,$v0,$zero /* f0e71b8: 8fa600a8 */ lw $a2,0xa8($sp) -/* f0e71bc: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e71bc: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e71c0: afb90010 */ sw $t9,0x10($sp) /* f0e71c4: 8fa7009c */ lw $a3,0x9c($sp) /* f0e71c8: 8faa004c */ lw $t2,0x4c($sp) @@ -6466,7 +6466,7 @@ glabel menuitemObjectiveRender /* f0e71dc: 8fa60048 */ lw $a2,0x48($sp) /* f0e71e0: afb00014 */ sw $s0,0x14($sp) /* f0e71e4: afb00018 */ sw $s0,0x18($sp) -/* f0e71e8: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e71e8: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e71ec: afaa0010 */ sw $t2,0x10($sp) /* f0e71f0: 8fab005c */ lw $t3,0x5c($sp) /* f0e71f4: 8fac004c */ lw $t4,0x4c($sp) @@ -6477,7 +6477,7 @@ glabel menuitemObjectiveRender /* f0e7208: 8fa60048 */ lw $a2,0x48($sp) /* f0e720c: 8fa7009c */ lw $a3,0x9c($sp) /* f0e7210: afb00014 */ sw $s0,0x14($sp) -/* f0e7214: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e7214: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e7218: afac0010 */ sw $t4,0x10($sp) /* f0e721c: 10000074 */ beqz $zero,.NB0f0e73f0 /* f0e7220: afa20130 */ sw $v0,0x130($sp) @@ -6507,7 +6507,7 @@ glabel menuitemObjectiveRender /* f0e727c: 25f90019 */ addiu $t9,$t7,0x19 /* f0e7280: 0fc537a0 */ jal func0f153780 /* f0e7284: afb9006c */ sw $t9,0x6c($sp) -/* f0e7288: 0fc37e4b */ jal func0f0e2498 +/* f0e7288: 0fc37e4b */ jal menugfx0f0e2498 /* f0e728c: 00402025 */ or $a0,$v0,$zero /* f0e7290: 8fa3012c */ lw $v1,0x12c($sp) /* f0e7294: 8fa6007c */ lw $a2,0x7c($sp) @@ -6522,7 +6522,7 @@ glabel menuitemObjectiveRender /* f0e72b8: afa90054 */ sw $t1,0x54($sp) /* f0e72bc: 00402025 */ or $a0,$v0,$zero /* f0e72c0: 87a50142 */ lh $a1,0x142($sp) -/* f0e72c4: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e72c4: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e72c8: 8fa70080 */ lw $a3,0x80($sp) /* f0e72cc: 8fa50080 */ lw $a1,0x80($sp) /* f0e72d0: 8fac0078 */ lw $t4,0x78($sp) @@ -6532,7 +6532,7 @@ glabel menuitemObjectiveRender /* f0e72e0: 8fa6007c */ lw $a2,0x7c($sp) /* f0e72e4: afb00014 */ sw $s0,0x14($sp) /* f0e72e8: afb00018 */ sw $s0,0x18($sp) -/* f0e72ec: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e72ec: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e72f0: afac0010 */ sw $t4,0x10($sp) /* f0e72f4: 87ab0142 */ lh $t3,0x142($sp) /* f0e72f8: 8fa60078 */ lw $a2,0x78($sp) @@ -6554,7 +6554,7 @@ glabel menuitemObjectiveRender .NB0f0e7338: /* f0e7338: 25a7ffff */ addiu $a3,$t5,-1 /* f0e733c: afa70058 */ sw $a3,0x58($sp) -/* f0e7340: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e7340: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e7344: afa30014 */ sw $v1,0x14($sp) /* f0e7348: 8fa50058 */ lw $a1,0x58($sp) /* f0e734c: 8fa8004c */ lw $t0,0x4c($sp) @@ -6565,7 +6565,7 @@ glabel menuitemObjectiveRender /* f0e7360: 8fa7005c */ lw $a3,0x5c($sp) /* f0e7364: afb00014 */ sw $s0,0x14($sp) /* f0e7368: afb00018 */ sw $s0,0x18($sp) -/* f0e736c: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e736c: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e7370: afa80010 */ sw $t0,0x10($sp) /* f0e7374: 8faf0074 */ lw $t7,0x74($sp) /* f0e7378: 8fa50058 */ lw $a1,0x58($sp) @@ -6575,7 +6575,7 @@ glabel menuitemObjectiveRender /* f0e7388: 8fa60078 */ lw $a2,0x78($sp) /* f0e738c: afb00014 */ sw $s0,0x14($sp) /* f0e7390: afb00018 */ sw $s0,0x18($sp) -/* f0e7394: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e7394: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e7398: 24a70001 */ addiu $a3,$a1,0x1 /* f0e739c: 8fa50058 */ lw $a1,0x58($sp) /* f0e73a0: 8fb80074 */ lw $t8,0x74($sp) @@ -6586,7 +6586,7 @@ glabel menuitemObjectiveRender /* f0e73b4: 8fa70054 */ lw $a3,0x54($sp) /* f0e73b8: afb00014 */ sw $s0,0x14($sp) /* f0e73bc: afb00018 */ sw $s0,0x18($sp) -/* f0e73c0: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e73c0: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e73c4: afb80010 */ sw $t8,0x10($sp) /* f0e73c8: 8fa60074 */ lw $a2,0x74($sp) /* f0e73cc: 8fa50044 */ lw $a1,0x44($sp) @@ -6595,7 +6595,7 @@ glabel menuitemObjectiveRender /* f0e73d8: afaa0010 */ sw $t2,0x10($sp) /* f0e73dc: 8fa7006c */ lw $a3,0x6c($sp) /* f0e73e0: afb00014 */ sw $s0,0x14($sp) -/* f0e73e4: 0fc37ef6 */ jal gfxDrawTessellatedRect +/* f0e73e4: 0fc37ef6 */ jal menugfxDrawTessellatedRect /* f0e73e8: afb00018 */ sw $s0,0x18($sp) /* f0e73ec: afa20130 */ sw $v0,0x130($sp) .NB0f0e73f0: @@ -8695,7 +8695,7 @@ glabel menuitemCheckboxRender /* f0ecb74: 24070006 */ addiu $a3,$zero,0x6 /* f0ecb78: 24c60002 */ addiu $a2,$a2,0x2 /* f0ecb7c: afb90010 */ sw $t9,0x10($sp) -/* f0ecb80: 0fc38dec */ jal gfxDrawSquare +/* f0ecb80: 0fc38dec */ jal menugfxDrawCheckbox /* f0ecb84: afa80018 */ sw $t0,0x18($sp) /* f0ecb88: 86290000 */ lh $t1,0x0($s1) /* f0ecb8c: 8fac0054 */ lw $t4,0x54($sp) @@ -8836,7 +8836,7 @@ glabel menuitemCheckboxRender // fillcolour = 0x7f002faf; // } // -// gdl = gfxDrawSquare(gdl, context->x + context->width - 16, context->y + 2, 6, +// gdl = menugfxDrawCheckbox(gdl, context->x + context->width - 16, context->y + 2, 6, // checked, maincolour, fillcolour); // // x = context->x + 10; @@ -10118,7 +10118,7 @@ Gfx *menuitemRankingRender(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 = gfxDrawFilledRect(gdl, + gdl = menugfxDrawFilledRect(gdl, context->x, context->y + 9, context->x + context->width, context->y + 10, linecolour1, linecolour1); @@ -10506,7 +10506,7 @@ glabel menuitemRankingRender /* f0eafb0: afb20014 */ sw $s2,0x14($sp) /* f0eafb4: 8fa401b0 */ lw $a0,0x1b0($sp) /* f0eafb8: 24660009 */ addiu $a2,$v1,0x9 -/* f0eafbc: 0fc380fc */ jal gfxDrawFilledRect +/* f0eafbc: 0fc380fc */ jal menugfxDrawFilledRect /* f0eafc0: 00ac3821 */ addu $a3,$a1,$t4 /* f0eafc4: 3c0de700 */ lui $t5,0xe700 /* f0eafc8: 3c038008 */ lui $v1,0x8008 diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index 9d75026ac..ea20adaf6 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -5,7 +5,7 @@ #include "game/game_0b0fd0.h" #include "game/game_0b3350.h" #include "game/savebuffer.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/mainmenu.h" #include "game/filemgr.h" #include "game/lv.h" diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 4756f5185..7122a8d1c 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -7,7 +7,7 @@ #include "game/game_0b0fd0.h" #include "game/game_0b69d0.h" #include "game/savebuffer.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/game_127910.h" #include "game/game_1531a0.h" #include "game/lv.h" diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index 2dbfb4d82..45af0aac6 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -11,7 +11,7 @@ #include "game/game_0b69d0.h" #include "game/savebuffer.h" #include "game/hudmsg.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/inventory/inventory.h" #include "game/game_127910.h" #include "game/game_1531a0.h" diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index d68a3baab..f9f360082 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -3,7 +3,7 @@ #include "game/camdraw.h" #include "game/game_0b3350.h" #include "game/savebuffer.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/mainmenu.h" #include "game/filemgr.h" #include "game/game_1531a0.h" diff --git a/src/game/music.c b/src/game/music.c index 91b1253c0..f27bb0158 100644 --- a/src/game/music.c +++ b/src/game/music.c @@ -1,6 +1,6 @@ #include #include "constants.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/lv.h" #include "game/music.h" #include "game/options.h" diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index ba430a46a..fadee68a5 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -2,7 +2,7 @@ #include #include "constants.h" #include "game/camdraw.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/crc.h" #include "game/gamefile.h" #include "game/pak/pak.h" diff --git a/src/game/propobj.c b/src/game/propobj.c index 04f50d23a..e21a594f8 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -30,7 +30,7 @@ #include "game/game_0b69d0.h" #include "game/game_0c33f0.h" #include "game/hudmsg.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/inventory/inventory.h" #include "game/game_127910.h" #include "game/game_1291b0.h" diff --git a/src/game/training/menus.c b/src/game/training/menus.c index 72dbb88ff..71578e914 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -5,8 +5,8 @@ #include "game/bondgun.h" #include "game/game_0b0fd0.h" #include "game/game_0b3350.h" -#include "game/game_0e0770.h" -#include "game/game_0f09f0.h" +#include "game/menugfx.h" +#include "game/menu.h" #include "game/mainmenu.h" #include "game/inventory/inventory.h" #include "game/game_1531a0.h" @@ -821,22 +821,22 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata // Render lines between the score table and the target texture // Horizontal lines - bottom left - gdl = gfxDrawFilledRect(gdl, renderdata->x + 45, renderdata->y + 36, renderdata->x + 81, renderdata->y + 37, linecolourtex, linecolourmid); - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 52, renderdata->y + 44, renderdata->x + 84, renderdata->y + 45, linecolourtex, linecolourmid); - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 62, renderdata->y + 50, renderdata->x + 87, renderdata->y + 51, linecolourtex, linecolourmid); - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 70, renderdata->y + 60, renderdata->x + 90, renderdata->y + 61, linecolourtex, linecolourmid); + gdl = menugfxDrawFilledRect(gdl, renderdata->x + 45, renderdata->y + 36, renderdata->x + 81, renderdata->y + 37, linecolourtex, linecolourmid); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 52, renderdata->y + 44, renderdata->x + 84, renderdata->y + 45, linecolourtex, linecolourmid); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 62, renderdata->y + 50, renderdata->x + 87, renderdata->y + 51, linecolourtex, linecolourmid); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 70, renderdata->y + 60, renderdata->x + 90, renderdata->y + 61, linecolourtex, linecolourmid); // Vertical lines - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 82, renderdata->y + 37, linecolourmid, linecolourmid); - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 84, renderdata->y + 28, renderdata->x + 85, renderdata->y + 45, linecolourmid, linecolourmid); - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 87, renderdata->y + 39, renderdata->x + 88, renderdata->y + 51, linecolourmid, linecolourmid); - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 90, renderdata->y + 50, renderdata->x + 91, renderdata->y + 61, linecolourmid, linecolourmid); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 82, renderdata->y + 37, linecolourmid, linecolourmid); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 84, renderdata->y + 28, renderdata->x + 85, renderdata->y + 45, linecolourmid, linecolourmid); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 87, renderdata->y + 39, renderdata->x + 88, renderdata->y + 51, linecolourmid, linecolourmid); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 90, renderdata->y + 50, renderdata->x + 91, renderdata->y + 61, linecolourmid, linecolourmid); // Horizontal lines - top right - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 96, renderdata->y + 18, linecolourmid, linecolourfig); - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 84, renderdata->y + 28, renderdata->x + 96, renderdata->y + 29, linecolourmid, linecolourfig); - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 87, renderdata->y + 39, renderdata->x + 96, renderdata->y + 40, linecolourmid, linecolourfig); - gdl = menugfxRenderDialogBorderLine(gdl, renderdata->x + 90, renderdata->y + 50, renderdata->x + 96, renderdata->y + 51, linecolourmid, linecolourfig); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 96, renderdata->y + 18, linecolourmid, linecolourfig); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 84, renderdata->y + 28, renderdata->x + 96, renderdata->y + 29, linecolourmid, linecolourfig); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 87, renderdata->y + 39, renderdata->x + 96, renderdata->y + 40, linecolourmid, linecolourfig); + gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 90, renderdata->y + 50, renderdata->x + 96, renderdata->y + 51, linecolourmid, linecolourfig); return (s32)gdl; } diff --git a/src/game/training/training.c b/src/game/training/training.c index d8ae80189..07f8a4f57 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -10,7 +10,7 @@ #include "game/game_0b0fd0.h" #include "game/game_0b69d0.h" #include "game/hudmsg.h" -#include "game/game_0f09f0.h" +#include "game/menu.h" #include "game/filemgr.h" #include "game/inventory/inventory.h" #include "game/explosions/explosions.h" diff --git a/src/include/game/game_0f09f0.h b/src/include/game/menu.h similarity index 98% rename from src/include/game/game_0f09f0.h rename to src/include/game/menu.h index 0d4825f17..32af803d4 100644 --- a/src/include/game/game_0f09f0.h +++ b/src/include/game/menu.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_0F09F0_H -#define IN_GAME_GAME_0F09F0_H +#ifndef IN_GAME_MENU_H +#define IN_GAME_MENU_H #include #include "data.h" #include "types.h" diff --git a/src/include/game/game_0e0770.h b/src/include/game/menugfx.h similarity index 60% rename from src/include/game/game_0e0770.h rename to src/include/game/menugfx.h index 944075f2f..a5ab80fc9 100644 --- a/src/include/game/game_0e0770.h +++ b/src/include/game/menugfx.h @@ -1,14 +1,14 @@ -#ifndef IN_GAME_GAME_0E0770_H -#define IN_GAME_GAME_0E0770_H +#ifndef IN_GAME_MENUGFX_H +#define IN_GAME_MENUGFX_H #include #include "data.h" #include "types.h" -void menuCreateBlur(void); +void menugfxCreateBlur(void); Gfx *menugfxRenderBgBlur(Gfx *gdl, u32 colour, s32 arg2, s32 arg3); Gfx *menugfxRenderDialogBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct menudialog *dialog, u32 colour1, u32 colour2, f32 arg8); Gfx *menugfxRenderBgGreenHaze(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2); -u32 func0f0e1668(void); +u32 menugfx0f0e1668(void); #if VERSION >= VERSION_NTSC_1_0 Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3, u8 alpha); @@ -18,22 +18,22 @@ Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3 Gfx *menugfxRenderGradient(Gfx *gdl, s32 x, s32 y, s32 width, s32 height, u32 colour1, u32 colour2, u32 colour3); Gfx *menugfxRenderSlider(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 markerx, u32 colour); -Gfx *func0f0e2348(Gfx *gdl); -Gfx *func0f0e2498(Gfx *gdl); -Gfx *gfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, bool arg7); -Gfx *gfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); -Gfx *gfxDrawTessellatedRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); +Gfx *menugfx0f0e2348(Gfx *gdl); +Gfx *menugfx0f0e2498(Gfx *gdl); +Gfx *menugfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, bool arg7); +Gfx *menugfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); +Gfx *menugfxDrawTessellatedRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); Gfx *menugfxDrawShimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bool arg6, s32 arg7, bool lefttoright); -Gfx *menugfxRenderDialogBorderLine(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 *menugfxDrawDialogBorderLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); +Gfx *menugfxDrawFilledRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); Gfx *menugfxDrawCarouselChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u32 colour1, u32 colour2); Gfx *menugfxDrawDialogChevron(Gfx *gdl, s32 x, s32 y, s32 arg2, s32 arg3, u32 colour1, u32 colour2, f32 arg7); -Gfx *gfxDrawSquare(Gfx *gdl, s32 x, s32 y, s32 size, bool fill, u32 bordercolour, u32 fillcolour); +Gfx *menugfxDrawCheckbox(Gfx *gdl, s32 x, s32 y, s32 size, bool fill, u32 bordercolour, u32 fillcolour); Gfx *menugfxRenderBgFailure(Gfx *gdl); Gfx *menugfxRenderBgCone(Gfx *gdl); Gfx *menugfxRenderBgFailureCopy(Gfx *gdl); -void func0f0e4fd4(void); -u32 func0f0e4fe0(void); +void menugfx0f0e4fd4(void); +u32 menugfx0f0e4fe0(void); Gfx *menugfxRenderBgSuccess(Gfx *gdl); #endif diff --git a/src/include/game/menu/items.h b/src/include/game/menuitem.h similarity index 98% rename from src/include/game/menu/items.h rename to src/include/game/menuitem.h index 533ede359..779ef76e3 100644 --- a/src/include/game/menu/items.h +++ b/src/include/game/menuitem.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_MENU_ITEMS_H -#define IN_GAME_MENU_ITEMS_H +#ifndef IN_GAME_MENUITEM_H +#define IN_GAME_MENUITEM_H #include #include "data.h" #include "types.h" diff --git a/src/lib/boot.c b/src/lib/boot.c index b8ab5bb2c..a6f29e01a 100644 --- a/src/lib/boot.c +++ b/src/lib/boot.c @@ -4,7 +4,7 @@ #include "lib/reset.h" #include "lib/segments.h" #include "constants.h" -#include "game/game_0e0770.h" +#include "game/menugfx.h" #include "bss.h" #include "lib/args.h" #include "lib/rzip.h" diff --git a/src/lib/sched.c b/src/lib/sched.c index 80f18d36a..8dd1ad2a5 100644 --- a/src/lib/sched.c +++ b/src/lib/sched.c @@ -2,7 +2,7 @@ #include "lib/boot.h" #include "lib/sched.h" #include "constants.h" -#include "game/game_0e0770.h" +#include "game/menugfx.h" #include "bss.h" #include "lib/args.h" #include "lib/audiomgr.h" @@ -833,7 +833,7 @@ void schedConsiderScreenshot(void) { if (g_MenuData.screenshottimer == 1) { if (IS8MB()) { - menuCreateBlur(); + menugfxCreateBlur(); } g_MenuData.screenshottimer = 0;