falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile menuUpdateCurFrame

This commit is contained in:
Ryan Dwyer 2020-03-25 18:26:22 +10:00
parent be021de931
commit ff07c8d744
3 changed files with 22 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/game/game_0f09f0.c
View File

@ -3631,64 +3631,26 @@ glabel func0f0f33bc
/* f0f3618: 27bd0060 */ addiu $sp,$sp,0x60 /* f0f3618: 27bd0060 */ addiu $sp,$sp,0x60
); );
GLOBAL_ASM( void menuUpdateCurFrame(void)
glabel func0f0f361c {
/* f0f361c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) s32 depth = g_MenuStack[g_MpPlayerNum].depth;
/* f0f3620: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6)
/* f0f3624: 3c18800a */ lui $t8,0x800a if (depth == 0) {
/* f0f3628: 2718e000 */ addiu $t8,$t8,-8192 // No more parent menus - return control to the player
/* f0f362c: 000e78c0 */ sll $t7,$t6,0x3 g_Vars.currentplayer->joybutinhibit = 0xffffffff;
/* f0f3630: 01ee7823 */ subu $t7,$t7,$t6 func0f0f8040();
/* f0f3634: 000f7880 */ sll $t7,$t7,0x2 g_MenuStack[g_MpPlayerNum].curframe = NULL;
/* f0f3638: 01ee7821 */ addu $t7,$t7,$t6 } else {
/* f0f363c: 000f78c0 */ sll $t7,$t7,0x3 // Set up parent menu
/* f0f3640: 01ee7823 */ subu $t7,$t7,$t6 struct menulayer *layer = &g_MenuStack[g_MpPlayerNum].layers[depth - 1];
/* f0f3644: 000f7900 */ sll $t7,$t7,0x4 g_MenuStack[g_MpPlayerNum].curframe = layer->siblings[layer->cursibling];
/* f0f3648: 01f81821 */ addu $v1,$t7,$t8 }
/* f0f364c: 846404f4 */ lh $a0,0x4f4($v1) }
/* f0f3650: 27bdffe8 */ addiu $sp,$sp,-24
/* f0f3654: afbf0014 */ sw $ra,0x14($sp)
/* f0f3658: 14800013 */ bnez $a0,.L0f0f36a8
/* f0f365c: 00045880 */ sll $t3,$a0,0x2
/* f0f3660: 3c08800a */ lui $t0,%hi(g_Vars+0x284)
/* f0f3664: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0)
/* f0f3668: 2419ffff */ addiu $t9,$zero,-1
/* f0f366c: 0fc3e010 */ jal func0f0f8040
/* f0f3670: ad191c40 */ sw $t9,0x1c40($t0)
/* f0f3674: 3c098007 */ lui $t1,%hi(g_MpPlayerNum)
/* f0f3678: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1)
/* f0f367c: 3c01800a */ lui $at,%hi(g_MenuStack+0x4f8)
/* f0f3680: 000950c0 */ sll $t2,$t1,0x3
/* f0f3684: 01495023 */ subu $t2,$t2,$t1
/* f0f3688: 000a5080 */ sll $t2,$t2,0x2
/* f0f368c: 01495021 */ addu $t2,$t2,$t1
/* f0f3690: 000a50c0 */ sll $t2,$t2,0x3
/* f0f3694: 01495023 */ subu $t2,$t2,$t1
/* f0f3698: 000a5100 */ sll $t2,$t2,0x4
/* f0f369c: 002a0821 */ addu $at,$at,$t2
/* f0f36a0: 1000000a */ beqz $zero,.L0f0f36cc
/* f0f36a4: ac20e4f8 */ sw $zero,%lo(g_MenuStack+0x4f8)($at)
.L0f0f36a8:
/* f0f36a8: 01645823 */ subu $t3,$t3,$a0
/* f0f36ac: 000b58c0 */ sll $t3,$t3,0x3
/* f0f36b0: 006b1021 */ addu $v0,$v1,$t3
/* f0f36b4: 804c0461 */ lb $t4,0x461($v0)
/* f0f36b8: 2442044c */ addiu $v0,$v0,0x44c
/* f0f36bc: 000c6880 */ sll $t5,$t4,0x2
/* f0f36c0: 004d7021 */ addu $t6,$v0,$t5
/* f0f36c4: 8dcf0000 */ lw $t7,0x0($t6)
/* f0f36c8: ac6f04f8 */ sw $t7,0x4f8($v1)
.L0f0f36cc:
/* f0f36cc: 8fbf0014 */ lw $ra,0x14($sp)
/* f0f36d0: 27bd0018 */ addiu $sp,$sp,0x18
/* f0f36d4: 03e00008 */ jr $ra
/* f0f36d8: 00000000 */ sll $zero,$zero,0x0
);
void menuPopDialog(void) void menuPopDialog(void)
{ {
func0f0f33bc(); func0f0f33bc();
func0f0f361c(); menuUpdateCurFrame();
} }
void func0f0f3704(struct menu_dialog *dialog) void func0f0f3704(struct menu_dialog *dialog)

