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

PAL: up to core1/rumblemanager.c

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-05 00:43:07 -05:00
parent 4fce59f41e
commit 17a0530ff8
5 changed files with 105 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core1/code_10A00.c
View File

@@ -2,6 +2,8 @@
#include "functions.h"
#include "variables.h"
#include "version.h"
extern s32 D_803727F4;
extern struct {
@@ -30,8 +32,13 @@ typedef struct {
extern s32 D_80276574;
/* .data */
s32 D_80275D30 = 0xC3A68832; //WHAT IS THIS?
s32 D_80275D34 = 0xDDC3A724; //WHAT IS THIS?
#if VERSION == VERSION_USA_1_0
s32 D_80275D30 = 0xC3A68832; //WHAT IS THIS?
s32 D_80275D34 = 0xDDC3A724; //WHAT IS THIS?
#elif VERSION == VERSION_PAL
s32 D_80275D30 = 0xED7BCDB7; //WHAT IS THIS?
s32 D_80275D34 = 0xF82DC7AC; //WHAT IS THIS?
#endif
s32 D_80275D38 = 0;
/* .bss */

18
src/core1/code_11AC0.c
View File

@@ -5,6 +5,8 @@
#include "music.h"
#include "n_libaudio.h"
#include "version.h"
extern void func_8025F570(ALCSPlayer *, u8);
extern void func_8025F510(ALCSPlayer *, u8, u8);
extern void func_8025F5C0(ALCSPlayer *, u8);
@@ -266,7 +268,11 @@ ALBank *music_get_sound_bank(void){
void func_8024F764(s32 arg0){//music track load
if(D_802820E0[arg0] == NULL){
func_8033B788();
#if VERSION == VERSION_USA_1_0
D_802820E0[arg0] = assetcache_get(arg0 + 0x1516);
#elif VERSION == VERSION_PAL
D_802820E0[arg0] = assetcache_get(arg0 + 0xd74);
#endif
}
}
@@ -532,8 +538,8 @@ void func_80250200(s32 arg0, s16 chan, s16 arg2, f32 arg3){
mask = osSetIntMask(OS_IM_NONE);
tmpf = (!func_80250074(arg0))? func_8025F4A0(sp28, chan) :127.0f;
if(arg3 < 0.0333333351f){
arg3 = 0.0333333351f;
if(arg3 < (2.0f/FRAMERATE)){
arg3 = (2.0f/FRAMERATE);
}
for(i = 0; i< 0x20; i++){
@@ -543,7 +549,7 @@ void func_80250200(s32 arg0, s16 chan, s16 arg2, f32 arg3){
D_80282110[i].unk0 = arg0;
D_80282110[i].chan = chan;
D_80282110[i].unk8 = tmpf;
D_80282110[i].unkC = (arg2 - tmpf)/((arg3 * 60.0f)/2);
D_80282110[i].unkC = (arg2 - tmpf)/((arg3 * (float)FRAMERATE)/2);
D_80282110[i].unk10 = arg2;
osSetIntMask(mask);
return;
@@ -561,8 +567,8 @@ void func_80250360(s32 arg0, s32 arg1, f32 arg2){
sp24 = func_802500CC(arg0);
sp1C = osSetIntMask(1);
tempo = alCSPGetTempo(sp24);
if( arg2 < 0.0333333351f){
arg2 = 0.0333333351f;
if( arg2 < (2.0f/FRAMERATE)){
arg2 = (2.0f/FRAMERATE);
}
for(i = 0; i < 0x20; i++){
if(D_80282110[i].unk8 == D_80282110[i].unk10
@@ -571,7 +577,7 @@ void func_80250360(s32 arg0, s32 arg1, f32 arg2){
D_80282110[i].unk0 = arg0;
D_80282110[i].chan = -1;
D_80282110[i].unk8 = tempo;
D_80282110[i].unkC = (arg1 - tempo)/((arg2 * 60.0f)/2);
D_80282110[i].unkC = (arg1 - tempo)/((arg2 * (float)FRAMERATE)/2);
D_80282110[i].unk10 = arg1;
osSetIntMask(sp1C);
return;

3
src/core1/rumblemanager.c
View File

@@ -2,6 +2,7 @@
#include "functions.h"
#include "variables.h"
#include "version.h"
void func_8024F35C(s32);
@@ -68,7 +69,7 @@ void __rumbleUpdate(void *arg0) {
do{
osRecvMesg(&D_80282390, NULL, 1);
D_802827E0++;
if (!D_802823B0 && ((D_802827E0 % 60) == 0)) {
if (!D_802823B0 && ((D_802827E0 % FRAMERATE) == 0)) {
func_80250930();
}
prev_state = rumble_state;