diff --git a/manual_syms.pal.txt b/manual_syms.pal.txt index f50b8b46..4ad1b1c8 100644 --- a/manual_syms.pal.txt +++ b/manual_syms.pal.txt @@ -47,7 +47,7 @@ func_8028F170 = 0x8028ef90; ability_isUnlocked = 0x8028efb0; player_is_present = 0x8028eff4; func_8028F1E0 = 0x8028f000; -func_8028F22C = 0x8028f04c; +player_isDead = 0x8028f04c; func_8028F25C = 0x8028f07c; func_8028F428 = 0x8028f248; func_8028F55C = 0x8028f37c; diff --git a/src/FP/racectrl.c b/src/FP/racectrl.c index 96a6ac7b..8fa28dbc 100644 --- a/src/FP/racectrl.c +++ b/src/FP/racectrl.c @@ -525,7 +525,7 @@ void func_8038BC0C(s32 arg0){ break; FP_D_803935A8.unk1A = TRUE; FP_func_8038AB60(0); - if(!func_8028F22C()){ + if(!player_isDead()){ func_8028F918(2); func_80311480(0xc10, 0x20, NULL, NULL, func_8038B2C8, NULL); }//L8038BD40 @@ -533,7 +533,7 @@ void func_8038BC0C(s32 arg0){ break; case 3: - if(!FP_D_803935A8.unk19 && !func_8028F22C()){ + if(!FP_D_803935A8.unk19 && !player_isDead()){ FP_D_803935A8.unk19 = 1; func_80311480(0xc0f, 0x20, NULL, NULL, NULL, NULL); }//L8038BD94 @@ -541,7 +541,7 @@ void func_8038BC0C(s32 arg0){ break; case 2: - if(!FP_D_803935A8.unk18 && !func_8028F22C()){ + if(!FP_D_803935A8.unk18 && !player_isDead()){ FP_D_803935A8.unk18 = 1; func_80311480(0xc0e, 0x20, NULL, NULL, NULL, NULL); }//L8038BDF0 diff --git a/src/MM/ch/orange.c b/src/MM/ch/orange.c index 1cc9584a..a550b53e 100644 --- a/src/MM/ch/orange.c +++ b/src/MM/ch/orange.c @@ -28,7 +28,7 @@ f32 D_80389A00[3] = {0.0f, 0.0f, 0.0f}; /* .code */ void __chorange_collisionCallback(ActorMarker *marker, ActorMarker *other_marker) { - if (!func_8028F22C() && + if (!player_isDead() && !mapSpecificFlags_get(MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE) && func_80311480(ASSET_B3A_TEXT_CONGA_HITS_PLAYER, 0, 0, 0, NULL, NULL)) { diff --git a/src/core1/code_CE60.c b/src/core1/code_CE60.c index 22650c06..ac11456e 100644 --- a/src/core1/code_CE60.c +++ b/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; diff --git a/src/core2/ch/snacker.c b/src/core2/ch/snacker.c index a46a26f2..a5d97e04 100644 --- a/src/core2/ch/snacker.c +++ b/src/core2/ch/snacker.c @@ -156,7 +156,7 @@ static void __chsnacker_ow(ActorMarker *marker, ActorMarker *other){ Actor *this; this = marker_getActor(marker); - if(level_get() == LEVEL_2_TREASURE_TROVE_COVE && !func_8028F22C()){ + if(level_get() == LEVEL_2_TREASURE_TROVE_COVE && !player_isDead()){ func_80311480(0xA29, 0, NULL, NULL, NULL, NULL); }//L802E10A4 diff --git a/src/core2/code_16010.c b/src/core2/code_16010.c index e4ecf392..6b2055eb 100644 --- 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; diff --git a/src/core2/code_5C870.c b/src/core2/code_5C870.c index d9d9b8d5..37af0d91 100644 --- a/src/core2/code_5C870.c +++ b/src/core2/code_5C870.c @@ -541,7 +541,7 @@ bool func_802E4424(void) { && (level_get() != 0) && (0.6 < D_8037E8E0.unk10) && gcpausemenu_80314B00() - && !func_8028F22C() + && !player_isDead() && func_8032056C() && levelSpecificFlags_validateCRC1() && dummy_func_80320248() diff --git a/src/core2/code_7060.c b/src/core2/code_7060.c index 50fc292c..a5370311 100644 --- a/src/core2/code_7060.c +++ b/src/core2/code_7060.c @@ -631,7 +631,7 @@ bool func_8028F20C(void){ return player_isStable(); } -bool func_8028F22C(void){ +bool player_isDead(void){ if(bs_getState() == BS_41_DIE){ return TRUE; }