From 151e098e48fcd779a296cfbdcedd8f4528f96232 Mon Sep 17 00:00:00 2001 From: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Date: Thu, 14 Oct 2021 16:25:14 +0100 Subject: `z_debug` OK (#330) * z_debug OK * Rename function * Remove duplicate struct * Update z64.h --- src/code/main.c | 2 +- src/code/z_debug.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/code/main.c b/src/code/main.c index 648536aef..a2b859991 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -24,7 +24,7 @@ void Main(void* arg) { startHeapSize = fb - sysHeap; SystemArena_Init(sysHeap, startHeapSize); - static_context_init(); + GameInfo_Init(); R_ENABLE_ARENA_DBG = 0; diff --git a/src/code/z_debug.c b/src/code/z_debug.c index e6f03bb5f..5848dfa71 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -1,3 +1,19 @@ #include "global.h" -#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug/static_context_init.s") +GameInfo* gGameInfo; + +void GameInfo_Init(void) { + s32 i; + + gGameInfo = (GameInfo*)SystemArena_Malloc(sizeof(GameInfo)); + if (1) {} + gGameInfo->unk_00 = 0; + gGameInfo->unk_01 = 0; + gGameInfo->unk_02 = 0; + gGameInfo->unk_04 = 0; + gGameInfo->unk_03 = 0; + + for (i = 0; i < ARRAY_COUNT(gGameInfo->data); i++) { + gGameInfo->data[i] = 0; + } +} -- cgit v1.2.3