8
src/game/game_107fb0.c
View File

@ -1069,7 +1069,7 @@ s32 menuhandlerPakCancelSave2(u32 operation, struct menu_item *item, s32 *value)
if (operation == MENUOP_SET) { if (operation == MENUOP_SET) {
func0f0f33bc(); func0f0f33bc();
func0f10898c(); func0f10898c();
func0f0f361c(); menuUpdateCurFrame();
} }
return 0; return 0;
@ -1098,7 +1098,7 @@ s32 menuhandlerAcknowledgePakFileLost(u32 operation, struct menu_item *item, s32
if (operation == MENUOP_SET) { if (operation == MENUOP_SET) {
func0f0f33bc(); func0f0f33bc();
func0f10898c(); func0f10898c();
func0f0f361c(); menuUpdateCurFrame();
} }
return 0; return 0;
@ -1591,7 +1591,7 @@ glabel var7f1b36c8
/* f1094c0: afa60044 */ sw $a2,0x44($sp) /* f1094c0: afa60044 */ sw $a2,0x44($sp)
/* f1094c4: 8fa60044 */ lw $a2,0x44($sp) /* f1094c4: 8fa60044 */ lw $a2,0x44($sp)
.L0f1094c8: .L0f1094c8:
/* f1094c8: 0fc3cd87 */ jal func0f0f361c /* f1094c8: 0fc3cd87 */ jal menuUpdateCurFrame
/* f1094cc: afa60044 */ sw $a2,0x44($sp) /* f1094cc: afa60044 */ sw $a2,0x44($sp)
/* f1094d0: 8fbf001c */ lw $ra,0x1c($sp) /* f1094d0: 8fbf001c */ lw $ra,0x1c($sp)
/* f1094d4: 8fa20044 */ lw $v0,0x44($sp) /* f1094d4: 8fa20044 */ lw $v0,0x44($sp)
@ -4040,7 +4040,7 @@ glabel menudialog0010b674
/* f10b738: 0fc42197 */ jal func0f10865c /* f10b738: 0fc42197 */ jal func0f10865c
/* f10b73c: 24040006 */ addiu $a0,$zero,0x6 /* f10b73c: 24040006 */ addiu $a0,$zero,0x6
.L0f10b740: .L0f10b740:
/* f10b740: 0fc3cd87 */ jal func0f0f361c /* f10b740: 0fc3cd87 */ jal menuUpdateCurFrame
/* f10b744: 00000000 */ sll $zero,$zero,0x0 /* f10b744: 00000000 */ sll $zero,$zero,0x0
.L0f10b748: .L0f10b748:
/* f10b748: 8fbf0014 */ lw $ra,0x14($sp) /* f10b748: 8fbf0014 */ lw $ra,0x14($sp)

4
src/include/game/game_0f09f0.h
View File

@ -36,7 +36,7 @@ void func0f0f2cf4(struct menu_dialog *dialog, struct menuframe *arg1, struct men
void menuPushDialog(struct menu_dialog *dialog); void menuPushDialog(struct menu_dialog *dialog);
u32 func0f0f3220(void); u32 func0f0f3220(void);
u32 func0f0f33bc(void); u32 func0f0f33bc(void);
u32 func0f0f361c(void); void menuUpdateCurFrame(void);
void menuPopDialog(void); void menuPopDialog(void);
void func0f0f3704(struct menu_dialog *dialog); void func0f0f3704(struct menu_dialog *dialog);
void func0f0f372c(u8 *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, s32 arg8); void func0f0f372c(u8 *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, s32 arg8);
@ -49,7 +49,7 @@ u32 func0f0f74a8(void);
u32 func0f0f7594(void); u32 func0f0f7594(void);
u32 func0f0f7728(void); u32 func0f0f7728(void);
u32 func0f0f7e98(void); u32 func0f0f7e98(void);
u32 func0f0f8040(void); void func0f0f8040(void);
void func0f0f8120(void); void func0f0f8120(void);
void func0f0f820c(struct menu_dialog *dialog, s32 arg1); void func0f0f820c(struct menu_dialog *dialog, s32 arg1);
bool func0f0f82a8(s32 arg0); bool func0f0f82a8(s32 arg0);