summaryrefslogtreecommitdiff
path: root/src/boot_O2_g3
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-06-18 02:43:47 -0400
committerGitHub <noreply@github.com>2023-06-18 16:43:47 +1000
commit587d12e3cbb2a1ffb6774c0823c54ce0e80a579b (patch)
tree77e25fd29e6bce3b979b7d50ec3851c9d2a9fc1e /src/boot_O2_g3
parent9c40dea7709726bd29fac8253586bc96c9f3ab8a (diff)
Yet another header cleanup (#1284)
* thread, scene and interface * non header stuff * fix missing stuff * z64sound_source.h * collision_check.h * Update include/z64sound_source.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64scene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64thread.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review * review * Update src/code/z_collision_check.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sound_source.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'src/boot_O2_g3')
-rw-r--r--src/boot_O2_g3/boot_main.c1
-rw-r--r--src/boot_O2_g3/idle.c3
-rw-r--r--src/boot_O2_g3/irqmgr.c1
-rw-r--r--src/boot_O2_g3/z_std_dma.c1
4 files changed, 6 insertions, 0 deletions
diff --git a/src/boot_O2_g3/boot_main.c b/src/boot_O2_g3/boot_main.c
index 6a561992b..ed16c34e0 100644
--- a/src/boot_O2_g3/boot_main.c
+++ b/src/boot_O2_g3/boot_main.c
@@ -2,6 +2,7 @@
#include "global.h"
#include "stack.h"
#include "stackcheck.h"
+#include "z64thread.h"
StackEntry sBootStackInfo;
OSThread sIdleThread;
diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c
index 6c63e2a70..f7c847449 100644
--- a/src/boot_O2_g3/idle.c
+++ b/src/boot_O2_g3/idle.c
@@ -3,6 +3,7 @@
#include "stack.h"
#include "buffers.h"
#include "stackcheck.h"
+#include "z64thread.h"
u8 D_80096B20 = 1;
vu8 gViConfigUseDefault = 1;
@@ -94,10 +95,12 @@ void Idle_InitVideo(void) {
D_8009B290 = 2;
gViConfigMode = osViModeNtscLan1;
break;
+
case OS_TV_MPAL:
D_8009B290 = 30;
gViConfigMode = osViModeMpalLan1;
break;
+
case OS_TV_PAL:
D_8009B290 = 44;
gViConfigMode = osViModeFpalLan1;
diff --git a/src/boot_O2_g3/irqmgr.c b/src/boot_O2_g3/irqmgr.c
index 1f1e94ab4..9a773f279 100644
--- a/src/boot_O2_g3/irqmgr.c
+++ b/src/boot_O2_g3/irqmgr.c
@@ -1,5 +1,6 @@
#include "global.h"
#include "stackcheck.h"
+#include "z64thread.h"
vs32 gIrqMgrResetStatus = 0;
volatile OSTime sIrqMgrResetTime = 0;
diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c
index 00d894f74..71b7ae846 100644
--- a/src/boot_O2_g3/z_std_dma.c
+++ b/src/boot_O2_g3/z_std_dma.c
@@ -2,6 +2,7 @@
#include "global.h"
#include "stack.h"
#include "stackcheck.h"
+#include "z64thread.h"
u32 sDmaMgrDmaBuffSize = 0x2000;