mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-17 13:24:45 +00:00
Code Issues Projects Releases Wiki Activity

[ntsc-1.2] Organize n64dd declarations and convert to 1.0 addresses (#2127)

Browse source 
* Reorganize n64dd declarations

* Fix bss

* Really fix bss
This commit is contained in:
cadmic 2024-09-04 11:56:24 -07:00 • committed by GitHub
parent aa1c7f3155
commit 8153c952f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 156 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/boot/cic6105.c
View file

@ -4,10 +4,8 @@
s32 func_80001714(void);
extern u64 cic6105ucodeTextStart[];
OSTask D_800067C0_unknown = {
4, 0, rspbootTextStart, 0x3E8, cic6105ucodeTextStart, 0x20, (u64*)gBuildTeam, 8, NULL, 0, NULL, 0, NULL, 0, NULL, 0,
4, 0, rspbootTextStart, 0x3E8, cic6105TextStart, 0x20, (u64*)gBuildTeam, 8, NULL, 0, NULL, 0, NULL, 0, NULL, 0,
};
s32 B_80008EE0;

8
src/boot/z_std_dma.c
View file

@ -197,8 +197,8 @@ s32 DmaMgr_AudioDmaHandler(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction) {
ASSERT(mb != NULL, "mb != NULL", "../z_std_dma.c", 532);
#if PLATFORM_N64
if (B_80121AE2) {
while (B_80121AE4) {
if (D_80121212) {
while (D_80121214) {
Sleep_Msec(1000);
}
}
@ -543,8 +543,8 @@ s32 DmaMgr_RequestAsync(DmaRequest* req, void* ram, uintptr_t vrom, size_t size,
#endif
#if PLATFORM_N64
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_70 != NULL)) {
if (B_80121AF0->unk_70(req, ram, vrom, size, unk, queue, msg) != 0) {
if ((B_80121220 != NULL) && (B_80121220->unk_70 != NULL)) {
if (B_80121220->unk_70(req, ram, vrom, size, unk, queue, msg) != 0) {
return 0;
}
}