kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Renaming player_isDead function

Browse Source
This commit is contained in:
Nabnut
2024-09-19 12:32:02 +02:00
parent f0d53d6fcd
commit db8a200799
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manual_syms.pal.txt
View File

@@ -47,7 +47,7 @@ func_8028F170 = 0x8028ef90;
ability_isUnlocked = 0x8028efb0; ability_isUnlocked = 0x8028efb0;
player_is_present = 0x8028eff4; player_is_present = 0x8028eff4;
func_8028F1E0 = 0x8028f000; func_8028F1E0 = 0x8028f000;
func_8028F22C = 0x8028f04c; player_isDead = 0x8028f04c;
func_8028F25C = 0x8028f07c; func_8028F25C = 0x8028f07c;
func_8028F428 = 0x8028f248; func_8028F428 = 0x8028f248;
func_8028F55C = 0x8028f37c; func_8028F55C = 0x8028f37c;

6
src/FP/racectrl.c
View File

@@ -525,7 +525,7 @@ void func_8038BC0C(s32 arg0){
break; break;
FP_D_803935A8.unk1A = TRUE; FP_D_803935A8.unk1A = TRUE;
FP_func_8038AB60(0); FP_func_8038AB60(0);
if(!func_8028F22C()){ if(!player_isDead()){
func_8028F918(2); func_8028F918(2);
func_80311480(0xc10, 0x20, NULL, NULL, func_8038B2C8, NULL); func_80311480(0xc10, 0x20, NULL, NULL, func_8038B2C8, NULL);
}//L8038BD40 }//L8038BD40
@@ -533,7 +533,7 @@ void func_8038BC0C(s32 arg0){
break; break;
case 3: case 3:
if(!FP_D_803935A8.unk19 && !func_8028F22C()){ if(!FP_D_803935A8.unk19 && !player_isDead()){
FP_D_803935A8.unk19 = 1; FP_D_803935A8.unk19 = 1;
func_80311480(0xc0f, 0x20, NULL, NULL, NULL, NULL); func_80311480(0xc0f, 0x20, NULL, NULL, NULL, NULL);
}//L8038BD94 }//L8038BD94
@@ -541,7 +541,7 @@ void func_8038BC0C(s32 arg0){
break; break;
case 2: case 2:
if(!FP_D_803935A8.unk18 && !func_8028F22C()){ if(!FP_D_803935A8.unk18 && !player_isDead()){
FP_D_803935A8.unk18 = 1; FP_D_803935A8.unk18 = 1;
func_80311480(0xc0e, 0x20, NULL, NULL, NULL, NULL); func_80311480(0xc0e, 0x20, NULL, NULL, NULL, NULL);
}//L8038BDF0 }//L8038BDF0

2
src/MM/ch/orange.c
View File

@@ -28,7 +28,7 @@ f32 D_80389A00[3] = {0.0f, 0.0f, 0.0f};
/* .code */ /* .code */
void __chorange_collisionCallback(ActorMarker *marker, ActorMarker *other_marker) { void __chorange_collisionCallback(ActorMarker *marker, ActorMarker *other_marker) {
if (!func_8028F22C() && if (!player_isDead() &&
!mapSpecificFlags_get(MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE) && !mapSpecificFlags_get(MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE) &&
func_80311480(ASSET_B3A_TEXT_CONGA_HITS_PLAYER, 0, 0, 0, NULL, NULL)) { func_80311480(ASSET_B3A_TEXT_CONGA_HITS_PLAYER, 0, 0, 0, NULL, NULL)) {

2
src/core1/code_CE60.c
View File

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

2
src/core2/ch/snacker.c
View File

@@ -156,7 +156,7 @@ static void __chsnacker_ow(ActorMarker *marker, ActorMarker *other){
Actor *this; Actor *this;
this = marker_getActor(marker); 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); func_80311480(0xA29, 0, NULL, NULL, NULL, NULL);
}//L802E10A4 }//L802E10A4

2
src/core2/code_16010.c
View File

@@ -232,7 +232,7 @@ bool func_8029D7B4(void){
&& func_8028EC04() < 1U && func_8028EC04() < 1U
&& func_80297C6C() != 3 && func_80297C6C() != 3
&& bs_getState() != BS_3D_FALL_TUMBLING && bs_getState() != BS_3D_FALL_TUMBLING
&& func_8028F22C() < 1U && player_isDead() < 1U
; ;
} }
return 0; return 0;

2
src/core2/code_5C870.c
View File

@@ -541,7 +541,7 @@ bool func_802E4424(void) {
&& (level_get() != 0) && (level_get() != 0)
&& (0.6 < D_8037E8E0.unk10) && (0.6 < D_8037E8E0.unk10)
&& gcpausemenu_80314B00() && gcpausemenu_80314B00()
&& !func_8028F22C() && !player_isDead()
&& func_8032056C() && func_8032056C()
&& levelSpecificFlags_validateCRC1() && levelSpecificFlags_validateCRC1()
&& dummy_func_80320248() && dummy_func_80320248()

2
src/core2/code_7060.c
View File

@@ -631,7 +631,7 @@ bool func_8028F20C(void){
return player_isStable(); return player_isStable();
} }
bool func_8028F22C(void){ bool player_isDead(void){
if(bs_getState() == BS_41_DIE){ if(bs_getState() == BS_41_DIE){
return TRUE; return TRUE;
} }