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_16010.c
+++ b/src/core2/code_16010.c
@@ -232,7 +232,7 @@ bool func_8029D7B4(void){
                && func_8028EC04() < 1U
                && func_80297C6C() != 3
                && bs_getState() != BS_3D_FALL_TUMBLING
-                && func_8028F22C() < 1U
+                && player_isDead() < 1U
                ;
    }
    return 0;