diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 3b29caa63..d6dd7afb7 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -5715,7 +5715,7 @@ bool aiSetStageFlag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - func0f049f2c(g_Vars.chrdata, flags); + chrSetStageFlag(g_Vars.chrdata, flags); g_Vars.aioffset += 6; return false; @@ -5728,7 +5728,7 @@ bool aiUnsetStageFlag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - func0f049f48(g_Vars.chrdata, flags); + chrUnsetStageFlag(g_Vars.chrdata, flags); g_Vars.aioffset += 6; return false; @@ -5742,8 +5742,8 @@ bool aiIfStageFlagEq(void) u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - if ((func0f049f68(g_Vars.chrdata, flags) && cmd[6] == 1) || - (!func0f049f68(g_Vars.chrdata, flags) && cmd[6] == 0)) { + if ((chrHasStageFlag(g_Vars.chrdata, flags) && cmd[6] == 1) || + (!chrHasStageFlag(g_Vars.chrdata, flags) && cmd[6] == 0)) { g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; diff --git a/src/game/game_000000.c b/src/game/game_000000.c index 3f5670462..f318297af 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -5,6 +5,7 @@ #include "game/game_000000.h" #include "game/game_0601b0.h" #include "library/library.h" +#include "setup/setup_000000.h" const u32 var001a78c0[] = { 0x40c907a9, @@ -84678,39 +84679,20 @@ bool chrHasFlagById(struct chrdata *ref, u32 chrnum, u32 flag, u32 bank) return false; } -GLOBAL_ASM( -glabel func0f049f2c -/* f049f2c: 3c028006 */ lui $v0,0x8006 -/* f049f30: 24427e54 */ addiu $v0,$v0,0x7e54 -/* f049f34: 8c4e0000 */ lw $t6,0x0($v0) -/* f049f38: afa40000 */ sw $a0,0x0($sp) -/* f049f3c: 01c57825 */ or $t7,$t6,$a1 -/* f049f40: 03e00008 */ jr $ra -/* f049f44: ac4f0000 */ sw $t7,0x0($v0) -); +void chrSetStageFlag(struct chrdata *chr, u32 flag) +{ + g_StageFlags |= flag; +} -GLOBAL_ASM( -glabel func0f049f48 -/* f049f48: 3c028006 */ lui $v0,0x8006 -/* f049f4c: 24427e54 */ addiu $v0,$v0,0x7e54 -/* f049f50: 8c4f0000 */ lw $t7,0x0($v0) -/* f049f54: 00a07027 */ nor $t6,$a1,$zero -/* f049f58: afa40000 */ sw $a0,0x0($sp) -/* f049f5c: 01cfc024 */ and $t8,$t6,$t7 -/* f049f60: 03e00008 */ jr $ra -/* f049f64: ac580000 */ sw $t8,0x0($v0) -); +void chrUnsetStageFlag(struct chrdata *chr, u32 flag) +{ + g_StageFlags = g_StageFlags & ~flag; +} -GLOBAL_ASM( -glabel func0f049f68 -/* f049f68: 3c0e8006 */ lui $t6,0x8006 -/* f049f6c: 8dce7e54 */ lw $t6,0x7e54($t6) -/* f049f70: afa40000 */ sw $a0,0x0($sp) -/* f049f74: 01c51024 */ and $v0,$t6,$a1 -/* f049f78: 0002782b */ sltu $t7,$zero,$v0 -/* f049f7c: 03e00008 */ jr $ra -/* f049f80: 01e01025 */ or $v0,$t7,$zero -); +bool chrHasStageFlag(struct chrdata *chr, u32 flag) +{ + return (g_StageFlags & flag) != 0; +} GLOBAL_ASM( glabel func0f049f84 diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 7604aa20f..6c99e5188 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -60600,14 +60600,14 @@ glabel func0f095684 /* f095748: 100000e3 */ beqz $zero,.L0f095ad8 /* f09574c: 0000a025 */ or $s4,$zero,$zero /* f095750: 00002025 */ or $a0,$zero,$zero -/* f095754: 0fc127da */ jal func0f049f68 +/* f095754: 0fc127da */ jal chrHasStageFlag /* f095758: 8ea50004 */ lw $a1,0x4($s5) /* f09575c: 544000df */ bnezl $v0,.L0f095adc /* f095760: 24020001 */ addiu $v0,$zero,0x1 /* f095764: 100000dc */ beqz $zero,.L0f095ad8 /* f095768: 0000a025 */ or $s4,$zero,$zero /* f09576c: 00002025 */ or $a0,$zero,$zero -/* f095770: 0fc127da */ jal func0f049f68 +/* f095770: 0fc127da */ jal chrHasStageFlag /* f095774: 8ea50004 */ lw $a1,0x4($s5) /* f095778: 504000d8 */ beqzl $v0,.L0f095adc /* f09577c: 24020001 */ addiu $v0,$zero,0x1 @@ -109805,7 +109805,7 @@ glabel func0f0c07c8 /* f0c0eac: 8fa6003c */ lw $a2,0x3c($sp) /* f0c0eb0: 00002025 */ or $a0,$zero,$zero /* f0c0eb4: 24050200 */ addiu $a1,$zero,0x200 -/* f0c0eb8: 0fc127da */ jal func0f049f68 +/* f0c0eb8: 0fc127da */ jal chrHasStageFlag /* f0c0ebc: afa6003c */ sw $a2,0x3c($sp) /* f0c0ec0: 14400041 */ bnez $v0,.L0f0c0fc8 /* f0c0ec4: 8fa6003c */ lw $a2,0x3c($sp) @@ -247855,11 +247855,11 @@ glabel func0f13bc48 /* f13bf88: 1000002a */ beqz $zero,.L0f13c034 /* f13bf8c: 01941021 */ addu $v0,$t4,$s4 /* f13bf90: 00002025 */ or $a0,$zero,$zero -/* f13bf94: 0fc127da */ jal func0f049f68 +/* f13bf94: 0fc127da */ jal chrHasStageFlag /* f13bf98: 24050100 */ addiu $a1,$zero,0x100 /* f13bf9c: 10400007 */ beqz $v0,.L0f13bfbc /* f13bfa0: 00002025 */ or $a0,$zero,$zero -/* f13bfa4: 0fc127da */ jal func0f049f68 +/* f13bfa4: 0fc127da */ jal chrHasStageFlag /* f13bfa8: 02a02825 */ or $a1,$s5,$zero /* f13bfac: 14400003 */ bnez $v0,.L0f13bfbc /* f13bfb0: 02602025 */ or $a0,$s3,$zero @@ -247871,7 +247871,7 @@ glabel func0f13bc48 /* f13bfc4: 1000001b */ beqz $zero,.L0f13c034 /* f13bfc8: 01d41021 */ addu $v0,$t6,$s4 /* f13bfcc: 00002025 */ or $a0,$zero,$zero -/* f13bfd0: 0fc127da */ jal func0f049f68 +/* f13bfd0: 0fc127da */ jal chrHasStageFlag /* f13bfd4: 02a02825 */ or $a1,$s5,$zero /* f13bfd8: 10400006 */ beqz $v0,.L0f13bff4 /* f13bfdc: 02602025 */ or $a0,$s3,$zero @@ -247889,7 +247889,7 @@ glabel func0f13bc48 /* f13c004: 1000000b */ beqz $zero,.L0f13c034 /* f13c008: 01f41021 */ addu $v0,$t7,$s4 /* f13c00c: 00002025 */ or $a0,$zero,$zero -/* f13c010: 0fc127da */ jal func0f049f68 +/* f13c010: 0fc127da */ jal chrHasStageFlag /* f13c014: 02a02825 */ or $a1,$s5,$zero /* f13c018: 14400003 */ bnez $v0,.L0f13c028 /* f13c01c: 02602025 */ or $a0,$s3,$zero @@ -302642,7 +302642,7 @@ glabel func0f16b96c /* f16caac: 15c00003 */ bnez $t6,.L0f16cabc /* f16cab0: 00000000 */ sll $zero,$zero,0x0 .L0f16cab4: -/* f16cab4: 0fc127d2 */ jal func0f049f48 +/* f16cab4: 0fc127d2 */ jal chrUnsetStageFlag /* f16cab8: 24050001 */ addiu $a1,$zero,0x1 .L0f16cabc: /* f16cabc: 0fc67e65 */ jal func0f19f994 @@ -359018,7 +359018,7 @@ glabel func0f19d338 /* f19d3f0: e7a40014 */ swc1 $f4,0x14($sp) .L0f19d3f4: /* f19d3f4: 00002025 */ or $a0,$zero,$zero -/* f19d3f8: 0fc127cb */ jal func0f049f2c +/* f19d3f8: 0fc127cb */ jal chrSetStageFlag /* f19d3fc: 24050001 */ addiu $a1,$zero,0x1 /* f19d400: 8fbf002c */ lw $ra,0x2c($sp) /* f19d404: 8fb00024 */ lw $s0,0x24($sp) @@ -361920,7 +361920,7 @@ glabel func0f19f994 /* f19fc78: 0fc67b37 */ jal func0f19ecdc /* f19fc7c: ac401c08 */ sw $zero,0x1c08($v0) /* f19fc80: 00002025 */ or $a0,$zero,$zero -/* f19fc84: 0fc127d2 */ jal func0f049f48 +/* f19fc84: 0fc127d2 */ jal chrUnsetStageFlag /* f19fc88: 24050001 */ addiu $a1,$zero,0x1 /* f19fc8c: 10000319 */ beqz $zero,.L0f1a08f4 /* f19fc90: 8fbf007c */ lw $ra,0x7c($sp) @@ -364064,7 +364064,7 @@ glabel func0f1a1998 /* f1a19f0: 00000000 */ sll $zero,$zero,0x0 /* f1a19f4: 00002025 */ or $a0,$zero,$zero .L0f1a19f8: -/* f1a19f8: 0fc127da */ jal func0f049f68 +/* f1a19f8: 0fc127da */ jal chrHasStageFlag /* f1a19fc: 24050010 */ addiu $a1,$zero,0x10 /* f1a1a00: 1040000d */ beqz $v0,.L0f1a1a38 /* f1a1a04: 00002025 */ or $a0,$zero,$zero @@ -364081,7 +364081,7 @@ glabel func0f1a1998 /* f1a1a30: 1000001f */ beqz $zero,.L0f1a1ab0 /* f1a1a34: a0790000 */ sb $t9,0x0($v1) .L0f1a1a38: -/* f1a1a38: 0fc127da */ jal func0f049f68 +/* f1a1a38: 0fc127da */ jal chrHasStageFlag /* f1a1a3c: 24050008 */ addiu $a1,$zero,0x8 /* f1a1a40: 5040001c */ beqzl $v0,.L0f1a1ab4 /* f1a1a44: 8fbf0014 */ lw $ra,0x14($sp) @@ -364148,13 +364148,13 @@ glabel func0f1a1ac0 /* f1a1b18: ac400004 */ sw $zero,0x4($v0) /* f1a1b1c: ac400008 */ sw $zero,0x8($v0) /* f1a1b20: 00002025 */ or $a0,$zero,$zero -/* f1a1b24: 0fc127d2 */ jal func0f049f48 +/* f1a1b24: 0fc127d2 */ jal chrUnsetStageFlag /* f1a1b28: 24050004 */ addiu $a1,$zero,0x4 /* f1a1b2c: 00002025 */ or $a0,$zero,$zero -/* f1a1b30: 0fc127d2 */ jal func0f049f48 +/* f1a1b30: 0fc127d2 */ jal chrUnsetStageFlag /* f1a1b34: 24050008 */ addiu $a1,$zero,0x8 /* f1a1b38: 00002025 */ or $a0,$zero,$zero -/* f1a1b3c: 0fc127d2 */ jal func0f049f48 +/* f1a1b3c: 0fc127d2 */ jal chrUnsetStageFlag /* f1a1b40: 24050010 */ addiu $a1,$zero,0x10 .L0f1a1b44: /* f1a1b44: 8fbf0014 */ lw $ra,0x14($sp) @@ -364174,13 +364174,13 @@ glabel func0f1a1b54 /* f1a1b6c: a0580000 */ sb $t8,0x0($v0) /* f1a1b70: ac400004 */ sw $zero,0x4($v0) /* f1a1b74: 00002025 */ or $a0,$zero,$zero -/* f1a1b78: 0fc127d2 */ jal func0f049f48 +/* f1a1b78: 0fc127d2 */ jal chrUnsetStageFlag /* f1a1b7c: 24050004 */ addiu $a1,$zero,0x4 /* f1a1b80: 00002025 */ or $a0,$zero,$zero -/* f1a1b84: 0fc127d2 */ jal func0f049f48 +/* f1a1b84: 0fc127d2 */ jal chrUnsetStageFlag /* f1a1b88: 24050008 */ addiu $a1,$zero,0x8 /* f1a1b8c: 00002025 */ or $a0,$zero,$zero -/* f1a1b90: 0fc127d2 */ jal func0f049f48 +/* f1a1b90: 0fc127d2 */ jal chrUnsetStageFlag /* f1a1b94: 24050010 */ addiu $a1,$zero,0x10 /* f1a1b98: 3c048009 */ lui $a0,0x8009 /* f1a1b9c: 0fc6875a */ jal func0f1a1d68 @@ -364188,7 +364188,7 @@ glabel func0f1a1b54 /* f1a1ba4: 0fc6878e */ jal func0f1a1e38 /* f1a1ba8: 00402025 */ or $a0,$v0,$zero /* f1a1bac: 00002025 */ or $a0,$zero,$zero -/* f1a1bb0: 0fc127cb */ jal func0f049f2c +/* f1a1bb0: 0fc127cb */ jal chrSetStageFlag /* f1a1bb4: 00402825 */ or $a1,$v0,$zero /* f1a1bb8: 3c08800a */ lui $t0,0x800a /* f1a1bbc: 8d08a244 */ lw $t0,-0x5dbc($t0) @@ -364197,7 +364197,7 @@ glabel func0f1a1b54 /* f1a1bc8: 0fc2a4ab */ jal func0f0a92ac /* f1a1bcc: ad191c08 */ sw $t9,0x1c08($t0) /* f1a1bd0: 00002025 */ or $a0,$zero,$zero -/* f1a1bd4: 0fc127cb */ jal func0f049f2c +/* f1a1bd4: 0fc127cb */ jal chrSetStageFlag /* f1a1bd8: 24050001 */ addiu $a1,$zero,0x1 /* f1a1bdc: 8fbf0014 */ lw $ra,0x14($sp) /* f1a1be0: 27bd0018 */ addiu $sp,$sp,0x18 @@ -364219,10 +364219,10 @@ glabel func0f1a1bec /* f1a1c10: 0fc2a58a */ jal func0f0a9628 /* f1a1c14: 00002825 */ or $a1,$zero,$zero /* f1a1c18: 00002025 */ or $a0,$zero,$zero -/* f1a1c1c: 0fc127cb */ jal func0f049f2c +/* f1a1c1c: 0fc127cb */ jal chrSetStageFlag /* f1a1c20: 24050004 */ addiu $a1,$zero,0x4 /* f1a1c24: 00002025 */ or $a0,$zero,$zero -/* f1a1c28: 0fc127d2 */ jal func0f049f48 +/* f1a1c28: 0fc127d2 */ jal chrUnsetStageFlag /* f1a1c2c: 24050010 */ addiu $a1,$zero,0x10 /* f1a1c30: 3c048009 */ lui $a0,0x8009 /* f1a1c34: 0fc6875a */ jal func0f1a1d68 @@ -364230,13 +364230,13 @@ glabel func0f1a1bec /* f1a1c3c: 0fc6878e */ jal func0f1a1e38 /* f1a1c40: 00402025 */ or $a0,$v0,$zero /* f1a1c44: 00002025 */ or $a0,$zero,$zero -/* f1a1c48: 0fc127d2 */ jal func0f049f48 +/* f1a1c48: 0fc127d2 */ jal chrUnsetStageFlag /* f1a1c4c: 00402825 */ or $a1,$v0,$zero /* f1a1c50: 3c18800a */ lui $t8,0x800a /* f1a1c54: 8f18a244 */ lw $t8,-0x5dbc($t8) /* f1a1c58: 00002025 */ or $a0,$zero,$zero /* f1a1c5c: 24050001 */ addiu $a1,$zero,0x1 -/* f1a1c60: 0fc127d2 */ jal func0f049f48 +/* f1a1c60: 0fc127d2 */ jal chrUnsetStageFlag /* f1a1c64: af001c08 */ sw $zero,0x1c08($t8) /* f1a1c68: 0fc2eda7 */ jal func0f0bb69c /* f1a1c6c: 00000000 */ sll $zero,$zero,0x0 @@ -364581,7 +364581,7 @@ glabel func0f1a2070 /* f1a20c8: 00000000 */ sll $zero,$zero,0x0 /* f1a20cc: 00002025 */ or $a0,$zero,$zero .L0f1a20d0: -/* f1a20d0: 0fc127da */ jal func0f049f68 +/* f1a20d0: 0fc127da */ jal chrHasStageFlag /* f1a20d4: 24050080 */ addiu $a1,$zero,0x80 /* f1a20d8: 1040000d */ beqz $v0,.L0f1a2110 /* f1a20dc: 00002025 */ or $a0,$zero,$zero @@ -364598,7 +364598,7 @@ glabel func0f1a2070 /* f1a2108: 1000001f */ beqz $zero,.L0f1a2188 /* f1a210c: a0790000 */ sb $t9,0x0($v1) .L0f1a2110: -/* f1a2110: 0fc127da */ jal func0f049f68 +/* f1a2110: 0fc127da */ jal chrHasStageFlag /* f1a2114: 24050040 */ addiu $a1,$zero,0x40 /* f1a2118: 5040001c */ beqzl $v0,.L0f1a218c /* f1a211c: 8fbf0014 */ lw $ra,0x14($sp) @@ -364662,13 +364662,13 @@ glabel func0f1a2198 /* f1a21e4: a0400001 */ sb $zero,0x1($v0) /* f1a21e8: ac400004 */ sw $zero,0x4($v0) /* f1a21ec: 00002025 */ or $a0,$zero,$zero -/* f1a21f0: 0fc127d2 */ jal func0f049f48 +/* f1a21f0: 0fc127d2 */ jal chrUnsetStageFlag /* f1a21f4: 24050020 */ addiu $a1,$zero,0x20 /* f1a21f8: 00002025 */ or $a0,$zero,$zero -/* f1a21fc: 0fc127d2 */ jal func0f049f48 +/* f1a21fc: 0fc127d2 */ jal chrUnsetStageFlag /* f1a2200: 24050040 */ addiu $a1,$zero,0x40 /* f1a2204: 00002025 */ or $a0,$zero,$zero -/* f1a2208: 0fc127d2 */ jal func0f049f48 +/* f1a2208: 0fc127d2 */ jal chrUnsetStageFlag /* f1a220c: 24050080 */ addiu $a1,$zero,0x80 .L0f1a2210: /* f1a2210: 8fbf0014 */ lw $ra,0x14($sp) @@ -364691,13 +364691,13 @@ glabel func0f1a2220 /* f1a2244: ac400004 */ sw $zero,0x4($v0) /* f1a2248: 00002025 */ or $a0,$zero,$zero /* f1a224c: 24050020 */ addiu $a1,$zero,0x20 -/* f1a2250: 0fc127d2 */ jal func0f049f48 +/* f1a2250: 0fc127d2 */ jal chrUnsetStageFlag /* f1a2254: afae001c */ sw $t6,0x1c($sp) /* f1a2258: 00002025 */ or $a0,$zero,$zero -/* f1a225c: 0fc127d2 */ jal func0f049f48 +/* f1a225c: 0fc127d2 */ jal chrUnsetStageFlag /* f1a2260: 24050040 */ addiu $a1,$zero,0x40 /* f1a2264: 00002025 */ or $a0,$zero,$zero -/* f1a2268: 0fc127d2 */ jal func0f049f48 +/* f1a2268: 0fc127d2 */ jal chrUnsetStageFlag /* f1a226c: 24050080 */ addiu $a1,$zero,0x80 /* f1a2270: 3c048009 */ lui $a0,0x8009 /* f1a2274: 0fc68937 */ jal func0f1a24dc @@ -364705,7 +364705,7 @@ glabel func0f1a2220 /* f1a227c: 0fc68970 */ jal func0f1a25c0 /* f1a2280: 00402025 */ or $a0,$v0,$zero /* f1a2284: 00002025 */ or $a0,$zero,$zero -/* f1a2288: 0fc127cb */ jal func0f049f2c +/* f1a2288: 0fc127cb */ jal chrSetStageFlag /* f1a228c: 00402825 */ or $a1,$v0,$zero /* f1a2290: 8fa2001c */ lw $v0,0x1c($sp) /* f1a2294: 24440200 */ addiu $a0,$v0,0x200 @@ -364718,7 +364718,7 @@ glabel func0f1a2220 /* f1a22b0: 0fc2a4ab */ jal func0f0a92ac /* f1a22b4: ad281c08 */ sw $t0,0x1c08($t1) /* f1a22b8: 00002025 */ or $a0,$zero,$zero -/* f1a22bc: 0fc127cb */ jal func0f049f2c +/* f1a22bc: 0fc127cb */ jal chrSetStageFlag /* f1a22c0: 24050001 */ addiu $a1,$zero,0x1 /* f1a22c4: 8fbf0014 */ lw $ra,0x14($sp) /* f1a22c8: 27bd0020 */ addiu $sp,$sp,0x20 @@ -364752,10 +364752,10 @@ glabel func0f1a22d4 /* f1a2328: 8e10d030 */ lw $s0,-0x2fd0($s0) /* f1a232c: a0490000 */ sb $t1,0x0($v0) /* f1a2330: 00002025 */ or $a0,$zero,$zero -/* f1a2334: 0fc127cb */ jal func0f049f2c +/* f1a2334: 0fc127cb */ jal chrSetStageFlag /* f1a2338: 24050020 */ addiu $a1,$zero,0x20 /* f1a233c: 00002025 */ or $a0,$zero,$zero -/* f1a2340: 0fc127d2 */ jal func0f049f48 +/* f1a2340: 0fc127d2 */ jal chrUnsetStageFlag /* f1a2344: 24050080 */ addiu $a1,$zero,0x80 /* f1a2348: 3c048009 */ lui $a0,0x8009 /* f1a234c: 0fc68937 */ jal func0f1a24dc @@ -364763,7 +364763,7 @@ glabel func0f1a22d4 /* f1a2354: 0fc68970 */ jal func0f1a25c0 /* f1a2358: 00402025 */ or $a0,$v0,$zero /* f1a235c: 00002025 */ or $a0,$zero,$zero -/* f1a2360: 0fc127d2 */ jal func0f049f48 +/* f1a2360: 0fc127d2 */ jal chrUnsetStageFlag /* f1a2364: 00402825 */ or $a1,$v0,$zero /* f1a2368: 26040200 */ addiu $a0,$s0,0x200 /* f1a236c: 0fc4569e */ jal func0f115a78 @@ -364810,7 +364810,7 @@ glabel func0f1a22d4 /* f1a2404: 0fc2a4ab */ jal func0f0a92ac /* f1a2408: 24040001 */ addiu $a0,$zero,0x1 /* f1a240c: 00002025 */ or $a0,$zero,$zero -/* f1a2410: 0fc127d2 */ jal func0f049f48 +/* f1a2410: 0fc127d2 */ jal chrUnsetStageFlag /* f1a2414: 24050001 */ addiu $a1,$zero,0x1 /* f1a2418: 0fc2eda7 */ jal func0f0bb69c /* f1a241c: 00000000 */ sll $zero,$zero,0x0 @@ -369660,7 +369660,7 @@ glabel menudialog001a6918 /* f1a6928: 14810004 */ bne $a0,$at,.L0f1a693c /* f1a692c: afa60020 */ sw $a2,0x20($sp) /* f1a6930: 00002025 */ or $a0,$zero,$zero -/* f1a6934: 0fc127cb */ jal func0f049f2c +/* f1a6934: 0fc127cb */ jal chrSetStageFlag /* f1a6938: 3c050800 */ lui $a1,0x800 .L0f1a693c: /* f1a693c: 8fbf0014 */ lw $ra,0x14($sp) @@ -369919,7 +369919,7 @@ glabel menudialog001a6c54 /* f1a6c64: 14810004 */ bne $a0,$at,.L0f1a6c78 /* f1a6c68: afa60020 */ sw $a2,0x20($sp) /* f1a6c6c: 00002025 */ or $a0,$zero,$zero -/* f1a6c70: 0fc127cb */ jal func0f049f2c +/* f1a6c70: 0fc127cb */ jal chrSetStageFlag /* f1a6c74: 3c050800 */ lui $a1,0x800 .L0f1a6c78: /* f1a6c78: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/include/setup/setup_000000.h b/src/include/setup/setup_000000.h index ecbb1831d..8fe4c9430 100644 --- a/src/include/setup/setup_000000.h +++ b/src/include/setup/setup_000000.h @@ -20,6 +20,7 @@ extern u32 var80067a58; extern u32 var800663d8; extern u32 var80067b30; extern u32 var80067b78; +extern u32 g_StageFlags; extern struct audiodefinition audiodefinitions[]; extern struct audioconfig audioconfigs[]; diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 01baafcae..6adbf9933 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -13561,7 +13561,7 @@ u32 var80067e44 = 0x00000000; u32 var80067e48 = (u32) &var80067d28; u32 var80067e4c = 0xffffffff; u32 var80067e50 = (u32) &var80067e48; -u32 var80067e54 = 0x00000000; +u32 g_StageFlags = 0; u32 var80067e58 = 0x00000000; u32 var80067e5c = 0x00000000; u32 var80067e60 = 0x00000000;