diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 7710ed1799..6a648ed5ce 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -1861,7 +1861,7 @@ void DmaMgr_ThreadEntry(void* arg0) { s32 DmaMgr_SendRequestImpl(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk, OSMesgQueue* queue, OSMesg msg) { static s32 sDmaMgrQueueFullLogged = 0; - if ((1 && (ram == 0)) || (osMemSize < ram + size + 0x80000000) || (vrom & 1) || (vrom > 0x4000000U) || + if ((1 && (ram == 0)) || (osMemSize < ram + size + 0x80000000) || (vrom & 1) || (vrom > 0x4000000) || (size == 0) || (size & 1)) { DmaMgr_Error(req, NULL, "ILLIGAL DMA-FUNCTION CALL", "パラメータ異常です"); } diff --git a/src/code/audio_playback.c b/src/code/audio_playback.c index 57568d37ab..bc4eea75a2 100644 --- a/src/code/audio_playback.c +++ b/src/code/audio_playback.c @@ -169,7 +169,7 @@ void Audio_ProcessNotes(void) { noteSubEu2 = &gAudioContext.noteSubsEu[gAudioContext.noteSubEuOffset + i]; playbackState = ¬e->playbackState; if (playbackState->parentLayer != NO_LAYER) { - if ((u32)playbackState->parentLayer < 0x7FFFFFFFU) { + if ((u32)playbackState->parentLayer < 0x7FFFFFFF) { continue; } @@ -349,7 +349,7 @@ Drum* Audio_GetDrum(s32 bankId, s32 drumId) { gAudioContext.audioErrorFlags = ((bankId << 8) + drumId) + 0x4000000; return NULL; } - if ((u32)gAudioContext.ctlEntries[bankId].drums < 0x80000000U) { + if ((u32)gAudioContext.ctlEntries[bankId].drums < 0x80000000) { return NULL; } drum = gAudioContext.ctlEntries[bankId].drums[drumId]; @@ -378,7 +378,7 @@ AudioBankSound* Audio_GetSfx(s32 bankId, s32 sfxId) { return NULL; } - if ((u32)gAudioContext.ctlEntries[bankId].soundEffects < 0x80000000U) { + if ((u32)gAudioContext.ctlEntries[bankId].soundEffects < 0x80000000) { return NULL; } diff --git a/src/code/code_800C3C20.c b/src/code/code_800C3C20.c index 65402c3e2c..72596fbf22 100644 --- a/src/code/code_800C3C20.c +++ b/src/code/code_800C3C20.c @@ -7,7 +7,7 @@ u8 D_8012D200[] = { void func_800C3C20(void) { s32 i; - for (i = 0; (i < ARRAY_COUNT(D_8012D200)) & 0xFFFFFFFFu; i++) { + for (i = 0; (i < ARRAY_COUNT(D_8012D200)) & 0xFFFFFFFF; i++) { func_800F87A0(D_8012D200[i]); } } diff --git a/src/code/main.c b/src/code/main.c index 94858bfde9..7afc300816 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -56,7 +56,7 @@ void Main(void* arg) { // "System heap initalization" osSyncPrintf("システムヒープ初期化 %08x-%08x %08x\n", sysHeap, fb, gSystemHeapSize); SystemHeap_Init(sysHeap, gSystemHeapSize); // initializes the system heap - if (osMemSize >= 0x800000U) { + if (osMemSize >= 0x800000) { debugHeap = SysCfb_GetFbEnd(); debugHeapSize = (s32)(0x80600000 - debugHeap); } else { diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index b90da9c6d9..3c65b7aec3 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -7,7 +7,7 @@ void SysCfb_Init(s32 n64dd) { u32 screenSize; u32 tmpFbEnd; - if (osMemSize >= 0x800000U) { + if (osMemSize >= 0x800000) { // "8MB or more memory is installed" osSyncPrintf("8Mバイト以上のメモリが搭載されています\n"); tmpFbEnd = 0x8044BE80; @@ -19,7 +19,7 @@ void SysCfb_Init(s32 n64dd) { osSyncPrintf("このバージョンのマージンは %dK バイトです\n", (0x4BC00 / 1024)); sSysCfbEnd = tmpFbEnd; } - } else if (osMemSize >= 0x400000U) { + } else if (osMemSize >= 0x400000) { osSyncPrintf("RAM4M mode\n"); sSysCfbEnd = 0x80400000; } else { diff --git a/src/code/z_play.c b/src/code/z_play.c index 6d45532ae4..7933d67f7e 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -244,7 +244,7 @@ void Gameplay_Init(GameState* thisx) { gSaveContext.cutsceneIndex = 0; } - if (gSaveContext.nextDayTime != 0xFFFFU) { + if (gSaveContext.nextDayTime != 0xFFFF) { gSaveContext.dayTime = gSaveContext.nextDayTime; gSaveContext.skyboxTime = gSaveContext.nextDayTime; } diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 356ffee17e..44287017b2 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -461,7 +461,7 @@ void Sram_WriteSave(SramContext* sramCtx) { j = 0; for (offset = 0; offset < CHECKSUM_SIZE; offset++) { - if (++j == 0x20U) { + if (++j == 0x20) { j = 0; } checksum += *ptr++; @@ -473,7 +473,7 @@ void Sram_WriteSave(SramContext* sramCtx) { checksum = 0; for (offset = 0; offset < CHECKSUM_SIZE; offset++) { - if (++j == 0x20U) { + if (++j == 0x20) { j = 0; } checksum += *ptr++; @@ -486,7 +486,7 @@ void Sram_WriteSave(SramContext* sramCtx) { checksum = 0; for (offset = 0; offset < CHECKSUM_SIZE; offset++) { - if (++j == 0x20U) { + if (++j == 0x20) { j = 0; } checksum += *ptr++; @@ -715,7 +715,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { for (offset = 0; offset < CHECKSUM_SIZE; offset++) { osSyncPrintf("%x ", *ptr); checksum += *ptr++; - if (++j == 0x20u) { + if (++j == 0x20) { osSyncPrintf("\n"); j = 0; }