summaryrefslogtreecommitdiff
path: root/src/boot_O2_g3
diff options
context:
space:
mode:
authorrozlette <uberpanzermensch@gmail.com>2020-02-28 15:16:12 -0600
committerrozlette <uberpanzermensch@gmail.com>2020-02-28 15:16:12 -0600
commitdc37a6f9f54e834bdf54b6872ee641252b4b4256 (patch)
tree2d0e6823750649f7fb754fc095f0de8e7c4a50f1 /src/boot_O2_g3
parent2ee01ad0b7cddd030b22a461c236f47261c44360 (diff)
Move variables in .data for most of boot files that have been decompiled
Diffstat (limited to 'src/boot_O2_g3')
-rw-r--r--src/boot_O2_g3/idle.c7
-rw-r--r--src/boot_O2_g3/irqmgr.c9
-rw-r--r--src/boot_O2_g3/z_std_dma.c2
3 files changed, 13 insertions, 5 deletions
diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c
index aa43b6cc3..fac5a2fa3 100644
--- a/src/boot_O2_g3/idle.c
+++ b/src/boot_O2_g3/idle.c
@@ -1,6 +1,13 @@
#include <ultra64.h>
#include <global.h>
+u8 D_80096B20 = 1;
+vu8 D_80096B24 = 1;
+u8 D_80096B28 = 0;
+u32 viEnabledSpecialFeatures = 0x42;
+f32 screenXScale = 1.0f;
+f32 screenYScale = 1.0f;
+
void Idle_ClearMemory(void* begin, void* end){
if (begin < end) {
bzero(begin, (s32)(int)end - (int)begin);
diff --git a/src/boot_O2_g3/irqmgr.c b/src/boot_O2_g3/irqmgr.c
index 18e1b262f..2558aacfe 100644
--- a/src/boot_O2_g3/irqmgr.c
+++ b/src/boot_O2_g3/irqmgr.c
@@ -6,11 +6,10 @@
#define OS_CPU_COUNTER (OS_CLOCK_RATE*3/4)
#define OS_USEC_TO_CYCLES(n) (((u64)(n)*(OS_CPU_COUNTER/15625LL))/(1000000LL/15625LL))
-// TODO .data section
-//vs32 gPrenmiStage;
-//volatile OSTime sLastPrenmiTime;
-//vu64 gLastFrameDuration;
-//s32 sFrameCount;
+vs32 gPrenmiStage = 0;
+volatile OSTime sLastPrenmiTime = 0;
+vu64 gLastFrameDuration = 0;
+s32 sFrameCount = 0;
void IrqMgr_AddCallback(IrqMgr* irqmgr, OSMesgQueueListNode* param_2, OSMesgQueue* param_3) {
u32 saveMask;
diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c
index d2bd6cd8e..a606c7586 100644
--- a/src/boot_O2_g3/z_std_dma.c
+++ b/src/boot_O2_g3/z_std_dma.c
@@ -1,6 +1,8 @@
#include <ultra64.h>
#include <global.h>
+UNK_TYPE4 dmamgrChunkSize = 0x2000;
+
s32 Dmamgr_DoDmaTransfer(u32 a0, void* a1, u32 a2) {
OSIoMesg sp60;
OSMesgQueue sp48;