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

Merge branch 'mr-origin-65'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-08 21:33:17 -05:00
parent 65e383dc67 3b092f2749
commit 01bb4b8a85
143 changed files with 959 additions and 829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core1/code_0.c
View File

@@ -178,7 +178,7 @@ void mainLoop(void){
}//L8023DE54
if( !func_8032056C()
|| !levelSpecificFlags_validateCRC1()
|| !func_80320240()
|| !dummy_func_80320240()
){
s32 offset;
//render weird CRC failure image

4
src/core1/code_10A00.c
View File

@@ -189,9 +189,9 @@ void pfsManager_update(void) {
temp_t6 = demo_readInput(&pfsManagerContPadData, &sp5C) == 0;
if ((D_802812D0.button & s0) || temp_t6) {
if (D_802812D0.button & s0) {
func_803204E4(0x64, 1);
volatileFlag_set(VOLATILE_FLAG_64, 1);
} else {
func_803204E4(0x63, 1);
volatileFlag_set(VOLATILE_FLAG_63, 1);
}
}
func_8033DD04(sp5C);

4
src/core1/code_CE60.c
View File

@@ -181,8 +181,8 @@ void func_8024AF00(s32 arg0, s32 arg1){
void func_8024AF48(void){
if(!D_802806F4) return;
if(func_803203FC(1)) return;
if(func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) return;
if(volatileFlag_get(VOLATILE_FLAG_1)) return;
if(volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) return;
if(func_802D686C()) return;
if(func_8028F22C()) return;
if(gctransition_8030BDC0()) return;