From f818fb5299980e5630d490140b325c228f9776b8 Mon Sep 17 00:00:00 2001 From: Random <28494085+Random0666@users.noreply.github.com> Date: Sat, 4 Apr 2020 18:12:59 +0200 Subject: Decompile graph.c - decompile `graph.c` (2 non-matchings left) - decompile `z_game_dlftbls.c` - add noop macros in `gbi.h` --- src/code/z_debug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/code/z_debug.c') diff --git a/src/code/z_debug.c b/src/code/z_debug.c index e5bc9199f..a4febc4c7 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -223,10 +223,10 @@ void func_80063D7C(GraphicsContext* gfxCtx) { void* unk[2]; Gfx* dlFrame[4]; // stores state of GfxCtx next ptrs - func_800C6AC4(&dlFrame, gfxCtx, "../z_debug.c", 628); + Graph_OpenDisp(&dlFrame, gfxCtx, "../z_debug.c", 628); GfxPrint_Ctor(&gfxPrint); sp78 = gfxCtx->polyOpa.p; - tempRet = func_800C6C20(gfxCtx->polyOpa.p); + tempRet = Graph_GfxPlusOne(gfxCtx->polyOpa.p); gSPDisplayList(gfxCtx->overlay.p++, tempRet); GfxPrint_Open(&gfxPrint, tempRet); @@ -241,9 +241,9 @@ void func_80063D7C(GraphicsContext* gfxCtx) { D_8011E0B0 = 0; sp7C = GfxPrint_Close(&gfxPrint); gSPEndDisplayList(sp7C++); - func_800C6C28(sp78, sp7C); + Graph_BranchDlist(sp78, sp7C); gfxCtx->polyOpa.p = sp7C; if (0) {} - func_800C6B54(&dlFrame, gfxCtx, "../z_debug.c", 664); + Graph_CloseDisp(&dlFrame, gfxCtx, "../z_debug.c", 664); GfxPrint_Dtor(&gfxPrint); } -- cgit v1.2.3 From 43acba22a94c4e90a237dda5a3376c099633cbda Mon Sep 17 00:00:00 2001 From: Random <28494085+Random0666@users.noreply.github.com> Date: Sun, 5 Apr 2020 19:29:30 +0200 Subject: Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs --- src/code/z_debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/code/z_debug.c') diff --git a/src/code/z_debug.c b/src/code/z_debug.c index a4febc4c7..adda7974b 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -221,9 +221,9 @@ void func_80063D7C(GraphicsContext* gfxCtx) { void* unk2[6]; GfxPrint gfxPrint; void* unk[2]; - Gfx* dlFrame[4]; // stores state of GfxCtx next ptrs + Gfx* dispRefs[4]; // stores state of GfxCtx next ptrs - Graph_OpenDisp(&dlFrame, gfxCtx, "../z_debug.c", 628); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_debug.c", 628); GfxPrint_Ctor(&gfxPrint); sp78 = gfxCtx->polyOpa.p; tempRet = Graph_GfxPlusOne(gfxCtx->polyOpa.p); @@ -244,6 +244,6 @@ void func_80063D7C(GraphicsContext* gfxCtx) { Graph_BranchDlist(sp78, sp7C); gfxCtx->polyOpa.p = sp7C; if (0) {} - Graph_CloseDisp(&dlFrame, gfxCtx, "../z_debug.c", 664); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_debug.c", 664); GfxPrint_Dtor(&gfxPrint); } -- cgit v1.2.3