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

PAL: sync core2/code_7060 & resolve file compiler warnings

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-28 13:20:56 -05:00
parent 86b22d6d09
commit 87b9bb398f
17 changed files with 136 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CCW/code_3310.c
View File

@@ -270,9 +270,9 @@ void CCW_func_80389BFC(Actor *this) {
func_8028F784(0);
}
if ((local->unk0->map_id != MAP_43_CCW_SPRING) && ((this->position[0] + 500.0f) < sp4C[0])) {
func_8028F364(this->position, 1110.0f, 200.0f, ACTOR_2A2_CATERPILLAR, &this);
player_setCarryObjectPoseInCylinder(this->position, 1110.0f, 200.0f, ACTOR_2A2_CATERPILLAR, &this);
if ((local->unk0->unkE != 0) && (carriedObj_getActorId() == ACTOR_2A2_CATERPILLAR) && (ml_distance_vec3f(this->position, sp4C) < 1010.0f) && (player_throwCarriedObject() != 0)) {
func_8028FA54(D_8038FDE0);
player_setThrowTargetPosition(D_8038FDE0);
if ((local->unk0->map_id == MAP_44_CCW_SUMMER) && (local->unk4 == 0)) {
gcdialog_showText(0xCD8, 4, NULL, NULL, NULL, NULL);
}

4
src/CCW/code_5540.c
View File

@@ -142,9 +142,9 @@ void chnabnut_update(Actor *this) {
this->yaw += sp24 * 10.0f;
}
if (this->has_met_before && !func_803114B0()) {
func_8028F364(this->position, 500.0f, 200.0f, ACTOR_2A9_ACORN, &this);
player_setCarryObjectPoseInCylinder(this->position, 500.0f, 200.0f, ACTOR_2A9_ACORN, &this);
if ((carriedObj_getActorId() == ACTOR_2A9_ACORN) && (ml_distance_vec3f(this->position, sp30) < 300.0f) && player_throwCarriedObject()) {
func_8028FA54(D_8038F350);
player_setThrowTargetPosition(D_8038F350);
local->returned_acorn_count++;
if (local->returned_acorn_count == 6) {
chnabnut_setState(this, NABNUT_STATE_2_WAIT);

2
src/FP/ch/scarfsled.c
View File

@@ -105,7 +105,7 @@ void __chScarfSled_func_80386630(Actor *this){
sp64[0] = this->pitch;
sp64[1] = this->yaw;
sp64[2] = this->roll;
func_8028FAEC(sp64);
player_setIdealRotation(sp64);
}//L80386724
if(1.0 == this->unk48){

4
src/GV/ch/histup.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_8028F738(f32[3], f32[3], f32, s32);
extern void player_setClimbParams(f32[3], f32[3], f32, s32);
extern int func_8030E3FC(u8);
@@ -62,7 +62,7 @@ Actor *func_8038DA18(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
sp38[1] = this->position_y;
}
if(func_8038D920(this, sp38[1])){
func_8028F738(sp2C, sp38, (f32)this->unkF4_8, 2);
player_setClimbParams(sp2C, sp38, (f32)this->unkF4_8, 2);
}
return this;

2
src/TTC/ch/blubber.c
View File

@@ -111,7 +111,7 @@ void func_8038771C(Actor *this){
void func_80387774(Actor **this_ptr){
ActorLocal_Blubber *local = (ActorLocal_Blubber *)&(*this_ptr)->local;
func_8028F364(local->throw_target_position, local->throw_target_radius, 100.0f, ACTOR_2A_GOLD_BULLION, this_ptr);
player_setCarryObjectPoseInCylinder(local->throw_target_position, local->throw_target_radius, 100.0f, ACTOR_2A_GOLD_BULLION, this_ptr);
if( func_80329530(*this_ptr, 200)
&& bacarry_get_markerId() == MARKER_37_GOLD_BULLION
&& player_throwCarriedObject()

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

@@ -90,7 +90,7 @@ f32 func_802D7038(Actor *this) {
void func_802D7124(Actor *actor, f32 arg1) {
f32 vp[3];
viewport_getPosition_vec3f(&vp);
viewport_getPosition_vec3f(vp);
if ((actor->position[0] - vp[0]) * (actor->position[0] - vp[0]) + (actor->position[2] - vp[2]) * (actor->position[2] - vp[2]) < 12250000.0f) {
func_802D729C(actor, arg1);
}

4
src/core2/ch/climbBase.c
View File

@@ -4,7 +4,7 @@
void func_802D77D4(Actor *this);
extern void func_8028F738(f32[3], f32[3], f32, u32);
extern void player_setClimbParams(f32[3], f32[3], f32, u32);
extern f32 func_80258640(f32[3], f32[3]);
typedef struct {
@@ -78,7 +78,7 @@ void func_802D77D4(Actor *this) {
if (((sp4C[0] * sp4C[0]) + (sp4C[2] * sp4C[2])) < (sp3C * sp3C)) {
if ((this->position[1] < sp40[1]) && (sp40[1] <= local->unk0[1])) {
if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) == 0) {
func_8028F738(this->position, local->unk0, (f32)this->unkF4_8, local->unkC);
player_setClimbParams(this->position, local->unk0, (f32)this->unkF4_8, local->unkC);
}
}
}

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

@@ -57,7 +57,7 @@ void __chTermite_updateWalkSFX(Actor *this) {
f32 sp24[3];
f32 sp20;
viewport_getPosition_vec3f(&sp24);
viewport_getPosition_vec3f(sp24);
sp20 = ml_map_f( (300.0f - sp24[0])*(300.0f - sp24[0]) + (this->position[1] - sp24[1])*(this->position[1] - sp24[1]) + (-858.0f - sp24[2])*(-858.0f - sp24[2])
, 7617600.0f, 8236900.0f
, 8000.0f, 1000.0f

32
src/core2/code_7060.c
View File

@@ -22,7 +22,7 @@ extern void func_8029B73C(f32 arg0[3], f32 arg1, f32 arg2, f32 arg3, f32 arg4);
bool func_8028F4B8(f32 arg0[3], f32 arg1, f32 arg2);
bool func_8028F620(f32 arg0[3], f32 arg1, f32 arg2);
void func_8028F85C(f32 arg0[3]);
void func_8028F8A4(f32 rotation[3]);
void player_setRotation(f32 rotation[3]);
void func_8028F918(s32 arg0);
@@ -46,15 +46,15 @@ f32 D_8037BFCC;
f32 D_8037BFD0;
/* .code */
bool func_8028DFF0(s32 arg0, s32 arg1[3]) {
bool func_8028DFF0(s32 arg0, s32 position[3]) {
if (arg0 >= 0x80) {
arg1[0] = func_802E4A98(arg0);
arg1[1] = func_802E4AAC(arg0);
arg1[2] = func_802E4AC0(arg0);
position[0] = func_802E4A98(arg0);
position[1] = func_802E4AAC(arg0);
position[2] = func_802E4AC0(arg0);
return TRUE;
}
else{
return _nodeProp_findPositionFromActorId(func_803084F0(arg0), arg1);
return _nodeProp_findPositionFromActorId(func_803084F0(arg0), position);
}
}
@@ -151,7 +151,7 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) {
bs_setState(badrone_goto(sp7C, 1.0f, func_8028E0B0, NULL));
return;
}
func_8028F85C(&sp7C);
func_8028F85C(sp7C);
func_80295A8C();
bsStoredState_setTrot(FALSE);
miscFlag_clear(MISC_FLAG_16);
@@ -192,7 +192,7 @@ void func_8028E4B0(void) {
return;
}
if (sp20 == 0x63) {
func_8028F85C(&D_8037BFC0);
func_8028F85C(D_8037BFC0);
yaw_set(D_8037BFCC);
D_8037BFBC = (s32) D_8037BFD0;
D_8037BFB8 = 1;
@@ -213,12 +213,12 @@ void func_8028E4B0(void) {
D_80363694--;
if (D_80363694 == 0) {
func_8028F85C(D_80363698);
func_8028F8A4(D_803636A4);
player_setRotation(D_803636A4);
}
}
if (D_803636B0) {
D_803636B0 = FALSE;
func_8028F85C(&D_803636B4);
func_8028F85C(D_803636B4);
}
}
@@ -668,7 +668,7 @@ bool player_setCarryObjectPoseInHorizontalRadius(f32 position[3], f32 radius, en
}
//sets carry actor if player is within a cylinder around a point
bool func_8028F364(f32 position[3], f32 radius, f32 vert_range, enum actor_e actor_id, Actor **arg4) {
bool player_setCarryObjectPoseInCylinder(f32 position[3], f32 radius, f32 vert_range, enum actor_e actor_id, Actor **arg4) {
if (player_isInVerticalRange(position, vert_range)) {
return player_setCarryObjectPoseInHorizontalRadius(position, radius, actor_id, arg4);
}
@@ -774,7 +774,7 @@ void player_stateTimer_set(enum state_timer_e timer_id, f32 value){
stateTimer_set(timer_id, value);
}
void func_8028F738(f32 bottom[3], f32 top[3], f32 radius, u32 arg3){
void player_setClimbParams(f32 bottom[3], f32 top[3], f32 radius, u32 arg3){
climbSet(bottom, top, radius, arg3);
}
@@ -824,7 +824,7 @@ void func_8028F85C(f32 arg0[3]){
cameraMode_update();
}
void func_8028F8A4(f32 rotation[3]){
void player_setRotation(f32 rotation[3]){
pitch_setIdeal(rotation[0]);
yaw_setIdeal(rotation[1]);
roll_setIdeal(rotation[2]);
@@ -875,8 +875,8 @@ void func_8028FA34(enum actor_e arg0, Actor *arg1){
func_8028DEEC(arg0, arg1);
}
void func_8028FA54(f32 arg0[3]){
set_throw_target_position(arg0);
void player_setThrowTargetPosition(f32 position[3]){
set_throw_target_position(position);
}
void func_8028FA74(f32 dst[3]){
@@ -897,7 +897,7 @@ void func_8028FAB0(f32 arg0[3]){
func_80298564(diff);
}
void func_8028FAEC(f32 rotation[3]){
void player_setIdealRotation(f32 rotation[3]){
pitch_setIdeal(rotation[0]);
yaw_setIdeal(rotation[1]);
roll_setIdeal(rotation[2]);

8
src/core2/code_85800.c
View File

@@ -219,8 +219,8 @@ s32 func_8030CDE4(SfxSource *arg0){
f32 temp_f0;
f32 pad;
viewport_getPosition_vec3f(&sp44);
viewport_getLookVector(&sp38);
viewport_getPosition_vec3f(sp44);
viewport_getLookVector(sp38);
sp2C[0] = arg0->position[0] - sp44[0];
sp2C[1] = arg0->position[1] - sp44[1];
sp2C[2] = arg0->position[2] - sp44[2];
@@ -228,9 +228,9 @@ s32 func_8030CDE4(SfxSource *arg0){
if(sp2C[0]*sp2C[0] + sp2C[1]*sp2C[1] + sp2C[2]*sp2C[2] < 10.0f){
return 0x40;
}
ml_vec3f_normalize(&sp2C);
ml_vec3f_normalize(sp2C);
sp38[1] = 0.0f;
ml_vec3f_normalize(&sp38);
ml_vec3f_normalize(sp38);
temp_f0 = func_80256AB4(sp38[0], sp38[2], sp2C[0], sp2C[2]);
if(arg0->unk16){
arg0->unk18 += 0.07*((f32)(s32)(64.0f - (temp_f0 * 63.0f)) - arg0->unk18);

2
src/core2/code_935F0.c
View File

@@ -163,7 +163,7 @@ void chMinigame_update(Actor *this){
marker_setFreeMethod(this->marker, __chMinigame_free);
func_8028FAB0(this->position);
this->unk1C[0] = 0.0f; this->unk1C[1] = this->yaw; this->unk1C[2] = 0.0f;
func_8028FAEC(this->unk1C);
player_setIdealRotation(this->unk1C);
this->has_met_before = FALSE;
if(this->unk10_12 >= 7){
marker_despawn(this->marker);

2
src/core2/code_C8760.c
View File

@@ -55,7 +55,7 @@ void func_8034F774(void){
sfxsource_setSfxId(D_803720A0.sfxsourceIdx, 0x3EC);
func_8030DD14(D_803720A0.sfxsourceIdx, 3);
func_8030DFF0(D_803720A0.sfxsourceIdx, 1);
sfxsource_set_position(D_803720A0.sfxsourceIdx, &sp44);
sfxsource_set_position(D_803720A0.sfxsourceIdx, sp44);
sfxsource_set_fade_distances(D_803720A0.sfxsourceIdx, 400.0f, 3200.0f);
func_8030DE44(D_803720A0.sfxsourceIdx, 2, 0.5f);
func_8030E2C4(D_803720A0.sfxsourceIdx);

4
src/fight/chfinalboss.c
View File

@@ -23,7 +23,7 @@ extern void sfxsource_setSampleRate(u8, s32);
extern void func_80328FF0(Actor *arg0, f32 arg1);
extern f32 func_80257204(f32, f32, f32, f32);
extern void func_8028F85C(f32[3]);
extern void func_8028FAEC(f32[3]);
extern void player_setIdealRotation(f32[3]);
extern f32 func_8033229C(ActorMarker *);
Actor *chfinalboss_draw(ActorMarker *arg0, Gfx **arg1, Mtx **arg2, Vtx **arg3);
@@ -1883,7 +1883,7 @@ void chfinalboss_phase5_update(ActorMarker *marker) {
D_803928C8[0] = 0.0f;
D_803928C8[1] = func_80257204(D_803917E0[0], D_803917E0[2], this->position[0], this->position[2]);
D_803928C8[2] = 0.0f;
func_8028FAEC(D_803928C8);
player_setIdealRotation(D_803928C8);
}
if (__chFinalBossJinjonatorHits == 3) {
gcdialog_showText(randi2(0, 5) + 0x1159, 0x20, NULL, NULL, NULL, NULL);

2
src/lair/code_5ED0.c
View File

@@ -1142,7 +1142,7 @@ void func_8038DFBC(void)
void func_8038E070(void)
{
func_8028F85C(&D_8037DCB8->playerPosition);
func_8028F8A4(&D_8037DCB8->playerRotation);
player_setRotation(&D_8037DCB8->playerRotation);
func_8028F918(2);
}