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

address variaty of compiler warnings and code documentation

Browse Source
This commit is contained in:
Banjo Kazooie
2022-12-03 01:30:35 -06:00
parent 263b5bab4e
commit 1c063c781c
211 changed files with 1341 additions and 1323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CCW/code_160.c
View File

@@ -140,7 +140,7 @@ void func_8038687C(Actor *this) {
return;
}
if ((s32)local->unk0 == 1) {
other = func_80326EEC(0x46);
other = actorArray_findActorFromActorId(0x46);
if(func_803203FC(2)) {
local->unk0 = NULL;
if (other != NULL) {
@@ -192,7 +192,7 @@ void func_8038687C(Actor *this) {
break;
}
func_802C3F04(func_802C4140, 0x29B, reinterpret_cast(s32, sp4C[0]), reinterpret_cast(s32, sp4C[1]), reinterpret_cast(s32, sp4C[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x29B, reinterpret_cast(s32, sp4C[0]), reinterpret_cast(s32, sp4C[1]), reinterpret_cast(s32, sp4C[2]));
local->unk4++;
}
local->unkC = randf2(0.5 - ((local->unk8 / 10) * 0.4), 1.0 - ((local->unk8 / 10) * 0.8));

4
src/CCW/code_1B20.c
View File

@@ -123,14 +123,14 @@ Actor *CCW_func_803882F4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
}
void func_803883F4() {
Actor* actor = func_80326EEC(0x29D);
Actor* actor = actorArray_findActorFromActorId(0x29D);
if (actor && actor->state == 1) {
func_80387F64(actor, 2);
}
}
bool func_80388438() {
Actor* actor = func_80326EEC(0x29D);
Actor* actor = actorArray_findActorFromActorId(0x29D);
if (actor && actor->state == 2) {
return TRUE;
}

4
src/CCW/code_2270.c
View File

@@ -60,7 +60,7 @@ void CCW_func_8038868C(Actor *this, s32 next_state) {
timed_playSfx(0.8f, SFX_4B_GULPING, 0.8f, 28000);
timed_playSfx(1.4f, SFX_4B_GULPING, 0.8f, 28000);
timed_playSfx(2.0f, SFX_4B_GULPING, 0.8f, 28000);
timedFunc_set_2(3.2f, (TFQM2) CCW_func_80388660, (s32) this->marker, 3);
timedFunc_set_2(3.2f, (GenMethod_2) CCW_func_80388660, (s32) this->marker, 3);
}
if (next_state == 3) {
func_803883F4();
@@ -95,7 +95,7 @@ void func_8038894C(ActorMarker* marker, ActorMarker *other_marker) {
Actor* actor = marker_getActor(marker);
if (actor->state == 1) {
actor_collisionOff(actor);
timedFunc_set_2(0.5f, (TFQM2)CCW_func_80388660, (s32)actor->marker, 2);
timedFunc_set_2(0.5f, (GenMethod_2)CCW_func_80388660, (s32)actor->marker, 2);
}
}

2
src/CCW/code_3310.c
View File

@@ -111,7 +111,7 @@ void func_80389700(ActorMarker *marker, enum asset_e text_id, s32 arg2) {
void func_80389740(ActorMarker *marker) {
Actor *this = marker_getActor(marker);
if (this->marker->unk14_21) {
func_802C3F04(func_802C4140, 0x30C, reinterpret_cast(s32, D_8038FDE0[0]), reinterpret_cast(s32, D_8038FDE0[1]), reinterpret_cast(s32, D_8038FDE0[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x30C, reinterpret_cast(s32, D_8038FDE0[0]), reinterpret_cast(s32, D_8038FDE0[1]), reinterpret_cast(s32, D_8038FDE0[2]));
}
}

2
src/CCW/code_5540.c
View File

@@ -40,7 +40,7 @@ void chnabnut_setState(Actor *this, s32 next_state) {
}
if (next_state == NABNUT_STATE_2_WAIT) {
timedFunc_set_2(1.0f, (TFQM2)__chnabnut_setState_method, (s32)this->marker, NABNUT_STATE_3_BACKFLIP);
timedFunc_set_2(1.0f, (GenMethod_2)__chnabnut_setState_method, (s32)this->marker, NABNUT_STATE_3_BACKFLIP);
}
if (next_state == NABNUT_STATE_3_BACKFLIP) {

2
src/CCW/code_5BF0.c
View File

@@ -61,7 +61,7 @@ void CCW_func_8038C16C(Actor *this, s32 next_state) {
func_80335924(this->unk148, 0x231, 0.2f, 4.0f);
}
if ((this->marker->unk14_20 == 0x1C7) || (this->marker->unk14_20 == 0x1CB) || (this->marker->unk14_20 == 0x1C8)) {
other = func_80326EEC(0x313);
other = actorArray_findActorFromActorId(0x313);
if (other != 0) {
this->position[0] = other->position[0];
this->position[1] = other->position[1];

2
src/CCW/code_8050.c
View File

@@ -87,7 +87,7 @@ void func_8038E4C0(ActorMarker* marker, s32 arg1) {
FUNC_8030E8B4(SFX_C2_GRUBLIN_EGH, 1.0f, 32000, actor->position, 1250, 2500);
pCtrl = partEmitList_pushNew(1);
func_8038E440(pCtrl, actor, ASSET_52D_MODEL_GRUBLIN_HOOD_HAT);
func_802C3F04((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32,actor->position_x), reinterpret_cast(s32,actor->position_y), reinterpret_cast(s32,actor->position_z));
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32,actor->position_x), reinterpret_cast(s32,actor->position_y), reinterpret_cast(s32,actor->position_z));
actor_collisionOff(actor);
actor->unk138_24 = 1;
}

2
src/CCW/code_950.c
View File

@@ -125,7 +125,7 @@ void chwasp_update(Actor *this) {
return;
}
if(local->unk4 == NULL) {
other = func_80326EEC(0x299);
other = actorArray_findActorFromActorId(0x299);
if (other == NULL) {
marker_despawn(this->marker);
return;