nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use Macro for __FILE__ & __LINE__ when possible (#559)

Browse Source 
* First batch some overlay

* Almost all overlay

* effect & gamestate

* kaleido stuffs

* more overlay

* more left over from code folder

* remaining hardcoded line and file

* Open & Close _DISP __FILE__ & __LINE__ clean up

* Some if (1) {} remove

* LOG_xxxx __FILE__ , __LINE__ cleaned

* ASSERT macro __FILE__ __LINE__

* mtx without line/file in functions

* " if (1) {} " & "if (0) {}" and tab/white place

* LogUtils as macro

* GameState_, GameAlloc_, SystemArena_ & ZeldaArena_

* Revert "GameState_, GameAlloc_, SystemArena_ & ZeldaArena_"

This reverts commit 0d85caaf7e342648c01a15fe21e93637352dc596.

* Like last commit but as macro

* Fix matrix not using macros

* use function not macro

* DebugArena_* functions
GameAlloc_MallocDebug
BgCheck_PosErrorCheck as macros
removed issues with ; in macro file
This commit is contained in:
Baoulettes
2022-07-06 01:29:34 +02:00
committed by GitHub
parent a9c3c7541e
commit a5df9dddf0
467 changed files with 3081 additions and 3459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
soh/src/code/z_vismono.c
View File

@@ -23,7 +23,7 @@ void VisMono_Init(VisMono* this) {
}
void VisMono_Destroy(VisMono* this) {
SystemArena_FreeDebug(this->monoDl, "../z_vismono.c", 137);
SYSTEM_ARENA_FREE_DEBUG(this->monoDl);
}
void VisMono_UpdateTexture(VisMono* this, u16* tex) {
@@ -96,12 +96,12 @@ void VisMono_Draw(VisMono* this, Gfx** gfxp) {
glistpEnd = VisMono_DrawTexture(this, monoDL);
if (!(glistpEnd <= monoDL + DLSIZE)) {
LOG_ADDRESS("glistp_end", glistpEnd, "../z_vismono.c", 257);
LOG_ADDRESS("mono_dl", monoDL, "../z_vismono.c", 258);
LOG_ADDRESS("mono_dl + (1+3+1+1+80*(7+2+2+3)+1)", monoDL + DLSIZE, "../z_vismono.c", 259);
LOG_ADDRESS("(1+3+1+1+80*(7+2+2+3)+1)", DLSIZE, "../z_vismono.c", 260);
LOG_ADDRESS("glistp_end", glistpEnd);
LOG_ADDRESS("mono_dl", monoDL);
LOG_ADDRESS("mono_dl + (1+3+1+1+80*(7+2+2+3)+1)", monoDL + DLSIZE);
LOG_ADDRESS("(1+3+1+1+80*(7+2+2+3)+1)", DLSIZE);
}
ASSERT(glistpEnd <= monoDL + DLSIZE, "glistp_end <= mono_dl + DLSIZE", "../z_vismono.c", 262);
ASSERT(glistpEnd <= monoDL + DLSIZE);
}
gDPPipeSync(gfx++);
@@ -124,13 +124,13 @@ void VisMono_DrawOld(VisMono* this) {
Gfx* glistpEnd;
if (!this->tlut) {
this->tlut = SystemArena_MallocDebug(256 * sizeof(u16), "../z_vismono.c", 283);
this->tlut = SYSTEM_ARENA_MALLOC_DEBUG(256 * sizeof(u16));
VisMono_UpdateTexture(this, this->tlut);
}
if (!this->monoDl) {
this->monoDl = SystemArena_MallocDebug(DLSIZE * sizeof(Gfx), "../z_vismono.c", 289);
this->monoDl = SYSTEM_ARENA_MALLOC_DEBUG(DLSIZE * sizeof(Gfx));
glistpEnd = VisMono_DrawTexture(this, this->monoDl);
ASSERT(glistpEnd <= this->monoDl + DLSIZE, "glistp_end <= this->mono_dl + DLSIZE", "../z_vismono.c", 292);
ASSERT(glistpEnd <= this->monoDl + DLSIZE);
}
}