Merge branch 'mr-origin-80'

2024-09-26 19:10:37 -05:00
parent e8eed5ecb9 249f5a7329
commit 8a312a3e64
170 changed files with 1495 additions and 1305 deletions
--- a/src/core2/code_91E10.c
+++ b/src/core2/code_91E10.c
@@ -402,9 +402,11 @@ void func_803197AC(s32 arg0){
            item_set(ITEM_6_HOURGLASS, TRUE);
            D_803830E0->unk15 = 0;
            D_803830E0->unk13 = 1U;
-            for(i = 1; i < 4; i++){
-                func_80319758(i, (i == D_803830E0->unk13) ? TRUE : FALSE);
+
+            for (i = 1; i < 4; i++) {
+                func_80319758(i, BOOL(i == D_803830E0->unk13));
            }
+
            break;

        case 7: //80319C0C