From 235b0b8e0b53ebe1962a33291f02c7b9853d1de3 Mon Sep 17 00:00:00 2001 From: Roman971 <32455037+Roman971@users.noreply.github.com> Date: Wed, 27 May 2020 15:06:37 +0200 Subject: Fix more raw pointers (rsp and part of .data) (#170) Known files left with pointers in .data after this (possibly the only ones since I checked roughly everything): - flg_set.c - z_camera.c - db_camera.c - code_800D7CD0.c (ucode_disas.c) - audio (not sure which ones, see the structure sheet) --- src/code/sys_ucode.c | 3 +++ src/code/z_room.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/code') diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c index e34fd1307..6496217eb 100644 --- a/src/code/sys_ucode.c +++ b/src/code/sys_ucode.c @@ -1,5 +1,8 @@ #include +u32 D_8012DBA0 = (u32)&D_80155F50; +u32 D_8012DBA4 = (u32)&D_80157580; + u32 SysUcode_GetUCodeBoot() { return &D_80009320; } diff --git a/src/code/z_room.c b/src/code/z_room.c index f77216da6..bf3ab98e3 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -362,7 +362,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { if (sp98) { // gSPLoadUcodeL(gfxCtx->polyOpa.p++, rspS2DEX)? - gSPLoadUcodeEx(gfxCtx->polyOpa.p++, D_00113070, D_001579A0, 0x800); + gSPLoadUcodeEx(gfxCtx->polyOpa.p++, OS_K0_TO_PHYSICAL(D_80113070), OS_K0_TO_PHYSICAL(D_801579A0), 0x800); if (1) { Vec3f sp60; @@ -469,7 +469,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { if (sp94) { // gSPLoadUcodeL(gfxCtx->polyOpa.p++, rspS2DEX)? - gSPLoadUcodeEx(gfxCtx->polyOpa.p++, D_00113070, D_001579A0, 0x800); + gSPLoadUcodeEx(gfxCtx->polyOpa.p++, OS_K0_TO_PHYSICAL(D_80113070), OS_K0_TO_PHYSICAL(D_801579A0), 0x800); if (1) { Vec3f sp5C; -- cgit v1.2.3