diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index b49062538..c1991cd44 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -10050,7 +10050,7 @@ u32 var80084628 = 0x00000000; u32 var8008462c = 0x00000000; // 2a650 -struct menu_item menuitems_mpendgame[] = { +struct menu_item g_MpEndGameMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x02000020, L_MPMENU(291), 0x00000000, NULL }, // "Are you sure?" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(292), 0x00000000, NULL }, // "Cancel" @@ -10059,17 +10059,17 @@ struct menu_item menuitems_mpendgame[] = { }; // 2a6b4 -struct menu_dialog menudialog_mpendgame = { +struct menu_dialog g_MpEndGameMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(290), // "End Game" - menuitems_mpendgame, + g_MpEndGameMenuItems, NULL, 0x00000000, NULL, }; // 2a6cc -struct menu_item menuitems_2a6cc[] = { +struct menu_item g_MpPauseControlMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&mpMenuTextChallengeName, 0x00000000, menuhandler00178018 }, { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&mpMenuTextScenarioName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, L_AME(0), L_MPWEAPONS(162), (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Time Limit:" @@ -10078,42 +10078,42 @@ struct menu_item menuitems_2a6cc[] = { { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(286), (u32)&menutextMatchTime, NULL }, // "Game Time:" { MENUITEMTYPE_SELECTABLE, 1, 0x00000020, (u32)&menutextPauseOrUnpause, 0x00000000, menuhandlerMpPause }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000024, L_MPMENU(287), 0x00000000, &menudialog_mpendgame }, // "End Game" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000024, L_MPMENU(287), 0x00000000, &g_MpEndGameMenuDialog }, // "End Game" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2a794 -struct menu_dialog menudialog_2a794 = { +struct menu_dialog g_MpPauseControlMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(285), // "Control" - menuitems_2a6cc, + g_MpPauseControlMenuItems, NULL, 0x00000000, NULL, }; // 2a7ac -struct menu_item menuitems_2a7ac[] = { +struct menu_item g_MpInventoryMenuItems[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000000, 0x00000078, 0x00000042, menuhandler00106178 }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&mpMenuTextWeaponDescription, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2a7e8 -struct menu_dialog menudialog_2a7e8 = { +struct menu_dialog g_MpPauseInventoryMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(284), // "Inventory" - menuitems_2a7ac, + g_MpInventoryMenuItems, NULL, 0x00000000, - &menudialog_2a794, + &g_MpPauseControlMenuDialog, }; // 2a800 struct menu_dialog menudialog_2a800 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(284), // "Inventory" - menuitems_2a7ac, + g_MpInventoryMenuItems, NULL, 0x00000000, &menudialog_18d78, @@ -10123,88 +10123,88 @@ struct menu_dialog menudialog_2a800 = { struct menu_dialog menudialog_2a818 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(284), // "Inventory" - menuitems_2a7ac, + g_MpInventoryMenuItems, NULL, 0x00000000, &menudialog_18d90, }; // 2a830 -struct menu_item menuitems_2a830[] = { +struct menu_item g_MpPlayerStatsMenuItems[] = { { MENUITEMTYPE_PLAYERSTATS, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler00177e00 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2a858 -struct menu_dialog menudialog_2a858 = { +struct menu_dialog g_MpPausePlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1783a0, - menuitems_2a830, + g_MpPlayerStatsMenuItems, NULL, 0x00000000, - &menudialog_2a7e8, + &g_MpPauseInventoryMenuDialog, }; // 2a870 -struct menu_dialog menudialog_2a870 = { +struct menu_dialog g_MpEndscreenPlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1783a0, - menuitems_2a830, + g_MpPlayerStatsMenuItems, NULL, 0x00000000, NULL, }; // 2a888 -struct menu_item menuitems_2a888[] = { +struct menu_item g_MpPlayerRankingMenuItems[] = { { MENUITEMTYPE_RANKING, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2a8b0 -struct menu_dialog menudialog_2a8b0 = { +struct menu_dialog g_MpPausePlayerRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(276), // "Player Ranking" - menuitems_2a888, + g_MpPlayerRankingMenuItems, NULL, 0x00000000, - &menudialog_2a858, + &g_MpPausePlayerStatsMenuDialog, }; // 2a8c8 -struct menu_dialog menudialog_2a8c8 = { +struct menu_dialog g_MpEndscreenPlayerRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(276), // "Player Ranking" - menuitems_2a888, + g_MpPlayerRankingMenuItems, NULL, 0x00000000, - &menudialog_2a870, + &g_MpEndscreenPlayerStatsMenuDialog, }; // 2a8e0 -struct menu_item menuitems_2a8e0[] = { +struct menu_item g_MpTeamRankingMenuItems[] = { { MENUITEMTYPE_RANKING, 0, 0x00000000, 0x00000001, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2a908 -struct menu_dialog menudialog_2a908 = { +struct menu_dialog g_MpPauseTeamRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(279), // "Team Ranking" - menuitems_2a8e0, + g_MpTeamRankingMenuItems, NULL, 0x00000000, - &menudialog_2a8b0, + &g_MpPausePlayerRankingMenuDialog, }; // 2a920 -struct menu_dialog menudialog_2a920 = { +struct menu_dialog g_MpEndscreenTeamRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(279), // "Team Ranking" - menuitems_2a8e0, + g_MpTeamRankingMenuItems, NULL, 0x00000000, - &menudialog_2a8c8, + &g_MpEndscreenPlayerRankingMenuDialog, }; // 2a938 @@ -10224,7 +10224,7 @@ u16 g_OrdinalSuffixes[] = { }; // 2a950 -struct menu_item menuitems_2a950[] = { +struct menu_item g_MpGameOverMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x01000010, (u32)&mpGetCurrentPlayerName, (u32)&mpMenuTextPlacementWithSuffix, menuhandler001785c4 }, { MENUITEMTYPE_LABEL, 0, 0x01000000, L_MPMENU(261), (u32)&mpMenuTextPlayerTitle, menuhandler00178a94 }, // "Title:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -10238,85 +10238,85 @@ struct menu_item menuitems_2a950[] = { }; // 2aa18 -struct menu_dialog menudialog_2aa18 = { +struct menu_dialog g_MpEndscreenChallengeGameOverMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(260), // "Game Over" - menuitems_2a950, + g_MpGameOverMenuItems, NULL, 0x00000000, - &menudialog_2a8c8, + &g_MpEndscreenPlayerRankingMenuDialog, }; // 2aa30 -struct menu_dialog menudialog_2aa30 = { +struct menu_dialog g_MpEndscreenGameOverMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(260), // "Game Over" - menuitems_2a950, + g_MpGameOverMenuItems, NULL, 0x00000000, - &menudialog_2a920, + &g_MpEndscreenTeamRankingMenuDialog, }; // 2aa48 -struct menu_dialog menudialog_2aa48 = { +struct menu_dialog g_MpEndscreenChallengeCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPWEAPONS(165), // "Challenge Completed!" - menuitems_2a8e0, + g_MpTeamRankingMenuItems, NULL, 0x00000000, - &menudialog_2aa18, + &g_MpEndscreenChallengeGameOverMenuDialog, }; // 2aa60 -struct menu_dialog menudialog_2aa60 = { +struct menu_dialog g_MpEndscreenChallengeCheatedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(167), // "Challenge Cheated!" - menuitems_2a8e0, + g_MpTeamRankingMenuItems, NULL, 0x00000000, - &menudialog_2aa18, + &g_MpEndscreenChallengeGameOverMenuDialog, }; // 2aa78 -struct menu_dialog menudialog_2aa78 = { +struct menu_dialog g_MpEndscreenChallengeFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(166), // "Challenge Failed!" - menuitems_2a8e0, + g_MpTeamRankingMenuItems, NULL, 0x00000000, - &menudialog_2aa18, + &g_MpEndscreenChallengeGameOverMenuDialog, }; // 2aa90 -struct menu_item menuitems_2aa90[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x000054fa, 0x00000000, NULL }, +struct menu_item g_MpEndscreenConfirmPlayerNameMenuItems[] = { + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(250), 0x00000000, NULL }, // "Confirm player name:" { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler00178bf4 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2aacc -struct menu_dialog menudialog_2aacc = { +struct menu_dialog g_MpEndscreenConfirmPlayerNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(142), // "Player Name" - menuitems_2aa90, + g_MpEndscreenConfirmPlayerNameMenuItems, NULL, 0x00000000, NULL, }; // 2aae4 -struct menu_item menuitems_2aae4[] = { +struct menu_item g_MpEndscreenSavePlayerMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(247), 0x00000000, NULL }, // "Save new player and statistics?" - { MENUITEMTYPE_SELECTABLE, 0, 0x0000002c, L_MPWEAPONS(248), 0x00000000, &menudialog_2aacc }, // "Save Now" + { MENUITEMTYPE_SELECTABLE, 0, 0x0000002c, L_MPWEAPONS(248), 0x00000000, &g_MpEndscreenConfirmPlayerNameMenuDialog }, // "Save Now" { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS(249), 0x00000000, NULL }, // "No Thanks!" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2ab34 -struct menu_dialog menudialog_2ab34 = { +struct menu_dialog g_MpEndscreenSavePlayerMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(246), // "Save Player" - menuitems_2aae4, + g_MpEndscreenSavePlayerMenuItems, NULL, 0x00000004, NULL, diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 5050d0931..901108e0f 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -3273,15 +3273,15 @@ glabel func0f0f3220 /* f0f32c4: 00000000 */ sll $zero,$zero,0x0 /* f0f32c8: 8c820000 */ lw $v0,0x0($a0) /* f0f32cc: 24010002 */ addiu $at,$zero,0x2 -/* f0f32d0: 3c0b8008 */ lui $t3,%hi(menudialog_2aa60) +/* f0f32d0: 3c0b8008 */ lui $t3,%hi(g_MpEndscreenChallengeCheatedMenuDialog) /* f0f32d4: 904a0000 */ lbu $t2,0x0($v0) -/* f0f32d8: 256b4a40 */ addiu $t3,$t3,%lo(menudialog_2aa60) +/* f0f32d8: 256b4a40 */ addiu $t3,$t3,%lo(g_MpEndscreenChallengeCheatedMenuDialog) /* f0f32dc: 15410008 */ bne $t2,$at,.L0f0f3300 /* f0f32e0: 00000000 */ sll $zero,$zero,0x0 /* f0f32e4: 11620005 */ beq $t3,$v0,.L0f0f32fc /* f0f32e8: 00004025 */ or $t0,$zero,$zero -/* f0f32ec: 3c0c8008 */ lui $t4,%hi(menudialog_2aa78) -/* f0f32f0: 258c4a58 */ addiu $t4,$t4,%lo(menudialog_2aa78) +/* f0f32ec: 3c0c8008 */ lui $t4,%hi(g_MpEndscreenChallengeFailedMenuDialog) +/* f0f32f0: 258c4a58 */ addiu $t4,$t4,%lo(g_MpEndscreenChallengeFailedMenuDialog) /* f0f32f4: 15820002 */ bne $t4,$v0,.L0f0f3300 /* f0f32f8: 00000000 */ sll $zero,$zero,0x0 .L0f0f32fc: diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index 0fbe8898e..5fd8ba223 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -932,14 +932,14 @@ glabel func0f178dbc /* f178e48: 11c00012 */ beqz $t6,.L0f178e94 /* f178e4c: a04d083b */ sb $t5,0x83b($v0) /* f178e50: 8c8f000c */ lw $t7,0xc($a0) -/* f178e54: 3c048008 */ lui $a0,%hi(menudialog_2a8b0) +/* f178e54: 3c048008 */ lui $a0,%hi(g_MpPausePlayerRankingMenuDialog) /* f178e58: 24050004 */ addiu $a1,$zero,0x4 /* f178e5c: 31f80002 */ andi $t8,$t7,0x2 /* f178e60: 13000007 */ beqz $t8,.L0f178e80 -/* f178e64: 24844890 */ addiu $a0,$a0,%lo(menudialog_2a8b0) -/* f178e68: 3c048008 */ lui $a0,%hi(menudialog_2a908) +/* f178e64: 24844890 */ addiu $a0,$a0,%lo(g_MpPausePlayerRankingMenuDialog) +/* f178e68: 3c048008 */ lui $a0,%hi(g_MpPauseTeamRankingMenuDialog) /* f178e6c: 0fc3e0cc */ jal menuPushRootDialog -/* f178e70: 248448e8 */ addiu $a0,$a0,%lo(menudialog_2a908) +/* f178e70: 248448e8 */ addiu $a0,$a0,%lo(g_MpPauseTeamRankingMenuDialog) /* f178e74: 3c068007 */ lui $a2,%hi(g_MpPlayerNum) /* f178e78: 10000017 */ beqz $zero,.L0f178ed8 /* f178e7c: 24c61448 */ addiu $a2,$a2,%lo(g_MpPlayerNum) @@ -1006,15 +1006,15 @@ glabel func0f178ef0 /* f178f44: 3c09800b */ lui $t1,%hi(g_MpSetup+0x88) /* f178f48: 9129cc10 */ lbu $t1,%lo(g_MpSetup+0x88)($t1) /* f178f4c: 24010005 */ addiu $at,$zero,0x5 -/* f178f50: 3c048008 */ lui $a0,%hi(menudialog_2aa30) +/* f178f50: 3c048008 */ lui $a0,%hi(g_MpEndscreenGameOverMenuDialog) /* f178f54: 1521001d */ bne $t1,$at,.L0f178fcc -/* f178f58: 24844a10 */ addiu $a0,$a0,%lo(menudialog_2aa30) +/* f178f58: 24844a10 */ addiu $a0,$a0,%lo(g_MpEndscreenGameOverMenuDialog) /* f178f5c: 3c0a800a */ lui $t2,%hi(g_CheatsActiveBank0) /* f178f60: 8d4a21d0 */ lw $t2,%lo(g_CheatsActiveBank0)($t2) -/* f178f64: 3c048008 */ lui $a0,%hi(menudialog_2aa60) +/* f178f64: 3c048008 */ lui $a0,%hi(g_MpEndscreenChallengeCheatedMenuDialog) /* f178f68: 3c0b800a */ lui $t3,%hi(g_CheatsActiveBank1) /* f178f6c: 15400004 */ bnez $t2,.L0f178f80 -/* f178f70: 24844a40 */ addiu $a0,$a0,%lo(menudialog_2aa60) +/* f178f70: 24844a40 */ addiu $a0,$a0,%lo(g_MpEndscreenChallengeCheatedMenuDialog) /* f178f74: 8d6b21d4 */ lw $t3,%lo(g_CheatsActiveBank1)($t3) /* f178f78: 11600005 */ beqz $t3,.L0f178f90 /* f178f7c: 00000000 */ sll $zero,$zero,0x0 @@ -1027,15 +1027,15 @@ glabel func0f178ef0 /* f178f90: 0fc6714f */ jal func0f19c53c /* f178f94: 00000000 */ sll $zero,$zero,0x0 /* f178f98: 10400007 */ beqz $v0,.L0f178fb8 -/* f178f9c: 3c048008 */ lui $a0,%hi(menudialog_2aa78) -/* f178fa0: 3c048008 */ lui $a0,%hi(menudialog_2aa48) -/* f178fa4: 24844a28 */ addiu $a0,$a0,%lo(menudialog_2aa48) +/* f178f9c: 3c048008 */ lui $a0,%hi(g_MpEndscreenChallengeFailedMenuDialog) +/* f178fa0: 3c048008 */ lui $a0,%hi(g_MpEndscreenChallengeCompletedMenuDialog) +/* f178fa4: 24844a28 */ addiu $a0,$a0,%lo(g_MpEndscreenChallengeCompletedMenuDialog) /* f178fa8: 0fc3e0cc */ jal menuPushRootDialog /* f178fac: 24050005 */ addiu $a1,$zero,0x5 /* f178fb0: 1000000e */ beqz $zero,.L0f178fec /* f178fb4: 00000000 */ sll $zero,$zero,0x0 .L0f178fb8: -/* f178fb8: 24844a58 */ addiu $a0,$a0,%lo(menudialog_2aa78) +/* f178fb8: 24844a58 */ addiu $a0,$a0,%lo(g_MpEndscreenChallengeFailedMenuDialog) /* f178fbc: 0fc3e0cc */ jal menuPushRootDialog /* f178fc0: 24050005 */ addiu $a1,$zero,0x5 /* f178fc4: 10000009 */ beqz $zero,.L0f178fec @@ -1046,8 +1046,8 @@ glabel func0f178ef0 /* f178fd4: 10000005 */ beqz $zero,.L0f178fec /* f178fd8: 00000000 */ sll $zero,$zero,0x0 .L0f178fdc: -/* f178fdc: 3c048008 */ lui $a0,%hi(menudialog_2aa18) -/* f178fe0: 248449f8 */ addiu $a0,$a0,%lo(menudialog_2aa18) +/* f178fdc: 3c048008 */ lui $a0,%hi(g_MpEndscreenChallengeGameOverMenuDialog) +/* f178fe0: 248449f8 */ addiu $a0,$a0,%lo(g_MpEndscreenChallengeGameOverMenuDialog) /* f178fe4: 0fc3e0cc */ jal menuPushRootDialog /* f178fe8: 24050005 */ addiu $a1,$zero,0x5 .L0f178fec: @@ -1067,10 +1067,10 @@ glabel func0f178ef0 /* f179020: 57000009 */ bnezl $t8,.L0f179048 /* f179024: 8fbf0014 */ lw $ra,0x14($sp) /* f179028: 94590050 */ lhu $t9,0x50($v0) -/* f17902c: 3c048008 */ lui $a0,%hi(menudialog_2ab34) +/* f17902c: 3c048008 */ lui $a0,%hi(g_MpEndscreenSavePlayerMenuDialog) /* f179030: 34684000 */ ori $t0,$v1,0x4000 /* f179034: 17200003 */ bnez $t9,.L0f179044 -/* f179038: 24844b14 */ addiu $a0,$a0,%lo(menudialog_2ab34) +/* f179038: 24844b14 */ addiu $a0,$a0,%lo(g_MpEndscreenSavePlayerMenuDialog) /* f17903c: 0fc3cbd3 */ jal menuPushDialog /* f179040: a4480048 */ sh $t0,0x48($v0) .L0f179044: diff --git a/src/include/game/data/data_020df0.h b/src/include/game/data/data_020df0.h index 19c6493ec..0a7c1eadf 100644 --- a/src/include/game/data/data_020df0.h +++ b/src/include/game/data/data_020df0.h @@ -306,15 +306,15 @@ extern u32 var800844f0; extern s32 var800845d8; extern u32 var800845dc; extern u32 var800845f4; -extern struct menu_dialog menudialog_2a8b0; -extern struct menu_dialog menudialog_2a908; +extern struct menu_dialog g_MpPausePlayerRankingMenuDialog; +extern struct menu_dialog g_MpPauseTeamRankingMenuDialog; extern u16 g_OrdinalSuffixes[12]; -extern struct menu_dialog menudialog_2aa18; -extern struct menu_dialog menudialog_2aa30; -extern struct menu_dialog menudialog_2aa48; -extern struct menu_dialog menudialog_2aa60; -extern struct menu_dialog menudialog_2aa78; -extern struct menu_dialog menudialog_2ab34; +extern struct menu_dialog g_MpEndscreenChallengeGameOverMenuDialog; +extern struct menu_dialog g_MpEndscreenGameOverMenuDialog; +extern struct menu_dialog g_MpEndscreenChallengeCompletedMenuDialog; +extern struct menu_dialog g_MpEndscreenChallengeCheatedMenuDialog; +extern struct menu_dialog g_MpEndscreenChallengeFailedMenuDialog; +extern struct menu_dialog g_MpEndscreenSavePlayerMenuDialog; extern struct menu_dialog menudialog_2aba0; extern struct mparena g_MpArenas[17]; extern u32 var80084bf8;