diff options
| author | rozlette <uberpanzermensch@gmail.com> | 2020-01-20 23:26:49 -0600 |
|---|---|---|
| committer | rozlette <uberpanzermensch@gmail.com> | 2020-01-20 23:27:02 -0600 |
| commit | 930b8bc242a3b5678b81279ba8fc59b2d85ce0ca (patch) | |
| tree | a16a2468707324ba3015098408b97103fb9dcbf0 /src/boot_O2_g3 | |
| parent | 0f93f269d4deb8df7d11482dcc18a9bc590561b6 (diff) | |
Port a bunch of libultra files from sm64
Diffstat (limited to 'src/boot_O2_g3')
| -rw-r--r-- | src/boot_O2_g3/boot_0x80080060.c | 4 | ||||
| -rw-r--r-- | src/boot_O2_g3/boot_0x800805E0.c | 2 | ||||
| -rw-r--r-- | src/boot_O2_g3/z_std_dma.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/boot_O2_g3/boot_0x80080060.c b/src/boot_O2_g3/boot_0x80080060.c index ba916f4e2..6989e3258 100644 --- a/src/boot_O2_g3/boot_0x80080060.c +++ b/src/boot_O2_g3/boot_0x80080060.c @@ -3,11 +3,11 @@ void start(void) { StackCheck_Init(&bootStackEntry, (u32)bootStack, (u32)&bootStack[1024], 0, -1, "boot"); - osMemSize = func_8008D350(); + osMemSize = osGetMemSize(); func_800818F4(); osInitialize(); osUnmapTLBAll(); - D_80096B40 = func_80092920(); + D_80096B40 = osCartRomInit(); StackCheck_Init(&idleStackEntry, (u32)idleStack, (u32)&idleStack[1024], 0, 256, "idle"); osCreateThread(&idleOSThread, 1, (osCreateThread_func)Idle_ThreadEntry, 0, &idleStack[1024], 12); osStartThread(&idleOSThread); diff --git a/src/boot_O2_g3/boot_0x800805E0.c b/src/boot_O2_g3/boot_0x800805E0.c index 9c46c4411..81c7e4361 100644 --- a/src/boot_O2_g3/boot_0x800805E0.c +++ b/src/boot_O2_g3/boot_0x800805E0.c @@ -10,7 +10,7 @@ UNK_RET func_800805E0(UNK_TYPE a0) { osViSetMode(&osViModeMpalLan1); break; case 0: - osViSetMode(&D_80097590); + osViSetMode(&osViModePalLan1); break; case 1: default: diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c index 3906ddede..a7cf044d5 100644 --- a/src/boot_O2_g3/z_std_dma.c +++ b/src/boot_O2_g3/z_std_dma.c @@ -2,7 +2,6 @@ #include <global.h> s32 Dmamgr_DoDmaTransfer(u32 a0, void* a1, u32 a2) { - u32 spPad; OSIoMesg sp60; OSMesgQueue sp48; OSMesg sp44; |