github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 13:00:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 0d85caaf7e.

* 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
commit a5df9dddf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
467 changed files with 3081 additions and 3459 deletions
Download patch file Download diff file Expand all files Collapse all files

12
soh/src/code/z_message_PAL.c
View file

@ -1629,7 +1629,7 @@ void Message_OpenText(GlobalContext* globalCtx, u16 textId) {
// OTRTODO
//DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)(_staff_message_data_staticSegmentRomStart + 4 + font->msgOffset),
//font->msgLength, "../z_message_PAL.c", 1954);
//font->msgLength, __FILE__, __LINE__);
} else {
Message_FindMessage(globalCtx, textId);
msgCtx->msgLength = font->msgLength;
@ -2869,7 +2869,6 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
break;
}
if (1) {}
if (sOcarinaNotesAlphaValues[i] != 255) {
sOcarinaNotesAlphaValues[i] += VREG(50);
if (sOcarinaNotesAlphaValues[i] >= 255) {
@ -2922,7 +2921,7 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) {
static s16 sFillTimer = 0;
s32 pad;
OPEN_DISPS(gfxCtx, "../z_message_PAL.c", 3485);
OPEN_DISPS(gfxCtx);
if (sVarLastValue != *var) {
sVarLastValue = *var;
@ -2943,7 +2942,7 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) {
gDPFillRectangle(POLY_OPA_DISP++, 40, 120, 60, 140); // 20x20 white box
gDPPipeSync(POLY_OPA_DISP++);
}
CLOSE_DISPS(gfxCtx, "../z_message_PAL.c", 3513);
CLOSE_DISPS(gfxCtx);
}
void Message_DrawDebugText(GlobalContext* globalCtx, Gfx** p) {
@ -2969,7 +2968,7 @@ void Message_Draw(GlobalContext* globalCtx) {
Gfx* polyOpaP;
s16 watchVar;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_message_PAL.c", 3554);
OPEN_DISPS(globalCtx->state.gfxCtx);
watchVar = gSaveContext.scarecrowCustomSongSet;
Message_DrawDebugVariableChanged(&watchVar, globalCtx->state.gfxCtx);
@ -2981,14 +2980,13 @@ void Message_Draw(GlobalContext* globalCtx) {
Graph_BranchDlist(polyOpaP, plusOne);
POLY_OPA_DISP = plusOne;
}
if (1) {}
plusOne = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP);
gSPDisplayList(OVERLAY_DISP++, plusOne);
Message_DrawMain(globalCtx, &plusOne);
gSPEndDisplayList(plusOne++);
Graph_BranchDlist(polyOpaP, plusOne);
POLY_OPA_DISP = plusOne;
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_message_PAL.c", 3582);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Message_Update(GlobalContext* globalCtx) {