mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-02 16:26:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile menuRender

Browse Source
This commit is contained in:
Ryan Dwyer
2022-01-24 12:29:34 +10:00
parent bb7e643829
commit 42da5ab14c
8 changed files with 406 additions and 3012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/credits.c
+4 -4
View File
@@ -5213,7 +5213,7 @@ glabel var7f1b5948
/* f13be0c: ad2034a4 */ sw $zero,0x34a4($t1)
/* f13be10: 8ce50000 */ lw $a1,0x0($a3)
/* f13be14: ac22fc3c */ sw $v0,-0x3c4($at)
/* f13be18: 0fc3d001 */ jal func0f0f38b0
/* f13be18: 0fc3d001 */ jal menuRenderHudPiece
/* f13be1c: 24a52ef0 */ addiu $a1,$a1,0x2ef0
/* f13be20: 3c0e0102 */ lui $t6,0x102
/* f13be24: 35ce0040 */ ori $t6,$t6,0x40
@@ -5522,7 +5522,7 @@ glabel var7f1b5948
/* f13b2a8: ad2034a4 */ sw $zero,0x34a4($t1)
/* f13b2ac: 8ce50000 */ lw $a1,0x0($a3)
/* f13b2b0: ac22f6dc */ sw $v0,%lo(var8007f6dc)($at)
/* f13b2b4: 0fc3ce2c */ jal func0f0f38b0
/* f13b2b4: 0fc3ce2c */ jal menuRenderHudPiece
/* f13b2b8: 24a52ef0 */ addiu $a1,$a1,0x2ef0
/* f13b2bc: 3c0e0102 */ lui $t6,0x102
/* f13b2c0: 35ce0040 */ ori $t6,$t6,0x40
@@ -5831,7 +5831,7 @@ glabel var7f1b5948
/* f135da8: ad2034a4 */ sw $zero,0x34a4($t1)
/* f135dac: 8ce50000 */ lw $a1,0x0($a3)
/* f135db0: ac221f30 */ sw $v0,0x1f30($at)
/* f135db4: 0fc3c0fd */ jal func0f0f38b0
/* f135db4: 0fc3c0fd */ jal menuRenderHudPiece
/* f135db8: 24a52ef0 */ addiu $a1,$a1,0x2ef0
/* f135dbc: 3c0e0102 */ lui $t6,0x102
/* f135dc0: 35ce0040 */ ori $t6,$t6,0x40
@@ -6023,7 +6023,7 @@ glabel var7f1b5948
// g_CreditsData->unk34a1 |= 0x02;
// g_CreditsData->unk34a4 = 0;
//
// gdl = func0f0f38b0(gdl, &g_CreditsData->unk2ef0, 4);
// gdl = menuRenderHudPiece(gdl, &g_CreditsData->unk2ef0, 4);
//
// gSPMatrix(gdl++, osVirtualToPhysical(matrix), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
//
src/game/game_0b69d0.c
+2 -2
View File
@@ -2896,7 +2896,7 @@ void currentPlayerDisplayDamage(void)
}
}
Gfx *hudRenderHealthBar(Gfx *gdl)
Gfx *playerRenderHealthBar(Gfx *gdl)
{
Mtxf matrix;
Mtxf *addr = gfxAllocateMatrix();
@@ -5310,7 +5310,7 @@ Gfx *currentPlayerRenderHud(Gfx *gdl)
if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY
&& currentPlayerIsHealthVisible()
&& func0f0f0c68()) {
gdl = hudRenderHealthBar(gdl);
gdl = playerRenderHealthBar(gdl);
}
if (g_Vars.normmplayerisrunning == false) {
src/game/game_0f09f0.c
+369 -2982
View File
File diff suppressed because it is too large Load Diff
src/game/lv.c
+12 -12
View File
@@ -1737,7 +1737,7 @@ glabel var7f1b8e7cpf
/* f16a5c8: 00402025 */ move $a0,$v0
/* f16a5cc: 0fc576bd */ jal currentPlayerScissorToViewport
/* f16a5d0: 00402025 */ move $a0,$v0
/* f16a5d4: 0fc3f0f0 */ jal func0f0fbc30
/* f16a5d4: 0fc3f0f0 */ jal menuRender
/* f16a5d8: 00402025 */ move $a0,$v0
/* f16a5dc: 100005a4 */ b .PF0f16bc70
/* f16a5e0: 00409825 */ move $s3,$v0
@@ -1832,7 +1832,7 @@ glabel var7f1b8e7cpf
/* f16a740: 02602025 */ move $a0,$s3
/* f16a744: 0fc576bd */ jal currentPlayerScissorToViewport
/* f16a748: 00402025 */ move $a0,$v0
/* f16a74c: 0fc3f0f0 */ jal func0f0fbc30
/* f16a74c: 0fc3f0f0 */ jal menuRender
/* f16a750: 00402025 */ move $a0,$v0
/* f16a754: 8e4c0284 */ lw $t4,0x284($s2)
/* f16a758: 00409825 */ move $s3,$v0
@@ -2219,7 +2219,7 @@ glabel var7f1b8e7cpf
/* f16acec: 00185fc2 */ srl $t3,$t8,0x1f
/* f16acf0: 116003cb */ beqz $t3,.PF0f16bc20
/* f16acf4: 00000000 */ nop
/* f16acf8: 0fc3f0f0 */ jal func0f0fbc30
/* f16acf8: 0fc3f0f0 */ jal menuRender
/* f16acfc: 02602025 */ move $a0,$s3
/* f16ad00: 100003c7 */ b .PF0f16bc20
/* f16ad04: 00409825 */ move $s3,$v0
@@ -3252,7 +3252,7 @@ glabel var7f1b8e7cpf
/* f16bbcc: 00186fc2 */ srl $t5,$t8,0x1f
/* f16bbd0: 51a00005 */ beqzl $t5,.PF0f16bbe8
/* f16bbd4: 8e4b0288 */ lw $t3,0x288($s2)
/* f16bbd8: 0fc3f0f0 */ jal func0f0fbc30
/* f16bbd8: 0fc3f0f0 */ jal menuRender
/* f16bbdc: 02602025 */ move $a0,$s3
/* f16bbe0: 00409825 */ move $s3,$v0
/* f16bbe4: 8e4b0288 */ lw $t3,0x288($s2)
@@ -3505,7 +3505,7 @@ Gfx *lvRender(Gfx *gdl)
gdl = vi0000b1d0(gdl);
gdl = viRenderViewportEdges(gdl);
gdl = currentPlayerScissorToViewport(gdl);
gdl = func0f0fbc30(gdl);
gdl = menuRender(gdl);
} else if (g_Vars.stagenum == STAGE_4MBMENU) {
gSPClipRatio(gdl++, FRUSTRATIO_2);
gSPDisplayList(gdl++, &var800613a0);
@@ -3519,7 +3519,7 @@ Gfx *lvRender(Gfx *gdl)
gdl = vi0000b1d0(gdl);
gdl = currentPlayerScissorToViewport(gdl);
gdl = func0f0fbc30(gdl);
gdl = menuRender(gdl);
if (g_Vars.currentplayer->pausemode != PAUSEMODE_UNPAUSED) {
currentPlayerTickPauseMenu();
@@ -3643,7 +3643,7 @@ Gfx *lvRender(Gfx *gdl)
mtx00016748(1);
if (g_Vars.currentplayer->menuisactive) {
gdl = func0f0fbc30(gdl);
gdl = menuRender(gdl);
}
} else {
if (var80075d60 == 2) {
@@ -4055,7 +4055,7 @@ Gfx *lvRender(Gfx *gdl)
mtx00016748(1);
if (g_Vars.currentplayer->menuisactive) {
gdl = func0f0fbc30(gdl);
gdl = menuRender(gdl);
}
mtx00016748(g_Vars.currentplayerstats->scale_bg2gfx);
@@ -4337,7 +4337,7 @@ glabel var7f1b1fd4nb
/* f164318: 00402025 */ or $a0,$v0,$zero
/* f16431c: 0fc55c96 */ jal currentPlayerScissorToViewport
/* f164320: 00402025 */ or $a0,$v0,$zero
/* f164324: 0fc3e0e0 */ jal func0f0fbc30
/* f164324: 0fc3e0e0 */ jal menuRender
/* f164328: 00402025 */ or $a0,$v0,$zero
/* f16432c: 10000658 */ beqz $zero,.NB0f165c90
/* f164330: 00409825 */ or $s3,$v0,$zero
@@ -4403,7 +4403,7 @@ glabel var7f1b1fd4nb
/* f16441c: 02602025 */ or $a0,$s3,$zero
/* f164420: 0fc55c96 */ jal currentPlayerScissorToViewport
/* f164424: 00402025 */ or $a0,$v0,$zero
/* f164428: 0fc3e0e0 */ jal func0f0fbc30
/* f164428: 0fc3e0e0 */ jal menuRender
/* f16442c: 00402025 */ or $a0,$v0,$zero
/* f164430: 8e4a0284 */ lw $t2,0x284($s2)
/* f164434: 00409825 */ or $s3,$v0,$zero
@@ -4802,7 +4802,7 @@ glabel var7f1b1fd4nb
/* f1649f4: 0018cfc2 */ srl $t9,$t8,0x1f
/* f1649f8: 13200488 */ beqz $t9,.NB0f165c1c
/* f1649fc: 00000000 */ sll $zero,$zero,0x0
/* f164a00: 0fc3e0e0 */ jal func0f0fbc30
/* f164a00: 0fc3e0e0 */ jal menuRender
/* f164a04: 02602025 */ or $a0,$s3,$zero
/* f164a08: 10000484 */ beqz $zero,.NB0f165c1c
/* f164a0c: 00409825 */ or $s3,$v0,$zero
@@ -6036,7 +6036,7 @@ glabel var7f1b1fd4nb
/* f165bc8: 000c5fc2 */ srl $t3,$t4,0x1f
/* f165bcc: 51600005 */ beqzl $t3,.NB0f165be4
/* f165bd0: 8e580288 */ lw $t8,0x288($s2)
/* f165bd4: 0fc3e0e0 */ jal func0f0fbc30
/* f165bd4: 0fc3e0e0 */ jal menuRender
/* f165bd8: 02602025 */ or $a0,$s3,$zero
/* f165bdc: 00409825 */ or $s3,$v0,$zero
/* f165be0: 8e580288 */ lw $t8,0x288($s2)
src/include/game/game_0b69d0.h
+1 -1
View File
@@ -38,7 +38,7 @@ void currentPlayerTickChrFade(void);
void currentPlayerDisplayHealth(void);
void currentPlayerTickDamageAndHealth(void);
void currentPlayerDisplayDamage(void);
Gfx *hudRenderHealthBar(Gfx *gdl);
Gfx *playerRenderHealthBar(Gfx *gdl);
void currentPlayerSurroundWithExplosions(s32 arg0);
void currentPlayerTickExplode(void);
void viResetLoResIf4Mb(void);
src/include/game/game_0f09f0.h
+12 -6
View File
@@ -13,7 +13,13 @@ bool menuIsSoloMissionOrMp(void);
bool currentPlayerIsMenuOpenInSoloOrMp(void);
bool func0f0f0c68(void);
void func0f0f0ca0(s32 value, bool allplayers);
u32 func0f0f0ce8(void);
#if VERSION >= VERSION_NTSC_1_0
Gfx *menuRenderBannerMessages(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool arg5, s32 arg6, s32 arg7, s32 arg8);
#else
Gfx *menuRenderBannerMessages(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool arg5, s32 arg6);
#endif
struct menudfc *func0f0f1338(struct menuitem *item);
void func0f0f139c(struct menuitem *item, f32 arg1);
void func0f0f13ec(struct menuitem *item);
@@ -52,7 +58,7 @@ void menuPopDialog(void);
void func0f0f3704(struct menudialogdef *dialogdef);
void func0f0f372c(u8 *arg0, f32 x, f32 y, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, s32 arg8);
void func0f0f37a4(u8 *arg0);
Gfx *func0f0f38b0(Gfx *gdl, u8 *arg1, u32 arg2);
Gfx *menuRenderHudPiece(Gfx *gdl, u8 *arg1, u32 arg2);
u32 func0f0f5004(void);
Gfx *menuApplyScissor(Gfx *gdl);
u32 func0f0f5360(void);
@@ -68,7 +74,7 @@ void func0f0f8300(void);
void menuPushRootDialog(struct menudialogdef *dialogdef, s32 arg1);
void func0f0f85e0(struct menudialogdef *dialogdef, s32 root);
u32 func0f0f8634(void);
u32 func0f0f86a8(void);
Gfx *menuRenderDialogs(Gfx *gdl);
void func0f0f8bb4(u8 *arg0, u32 arg1, u32 arg2);
void menuInit(void);
u32 func0f0f9030(void);
@@ -76,9 +82,9 @@ u32 func0f0f935c(void);
void dialogInitItems(struct menudialog *dialog);
void func0f0fa6ac(void);
void menuDialogTick(void);
u32 func0f0fb488(void);
Gfx *func0f0fbba0(Gfx *gdl, u8 param_2, s32 arg2);
Gfx *func0f0fbc30(Gfx *gdl);
Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac);
Gfx *menuRenderBackgroundLayer2(Gfx *gdl, u8 bg, f32 frac);
Gfx *menuRender(Gfx *gdl);
u32 menuChooseMusic(void);
u32 menuGetRoot(void);
void func0f0fce8c(struct menudialogdef *dialogdef, s32 playernum, s32 arg2);
src/include/game/game_1531a0.h
+1 -1
View File
@@ -17,7 +17,7 @@ Gfx *func0f153858(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2);
Gfx *func0f1538e4(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2);
Gfx *func0f153990(Gfx *gdl, s32 left, s32 top, s32 width, s32 height);
Gfx *func0f153a34(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour);
u32 func0f153ab0(void);
Gfx *func0f153ab0(Gfx *gdl);
void func0f153b40(void);
void func0f153b6c(s32 arg0);
void func0f153c20(s32 x, s32 y, f32 arg2, u8 arg3);
src/include/types.h
+5 -4
View File
@@ -5148,7 +5148,7 @@ struct menudata {
/*0x014*/ u8 bg;
/*0x015*/ u8 nextbg;
/*0x016*/ u8 unk016;
/*0x017*/ u8 unk017[4];
/*0x017*/ u8 playerjoinalpha[4];
/*0x01b*/ s8 unk01b;
/*0x01c*/ u8 unk01c;
/*0x020*/ u32 unk020;
@@ -5173,7 +5173,8 @@ struct menudata {
/*0x06c*/ u32 unk06c;
/*0x070*/ u32 unk070;
/*0x074*/ u32 unk074;
/*0x078*/ u32 unk078;
/*0x078*/ u16 unk078;
/*0x07a*/ s16 unk07a;
/*0x07c*/ u32 unk07c;
/*0x080*/ u32 unk080;
/*0x084*/ u32 unk084;
@@ -5484,8 +5485,8 @@ struct menudata {
/*0x548*/ u32 unk548;
/*0x54c*/ u32 unk54c;
/*0x550*/ u32 unk550;
/*0x554*/ f32 unk554;
/*0x558*/ f32 unk558;
/*0x554*/ f32 hudpiecex; // screen coords of the base of the stem - usually off-screen
/*0x558*/ f32 hudpiecey;
/*0x55c*/ f32 unk55c;
/*0x560*/ f32 unk560;
/*0x564*/ f32 unk564;