Merge branch 'mr-origin-80'

src/core1/code_10A00.c

@@ -316,8 +316,8 @@ void pfsManager_init(void){
     osStartThread(&sPfsManagerThread);
 }
 
-bool pfsManager_contErr(void){
-    return pfsManagerContStatus.errno ? TRUE : FALSE;
+bool pfsManager_contErr(void) {
+    return BOOL(pfsManagerContStatus.errno);
 }
 
 void func_8024F150(void){

src/core1/code_CE60.c

@@ -184,7 +184,7 @@ void func_8024AF48(void){
     if(volatileFlag_get(VOLATILE_FLAG_1))    return;
     if(volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) return;
     if(func_802D686C())     return;
-    if(func_8028F22C())     return;
+    if(player_isDead())     return;
     if(gctransition_8030BDC0()) return;
     if(getGameMode() == GAME_MODE_A_SNS_PICTURE) return;
 

src/core1/memory.c

@@ -251,7 +251,7 @@ u32 heap_get_occupied_size(void){
 
 bool func_8025498C(s32 size){
     s32 v0 = func_802549BC(size);
-    return v0 ? TRUE : FALSE;
+    return BOOL(v0);
 }
 
 EmptyHeapBlock *func_802549BC(s32 size){