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/SM/ch/attacktutorial.c
View File

@@ -43,7 +43,7 @@ s32 SM_func_803871FC(Actor *this, s32 arg1){
s32 tmp_v0;
sp1C = (arg1 == 1)? ACTOR_166_TOPPER_A : (tmp_v0 = (arg1 == 2)? ACTOR_165_BAWL_A : ACTOR_164_COLLYWOBBLE_A);
func_802C3D3C(__chAttackTutorial_spawnEnemy, this->marker, sp1C);
__spawnQueue_add_2(__chAttackTutorial_spawnEnemy, this->marker, sp1C);
}
@@ -113,7 +113,7 @@ void chAttackTutorial_update(Actor *this){
if(!this->initialized){
//find closest tutorial bottles
bottles = func_80326D68(this->position, ACTOR_12B_TUTORIAL_BOTTLES, -1, &sp2C);
bottles = actorArray_findClosestActorFromActorId(this->position, ACTOR_12B_TUTORIAL_BOTTLES, -1, &sp2C);
if(bottles != NULL){
this->unk1C_x = bottles->position_x;
this->unk1C_y = bottles->position_y;

2
src/SM/ch/vegetables.c
View File

@@ -203,7 +203,7 @@ void func_80387C28(Actor * this){
if(this->unk38_31){
this->position_y += 100.0f;
func_802CA1CC(HONEYCOMB_17_SM_COLIWOBBLE);
func_802C3F04((GenMethod_4)func_802C4218, 0x1f, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, this->position_y), reinterpret_cast(s32, this->position_z));
__spawnQueue_add_4((GenMethod_4)func_802C4218, 0x1f, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, this->position_y), reinterpret_cast(s32, this->position_z));
}//L80387D64
func_803252D0(1.5f, 7);
actor_collisionOff(this);

2
src/SM/code_2990.c
View File

@@ -407,7 +407,7 @@ void func_803899B0(Actor * this){
}//L80389B20
if(!this->unk16C_4){
__spawnqueue_add_1((GenMethod_1)func_80389948, reinterpret_cast(s32, this->marker));
__spawnQueue_add_1((GenMethod_1)func_80389948, reinterpret_cast(s32, this->marker));
this->unk16C_4 = 1;
}//L80389B4C

2
src/SM/code_4070.c
View File

@@ -63,7 +63,7 @@ void SM_func_8038A5D8(Actor *this){
s32 temp_a0;
if(!this->initialized){
temp_v0 = func_80326D68(this->position, ACTOR_12B_TUTORIAL_BOTTLES, -1, &sp40);
temp_v0 = actorArray_findClosestActorFromActorId(this->position, ACTOR_12B_TUTORIAL_BOTTLES, -1, &sp40);
if(temp_v0){
this->unk1C_x = temp_v0->position_x;
this->unk1C_y = temp_v0->position_y;

4
src/SM/code_5B0.c
View File

@@ -113,7 +113,7 @@ void SM_func_80386D68(Actor *this){
if(this->unk100 && func_803870E8(this->unk100)){
func_802CA1CC(HONEYCOMB_18_SM_QUARRIES);
func_802C3F04((GenMethod_4)func_802C4218, 0x1F, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4218, 0x1F, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
}
marker_despawn(this->marker);
}
@@ -139,7 +139,7 @@ void SM_func_80386EF4(Actor *this) {
if ((this->state) == 1) {
temp_t3 = this->unk38_31++ ^ 2;
if ((temp_t3) == 0) {
other = func_80326EEC(0x16E);
other = actorArray_findActorFromActorId(0x16E);
if (other != NULL) {
this->unk100 = other->marker;
} else {

2
src/SM/code_BF0.c
View File

@@ -24,7 +24,7 @@ void SM_func_80386FE0(Actor *this){
switch(this->state){
case 1://L80387064
if(this->unk38_31++ == 2){
this->unk10_12 = func_80326F58(0x16f);
this->unk10_12 = actorArray_actorCount(ACTOR_16F_QUARRIE);
func_80328A84(this, 2);
}
break;