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

Merge branch 'banjo-kazooie-load_overlay_match'

Browse Source
This commit is contained in:
Banjo Kazooie
2023-01-02 13:04:02 -06:00
parent 2c102f2619 2b4cb29c05
commit 604ee44f06
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/core1/code_136D0.c
View File

@@ -141,11 +141,9 @@ int is_overlay_loaded(int overlay_id){
return D_80282800 == overlay_id; return D_80282800 == overlay_id;
} }
//load_overlay bool load_overlay(enum overlay_e overlay_id){
#ifndef NONMATCHING enum overlay_e rom_addr;
#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_136D0/load_overlay.s")
#else
bool load_overlay(enum overlay_e overlay_id){
if(overlay_id == 0) if(overlay_id == 0)
return FALSE; return FALSE;
@@ -153,17 +151,23 @@ bool load_overlay(enum overlay_e overlay_id){
return FALSE; return FALSE;
D_80282800 = overlay_id; D_80282800 = overlay_id;
rom_addr = D_802762D0 + overlay_id;
func_80253050( func_80253050(
overlay_id, overlay_id,
D_802762D0[overlay_id].ram_start, D_802762D0[overlay_id].ram_end, ((struct2As*)rom_addr)->ram_start,
D_802762D0[overlay_id].unkC, D_802762D0[overlay_id].unk10, ((struct2As*)rom_addr)->ram_end,
D_802762D0[overlay_id].code_start, D_802762D0[overlay_id].code_end, ((struct2As*)rom_addr)->unkC,
D_802762D0[overlay_id].data_start, D_802762D0[overlay_id].data_end, ((struct2As*)rom_addr)->unk10,
D_802762D0[overlay_id].bss_start, D_802762D0[overlay_id].bss_end ((struct2As*)rom_addr)->code_start,
((struct2As*)rom_addr)->code_end,
((struct2As*)rom_addr)->data_start,
((struct2As*)rom_addr)->data_end,
((struct2As*)rom_addr)->bss_start,
((struct2As*)rom_addr)->bss_end
); );
return TRUE; return TRUE;
} }
#endif
//clear_loaded_overlay_id //clear_loaded_overlay_id
s32 func_802512FC(void){ s32 func_802512FC(void){
@@ -182,4 +186,4 @@ void func_80251308(void){
func_802511C4(); func_802511C4();
} }
void func_802513A4(void){} void func_802513A4(void){}