mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 23:44:53 +00:00
Code Issues Projects Releases Wiki Activity

Introduce OPEN_DISPS/CLOSE_DISPS macros (#360)

Browse source
This commit is contained in:
Roman971 2020-08-30 01:00:17 +02:00 • committed by GitHub
parent 1f1b5e39f5
commit 2a2fdf7f3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
134 changed files with 3133 additions and 3775 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/code/game.c
View file

@ -148,13 +148,11 @@ void GameState_DrawInputDisplay(u16 input, Gfx** gfx) {
void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) {
Gfx* newDList;
Gfx* polyOpaP;
Gfx* dispRefs[5];
char pad[0x8];
GfxPrint printChars;
Graph_OpenDisps(dispRefs, gfxCtx, "../game.c", 746);
newDList = Graph_GfxPlusOne(polyOpaP = gfxCtx->polyOpa.p);
gSPDisplayList(gfxCtx->overlay.p++, newDList);
OPEN_DISPS(gfxCtx, "../game.c", 746);
newDList = Graph_GfxPlusOne(polyOpaP = oGfxCtx->polyOpa.p);
gSPDisplayList(oGfxCtx->overlay.p++, newDList);
if (R_ENABLE_FB_FILTER == 1) {
GameState_SetFBFilter(&newDList);
@ -166,14 +164,19 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) {
}
if (R_ENABLE_AUDIO_DBG & 1) {
GfxPrint_Init(&printChars);
GfxPrint_Open(&printChars, newDList);
func_800EEA50(&printChars);
newDList = GfxPrint_Close(&printChars);
GfxPrint_Destroy(&printChars);
s32 pad;
GfxPrint printer;
GfxPrint_Init(&printer);
GfxPrint_Open(&printer, newDList);
func_800EEA50(&printer);
newDList = GfxPrint_Close(&printer);
GfxPrint_Destroy(&printer);
}
if (R_ENABLE_ARENA_DBG < 0) {
s32 pad;
DebugArena_Display();
SystemArena_Display();
//% 08x bytes left until the death of Hyrule (game_alloc)
@ -181,13 +184,13 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) {
R_ENABLE_ARENA_DBG = 0;
}
if (1) {
gSPEndDisplayList(newDList++);
Graph_BranchDlist(polyOpaP, newDList);
gfxCtx->polyOpa.p = newDList;
}
gSPEndDisplayList(newDList++);
Graph_BranchDlist(polyOpaP, newDList);
oGfxCtx->polyOpa.p = newDList;
Graph_CloseDisps(dispRefs, gfxCtx, "../game.c", 800);
if (1) {}
CLOSE_DISPS(gfxCtx, "../game.c", 800);
func_80063D7C(gfxCtx);
@ -198,41 +201,37 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) {
}
void GameState_SetFrameBuffer(GraphicsContext* gfxCtx) {
Gfx* dispRef[5];
OPEN_DISPS(gfxCtx, "../game.c", 814);
Graph_OpenDisps(dispRef, gfxCtx, "../game.c", 814);
gSPSegment(oGfxCtx->polyOpa.p++, 0, 0);
gSPSegment(oGfxCtx->polyOpa.p++, 0xF, gfxCtx->curFrameBuffer);
gSPSegment(oGfxCtx->polyOpa.p++, 0xE, gZBuffer);
gSPSegment(oGfxCtx->polyXlu.p++, 0, 0);
gSPSegment(oGfxCtx->polyXlu.p++, 0xF, gfxCtx->curFrameBuffer);
gSPSegment(oGfxCtx->polyXlu.p++, 0xE, gZBuffer);
gSPSegment(oGfxCtx->overlay.p++, 0, 0);
gSPSegment(oGfxCtx->overlay.p++, 0xF, gfxCtx->curFrameBuffer);
gSPSegment(oGfxCtx->overlay.p++, 0xE, gZBuffer);
gSPSegment(gfxCtx->polyOpa.p++, 0, 0);
gSPSegment(gfxCtx->polyOpa.p++, 0xF, gfxCtx->curFrameBuffer);
gSPSegment(gfxCtx->polyOpa.p++, 0xE, gZBuffer);
gSPSegment(gfxCtx->polyXlu.p++, 0, 0);
gSPSegment(gfxCtx->polyXlu.p++, 0xF, gfxCtx->curFrameBuffer);
gSPSegment(gfxCtx->polyXlu.p++, 0xE, gZBuffer);
gSPSegment(gfxCtx->overlay.p++, 0, 0);
gSPSegment(gfxCtx->overlay.p++, 0xF, gfxCtx->curFrameBuffer);
gSPSegment(gfxCtx->overlay.p++, 0xE, gZBuffer);
Graph_CloseDisps(dispRef, gfxCtx, "../game.c", 838);
CLOSE_DISPS(gfxCtx, "../game.c", 838);
}
void func_800C49F4(GraphicsContext* gfxCtx) {
Gfx* newDlist;
Gfx* polyOpaP;
Gfx* dispRefs[5];
Graph_OpenDisps(dispRefs, gfxCtx, "../game.c", 846);
OPEN_DISPS(gfxCtx, "../game.c", 846);
newDlist = Graph_GfxPlusOne(polyOpaP = gfxCtx->polyOpa.p);
gSPDisplayList(gfxCtx->overlay.p++, newDlist);
newDlist = Graph_GfxPlusOne(polyOpaP = oGfxCtx->polyOpa.p);
gSPDisplayList(oGfxCtx->overlay.p++, newDlist);
// necessary to match
if (1) {
gSPEndDisplayList(newDlist++);
Graph_BranchDlist(polyOpaP, newDlist);
gfxCtx->polyOpa.p = newDlist;
}
gSPEndDisplayList(newDlist++);
Graph_BranchDlist(polyOpaP, newDlist);
oGfxCtx->polyOpa.p = newDlist;
Graph_CloseDisps(dispRefs, gfxCtx, "../game.c", 865);
if (1) {}
CLOSE_DISPS(gfxCtx, "../game.c", 865);
}
void GameState_ReqPadData(GameState* gameState) {