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

Function and Enum Naming

Browse Source 
Enum Changes:

BSGROUP_4_LOOK = 0x4

MISC_FLAG_17_FPV = 0x17

Moved nc_first_person_state to global enums.h

Function names:

func_8028EE84() -> player_getWaterState()

func_8028B2E8() -> player_isStable()

func_80294F78() -> should_look_first_person_camera()

func_80294F78() -> can_view_first_person()

func_8028B424() -> player_isFallTumbling()

func_8029C780() -> bs_getTypeOfJump()

func_8028DB14() -> hitbox_getHitboxForActor()
This commit is contained in:
Shmoopi
2024-09-02 08:40:25 -10:00
parent 98e97f4e95
commit 1bf68887e6
62 changed files with 216 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/ba/falldamage.c
View File

@@ -124,7 +124,7 @@ void bafalldamage_init(void){
void bafalldamage_update(void){
s32 player_position;
player_position = func_8028ECAC();
if(func_8028B2E8() || (func_8028EE84() != BSWATERGROUP_0_NONE) || player_position == BSGROUP_A_FLYING){
if(player_isStable() || (player_getWaterState() != BSWATERGROUP_0_NONE) || player_position == BSGROUP_A_FLYING){
bafalldamage_start();
bafalldamage_set_state(1);
}

4
src/core2/ba/marker.c
View File

@@ -529,7 +529,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
player_getPosition(spA0);
jiggy_id = chjiggy_getJiggyId(actor);
if( jiggy_id != JIGGY_2F_FP_XMAS_TREE
|| (func_8028B2E8() && !(3600.0f < ml_distanceSquared_vec3f(actor->position, spA0)))
|| (player_isStable() && !(3600.0f < ml_distanceSquared_vec3f(actor->position, spA0)))
){
jiggyscore_setCollected(jiggy_id, TRUE);
item_adjustByDiffWithoutHud(ITEM_26_JIGGY_TOTAL, 1);
@@ -686,7 +686,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
break;
case MARKER_6B_GLOOPBUBBLE: //L8028CD20
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
item_adjustByDiffWithHud(ITEM_17_AIR, fxairscore_count_to_time(2));
}
break;

2
src/core2/ba/model.c
View File

@@ -269,7 +269,7 @@ void baModel_setVisible(s32 arg0){
}
void baModel_802921D4(f32 arg0[3]){
if(func_8028EE84() == BSWATERGROUP_0_NONE){
if(player_getWaterState() == BSWATERGROUP_0_NONE){
D_8037C150.unk0 = 1;
D_8037C150.unk4[0] = arg0[0];
D_8037C150.unk4[1] = arg0[1];