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

Merge branch 'mr-origin-86'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-08 01:58:19 -05:00
parent 06204d3b68 7f41a49ef8
commit 680cf7a950
34 changed files with 568 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ void bacarriedobj_spawn(enum actor_e actor_id){
void func_8028DEEC(enum actor_e actor_id, Actor *actor){
f32 sp1C[3];
nodeprop_getPosition(func_80304C38(actor_id, actor), sp1C);
nodeprop_getPosition(nodeprop_findByActorIdAndActorPosition(actor_id, actor), sp1C);
set_throw_target_position(sp1C);
}

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

@@ -80,7 +80,7 @@ ActorInfo D_80365F00 = { 0xE6, 0x197, 0x532, 0x1, D_80365ED0, func_802C4C14, act
/* .bss */
s32 mm_hut_smash_count;
u32 D_8037DCB4;
u32 CH_TREASUREHUNT_PUZZLE_CURRENT_STEP;
struct FF_StorageStruct* D_8037DCB8;
s32 D_8037DCBC;
u8 D_8037DCC0[7];

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

@@ -349,7 +349,7 @@ void chmole_update(Actor *this){
if(!this->initialized){
// Checks if player is within radius of a specific actor exists within the same cube
// If actor exists and player is within radius, force trigger conversation
node_prop = func_80304C38(0x372, this);
node_prop = nodeprop_findByActorIdAndActorPosition(0x372, this);
if(node_prop == NULL){
this->unk38_0 = FALSE;
}
@@ -363,7 +363,7 @@ void chmole_update(Actor *this){
this->marker->collidable = FALSE;
this->initialized = TRUE;
if(this->unkF4_8 == 0x12){
node_prop = func_80304C38(0x349, this);
node_prop = nodeprop_findByActorIdAndActorPosition(0x349, this);
if(node_prop == NULL){
this->velocity[0] = this->position[0];
this->velocity[1] = this->position[1];

4
src/core2/code_47BD0.c
View File

@@ -142,7 +142,7 @@ void func_802CEEA4(Actor *this, Struct_core2_47BD0_0 *arg1) {
}
void func_802CEF54(Actor *this, f32 arg1[3], f32 arg2){
void func_802CEF54(Actor *this, f32 arg1[3], f32 distance){
f32 sp34[3];
s32 phi_v1;
s32 phi_v0;
@@ -153,7 +153,7 @@ void func_802CEF54(Actor *this, f32 arg1[3], f32 arg2){
phi_v1 = (this->state == 5) ? 200 : 50;
phi_v0 = (this->state == 5) ? 200 : 100;
func_802CEDE4(sp34, this->unk1C, arg2, &this->actor_specific_1_f, (f32) phi_v1, (f32) phi_v0);
func_802CEDE4(sp34, this->unk1C, distance, &this->actor_specific_1_f, (f32) phi_v1, (f32) phi_v0);
this->unk1C[0] = this->unk1C[0] + arg1[0];
this->unk1C[1] = this->unk1C[1] + arg1[1];
this->unk1C[2] = this->unk1C[2] + arg1[2];

4
src/core2/code_599E0.c
View File

@@ -2,13 +2,13 @@
#include "functions.h"
#include "variables.h"
s32 func_802E0970(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, bool arg5, f32 arg6[3]) {
s32 func_802E0970(enum sfx_e sfxId, f32 arg1, f32 arg2, f32 arg3, s32 sampleRate, bool arg5, f32 position[3]) {
f32 temp_f0;
f32 phi_f2;
phi_f2 = (arg5) ? arg1 : arg2;
temp_f0 = arg3 * 0.5;
func_8030E878(arg0, randf2(phi_f2 - temp_f0, phi_f2 + temp_f0), arg4, arg6, 1000.0f, 2300.0f);
func_8030E878(sfxId, randf2(phi_f2 - temp_f0, phi_f2 + temp_f0), sampleRate, position, 1000.0f, 2300.0f);
return NOT(arg5);
}

2
src/core2/code_7AF80.c
View File

@@ -995,7 +995,7 @@ NodeProp *cubeList_findNodePropByActorId(enum actor_e actor_id, s32 position[3])
return NULL;
}
NodeProp *func_80304C38(enum actor_e actor_id, Actor *actor){
NodeProp *nodeprop_findByActorIdAndActorPosition(enum actor_e actor_id, Actor *actor){
s32 tmp_position[3];
s32 *position;

26
src/core2/code_85800.c
View File

@@ -39,7 +39,7 @@ typedef struct {
u8 unk40;
u8 unk41;
u8 busy;
u8 unk43_7:3;
u8 unk43_7:3; // value is set to 1, 2 or 3
u8 unk43_4:3;
u8 unk43_1:2;
}SfxSource;
@@ -420,11 +420,11 @@ void func_8030D644(void){
}
}
void func_8030D6C4(enum sfx_e uid, f32 arg1, s32 arg2, s32 arg3, s32 arg4){
void func_8030D6C4(enum sfx_e uid, f32 arg1, s32 sampleRate, s32 arg3, s32 arg4){
u8 indx = sfxsource_createSfxsourceAndReturnIndex();
if(indx){
sfxsource_setSfxId(indx, uid);
sfxsource_setSampleRate(indx, arg2);
sfxsource_setSampleRate(indx, sampleRate);
sfxsource_playSfxAtVolume(indx, arg1);
func_8030DCCC(indx, arg3);
func_8030DD14(indx, 1);
@@ -850,8 +850,8 @@ void func_8030E4E4(enum sfx_e uid){
func_8030D6C4(uid, 1.0f, 22000, 0, 0);
}
void sfxsource_play(enum sfx_e uid, s32 sample_rate){
func_8030D6C4(uid, 1.0f, sample_rate, 0, 2);
void sfxsource_play(enum sfx_e uid, s32 sampleRate){
func_8030D6C4(uid, 1.0f, sampleRate, 0, 2);
}
void func_8030E540(enum sfx_e uid){
@@ -899,7 +899,7 @@ void func_8030E760(enum sfx_e uid, f32 arg1, s32 arg2){
func_8030D6C4(uid, arg1, arg2, 0, 0);
}
void sfx_play(enum sfx_e uid, f32 arg1, u32 sampleRate, f32 position[3], f32 minFadeDistance, f32 maxFadeDistance, s32 arg6){
void sfx_play(enum sfx_e uid, f32 volume, u32 sampleRate, f32 position[3], f32 minFadeDistance, f32 maxFadeDistance, s32 arg6){
u8 sfxsource;
f32 player_position[3];
@@ -913,7 +913,7 @@ void sfx_play(enum sfx_e uid, f32 arg1, u32 sampleRate, f32 position[3], f32 min
func_8030DD90(sfxsource, arg6); // priority ?
sfxsource_setSfxId(sfxsource, uid);
sfxsource_setSampleRate(sfxsource, sampleRate);
sfxsource_playSfxAtVolume(sfxsource, arg1); // volume ?
sfxsource_playSfxAtVolume(sfxsource, volume);
sfxsource_set_fade_distances(sfxsource, minFadeDistance, maxFadeDistance);
sfxsource_set_position(sfxsource, position);
func_8030DD14(sfxsource, 1);
@@ -922,8 +922,8 @@ void sfx_play(enum sfx_e uid, f32 arg1, u32 sampleRate, f32 position[3], f32 min
}
}
void func_8030E878(enum sfx_e id, f32 arg1, u32 sampleRate, f32 position[3], f32 minFadeDistance, f32 maxFadeDistance){
sfx_play(id, arg1, sampleRate, position, minFadeDistance, maxFadeDistance, 2);
void func_8030E878(enum sfx_e id, f32 volume, u32 sampleRate, f32 position[3], f32 minFadeDistance, f32 maxFadeDistance){
sfx_play(id, volume, sampleRate, position, minFadeDistance, maxFadeDistance, 2);
}
// fadeDistance is a 32-bit value where the lower 16 bits represent minFadeDistance and the upper 16 bits represent maxFadeDistance.
@@ -935,12 +935,12 @@ void func_8030E8B4(u32 arg0, f32 position[3], u32 fadeDistance){
);
}
void func_8030E988(enum sfx_e uid, f32 arg1, u32 sampleRate, f32 position[3], f32 minFadeDistance, f32 maxFadeDistance){
sfx_play(uid, arg1, sampleRate, position, minFadeDistance, maxFadeDistance, 1);
void func_8030E988(enum sfx_e uid, f32 volume, u32 sampleRate, f32 position[3], f32 minFadeDistance, f32 maxFadeDistance){
sfx_play(uid, volume, sampleRate, position, minFadeDistance, maxFadeDistance, 1);
}
void func_8030E9C4(enum sfx_e uid, f32 arg1, u32 sampleRate, f32 position[3], f32 minFadeDistance, f32 maxFadeDistance){
sfx_play(uid, arg1, sampleRate, position, minFadeDistance, maxFadeDistance, 0);
void func_8030E9C4(enum sfx_e uid, f32 volume, u32 sampleRate, f32 position[3], f32 minFadeDistance, f32 maxFadeDistance){
sfx_play(uid, volume, sampleRate, position, minFadeDistance, maxFadeDistance, 0);
}
void func_8030E9FC(enum sfx_e uid, f32 arg1, f32 arg2, u32 sampleRate, f32 position[3], f32 minFadeDistance, f32 maxFadeDistance){

22
src/core2/code_956B0.c
View File

@@ -4,14 +4,14 @@
extern void func_8028F3D8(f32 *, f32, void(*)(ActorMarker *), ActorMarker *);
extern void func_8028F760(s32, f32, f32);
extern void func_8031CE70(f32 *arg0, s32 arg1, s32 arg2);
extern void func_8031CE70(f32 *arg0, enum map_e arg1, s32 arg2);
extern s32 fileProgressFlag_get(s32);
extern s32 fileProgressFlag_getN(s32 offset, s32 numBits);
extern void func_8031FFAC(void);
extern void fileProgressFlag_set(s32 index, s32 set);
extern void ml_vec3h_to_vec3f(f32 *, s32);
extern NodeProp *func_80304ED0(void*, f32 *);
extern void func_8031CD44(s32, s32, f32, f32, s32);
extern void func_8031CD44(enum map_e, s32, f32, f32, s32);
extern void func_80256E24(f32 *, f32, f32, f32, f32, f32);
extern void mapSpecificFlags_set(s32, s32);
@@ -170,7 +170,7 @@ void func_8031CD20(s32 arg0, s32 arg1, s32 arg2) {
func_8031CC8C(arg0, (arg1 << 8) + arg2);
}
void func_8031CD44(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) {
void func_8031CD44(enum map_e arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) {
f32 sp3C[3];
f32 sp30[3];
f32 sp24[3];
@@ -195,7 +195,7 @@ void func_8031CE28(s32 arg0, s32 arg1, f32 arg2) {
func_8031CD44(arg0, arg1, vec[1], arg2, 0x25);
}
void func_8031CE70(f32 *arg0, s32 arg1, s32 arg2) {
void func_8031CE70(f32 *arg0, enum map_e arg1, s32 arg2) {
f32 playerPos[3];
f32 sp38[3];
NodeProp *phi_s0;
@@ -231,12 +231,12 @@ void func_8031CE70(f32 *arg0, s32 arg1, s32 arg2) {
}
}
void func_8031D04C(s32 arg0, s32 arg1) {
void func_8031D04C(enum map_e arg0, s32 arg1) {
func_8031CB50(arg0, arg1, 0);
}
void func_8031D06C(s32 arg0, s32 arg1) {
func_8031CB50(0x20, 0, 0);
void func_8031D06C(enum map_e arg0, s32 arg1) {
func_8031CB50(MAP_20_CS_END_NOT_100, 0, 0);
}
void func_8031D09C(s32 arg0, s32 arg1) {
@@ -402,7 +402,7 @@ void func_8031D628(s32 arg0, s32 arg1) {
if (actor) {
marker_despawn(actor->marker);
}
func_8031CB50(7, 0xC, 0);
func_8031CB50(MAP_7_TTC_TREASURE_TROVE_COVE, 0xC, 0);
}
void warp_mmmEnterDiningRoomDoor(s32 arg0, s32 arg1) {
@@ -527,7 +527,7 @@ void warp_mmmEnterChurchSecretRoom(s32 arg0, s32 arg1) {
func_8031CC8C(arg0, 0x2B01);
}
void func_8031DAA8(s32 arg0, s32 arg1) {
void func_8031DAA8(enum map_e arg0, s32 arg1) {
func_8028F918(0);
func_8031CB50(arg0, arg1, 0);
}
@@ -560,7 +560,7 @@ void warp_mmmEnterRainBarrel(s32 arg0, s32 arg1) {
}
void func_8031DBE8(void) {
func_8031CB50(0x2F, 1, 1);
func_8031CB50(MAP_2F_MMM_WATERDRAIN_BARREL, 1, 1);
}
void func_8031DC10(s32 arg0, s32 arg1) {
@@ -598,7 +598,7 @@ void warp_bgsEnterTanktupConditional(s32 arg0, s32 arg1) {
}
void warp_ttcEnterNippersShell(s32 arg0, s32 arg1) {
if (func_80388A44() != 0) {
if (chNipper_isInState7() != 0) {
func_8031CC8C(arg0, 0x601);
}
}

2
src/core2/code_9A740.c
View File

@@ -54,7 +54,7 @@ void func_803216D0(enum map_e map){
mm_resetHuts();
break;
case MAP_7_TTC_TREASURE_TROVE_COVE:
ttc_resetTresureHunt();
chTreasurehunt_resetProgress();
break;
case MAP_1B_MMM_MAD_MONSTER_MANSION:
mmm_resetFlowerPots();

2
src/core2/code_9E370.c
View File

@@ -1932,7 +1932,7 @@ void func_8032A82C(Actor *arg0, s32 arg1) {
Actorlocal_Core2_9E370 *sp1C;
sp1C = &arg0->local;
sp24 = func_80304C38(arg1, arg0);
sp24 = nodeprop_findByActorIdAndActorPosition(arg1, arg0);
if (sp24 != NULL) {
sp1C->unkC = func_80304DA8(sp24);
nodeprop_getPosition(sp24, sp1C->unk0);

16
src/core2/code_AD110.c
View File

@@ -291,12 +291,12 @@ extern void warp_lairEnterLairFromSMLevel(s32, s32);
extern void func_802C1674(s32, s32);
extern void func_802C169C(s32, s32);
extern void TTC_func_80389BFC(s32, s32);
extern void func_80389C24(s32, s32);
extern void func_80389C4C(s32, s32);
extern void func_80389C74(s32, s32);
extern void func_80389C9C(s32, s32);
extern void func_80389CC4(s32, s32);
extern void chTreasurehunt_checkStepProgress0(s32, s32);
extern void chTreasurehunt_checkStepProgress1(s32, s32);
extern void chTreasurehunt_checkStepProgress2(s32, s32);
extern void chTreasurehunt_checkStepProgress3(s32, s32);
extern void chTreasurehunt_checkStepProgress4(s32, s32);
extern void chTreasurehunt_checkStepProgress5(s32, s32);
extern void chMumbo_detransformWarn(s32, s32);
extern void chMumbo_detransformTrigger(s32, s32);
extern void func_8033443C(s32, s32);
@@ -413,8 +413,8 @@ Method_core2_AD110 D_8036FE5C[] ={
func_8033443C, func_8033443C, func_8033443C, func_8033443C,
func_8033443C, func_8033443C, func_8033443C, func_8033443C,
func_8033443C, func_8033443C, func_8033443C, func_8033443C,
func_8033443C, TTC_func_80389BFC, func_80389C24, func_80389C4C,
func_80389C74, func_80389C9C, func_80389CC4, chMumbo_detransformWarn,
func_8033443C, chTreasurehunt_checkStepProgress0, chTreasurehunt_checkStepProgress1, chTreasurehunt_checkStepProgress2,
chTreasurehunt_checkStepProgress3, chTreasurehunt_checkStepProgress4, chTreasurehunt_checkStepProgress5, chMumbo_detransformWarn,
chMumbo_detransformTrigger, func_8033443C, func_8033443C, func_8033443C,
func_8033443C, func_8033443C, func_8033443C, func_8033443C,
func_8033443C, func_8033443C, func_8033443C, func_8033443C,

2
src/core2/spawnqueue.c
View File

@@ -374,7 +374,7 @@ void spawnQueue_reset(void){
GV_func_8038F154();
break;
case OVERLAY_5_BEACH:
TTC_func_80388AC0();
TTC_resetSpawnableActors();
break;
case OVERLAY_6_JUNGLE:
MM_func_803888B0();