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

2
src/fight/chbossjinjobase.c
View File

@@ -127,7 +127,7 @@ void func_8038D568(Actor *this){
this->velocity_y = 100.0f;
func_802BB3DC(0, 8.0f, 0.92f);
func_802C3F04((GenMethod_4)func_802C4140, 0x3ad, *(s32*)&this->unk1C[0], *(s32*)&this->unk1C[1], *(s32*)&this->unk1C[2]);
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x3ad, *(s32*)&this->unk1C[0], *(s32*)&this->unk1C[1], *(s32*)&this->unk1C[2]);
func_8038D2EC(this->unk1C, 0x10);
SPAWNQUEUE_ADD_1(chbossjinjobase_spawnStoneJinjo, this->marker);
}

2
src/fight/chbossshadow.c
View File

@@ -17,7 +17,7 @@ Actor *chbossshadow_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3)
f32 sp34[3];
f32 sp30;
Actor *this;
this = func_80325300(marker, sp34);
this = marker_getActorAndRotation(marker, sp34);
sp30 = this->scale * ml_map_f(this->unk1C[0], 0.0f, 1000.0f, 1.75f, 0.9f);
modelRender_setDepthMode(MODEL_RENDER_DEPTH_COMPARE);
modelRender_draw(gdl, mptr, this->position, sp34, sp30, NULL, func_80330B1C(marker));

6
src/fight/chfinalboss.c
View File

@@ -1319,7 +1319,7 @@ void __chfinalboss_spawnStatue(enum bossjinjo_e statue_id) {
Actor *sp1C;
ActorLocal_fight_180 *local;
local = (ActorLocal_fight_180 *)&func_80326EEC(ACTOR_38B_GRUNTILDA_FINAL_BOSS)->local;
local = (ActorLocal_fight_180 *)&actorArray_findActorFromActorId(ACTOR_38B_GRUNTILDA_FINAL_BOSS)->local;
switch (statue_id) {
case BOSSJINJO_ORANGE:
@@ -2309,7 +2309,7 @@ void chfinalboss_update(Actor *this){
__chFinalBossJinjoStatueMarker[i] = NULL;
}
__spawnqueue_add_1((GenMethod_1) chfinalboss_spawnShadow, (s32) this->marker);
__spawnQueue_add_1((GenMethod_1) chfinalboss_spawnShadow, (s32) this->marker);
chfinalboss_setPhase(this->marker, 0);
local->hits = 0;
func_80386600(this->marker, 0);
@@ -2415,7 +2415,7 @@ void func_8038C148(void) {
s32 camera_node;
f32 sp34;
sp4C = func_80326EEC(ACTOR_38B_GRUNTILDA_FINAL_BOSS);
sp4C = actorArray_findActorFromActorId(ACTOR_38B_GRUNTILDA_FINAL_BOSS);
sp48 = (ActorLocal_fight_180 *)&sp4C->local;
sp34 = func_8038DFA0();
temp_f20 = sp34 + chjinjonator_80391234();

2
src/fight/chjinjonatorbase.c
View File

@@ -97,7 +97,7 @@ void func_8038E260(ActorMarker *arg0) {
Actor *sp24 = marker_getActor(arg0);
func_802BB3DC(0, 18.0f, 0.92f);
func_802C3F04((GenMethod_4) func_802C4140, 0x3AD, *(u32 *)(&sp24->unk1C_x), *(u32 *)(&sp24->unk1C_y), *(u32 *)(&sp24->unk1C_z));
__spawnQueue_add_4((GenMethod_4) func_802C4140, 0x3AD, *(u32 *)(&sp24->unk1C_x), *(u32 *)(&sp24->unk1C_y), *(u32 *)(&sp24->unk1C_z));
func_8038E03C(sp24->unk1C, 0x10);
}

4
src/fight/chstonejinjo.c
View File

@@ -3,7 +3,7 @@
#include "variables.h"
#include "fight.h"
extern Actor *func_80326EEC();
extern Actor *actorArray_findActorFromActorId();
extern void func_80328B8C(Actor*, s32, f32, s32);
extern f32 chbossjinjo_8038D268(void);
@@ -135,5 +135,5 @@ void chstonejinjo_breakOpen(ActorMarker *marker){
}
f32 func_8038DFA0(void) {
return func_80326EEC(ACTOR_3A1_STONE_JINJO)->unk1C_x;
return actorArray_findActorFromActorId(ACTOR_3A1_STONE_JINJO)->unk1C_x;
}

2
src/fight/fight.h
View File

@@ -9,4 +9,4 @@ enum bossjinjo_e{
BOSSJINJO_JINJONATOR
};
#endif
#endif