diff options
| author | Baoulettes <perlouzerie@hotmail.fr> | 2022-07-06 01:29:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-05 19:29:34 -0400 |
| commit | a5df9dddf06adc328dea2877d1f21d1836653b35 (patch) | |
| tree | c333cbf26b7caf5d940788b38b5a696fe7dda848 /soh/src/code/code_800EC960.c | |
| parent | a9c3c7541e927e31b671e94ceaa43df73df5a8d7 (diff) | |
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
Diffstat (limited to 'soh/src/code/code_800EC960.c')
| -rw-r--r-- | soh/src/code/code_800EC960.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c index 8e1694b7c..c5d150984 100644 --- a/soh/src/code/code_800EC960.c +++ b/soh/src/code/code_800EC960.c @@ -1558,7 +1558,6 @@ void func_800ED458(s32 arg0) { if ((D_8016BA10 == 0) || ((D_8016BA10 & sOcarinaAllowedBtnMask) != (sCurOcarinaBtnPress & sOcarinaAllowedBtnMask))) { D_8016BA10 = 0; - if (1) {} sCurOcarinaBtnVal = 0xFF; sCurOcarinaBtnIdx = 0xFF; phi_v1_2 = (sCurOcarinaBtnPress & sOcarinaAllowedBtnMask) & (sPrevOcarinaBtnPress & sOcarinaAllowedBtnMask); @@ -1802,7 +1801,6 @@ void func_800EDD68(u8 arg0) { lastNote = song[i].noteIdx; } - if (1) {} if (sRecordSongPos != (i + 1)) { sRecordSongPos = i + 2; @@ -2030,7 +2028,6 @@ s32 Audio_OcaMemoryGameGenNote(void) { sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos].unk_02 = 0; sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos + 1].noteIdx = 0xFF; sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos + 1].unk_02 = 0; - if (1) {} return 0; } @@ -3014,14 +3011,12 @@ void AudioDebug_ProcessInput_SndCont(void) { if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { if (sAudioSndContSel == 0) { - if (1) {} func_800F595C(sAudioSndContWork[sAudioSndContSel]); } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CRIGHT)) { if (sAudioSndContSel == 0) { - if (1) {} func_800F5ACC(sAudioSndContWork[sAudioSndContSel]); } } |