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

rename animctrl to anctrl to match source debug string and tooie naming

Browse Source 
rename `rumbleManager` to `bamotor`
This commit is contained in:
banjo.decomp
2024-10-30 19:51:58 -05:00
parent aa181c3bd9
commit 4c3d4df97b
134 changed files with 1588 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/core1/rumblemanager.c → src/core1/bamotor.c
View File

@@ -23,9 +23,9 @@ OSThread sRumbleThread;
u8 sRumbleThreadStack[RUMBLE_THREAD_STACK_SIZE];
/* .code */
void rumbleManager_80250D94(f32, f32, f32);
void baMotor_80250D94(f32, f32, f32);
void __rumbleManager_startRumble(void){
void __baMotor_startRumble(void){
u32 motor_status;
if(D_802823B0){
@@ -36,7 +36,7 @@ void __rumbleManager_startRumble(void){
}
}
void __rumbleManager_stopRumble(void){
void __baMotor_stopRumble(void){
u32 motor_status;
if(D_802823B0){
@@ -90,27 +90,27 @@ void rumbleThread_entry(void *arg) {
if (rumble_state != prev_state) {
if (rumble_state) {
__rumbleManager_startRumble(); //start_motor
__baMotor_startRumble(); //start_motor
}
else{
__rumbleManager_stopRumble(); //stop_motor
__baMotor_stopRumble(); //stop_motor
}
}
}while(1);
}
void __rumbleManager_80250BA4(s32 arg0, s32 arg1, s32 arg2){
void __baMotor_80250BA4(s32 arg0, s32 arg1, s32 arg2){
f64 f0 = 524288.0;
rumbleManager_80250D94(arg0/f0, arg1/f0, arg2/f0);
baMotor_80250D94(arg0/f0, arg1/f0, arg2/f0);
}
void rumbleManager_80250C08(void) {
void baMotor_80250C08(void) {
if (D_802823AC != 0) {
D_80282424 = MIN(D_80282420, D_80282424 + time_getDelta());
}
}
void rumbleManager_init(void) {
void baMotor_init(void) {
s32 pfs_status;
func_8024F35C(4);
@@ -130,9 +130,9 @@ void rumbleManager_init(void) {
}
}
void __rumbleManager_80250D8C(void){}
void __baMotor_80250D8C(void){}
void rumbleManager_80250D94(f32 arg0, f32 arg1, f32 arg2){
void baMotor_80250D94(f32 arg0, f32 arg1, f32 arg2){
f32 f4;
if(arg2 != 0.0f && D_802823AC){
if(func_802E4A08() == 0){
@@ -146,20 +146,20 @@ void rumbleManager_80250D94(f32 arg0, f32 arg1, f32 arg2){
}
}
void rumbleManager_80250E6C(f32 arg0, f32 arg1){
rumbleManager_80250D94(arg0, arg0, arg1);
void baMotor_80250E6C(f32 arg0, f32 arg1){
baMotor_80250D94(arg0, arg0, arg1);
}
void rumbleManager_80250E94(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5){
void baMotor_80250E94(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5){
if(D_802823AC){
timedFunc_set_3(0.0f, (GenFunction_3) __rumbleManager_80250BA4, 0, (s32) (arg0 * 524288.0f), (s32) (arg2*524288.0f));
timedFunc_set_3(arg2, (GenFunction_3) __rumbleManager_80250BA4, (s32) (arg0 * 524288.0f), (s32) (arg1 * 524288.0f), (s32) (arg3*524288.0f));
timedFunc_set_3(arg2 + arg3, (GenFunction_3) __rumbleManager_80250BA4, (s32) (arg1 * 524288.0f), (s32) (arg1 * 524288.0f), (s32) (arg4*524288.0f));
timedFunc_set_3(arg2 + arg3 + arg4, (GenFunction_3) __rumbleManager_80250BA4, (s32) (arg1 * 524288.0f), 0, (s32) (arg5*524288.0f));
timedFunc_set_3(0.0f, (GenFunction_3) __baMotor_80250BA4, 0, (s32) (arg0 * 524288.0f), (s32) (arg2*524288.0f));
timedFunc_set_3(arg2, (GenFunction_3) __baMotor_80250BA4, (s32) (arg0 * 524288.0f), (s32) (arg1 * 524288.0f), (s32) (arg3*524288.0f));
timedFunc_set_3(arg2 + arg3, (GenFunction_3) __baMotor_80250BA4, (s32) (arg1 * 524288.0f), (s32) (arg1 * 524288.0f), (s32) (arg4*524288.0f));
timedFunc_set_3(arg2 + arg3 + arg4, (GenFunction_3) __baMotor_80250BA4, (s32) (arg1 * 524288.0f), 0, (s32) (arg5*524288.0f));
}
}
void rumbleManager_80250FC0(void){
void baMotor_80250FC0(void){
int i;
u32 motor_status;
if(D_802823B0){

4
src/core1/code_0.c
View File

@@ -111,7 +111,7 @@ void core1_init(void) {
allocUnusedBlock();
assetCache_init();
pfsManager_init();
rumbleManager_init();
baMotor_init();
audioManager_init();
graphicsCache_init();
ml_init();
@@ -147,7 +147,7 @@ void mainLoop(void){
pfsManager_update();
sDisableInput = FALSE;
rumbleManager_80250C08();
baMotor_80250C08();
if(!mapSpecificFlags_validateCRC1()){
eeprom_writeBlocks(0, 0, 0x80397AD0, 0x40);

2
src/core1/code_8C50.c
View File

@@ -428,7 +428,7 @@ void func_8024730C(void){
// if(&D_802759A8){}
osViSetMode(&D_80275A48);
#endif
rumbleManager_80250FC0(); //stop controller motors
baMotor_80250FC0(); //stop controller motors
do{
osDpSetStatus(DPC_STATUS_FLUSH);
}while(1);