mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-07-16 10:02:59 -07:00
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 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:
parent
a9c3c7541e
commit
a5df9dddf0
467 changed files with 3081 additions and 3459 deletions
|
@ -11,7 +11,7 @@ void Sample_Draw(SampleContext* this) {
|
|||
GraphicsContext* gfxCtx = this->state.gfxCtx;
|
||||
View* view = &this->view;
|
||||
|
||||
OPEN_DISPS(gfxCtx, "../z_sample.c", 62);
|
||||
OPEN_DISPS(gfxCtx);
|
||||
|
||||
gSPSegment(POLY_OPA_DISP++, 0x00, NULL);
|
||||
gSPSegment(POLY_OPA_DISP++, 0x01, this->staticSegment);
|
||||
|
@ -36,7 +36,7 @@ void Sample_Draw(SampleContext* this) {
|
|||
gDPSetCombineMode(POLY_OPA_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
|
||||
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 0, 0);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_sample.c", 111);
|
||||
CLOSE_DISPS(gfxCtx);
|
||||
}
|
||||
|
||||
void Sample_Main(GameState* thisx) {
|
||||
|
@ -79,8 +79,8 @@ void Sample_SetupView(SampleContext* this) {
|
|||
void Sample_LoadTitleStatic(SampleContext* this) {
|
||||
size_t size = _title_staticSegmentRomEnd - _title_staticSegmentRomStart;
|
||||
|
||||
this->staticSegment = GameState_Alloc(&this->state, size, "../z_sample.c", 163);
|
||||
DmaMgr_SendRequest1(this->staticSegment, _title_staticSegmentRomStart, size, "../z_sample.c", 164);
|
||||
this->staticSegment = GAMESTATE_ALLOC_MC(&this->state, size);
|
||||
DmaMgr_SendRequest1(this->staticSegment, _title_staticSegmentRomStart, size, __FILE__, __LINE__);
|
||||
}
|
||||
|
||||
void Sample_Init(GameState* thisx) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue