gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename `D_800C4B20` to `nuGfxZBuffer`

This commit is contained in:
gijs 2023-10-20 17:01:28 +02:00
parent 33d37c4963
commit eb57aa31f3
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common.h
View File

@ -132,7 +132,6 @@ extern s32 D_800E8B14;
extern s32 __SCREEN_IS_NOT_BLACK; extern s32 __SCREEN_IS_NOT_BLACK;
extern s32 D_800A9EB0; extern s32 D_800A9EB0;
extern s32 __SOMETHING_FRAMEBUFFERS; extern s32 __SOMETHING_FRAMEBUFFERS;
extern s32 D_800C4B20;
extern void* D_800C4CE0; extern void* D_800C4CE0;
extern s32 D_A9EF0; extern s32 D_A9EF0;
extern s32 D_800C4B30; extern s32 D_800C4B30;

2
include/nu/nusys.h
View File

@ -988,7 +988,7 @@ extern void nuDebConPrintf(u32 wndNo, const char* fmt, ...);
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
#define nuGfxSetZBuffer(ZBuf_p) \ #define nuGfxSetZBuffer(ZBuf_p) \
{ \ { \
nuGfxZBuffer = ZBuf_p; \ nuGfxZBuffer = (u16*)ZBuf_p; \
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* Remove callback functions */ /* Remove callback functions */

1
linker_scripts/symbols/addr.txt
View File

@ -14,6 +14,7 @@ nuGfxTaskSpool = 0x800E79A4;
nuGfxThread = 0x800BE1C0; nuGfxThread = 0x800BE1C0;
nuGfxSwapCfbFunc = 0x800A9E84; nuGfxSwapCfbFunc = 0x800A9E84;
nuGfxSwapCfb = 0x8008B110; nuGfxSwapCfb = 0x8008B110;
nuGfxZBuffer = 0x800C4B20;
nuBoot = 0x8007F880; nuBoot = 0x8007F880;
nuScCreateScheduler = 0x80088C50; // rom:0x19050 nuScCreateScheduler = 0x80088C50; // rom:0x19050

2
src/_ob_unusual_spiders.c
View File

@ -9,7 +9,7 @@ void nuGfxInitEX2(void) {
nuGfxThreadStart(); nuGfxThreadStart();
nuGfxSetCfb(&__SOMETHING_FRAMEBUFFERS, NU_GFX_FRAMEBUFFER_NUM); nuGfxSetCfb(&__SOMETHING_FRAMEBUFFERS, NU_GFX_FRAMEBUFFER_NUM);
D_800C4B20 = BOOT_ADDRESS_ULTRA; nuGfxSetZBuffer(NU_GFX_ZBUFFER_ADDR);
nuGfxSwapCfbFuncSet(nuGfxSwapCfb); nuGfxSwapCfbFuncSet(nuGfxSwapCfb);
D_800C4CE0 = &D_800A9EB0; D_800C4CE0 = &D_800A9EB0;
nuGfxTaskMgrInit(); nuGfxTaskMgrInit();

11
src/main.c
View File

@ -2,6 +2,7 @@
#include "libmus.h" #include "libmus.h"
#include "nu/nusys.h" #include "nu/nusys.h"
#include "os_convert.h"
extern u16 D_800AEDE2; extern u16 D_800AEDE2;
typedef struct { typedef struct {
@ -384,7 +385,7 @@ void func_80073398(void) {
D_800A8211 = 0; D_800A8211 = 0;
D_800A8210 = 0; D_800A8210 = 0;
D_800AEF9C = func_800712C4(D_800AEF9C); D_800AEF9C = func_800712C4(D_800AEF9C);
D_800C4B20 = 0; nuGfxZBuffer = 0;
} }
INCLUDE_ASM(const s32, "main", func_800733F8); INCLUDE_ASM(const s32, "main", func_800733F8);
@ -400,15 +401,11 @@ void func_800737A0(void) {
/* 3C2C 8007382C */ /* 3C2C 8007382C */
void func_8007382C(void) { void func_8007382C(void) {
u32 temp_a1;
if (__get_compared_osTvType() != 0) if (__get_compared_osTvType() != 0)
return; return;
if (D_800A8213 != 0) { if (D_800A8213 != 0) {
temp_a1 = D_800C4B20 - 0x80000000; gDPSetDepthImage(obPtrDisplayList++, OS_K0_TO_PHYSICAL(nuGfxZBuffer));
gDPSetDepthImage(obPtrDisplayList++, temp_a1);
gDPPipeSync(obPtrDisplayList++); gDPPipeSync(obPtrDisplayList++);
@ -417,7 +414,7 @@ void func_8007382C(void) {
gDPPipeSync(obPtrDisplayList++); gDPPipeSync(obPtrDisplayList++);
gDPSetRenderMode(obPtrDisplayList++, G_RM_NOOP, G_RM_NOOP2); gDPSetRenderMode(obPtrDisplayList++, G_RM_NOOP, G_RM_NOOP2);
gDPSetColorImage(obPtrDisplayList++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, temp_a1); gDPSetColorImage(obPtrDisplayList++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, OS_K0_TO_PHYSICAL(nuGfxZBuffer));
gDPSetFillColor(obPtrDisplayList++, 0xFFFCFFFC); gDPSetFillColor(obPtrDisplayList++, 0xFFFCFFFC);
gDPPipeSync(obPtrDisplayList++); gDPPipeSync(obPtrDisplayList++);