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

Merge branch 'master' into wip/pal_integration

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-05 20:10:25 -05:00
parent 17a0530ff8 4f122e5b8c
commit 1a240c651c
112 changed files with 429 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/core1/code_0.c
View File

@@ -14,7 +14,7 @@ void func_8023DFF0(s32);
s32 D_80275610 = 0;
s32 D_80275614 = 0;
u32 D_80275618 = 0;
u32 gGlobalTimer = 0;
u32 D_8027561C[] = {
0x9, 0x4, 0xA, 0x3, 0xB, 0x2, 0xC, 0x5, 0x0,
0x1, 0x6, 0xD, -1
@@ -70,16 +70,16 @@ void func_8023DA9C(s32 arg0){
func_80255CD8();
}
u32 func_8023DB4C(u32 arg0){
return D_80275618 & arg0;
u32 globalTimer_getTimeMasked(u32 mask){
return gGlobalTimer & mask;
}
s32 func_8023DB5C(void){
return D_80275618;
s32 globalTimer_getTime(void){
return gGlobalTimer;
}
void func_8023DB68(void){
D_80275618 = 0;
void globalTimer_reset(void){
gGlobalTimer = 0;
}
s32 func_8023DB74(void){
@@ -122,16 +122,16 @@ void core1_init(void){
ml_init();
gctransition_reset();
D_8027A130 = 0;
D_80275618 = 0;
gGlobalTimer = 0;
func_8023DA9C(3);
}
void func_8023DCDC(void){
D_80275618++;
void globalTimer_incTimer(void){
gGlobalTimer++;
}
void func_8023DCF4(void){
D_80275618--;
void globalTimer_decTimer(void){
gGlobalTimer--;
}
void mainLoop(void){
@@ -141,12 +141,12 @@ void mainLoop(void){
u16 rgba;
s32 offset;
if((func_8023DB5C() & 0x7f) == 0x11)
if((globalTimer_getTime() & 0x7f) == 0x11)
sns_write_payload_over_heap();
func_8023DA74();
if(D_8027A130 != 3 || getGameMode() != GAME_MODE_4_PAUSED)
func_8023DCDC();
globalTimer_incTimer();
if(!D_8027BEEC)
pfsManager_update();
@@ -183,7 +183,7 @@ void mainLoop(void){
//render weird CRC failure image
for(y= 0x1e; y < framebuffer_height - 0x1e; y++){//L8023DEB4
for(x = 0x14; x < 0xeb; x++){
tmp = ((8 * func_8023DB5C()) + ((x*x) + (y*y)));
tmp = ((8 * globalTimer_getTime()) + ((x*x) + (y*y)));
r = _SHIFTL(x>>3, 11, 5);
g = _SHIFTL(y>>3, 6, 5);

2
src/core1/code_10A00.c
View File

@@ -133,7 +133,7 @@ s32 func_8024E67C(s32 controller_index){
}
s32 func_8024E698(s32 controller_index){
if(func_8023DB5C() < 2){
if(globalTimer_getTime() < 2){
return 0;
}

4
src/core1/code_11AC0.c
View File

@@ -322,7 +322,7 @@ void func_8024F890(u8 arg0, enum comusic_e arg1){
alCSPSetSeq(&D_80281720[arg0].cseqp, &D_80281720[arg0].cseq);
alCSPPlay(&D_80281720[arg0].cseqp);
alCSPSetVol(&D_80281720[arg0].cseqp, D_80281720[arg0].unk0);
if(player_is_present() && func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_is_present() && player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8025F3F0(&D_80281720[arg0].cseqp, 0.0f, 1.0f);
}
else{
@@ -433,7 +433,7 @@ void func_8024FE44(u8 arg0, f32 arg1, f32 arg2){
D_80281720[arg0].unk17C = arg1;
D_80281720[arg0].unk180 = arg2;
if(func_80250074(arg0) == 0){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8025F3F0(&D_80281720[arg0].cseqp, 0.0f, 1.0f);
}else{
func_8025F3F0(&D_80281720[arg0].cseqp, arg1, arg2);

2
src/core1/code_1D5D0.c
View File

@@ -211,7 +211,7 @@ void sns_write_payload_over_heap(void)
s32 val2;
u32 i;
if (func_8023DB5C() <= 0x3B || snsToRestoreItems)
if (globalTimer_getTime() <= 0x3B || snsToRestoreItems)
return;
sns_generate_payload(snsBasePayloadPtr2);

6
src/core1/code_9D30.c
View File

@@ -197,12 +197,12 @@ void func_80247C20(void) {
s32 i;
if (D_80275BE4 == 0) {
D_80275BE4 = func_8023DB5C();
D_80275BE4 = globalTimer_getTime();
return;
}
if (func_8023DB5C() != D_80275BE4) {
if (globalTimer_getTime() != D_80275BE4) {
D_80275BE0 = FALSE;
D_80275BE4 = func_8023DB5C();
D_80275BE4 = globalTimer_getTime();
}
if (D_80275BE0) {

22
src/core1/code_CE60.c
View File

@@ -170,7 +170,7 @@ void func_8024AED8(void){
}
void func_8024AF00(s32 arg0, s32 arg1){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(arg0);
}
else{
@@ -208,7 +208,7 @@ void func_8024AF48(void){
case MAP_7_TTC_TREASURE_TROVE_COVE: // L8024B094
func_8024A9EC(0);
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x600);
}
else if(func_8024A8DC(-0x12C, 0x58c, 0x866)
@@ -228,7 +228,7 @@ void func_8024AF48(void){
case MAP_B_CC_CLANKERS_CAVERN: // L8024B158
func_8024A9EC(0);
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
if(!(D_802806F8[1] < 0x28b)){
func_8024A8AC(0x8180, 5.0f);
}
@@ -242,7 +242,7 @@ void func_8024AF48(void){
break;
case MAP_12_GV_GOBIS_VALLEY:// L8024B1BC
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8020);
}
else if(func_8024A8DC(-0xf96, 0x1626, 0xe74)){
@@ -262,7 +262,7 @@ void func_8024AF48(void){
break;
case MAP_1_SM_SPIRAL_MOUNTAIN: // L8024B23C
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x9000);
}
else{
@@ -360,7 +360,7 @@ void func_8024AF48(void){
break;
case MAP_45_CCW_AUTUMN:// L8024B4D4
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x600);
}
else{
@@ -382,7 +382,7 @@ void func_8024AF48(void){
break;
case MAP_27_FP_FREEZEEZY_PEAK:// L8024B538
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x400);
}
else if( mapSpecificFlags_get(0) && !jiggyscore_isCollected(JIGGY_2F_FP_XMAS_TREE)){
@@ -453,7 +453,7 @@ void func_8024AF48(void){
break;
case MAP_6B_GL_180_NOTE_DOOR:// L8024B704
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8800);
}
else if(func_8024A8DC(0x10eb, 0x4f5, 0x730)) {
@@ -476,7 +476,7 @@ void func_8024AF48(void){
break;
case MAP_70_GL_CC_LOBBY:// L8024B7B4
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8100);
}
else if(func_8024A8DC(-0x19d6, -0x1d3, 0x71e)){
@@ -520,7 +520,7 @@ void func_8024AF48(void){
break;
case MAP_71_GL_STATUE_ROOM:// L8024B8C0
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x200);
}
else if(func_8024A8DC(-0xf0e, -0x15a, 0x302)){
@@ -570,7 +570,7 @@ void func_8024AF48(void){
break;
case MAP_78_GL_RBB_AND_MMM_PUZZLE:// L8024BA98
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8200);
}
else if(0x15a <= D_802806F8[1] && func_8024A8DC(-0x89a, 0x21a, 0x368)){