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

1
src/TTC/ch/clam.c
View File

@@ -3,7 +3,6 @@
#include "variables.h"
extern Actor *spawnQueue_bundle_f32(s32, s32, s32, s32);
extern f32 func_80257204(f32, f32, f32, f32);
extern ActorProp * func_80320EB0(ActorMarker *, f32, s32);
static void __chClam_updateFunc(Actor *this);

4
src/TTC/ch/nipper.c
View File

@@ -213,13 +213,13 @@ static void __chNipper_updateFunc(Actor *this){
if(0.0f == this->velocity_x && xVelocity){
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, -1, 5000);
func_8032BB88(this, 0, 4000);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
}
else if(!xVelocity && 0.0f != this->velocity_x){
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 0, 300);
func_8025AABC(COMUSIC_12_TTC_NIPPER);
func_8032BB88(this, -1, 300);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
this->velocity_x = xVelocity;
}

2
src/TTC/code_26D0.c
View File

@@ -1,8 +1,8 @@
#include <ultra64.h>
#include "core1/core1.h"
#include "functions.h"
#include "variables.h"
#include "prop.h"
#include "SnS.h"
#include "actor.h"
extern ActorInfo gChClam;

2
src/TTC/code_3E30.c
View File

@@ -1,8 +1,8 @@
#include <ultra64.h>
#include "core1/core1.h"
#include "functions.h"
#include "variables.h"
#include "SnS.h"
/* extern */
extern void func_802D6310(f32, enum map_e, s32, s32, enum file_progress_e);