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

Merge branch 'mr-origin-96'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-19 23:10:46 -05:00
parent 9443a276c5 0ba0a22549
commit a59e1abddf
291 changed files with 2238 additions and 2204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/bs/ant.c
View File

@@ -440,7 +440,7 @@ void bsant_die_update(void){
}
void bsant_die_end(void){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);

2
src/core2/bs/bFly.c
View File

@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "core1/core1.h"
#include "functions.h"
#include "variables.h"
#include <core1/viewport.h>
#include "core2/ba/physics.h"
#include "core2/ba/flap.h"

2
src/core2/bs/bSwim.c
View File

@@ -464,7 +464,7 @@ void func_802A8098(void) {
void func_802A82D4(void) {
func_802906A4(1);
func_80291548();
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baMarker_collisionOn();
if (bs_getNextState() != BS_5A_LOADZONE) {
func_80346CE8();

4
src/core2/bs/bWhirl.c
View File

@@ -39,7 +39,7 @@ static void __bsbwhirl_end(void){
func_8029B0C0();
func_8029E070(0);
func_8025A55C(-1, 0xfa0, 0xd);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
func_8025A7DC(COMUSIC_25_USING_GOLD_FEATHERS);
}
baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL);
@@ -86,7 +86,7 @@ void bsbwhirl_enter_init(void){
func_8029B324(1, 1.0f);
func_8029E070(1);
D_8037D3B0 = 0.0f;
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A55C(0, 0xfa0, 0xd);
func_8025A6EC(0x25, 0x6d60);
func_80299BD4();

7
src/core2/bs/beeMain.c
View File

@@ -14,7 +14,6 @@ f32 baanim_getTimer(void);
void baanim_setEndAndDuration(f32, f32);
f32 func_8029B2E8(void);
f32 func_8029B33C(void);
f32 ml_interpolate_f(f32, f32, f32);
f32 func_8029B30C();
/* .data */
@@ -469,7 +468,7 @@ void func_802A1DD8(void){
}
void func_802A1F2C(void){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
func_80291548();
func_80292EA4();
@@ -508,7 +507,7 @@ void func_802A2014(void){
void func_802A2054(void){
baMarker_collisionOn();
func_8025A2FC(-1, 0xFA0);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
func_80291548();
func_80298A64();
}
@@ -519,7 +518,7 @@ void func_802A2098(void){
yaw_setIdeal(func_8029B41C());
func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
baphysics_set_target_horizontal_velocity(0.0f);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A2FC(0, 0xFA0);
func_8025A6EC(COMUSIC_42_NOTEDOOR_OPENING_FANFARE, -1);
func_8029151C(0xC);

2
src/core2/bs/croc.c
View File

@@ -490,7 +490,7 @@ void bscroc_die_update(void){
}
void bscroc_die_end(void){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);

2
src/core2/bs/die.c
View File

@@ -124,7 +124,7 @@ void bsdie_update(void){
}
void bsdie_end(void){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
func_8029E070(0);
pitch_setIdeal(0.0f);

5
src/core2/bs/dronexform.c
View File

@@ -1,16 +1,13 @@
#include <ultra64.h>
#include "core1/core1.h"
#include "functions.h"
#include "variables.h"
#include <core1/viewport.h>
#include "core2/ba/physics.h"
extern void player_setYPosition(f32);
extern void yaw_applyIdeal(void);
extern f32 func_80257A44(f32, f32);
extern f32 cosf(f32);
extern f32 ml_remainder_f(f32, f32);
extern f32 func_80257AD4(f32, f32);
/* .bss */
struct {

8
src/core2/bs/jig.c
View File

@@ -32,7 +32,7 @@ void bsjig_jiggy_init(void){
yaw_setIdeal(func_8029B41C()); //face camera
func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
baphysics_set_target_horizontal_velocity(0.0f);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A2FC(0,0xfa0);
tmp = (item_getCount(ITEM_E_JIGGY) == 9);
if(tmp == 0) //weird if...
@@ -106,7 +106,7 @@ void bsjig_jiggy_end(void){
if(bs_getNextState() != BS_34_JIG_NOTEDOOR){
func_8025A2FC(-1, 0xfa0);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
baMarker_collisionOn();
if( jiggyscore_total() == 100
@@ -148,7 +148,7 @@ void bsjig_jiggy_interrupt(void){
void bsjig_notedoor_end(void){
baMarker_collisionOn();
func_8025A2FC(-1, 0xfa0);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
func_8029E070(0);
func_80291548();
if( D_8037D4B2
@@ -174,7 +174,7 @@ void bsjig_notedoor_init(void){
func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
baphysics_set_target_horizontal_velocity(0.0f);
if(bs_getPrevState() != BS_44_JIG_JIGGY){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A2FC(0,0xfa0);
}
func_8025A6EC(COMUSIC_42_NOTEDOOR_OPENING_FANFARE,-1);

2
src/core2/bs/pumpkin.c
View File

@@ -524,7 +524,7 @@ void bspumpkin_die_update(void){
void bspumpkin_die_end(void) {
func_802B229C();
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);

8
src/core2/bs/timeout.c
View File

@@ -17,7 +17,7 @@ void func_802B6270(void){
ncDynamicCamD_func_802BF2C0(80.0f);
func_8025A58C(0,0xfa0);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8029E070(1);
baMarker_collisionOff();
}
@@ -42,7 +42,7 @@ void func_802B6314(void){
void func_802B63C8(void){
func_80292EA4();
func_80291548();
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
void func_802B63F8(void){
@@ -58,7 +58,7 @@ void func_802B63F8(void){
ncDynamicCamD_func_802BF2C0(80.0f);
func_8025A58C(0,0xfa0);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baMarker_collisionOff();
func_8029E3C0(0, 2.9f);
}
@@ -71,6 +71,6 @@ void func_802B64D0(void){
void func_802B6500(void){
func_8029E070(0);
func_80291548();
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
func_8025A904();
}

1
src/core2/bs/walk.c
View File

@@ -11,7 +11,6 @@ f32 func_8029B2E8(void);
void func_8029AD28(f32, s32);
void baanim_scaleDuration(f32);
f32 func_8029B30C(void);
f32 ml_interpolate_f(f32, f32, f32);
void func_80299594(s32, f32);
// .data

9
src/core2/bs/walrus.c
View File

@@ -5,7 +5,6 @@
#include "core2/ba/physics.h"
extern void func_8029AD68(f32, s32);
extern f32 ml_dotProduct_vec3f(f32[3], f32[3]);
int bswalrus_inSet(enum bs_e state);
@@ -77,7 +76,7 @@ void func_802B7F28(void) {
if (900.0 < sp20[0] * sp20[0] + sp20[1] * sp20[1] + sp20[2] * sp20[2]) {
ml_vec3f_normalize(sp20);
func_80294480(sp2C);
if ( ml_dotProduct_vec3f(sp20, sp2C) < -0.2) {
if ( ml_vec3f_dot_product(sp20, sp2C) < -0.2) {
sp3C += D_8037D5C0 * 350.0;
}
}
@@ -508,7 +507,7 @@ void bswalrus_die_update(void){
}
void bswalrus_die_end(void){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
@@ -732,7 +731,7 @@ void bswalrus_timeout_init(void) {
ncDynamicCamD_func_802BF2C0(60.0f);
func_8025A58C(0, 4000);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baMarker_collisionOff();
func_8029E3C0(0, 2.9f);
func_802B813C();
@@ -749,7 +748,7 @@ void func_802B9830(void) {
void func_802B9880(void) {
func_80291548();
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
func_8025A904();
func_80292EA4();
func_802B80D0();