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

* 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

View File

@@ -73,7 +73,7 @@ void Moji_SetPosition(s32 gridX, s32 gridY) {
void Moji_DrawChar(GraphicsContext* gfxCtx, char c) {
s32 pad[2];
OPEN_DISPS(gfxCtx, "../z_moji.c", 86);
OPEN_DISPS(gfxCtx);
if ((u32)gMojiFontTLUTs & 0xF) {
osSyncPrintf("moji_tlut --> %X\n", gMojiFontTLUTs);
@@ -87,7 +87,7 @@ void Moji_DrawChar(GraphicsContext* gfxCtx, char c) {
(sScreenPosY + DISP_CHAR_HEIGHT) << 2, G_TX_RENDERTILE, GET_TEX_CHAR_S(c), GET_TEX_CHAR_T(c),
(1 << 10) * TEX_CHAR_WIDTH / DISP_CHAR_WIDTH, (1 << 10) * TEX_CHAR_HEIGHT / DISP_CHAR_HEIGHT);
CLOSE_DISPS(gfxCtx, "../z_moji.c", 123);
CLOSE_DISPS(gfxCtx);
}
/**
@@ -99,7 +99,7 @@ void Moji_DrawChar(GraphicsContext* gfxCtx, char c) {
void Moji_DrawString(GraphicsContext* gfxCtx, const char* str) {
s32 i;
OPEN_DISPS(gfxCtx, "../z_moji.c", 137);
OPEN_DISPS(gfxCtx);
if ((u32)gMojiFontTex & 0xF) {
osSyncPrintf("font_ff --> %X\n", gMojiFontTex);
@@ -140,5 +140,5 @@ void Moji_DrawString(GraphicsContext* gfxCtx, const char* str) {
}
}
CLOSE_DISPS(gfxCtx, "../z_moji.c", 181);
CLOSE_DISPS(gfxCtx);
}