Split cheat config out of setup_0160b0

This commit is contained in:
Ryan Dwyer
2020-01-20 19:43:24 +10:00
parent e05111dccf
commit 503ed2abec
9 changed files with 1410 additions and 1314 deletions
+2 -2
View File
@@ -489,7 +489,7 @@ char *cheatGetMarquee(struct menu_item *arg0)
if (g_MenuStack[g_MpPlayerNum].unk00 && g_MenuStack[g_MpPlayerNum].unk00->item && g_MenuStack[g_MpPlayerNum].unk00->item->type == MENUITEMTYPE_CHECKBOX) {
cheat_id = g_MenuStack[g_MpPlayerNum].unk00->item->param;
if (g_MenuStack[g_MpPlayerNum].unk00->dialog == &menudialog_cheats_buddies && g_MenuStack[g_MpPlayerNum].unk00->item == &menuitems_cheats_buddies[0]) {
if (g_MenuStack[g_MpPlayerNum].unk00->dialog == &g_CheatsBuddiesMenuDialog && g_MenuStack[g_MpPlayerNum].unk00->item == &g_CheatsBuddiesMenuItems[0]) {
// Velvet
sprintf(g_CheatMarqueeString, "%s: %s", textGet(0x548f), textGet(0x5475)); // "Buddy Available", "Velvet Dark"
return g_CheatMarqueeString;
@@ -498,7 +498,7 @@ char *cheatGetMarquee(struct menu_item *arg0)
if (cheatIsUnlocked(cheat_id)) {
// Show cheat name
sprintf(g_CheatMarqueeString, "%s: %s\n",
g_MenuStack[g_MpPlayerNum].unk00->dialog == &menudialog_cheats_buddies ? textGet(0x548f) : textGet(0x5488), // "Buddy Available", "Cheat available"
g_MenuStack[g_MpPlayerNum].unk00->dialog == &g_CheatsBuddiesMenuDialog ? textGet(0x548f) : textGet(0x5488), // "Buddy Available", "Cheat available"
textGet(g_Cheats[cheat_id].nametextid)
);
return g_CheatMarqueeString;
+2 -2
View File
@@ -38123,9 +38123,9 @@ glabel func0f086f40
/* f0870a0: 2401000f */ addiu $at,$zero,0xf
/* f0870a4: 14410008 */ bne $v0,$at,.L0f0870c8
/* f0870a8: 240e0001 */ addiu $t6,$zero,0x1
/* f0870ac: 3c048007 */ lui $a0,%hi(menudialog_cheats)
/* f0870ac: 3c048007 */ lui $a0,%hi(g_CheatsMenuDialog)
/* f0870b0: a3ae002b */ sb $t6,0x2b($sp)
/* f0870b4: 24844368 */ addiu $a0,$a0,%lo(menudialog_cheats)
/* f0870b4: 24844368 */ addiu $a0,$a0,%lo(g_CheatsMenuDialog)
/* f0870b8: 0fc3e178 */ jal func0f0f85e0
/* f0870bc: 2405000d */ addiu $a1,$zero,0xd
/* f0870c0: 1000001e */ beqz $zero,.L0f08713c