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

Documented ch Tumblar

Browse Source
This commit is contained in:
Owlenuff
2024-10-01 10:27:28 +02:00
parent ecac4dde39
commit 4bf7028254
21 changed files with 210 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
void func_802D77D4(Actor *this);
extern void player_setClimbParams(f32[3], f32[3], f32, u32);
extern f32 func_80258640(f32[3], f32[3]);
extern f32 ml_vec3f_horizontal_distance_zero_likely(f32[3], f32[3]);
typedef struct {
f32 unk0[3];
@@ -40,8 +40,8 @@ s32 func_802D76E0(Actor *this, f32 *arg1) {
return FALSE;
}
if (sp28 && temp_v0) {
sp30 = func_80258640(this->position, sp40);
if (func_80258640(this->position, sp34) < sp30) {
sp30 = ml_vec3f_horizontal_distance_zero_likely(this->position, sp40);
if (ml_vec3f_horizontal_distance_zero_likely(this->position, sp34) < sp30) {
sp28 = 0;
}
}

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

@@ -26,7 +26,7 @@ extern void warp_smExitBanjosHouse(s32, s32);
extern void func_80335110(s32);
extern void func_8024E60C(s32, s32[3]);
extern void func_8024E71C(s32, f32*);
extern void controller_getJoystick(s32, f32*);
extern char *gcpausemenu_TimeToA(int);
extern struct5Bs *func_803097A0(void);
@@ -334,7 +334,7 @@ void func_802C4C14(Actor *this){
else{//L802C4D24
func_8024E60C(0, sp74);
func_8024E55C(0, sp5C);
func_8024E71C(0, &sp54);
controller_getJoystick(0, &sp54);
switch(this->state){
case 2:
case 5:

4
src/core2/code_13FC0.c
View File

@@ -3,7 +3,7 @@
#include "variables.h"
#include <core1/viewport.h>
extern void func_8024E71C(s32, f32*);
extern void controller_getJoystick(s32, f32*);
extern f32 ml_acosf(f32);
extern f32 player_getYaw(void);
extern void particleEmitter_setSphericalParticleVelocityRange(ParticleEmitter *this, f32 pitch_min, f32 yaw_min, f32 radial_min, f32 pitch_max, f32 yaw_max, f32 radial_max);
@@ -79,7 +79,7 @@ void func_8029B11C(void) {
}
void func_8029B174(void) {
func_8024E71C(0, &D_8037D1A0.unk1C);
controller_getJoystick(0, &D_8037D1A0.unk1C);
if (D_8037D1A0.unk34) {
D_8037D1A0.unk1C[0] = D_8037D1A0.unk1C[1] = 0.0f;
}

2
src/core2/code_14420.c
View File

@@ -7,7 +7,7 @@
#include "core2/ba/physics.h"
#include <core1/viewport.h>
extern void func_8024E71C(s32, f32*);
extern void controller_getJoystick(s32, f32*);
extern f32 ml_acosf(f32);
extern f32 player_getYaw(void);
extern void particleEmitter_setSphericalParticleVelocityRange(ParticleEmitter *this, f32 pitch_min, f32 yaw_min, f32 radial_min, f32 pitch_max, f32 yaw_max, f32 radial_max);

6
src/core2/code_4C020.c
View File

@@ -4,7 +4,7 @@
#include "SnS.h"
extern f32 func_80258640(f32 [3], f32[3]);
extern f32 ml_vec3f_horizontal_distance_zero_likely(f32 [3], f32[3]);
extern void func_8025A788(enum comusic_e, f32, f32);
extern void func_8031CC40(enum map_e, s32);
extern void fxRipple_802F363C(f32);
@@ -565,13 +565,13 @@ void func_802D4680(Actor *this){
player_getPosition(sp1C);
switch(this->state){
case 0:
if(150.0f < func_80258640(this->position, sp1C)){
if(150.0f < ml_vec3f_horizontal_distance_zero_likely(this->position, sp1C)){
subaddie_set_state(this, 1);
D_803676AC = 0;
}
break;
case 1:
if(func_80258640(this->position, sp1C) < 150.0f && func_8028F20C()){
if(ml_vec3f_horizontal_distance_zero_likely(this->position, sp1C) < 150.0f && func_8028F20C()){
if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){
if(map_get() == MAP_8E_GL_FURNACE_FUN){
volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, 0);

2
src/core2/code_5C870.c
View File

@@ -626,7 +626,7 @@ s32 getGameMode(void){
int func_802E4A08(void){
return (D_8037E8E0.game_mode == GAME_MODE_6_FILE_PLAYBACK)
|| (D_8037E8E0.game_mode == 5)
|| (D_8037E8E0.game_mode == GAME_MODE_5_UNKNOWN)
|| (D_8037E8E0.game_mode == GAME_MODE_7_ATTRACT_DEMO)
|| (D_8037E8E0.game_mode == GAME_MODE_8_BOTTLES_BONUS)
|| (D_8037E8E0.game_mode == GAME_MODE_9_BANJO_AND_KAZOOIE)

2
src/core2/code_91E10.c
View File

@@ -488,7 +488,7 @@ void func_80319EA4(void) {
return;
func_8024E55C(0, sp58);
func_8024E71C(0, sp4C);
controller_getJoystick(0, sp4C);
for(phi_s0 = 0; phi_s0 < 4; phi_s0++){
gczoombox_update(D_803830E0->unk24[phi_s0]);
}

17
src/core2/code_C9F00.c
View File

@@ -41,7 +41,7 @@ Struct_Core2_C9F00_1 D_803725C0[] = {
void func_80351DE0(Struct6Bs *, Struct68s *);
extern void MMM_func_8038ADF0(void *, Struct68s *);
extern void chTumblar_init(void *, Struct68s *);
extern void func_80387940(void *, Struct68s *);
extern void GV_func_80387960(void *, Struct68s *);
extern void func_80387980(void *, Struct68s *);
@@ -53,7 +53,7 @@ extern void CC_func_80387A20(void *, Struct68s *);
extern void func_80351FE0(void *, Struct68s *);
void func_80351E60(Struct6Bs *, Struct68s *, f32);
extern void func_8038AF90(void *, Struct68s *, f32);
extern void chTumblar_update(void *, Struct68s *, f32);
extern void func_8038B790(void *, Struct68s *, f32);
extern void CCW_func_80387A40(void *, Struct68s *, f32);
extern void func_80352114(void *, Struct68s *, f32);
@@ -61,7 +61,7 @@ extern void func_80352114(void *, Struct68s *, f32);
Struct_Core2_C9F00_0 D_803725F4[] = {
{ NULL, NULL},
{func_80351DE0, func_80351E60},
{MMM_func_8038ADF0, func_8038AF90},
{chTumblar_init, chTumblar_update},
{ NULL, NULL},
{ NULL, func_8038B790},
{func_80387940, CCW_func_80387A40},
@@ -280,10 +280,11 @@ bool func_80351724(void * arg0){
return TRUE;
}
s32 func_80351758(Struct68s *arg0){
if(arg0->unk0 == 0){
s32 func_80351758_getSfxsourceIndex(Struct68s *arg0) {
if (arg0->unk0 == NULL) {
arg0->unk0 = sfxsource_createSfxsourceAndReturnIndex();
}
return arg0->unk0;
}
@@ -291,8 +292,8 @@ ActorMarker *func_80351794(Struct68s *arg0){
return arg0->unk4;
}
void func_8035179C(Struct68s* arg0, f32 arg1[3]) {
TUPLE_COPY(arg1, arg0->position)
void func_8035179C_copyPosition(Struct68s* arg0, f32 position[3]) {
TUPLE_COPY(position, arg0->position)
}
void * func_803517B8(s32 arg0){
@@ -473,7 +474,7 @@ void func_80351DE0(Struct6Bs *arg0, Struct68s *arg1) {
arg0->unk0 = randf2(80.0f, 100.0f);
arg0->unk4[0] = arg0->unk4[1] = arg0->unk4[2] = 0.0f;
arg0->unk10[0] = arg0->unk10[1] = arg0->unk10[2] = 0.0f;
func_8035179C(arg1, arg0->unk1C);
func_8035179C_copyPosition(arg1, arg0->unk1C);
func_80351814(arg1, arg0->unk28);
arg0->unk34 = 0.0f;
}

2
src/core2/code_CB050.c
View File

@@ -32,7 +32,7 @@ void func_80351FE0(Struct_core2_CB050_0 *arg0, Struct68s *arg1) {
arg0->unk28[0] = arg0->unk28[1] = arg0->unk28[2] = 0.0f;
arg0->unk34[0] = arg0->unk34[1] = arg0->unk34[2] = 0.0f;
arg0->unk40[0] = arg0->unk40[1] = arg0->unk40[2] = 0.0f;
func_8035179C(arg1, arg0->unk4C);
func_8035179C_copyPosition(arg1, arg0->unk4C);
func_80351814(arg1, arg0->unk58);
arg0->unk64 = 0.0f;
arg0->unk6C = 0;

4
src/core2/gc/pauseMenu.c
View File

@@ -33,7 +33,7 @@ void func_80310D2C(void);
s32 level_get(void);
void func_8024E6E0(s32, void *);
void func_8024E60C(s32, void *);
void func_8024E71C(s32, void *);
void controller_getJoystick(s32, void *);
s32 getGameMode(void);
void func_802DC5B8(void);
@@ -937,7 +937,7 @@ s32 gcPauseMenu_update(void) {
}
func_8024E55C(0, face_button);
func_8024E71C(0, joystick);
controller_getJoystick(0, joystick);
func_8024E60C(0, sp60);
func_8024E6E0(0, sp50);
func_80310D2C();