summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/__osMalloc.c2
-rw-r--r--src/code/audio_effects.c2
-rw-r--r--src/code/audio_playback.c22
-rw-r--r--src/code/audio_sound_params.c30
-rw-r--r--src/code/code_800C3C20.c2
-rw-r--r--src/code/code_800EC960.c40
-rw-r--r--src/code/debug_malloc.c2
-rw-r--r--src/code/fault.c81
-rw-r--r--src/code/fault_drawer.c26
-rw-r--r--src/code/graph.c4
-rw-r--r--src/code/main.c6
-rw-r--r--src/code/sched.c8
-rw-r--r--src/code/sys_cfb.c6
-rw-r--r--src/code/z_actor.c16
-rw-r--r--src/code/z_kaleido_manager.c4
-rw-r--r--src/code/z_play.c2
-rw-r--r--src/code/z_player_lib.c5
-rw-r--r--src/code/z_sram.c8
-rw-r--r--src/code/z_vismono.c2
19 files changed, 140 insertions, 128 deletions
diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c
index 113e1444f..b27392753 100644
--- a/src/code/__osMalloc.c
+++ b/src/code/__osMalloc.c
@@ -708,7 +708,7 @@ void __osDisplayArena(Arena* arena) {
if (!iter->isFree) {
osSyncPrintf(" [%016llu:%2d:%s:%d]", OS_CYCLES_TO_NSEC(iter->time), iter->threadId,
- iter->filename ? iter->filename : "**NULL**", iter->line);
+ iter->filename != NULL ? iter->filename : "**NULL**", iter->line);
}
osSyncPrintf("\n");
diff --git a/src/code/audio_effects.c b/src/code/audio_effects.c
index 73b5c9d1a..afe2bee38 100644
--- a/src/code/audio_effects.c
+++ b/src/code/audio_effects.c
@@ -86,7 +86,7 @@ f32 Audio_GetPortamentoFreqScale(Portamento* p) {
f32 result;
p->cur += p->speed;
- loResCur = (p->cur >> 8) & 0xff;
+ loResCur = (p->cur >> 8) & 0xFF;
if (loResCur >= 127) {
loResCur = 127;
diff --git a/src/code/audio_playback.c b/src/code/audio_playback.c
index 970aaf8f2..bc4eea75a 100644
--- a/src/code/audio_playback.c
+++ b/src/code/audio_playback.c
@@ -32,16 +32,16 @@ void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) {
sub->bitField0.s.usesHeadsetPanEffects = sp24.usesHeadsetPanEffects;
if (stereoHeadsetEffects && gAudioContext.soundMode == 1) {
smallPanIndex = pan >> 1;
- if (smallPanIndex > 0x3f) {
- smallPanIndex = 0x3f;
+ if (smallPanIndex > 0x3F) {
+ smallPanIndex = 0x3F;
}
sub->headsetPanLeft = gHeadsetPanQuantization[smallPanIndex];
- sub->headsetPanRight = gHeadsetPanQuantization[0x3f - smallPanIndex];
+ sub->headsetPanRight = gHeadsetPanQuantization[0x3F - smallPanIndex];
sub->bitField1.s.usesHeadsetPanEffects2 = true;
volLeft = gHeadsetPanVolume[pan];
- volRight = gHeadsetPanVolume[0x7f - pan];
+ volRight = gHeadsetPanVolume[0x7F - pan];
} else if (stereoHeadsetEffects && gAudioContext.soundMode == 0) {
strongLeft = strongRight = 0;
sub->headsetPanRight = 0;
@@ -49,7 +49,7 @@ void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) {
sub->bitField1.s.usesHeadsetPanEffects2 = false;
volLeft = gStereoPanVolume[pan];
- volRight = gStereoPanVolume[0x7f - pan];
+ volRight = gStereoPanVolume[0x7F - pan];
if (pan < 0x20) {
strongLeft = 1;
} else if (pan > 0x60) {
@@ -85,7 +85,7 @@ void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) {
sub->bitField0.s.stereoStrongRight = sp24.strongRight;
sub->bitField0.s.stereoStrongLeft = sp24.strongLeft;
volLeft = gDefaultPanVolume[pan];
- volRight = gDefaultPanVolume[0x7f - pan];
+ volRight = gDefaultPanVolume[0x7F - pan];
}
vel = 0.0f > vel ? 0.0f : vel;
@@ -169,7 +169,7 @@ void Audio_ProcessNotes(void) {
noteSubEu2 = &gAudioContext.noteSubsEu[gAudioContext.noteSubEuOffset + i];
playbackState = &note->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;
}
@@ -570,7 +570,7 @@ void Audio_InitSyntheticWave(Note* note, SequenceChannelLayer* seqLayer) {
s32 waveSampleCountIndex;
s32 waveId = seqLayer->instOrWave;
- if (waveId == 0xff) {
+ if (waveId == 0xFF) {
waveId = seqLayer->seqChannel->instOrWave;
}
@@ -761,7 +761,7 @@ void Audio_NoteInitForLayer(Note* note, SequenceChannelLayer* seqLayer) {
Audio_NoteInit(note);
instId = seqLayer->instOrWave;
- if (instId == 0xff) {
+ if (instId == 0xFF) {
instId = seqLayer->seqChannel->instOrWave;
}
sub->sound.audioBankSound = seqLayer->sound;
diff --git a/src/code/audio_sound_params.c b/src/code/audio_sound_params.c
index a0ce29630..2b90e5b98 100644
--- a/src/code/audio_sound_params.c
+++ b/src/code/audio_sound_params.c
@@ -109,7 +109,7 @@ SoundParams sPlayerBankParams[] = {
{ 0x30, 0x400 }, { 0x30, 0x400 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x80 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x3 }, { 0x30, 0x1 }, { 0x30, 0x0 }, { 0x30, 0x0 },
- { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x2000 }, { 0x30, 0xc00 }, { 0x30, 0x400 },
+ { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x2000 }, { 0x30, 0xC00 }, { 0x30, 0x400 },
{ 0x30, 0x400 }, { 0x30, 0x400 }, { 0x20, 0x80 }, { 0x20, 0x80 }, { 0x20, 0x80 }, { 0x20, 0x80 },
{ 0x20, 0x40 }, { 0x20, 0x40 }, { 0x20, 0x40 }, { 0x20, 0x40 }, { 0x20, 0x80 }, { 0x20, 0x80 },
{ 0x20, 0x80 }, { 0x20, 0x0 }, { 0x20, 0x0 }, { 0x20, 0x0 }, { 0x20, 0x0 }, { 0x20, 0x0 },
@@ -121,7 +121,7 @@ SoundParams sPlayerBankParams[] = {
{ 0x40, 0x0 }, { 0x40, 0x0 }, { 0x30, 0x440 }, { 0x30, 0x440 }, { 0x30, 0x440 }, { 0x30, 0x440 },
{ 0x30, 0x440 }, { 0x30, 0x440 }, { 0x30, 0x440 }, { 0x30, 0x440 }, { 0x30, 0x440 }, { 0x30, 0x440 },
{ 0x30, 0x440 }, { 0x30, 0x440 }, { 0x30, 0x440 }, { 0x30, 0x440 }, { 0x30, 0x440 }, { 0x30, 0x440 },
- { 0x30, 0xc00 }, { 0x30, 0x80 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
+ { 0x30, 0xC00 }, { 0x30, 0x80 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x60, 0x2 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x800 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
@@ -137,7 +137,7 @@ SoundParams sItemBankParams[] = {
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x40, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x80 }, { 0x30, 0x40 }, { 0x30, 0x400 }, { 0x20, 0x400 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x400 }, { 0x30, 0x400 }, { 0x60, 0x43 },
- { 0x30, 0x1 }, { 0x30, 0x401 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0xa0, 0x2 }, { 0xa0, 0x2 },
+ { 0x30, 0x1 }, { 0x30, 0x401 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0xA0, 0x2 }, { 0xA0, 0x2 },
{ 0x30, 0x400 }, { 0x30, 0x0 }, { 0x60, 0x0 }, { 0x60, 0x0 }, { 0x60, 0x0 }, { 0x30, 0x400 },
{ 0x30, 0x0 }, { 0x60, 0x81 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x60, 0x8003 }, { 0x60, 0x8003 },
{ 0x60, 0x8003 }, { 0x30, 0x4000 }, { 0x30, 0x4000 }, { 0x30, 0x40 }, { 0x80, 0x3 }, { 0x80, 0x3 },
@@ -148,26 +148,26 @@ SoundParams sItemBankParams[] = {
SoundParams sEnvBankParams[] = {
{ 0x70, 0x640 }, { 0x80, 0x40 }, { 0x30, 0x0 }, { 0x30, 0x40 }, { 0x30, 0x40 }, { 0x40, 0x40 },
- { 0x30, 0x480 }, { 0x38, 0x2 }, { 0x30, 0x40 }, { 0x30, 0x40 }, { 0x80, 0x2 }, { 0xa0, 0x3 },
+ { 0x30, 0x480 }, { 0x38, 0x2 }, { 0x30, 0x40 }, { 0x30, 0x40 }, { 0x80, 0x2 }, { 0xA0, 0x3 },
{ 0x30, 0x3 }, { 0x30, 0x3 }, { 0x30, 0x3 }, { 0x30, 0x3 }, { 0x30, 0x2 }, { 0x30, 0x40 },
{ 0x30, 0x40 }, { 0x30, 0x0 }, { 0x60, 0x0 }, { 0x30, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x82 },
{ 0x30, 0x0 }, { 0x40, 0x0 }, { 0x38, 0x0 }, { 0x28, 0x0 }, { 0x60, 0x0 }, { 0x70, 0x3 },
- { 0x30, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0xa0, 0x2008 }, { 0x20, 0x2 }, { 0x30, 0x0 },
+ { 0x30, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0xA0, 0x2008 }, { 0x20, 0x2 }, { 0x30, 0x0 },
{ 0x30, 0x800 }, { 0x30, 0x8800 }, { 0x30, 0x8000 }, { 0x30, 0x2 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x400 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x80 },
- { 0x60, 0x42 }, { 0x10, 0x0 }, { 0xa0, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x10 }, { 0x30, 0x3 },
- { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x2 }, { 0x30, 0x0 }, { 0xa0, 0x3 },
+ { 0x60, 0x42 }, { 0x10, 0x0 }, { 0xA0, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x10 }, { 0x30, 0x3 },
+ { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x2 }, { 0x30, 0x0 }, { 0xA0, 0x3 },
{ 0x30, 0x0 }, { 0x30, 0x400 }, { 0x30, 0x400 }, { 0x70, 0x13 }, { 0x60, 0x8000 }, { 0x30, 0x8000 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x2003 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x2010 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
- { 0x30, 0x1 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x40, 0x0 }, { 0x30, 0xc2 }, { 0x70, 0x2 },
+ { 0x30, 0x1 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x40, 0x0 }, { 0x30, 0xC2 }, { 0x70, 0x2 },
{ 0x60, 0x2 }, { 0x30, 0x0 }, { 0x60, 0x1 }, { 0x30, 0x2 }, { 0x30, 0x0 }, { 0x90, 0x3 },
{ 0x90, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x2 }, { 0x30, 0x3800 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x803 }, { 0x30, 0x0 }, { 0x30, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x2 }, { 0x30, 0x0 },
- { 0x30, 0x0 }, { 0x30, 0x2 }, { 0x30, 0x2 }, { 0x30, 0x2 }, { 0x40, 0x0 }, { 0x1c, 0x0 },
+ { 0x30, 0x0 }, { 0x30, 0x2 }, { 0x30, 0x2 }, { 0x30, 0x2 }, { 0x40, 0x0 }, { 0x1C, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x60, 0x200 }, { 0x30, 0x800 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x3 },
@@ -179,23 +179,23 @@ SoundParams sEnvBankParams[] = {
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x3 }, { 0x60, 0x3 },
{ 0x30, 0x80 }, { 0x30, 0x2000 }, { 0x30, 0x0 }, { 0x30, 0x1 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x2 }, { 0x30, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
- { 0x30, 0x0 }, { 0x30, 0x0 }, { 0xa0, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
- { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0xc0 }, { 0x30, 0x2 },
+ { 0x30, 0x0 }, { 0x30, 0x0 }, { 0xA0, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
+ { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0xC0 }, { 0x30, 0x2 },
{ 0x30, 0x2 }, { 0x30, 0x0 }, { 0x30, 0x3 }, { 0x30, 0x3 }, { 0x30, 0x0 }, { 0x30, 0x4083 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x80, 0x0 }, { 0x60, 0x0 }, { 0x90, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
- { 0x60, 0xc3 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x3 }, { 0x30, 0x3 }, { 0x30, 0x0 },
- { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0xa0, 0x800 }, { 0x30, 0x0 },
+ { 0x60, 0xC3 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x3 }, { 0x30, 0x3 }, { 0x30, 0x0 },
+ { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0xA0, 0x800 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x2 }, { 0x30, 0x0 }, { 0x30, 0x3 }, { 0x20, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 },
};
SoundParams sSystemBankParams[] = {
- { 0xc0, 0x0 }, { 0xc0, 0x0 }, { 0xb0, 0x20 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x50, 0x0 },
+ { 0xC0, 0x0 }, { 0xC0, 0x0 }, { 0xB0, 0x20 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x50, 0x0 },
{ 0x30, 0x20 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x20, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x28, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
- { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x18, 0x0 }, { 0x2c, 0x0 }, { 0x2c, 0x0 }, { 0x20, 0x0 },
+ { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x18, 0x0 }, { 0x2C, 0x0 }, { 0x2C, 0x0 }, { 0x20, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x20, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
{ 0x30, 0x0 }, { 0x30, 0x0 }, { 0x60, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 }, { 0x30, 0x0 },
diff --git a/src/code/code_800C3C20.c b/src/code/code_800C3C20.c
index 65402c3e2..72596fbf2 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/code_800EC960.c b/src/code/code_800EC960.c
index d3ab8cda4..92b7020cf 100644
--- a/src/code/code_800EC960.c
+++ b/src/code/code_800EC960.c
@@ -140,42 +140,42 @@ u8 D_80130658[0x70] = {
s8 sSpecReverbs[20] = { 0, 0, 0, 0, 0, 0, 0, 40, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
D_801306DC_s D_801306DC[20] = {
- { 0xc0ff, 0xc0fe, { 0, 2, 0, 0, 3, 0, 1, 2, 9, 1, 3, 64, 1, 4, 0, 1, 5, 32, 2, 2, 4, 2, 3,
+ { 0xC0FF, 0XC0FE, { 0, 2, 0, 0, 3, 0, 1, 2, 9, 1, 3, 64, 1, 4, 0, 1, 5, 32, 2, 2, 4, 2, 3,
0, 2, 4, 1, 2, 5, 16, 3, 2, 10, 3, 3, 112, 3, 4, 1, 3, 5, 48, 4, 2, 14, 4,
3, 127, 4, 4, 0, 4, 5, 16, 5, 2, 0, 5, 3, 127, 5, 4, 1, 5, 5, 16, 6, 2, 1,
6, 3, 127, 6, 4, 3, 6, 5, 16, 7, 2, 17, 7, 3, 127, 7, 4, 1, 7, 5, 16, 0xFF } },
- { 0xc0fb, 0xc0fa, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 3, 2, 11, 3, 3, 112, 3, 4, 1,
+ { 0xC0FB, 0xC0FA, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 3, 2, 11, 3, 3, 112, 3, 4, 1,
3, 5, 48, 4, 2, 14, 4, 3, 127, 4, 4, 0, 4, 5, 16, 5, 2, 0, 5, 3, 127, 5, 4, 1, 5, 5, 16,
6, 2, 1, 6, 3, 127, 6, 4, 3, 6, 5, 16, 7, 2, 17, 7, 3, 127, 7, 4, 1, 7, 5, 16, 0xFF } },
- { 0xc001, 0x4000, { 0, 2, 0, 0, 3, 0, 2, 2, 11, 2, 3, 48, 2, 4, 1, 2, 5, 32, 0xFF } },
- { 0xc005, 0x4000, { 0, 2, 1, 0, 3, 32, 2, 2, 11, 2, 3, 48, 2, 4, 1, 2, 5, 32, 0xFF } },
- { 0xc01f,
- 0xc000,
+ { 0xC001, 0x4000, { 0, 2, 0, 0, 3, 0, 2, 2, 11, 2, 3, 48, 2, 4, 1, 2, 5, 32, 0xFF } },
+ { 0xC005, 0x4000, { 0, 2, 1, 0, 3, 32, 2, 2, 11, 2, 3, 48, 2, 4, 1, 2, 5, 32, 0xFF } },
+ { 0xC01F,
+ 0xC000,
{ 0, 2, 0, 0, 3, 47, 1, 2, 13, 1, 3, 0, 1, 4, 1, 1, 5, 16, 2, 2, 16, 2, 3, 0, 2, 4, 1, 2,
5, 32, 3, 2, 14, 3, 3, 0, 3, 4, 0, 3, 5, 44, 4, 2, 11, 4, 3, 63, 4, 4, 1, 4, 5, 44, 0xFF } },
- { 0xc003, 0xc000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
- { 0xc0fb, 0xc0fa, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 3, 2, 11, 3, 3, 112, 3, 4, 1,
+ { 0xC003, 0xC000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
+ { 0xC0FB, 0xC0FA, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 3, 2, 11, 3, 3, 112, 3, 4, 1,
3, 5, 48, 4, 2, 14, 4, 3, 127, 4, 4, 0, 4, 5, 16, 5, 2, 0, 5, 3, 127, 5, 4, 1, 5, 5, 16,
6, 2, 1, 6, 3, 127, 6, 4, 3, 6, 5, 16, 7, 2, 17, 7, 3, 127, 7, 4, 1, 7, 5, 16, 0xFF } },
{ 0x8001, 0x0, { 0, 2, 1, 0, 3, 32, 0xFF } },
- { 0xc003, 0xc000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
- { 0xc003, 0xc000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
- { 0xc001, 0xc000, { 0, 2, 2, 0, 3, 0, 0, 4, 0, 0xFF } },
- { 0xc02f, 0xc02e, { 0, 2, 2, 0, 3, 0, 0, 4, 0, 1, 2, 10, 1, 3, 64, 1, 4, 0, 1, 5,
+ { 0xC003, 0xC000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
+ { 0xC003, 0xC000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
+ { 0xC001, 0xC000, { 0, 2, 2, 0, 3, 0, 0, 4, 0, 0xFF } },
+ { 0xC02F, 0xC02E, { 0, 2, 2, 0, 3, 0, 0, 4, 0, 1, 2, 10, 1, 3, 64, 1, 4, 0, 1, 5,
32, 2, 2, 15, 2, 3, 112, 2, 4, 1, 2, 5, 48, 3, 2, 14, 3, 3, 127, 3,
4, 0, 3, 5, 16, 5, 2, 4, 5, 3, 127, 5, 4, 0, 5, 5, 16, 0xFF } },
- { 0xc07f, 0xc07e, { 0, 2, 0, 0, 3, 0, 0, 4, 0, 1, 2, 10, 1, 3, 64, 1, 4, 0, 1, 5, 32,
+ { 0xC07F, 0xC07E, { 0, 2, 0, 0, 3, 0, 0, 4, 0, 1, 2, 10, 1, 3, 64, 1, 4, 0, 1, 5, 32,
2, 2, 11, 2, 3, 112, 2, 4, 1, 2, 5, 48, 3, 2, 12, 3, 3, 127, 3, 4, 0,
3, 5, 16, 4, 2, 6, 4, 3, 0, 4, 4, 0, 4, 5, 16, 5, 2, 0, 5, 3, 0,
5, 4, 0, 5, 5, 16, 6, 2, 1, 6, 3, 0, 6, 4, 0, 6, 5, 16, 0xFF } },
- { 0xc003, 0xc000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
- { 0xc003, 0xc000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
- { 0xc01f, 0xc000, { 0, 2, 0, 0, 3, 0, 1, 2, 0, 1, 3, 80, 1, 4, 1, 1, 5, 8, 2, 2, 10, 2, 3, 80, 2, 4, 1, 2,
+ { 0xC003, 0xC000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
+ { 0xC003, 0xC000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
+ { 0xC01F, 0xC000, { 0, 2, 0, 0, 3, 0, 1, 2, 0, 1, 3, 80, 1, 4, 1, 1, 5, 8, 2, 2, 10, 2, 3, 80, 2, 4, 1, 2,
5, 48, 3, 2, 6, 3, 3, 0, 3, 4, 0, 3, 5, 0, 4, 2, 11, 4, 3, 96, 4, 4, 0, 4, 5, 32, 0xFF } },
- { 0xc003, 0xc000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
- { 0xc003, 0xc000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
- { 0xc003, 0xc000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
- { 0xc003, 0xc000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
+ { 0xC003, 0xC000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
+ { 0xC003, 0xC000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
+ { 0xC003, 0xC000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
+ { 0xC003, 0xC000, { 0, 2, 0, 0, 3, 0, 1, 2, 4, 1, 3, 0, 1, 4, 1, 1, 5, 16, 0xFF } },
};
u32 sOcarinaAllowedBtnMask = 0x800F;
diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c
index ac67e507b..60c7607cb 100644
--- a/src/code/debug_malloc.c
+++ b/src/code/debug_malloc.c
@@ -83,7 +83,7 @@ void* DebugArena_Calloc(u32 num, u32 size) {
}
void DebugArena_Display(void) {
- // "Zelda heap display" (devs forgot to change "Zelda" to "Debug" apparently)
+ // "Zelda heap display" ("Zelda" should probably have been changed to "Debug")
osSyncPrintf("ゼルダヒープ表示\n");
__osDisplayArena(&sDebugArena);
}
diff --git a/src/code/fault.c b/src/code/fault.c
index 91e517552..aaf9237b2 100644
--- a/src/code/fault.c
+++ b/src/code/fault.c
@@ -39,6 +39,7 @@ extern FaultThreadStruct gFaultStruct;
void Fault_SleepImpl(u32 duration) {
u64 value = (duration * OS_CPU_COUNTER) / 1000ull;
+
Sleep_Cycles(value);
}
@@ -102,6 +103,7 @@ void Fault_ProcessClientContext(FaultClientContext* ctx) {
u32 Fault_ProcessClient(u32 callback, u32 param0, u32 param1) {
FaultClientContext a;
+
a.callback = callback;
a.param0 = param0;
a.param1 = param1;
@@ -118,6 +120,7 @@ void Fault_AddClient(FaultClient* client, void* callback, void* param0, void* pa
{
FaultClient* iter = sFaultStructPtr->clients;
+
while (iter != NULL) {
if (iter == client) {
alreadyExists = true;
@@ -186,6 +189,7 @@ void Fault_AddAddrConvClient(FaultAddrConvClient* client, void* callback, void*
{
FaultAddrConvClient* iter = sFaultStructPtr->addrConvClients;
+
while (iter != NULL) {
if (iter == client) {
alreadyExists = true;
@@ -347,9 +351,9 @@ void Fault_DrawCornerRec(u16 color) {
void Fault_PrintFReg(s32 idx, f32* value) {
u32 raw = *(u32*)value;
- s32 v0 = ((raw & 0x7f800000) >> 0x17) - 0x7f;
+ s32 v0 = ((raw & 0x7F800000) >> 0x17) - 0x7F;
- if ((v0 >= -0x7e && v0 < 0x80) || raw == 0) {
+ if ((v0 >= -0x7E && v0 < 0x80) || raw == 0) {
FaultDrawer_Printf("F%02d:%14.7e ", idx, *value);
} else {
FaultDrawer_Printf("F%02d: %08x(16) ", idx, raw);
@@ -358,9 +362,9 @@ void Fault_PrintFReg(s32 idx, f32* value) {
void Fault_LogFReg(s32 idx, f32* value) {
u32 raw = *(u32*)value;
- s32 v0 = ((raw & 0x7f800000) >> 0x17) - 0x7f;
+ s32 v0 = ((raw & 0x7F800000) >> 0x17) - 0x7F;
- if ((v0 >= -0x7e && v0 < 0x80) || raw == 0) {
+ if ((v0 >= -0x7E && v0 < 0x80) || raw == 0) {
osSyncPrintf("F%02d:%14.7e ", idx, *value);
} else {
osSyncPrintf("F%02d: %08x(16) ", idx, *(u32*)value);
@@ -370,6 +374,7 @@ void Fault_LogFReg(s32 idx, f32* value) {
void Fault_PrintFPCR(u32 value) {
s32 i;
u32 flag = 0x20000;
+
FaultDrawer_Printf("FPCSR:%08xH ", value);
for (i = 0; i < 6; i++) {
if (value & flag) {
@@ -384,6 +389,7 @@ void Fault_PrintFPCR(u32 value) {
void Fault_LogFPCR(u32 value) {
s32 i;
u32 flag = 0x20000;
+
osSyncPrintf("FPCSR:%08xH ", value);
for (i = 0; i < 6; i++) {
if (value & flag) {
@@ -396,11 +402,12 @@ void Fault_LogFPCR(u32 value) {
void Fault_PrintThreadContext(OSThread* t) {
__OSThreadContext* ctx;
- s32 causeStrIdx = (s32)((((u32)t->context.cause >> 2) & 0x1f) << 0x10) >> 0x10;
+ s32 causeStrIdx = (s32)((((u32)t->context.cause >> 2) & 0x1F) << 0x10) >> 0x10;
+
if (causeStrIdx == 0x17) {
causeStrIdx = 0x10;
}
- if (causeStrIdx == 0x1f) {
+ if (causeStrIdx == 0x1F) {
causeStrIdx = 0x11;
}
@@ -433,10 +440,10 @@ void Fault_PrintThreadContext(OSThread* t) {
Fault_PrintFReg(6, &ctx->fp6.f.f_even);
FaultDrawer_Printf("\n");
Fault_PrintFReg(8, &ctx->fp8.f.f_even);
- Fault_PrintFReg(0xa, &ctx->fp10.f.f_even);
+ Fault_PrintFReg(0xA, &ctx->fp10.f.f_even);
FaultDrawer_Printf("\n");
- Fault_PrintFReg(0xc, &ctx->fp12.f.f_even);
- Fault_PrintFReg(0xe, &ctx->fp14.f.f_even);
+ Fault_PrintFReg(0xC, &ctx->fp12.f.f_even);
+ Fault_PrintFReg(0xE, &ctx->fp14.f.f_even);
FaultDrawer_Printf("\n");
Fault_PrintFReg(0x10, &ctx->fp16.f.f_even);
Fault_PrintFReg(0x12, &ctx->fp18.f.f_even);
@@ -445,21 +452,22 @@ void Fault_PrintThreadContext(OSThread* t) {
Fault_PrintFReg(0x16, &ctx->fp22.f.f_even);
FaultDrawer_Printf("\n");
Fault_PrintFReg(0x18, &ctx->fp24.f.f_even);
- Fault_PrintFReg(0x1a, &ctx->fp26.f.f_even);
+ Fault_PrintFReg(0x1A, &ctx->fp26.f.f_even);
FaultDrawer_Printf("\n");
- Fault_PrintFReg(0x1c, &ctx->fp28.f.f_even);
- Fault_PrintFReg(0x1e, &ctx->fp30.f.f_even);
+ Fault_PrintFReg(0x1C, &ctx->fp28.f.f_even);
+ Fault_PrintFReg(0x1E, &ctx->fp30.f.f_even);
FaultDrawer_Printf("\n");
FaultDrawer_SetCharPad(0, 0);
}
void Fault_LogThreadContext(OSThread* t) {
__OSThreadContext* ctx;
- s32 causeStrIdx = (s32)((((u32)t->context.cause >> 2) & 0x1f) << 0x10) >> 0x10;
+ s32 causeStrIdx = (s32)((((u32)t->context.cause >> 2) & 0x1F) << 0x10) >> 0x10;
+
if (causeStrIdx == 0x17) {
causeStrIdx = 0x10;
}
- if (causeStrIdx == 0x1f) {
+ if (causeStrIdx == 0x1F) {
causeStrIdx = 0x11;
}
@@ -488,10 +496,10 @@ void Fault_LogThreadContext(OSThread* t) {
Fault_LogFReg(6, &ctx->fp6.f.f_even);
osSyncPrintf("\n");
Fault_LogFReg(8, &ctx->fp8.f.f_even);
- Fault_LogFReg(0xa, &ctx->fp10.f.f_even);
+ Fault_LogFReg(0xA, &ctx->fp10.f.f_even);
osSyncPrintf("\n");
- Fault_LogFReg(0xc, &ctx->fp12.f.f_even);
- Fault_LogFReg(0xe, &ctx->fp14.f.f_even);
+ Fault_LogFReg(0xC, &ctx->fp12.f.f_even);
+ Fault_LogFReg(0xE, &ctx->fp14.f.f_even);
osSyncPrintf("\n");
Fault_LogFReg(0x10, &ctx->fp16.f.f_even);
Fault_LogFReg(0x12, &ctx->fp18.f.f_even);
@@ -500,17 +508,18 @@ void Fault_LogThreadContext(OSThread* t) {
Fault_LogFReg(0x16, &ctx->fp22.f.f_even);
osSyncPrintf("\n");
Fault_LogFReg(0x18, &ctx->fp24.f.f_even);
- Fault_LogFReg(0x1a, &ctx->fp26.f.f_even);
+ Fault_LogFReg(0x1A, &ctx->fp26.f.f_even);
osSyncPrintf("\n");
- Fault_LogFReg(0x1c, &ctx->fp28.f.f_even);
- Fault_LogFReg(0x1e, &ctx->fp30.f.f_even);
+ Fault_LogFReg(0x1C, &ctx->fp28.f.f_even);
+ Fault_LogFReg(0x1E, &ctx->fp30.f.f_even);
osSyncPrintf("\n");
}
OSThread* Fault_FindFaultedThread() {
OSThread* iter = __osGetActiveQueue();
+
while (iter->priority != -1) {
- if (iter->priority > 0 && iter->priority < 0x7f && (iter->flags & 3)) {
+ if (iter->priority > 0 && iter->priority < 0x7F && (iter->flags & 3)) {
return iter;
}
iter = iter->tlnext;
@@ -520,10 +529,11 @@ OSThread* Fault_FindFaultedThread() {
void Fault_Wait5Seconds(void) {
OSTime start[2]; // to make the function allocate 0x28 bytes of stack instead of 0x20
+
start[0] = osGetTime();
do {
Fault_Sleep(0x10);
- } while ((osGetTime() - start[0]) < OS_USEC_TO_CYCLES(5000000) + 1); // 0xdf84759
+ } while ((osGetTime() - start[0]) < OS_USEC_TO_CYCLES(5000000) + 1);
sFaultStructPtr->faultActive = true;
}
@@ -684,8 +694,8 @@ void Fault_DrawMemDumpPage(const char* title, u32* addr, u32 param_3) {
if (alignedAddr < (u32*)0x80000000) {
alignedAddr = (u32*)0x80000000;
}
- if (alignedAddr > (u32*)0x807fff00) {
- alignedAddr = (u32*)0x807fff00;
+ if (alignedAddr > (u32*)0x807FFF00) {
+ alignedAddr = (u32*)0x807FFF00;
}
alignedAddr = (u32*)((u32)alignedAddr & ~3);
@@ -693,7 +703,7 @@ void Fault_DrawMemDumpPage(const char* title, u32* addr, u32 param_3) {
Fault_FillScreenBlack();
FaultDrawer_SetCharPad(-2, 0);
- FaultDrawer_DrawText(0x24, 0x12, "%s %08x", title ? title : "PrintDump", alignedAddr);
+ FaultDrawer_DrawText(0x24, 0x12, "%s %08x", title != NULL ? title : "PrintDump", alignedAddr);
if (alignedAddr >= (u32*)0x80000000 && alignedAddr < (u32*)0xC0000000) {
for (y = 0x1C; y != 0xE2; y += 9) {
FaultDrawer_DrawText(0x18, y, "%06x", writeAddr);
@@ -717,8 +727,8 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
if (addr < 0x80000000) {
addr = 0x80000000;
}
- if (addr > 0x807fff00) {
- addr = 0x807fff00;
+ if (addr > 0x807FFF00) {
+ addr = 0x807FFF00;
}
addr &= ~0xF;
@@ -884,7 +894,7 @@ void Fault_ResumeThread(OSThread* t) {
t->context.cause = 0;
t->context.fpcsr = 0;
t->context.pc += 4;
- *(u32*)t->context.pc = 0xd;
+ *(u32*)t->context.pc = 0xD;
osWritebackDCache(t->context.pc, 4);
osInvalICache(t->context.pc, 4);
osStartThread(t);
@@ -892,9 +902,10 @@ void Fault_ResumeThread(OSThread* t) {
void Fault_CommitFB() {
u16* fb;
+
osViSetYScale(1.0f);
osViSetMode(&osViModeNtscLan1);
- osViSetSpecialFeatures(0x42); // gama_disable|dither_fliter_enable_aa_mode3_disable
+ osViSetSpecialFeatures(OS_VI_GAMMA_OFF | OS_VI_DITHER_FILTER_ON);
osViBlack(false);
if (sFaultStructPtr->fb) {
@@ -902,7 +913,7 @@ void Fault_CommitFB() {
} else {
fb = (u16*)osViGetNextFramebuffer();
if ((u32)fb == 0x80000000) {
- fb = (u16*)((osMemSize | 0x80000000) - 0x25800);
+ fb = (u16*)((osMemSize | 0x80000000) - sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH]));
}
}
@@ -972,7 +983,7 @@ void Fault_ThreadEntry(void* arg) {
}
} while (faultedThread == NULL);
- __osSetFpcCsr(__osGetFpcCsr() & -0xf81);
+ __osSetFpcCsr(__osGetFpcCsr() & -0xF81);
sFaultStructPtr->faultedThread = faultedThread;
while (!sFaultStructPtr->faultHandlerEnabled) {
@@ -1045,11 +1056,11 @@ void Fault_Init(void) {
void Fault_HangupFaultClient(const char* arg0, const char* arg1) {
osSyncPrintf("HungUp on Thread %d\n", osGetThreadId(0));
- osSyncPrintf("%s\n", arg0 ? arg0 : "(NULL)");
- osSyncPrintf("%s\n", arg1 ? arg1 : "(NULL)");
+ osSyncPrintf("%s\n", arg0 != NULL ? arg0 : "(NULL)");
+ osSyncPrintf("%s\n", arg1 != NULL ? arg1 : "(NULL)");
FaultDrawer_Printf("HungUp on Thread %d\n", osGetThreadId(0));
- FaultDrawer_Printf("%s\n", arg0 ? arg0 : "(NULL)");
- FaultDrawer_Printf("%s\n", arg1 ? arg1 : "(NULL)");
+ FaultDrawer_Printf("%s\n", arg0 != NULL ? arg0 : "(NULL)");
+ FaultDrawer_Printf("%s\n", arg1 != NULL ? arg1 : "(NULL)");
}
void Fault_AddHungupAndCrashImpl(const char* arg0, const char* arg1) {
diff --git a/src/code/fault_drawer.c b/src/code/fault_drawer.c
index 036247d8a..fd0bf02d3 100644
--- a/src/code/fault_drawer.c
+++ b/src/code/fault_drawer.c
@@ -35,18 +35,18 @@ const u32 sFaultDrawerFont[] = {
};
FaultDrawer sFaultDrawerDefault = {
- (u16*)0x803DA800, // fb
- SCREEN_WIDTH, // w
- SCREEN_HEIGHT, // h
- 16, // yStart
- 223, // yEnd
- 22, // xStart
- 297, // xEnd
- GPACK_RGBA5551(255, 255, 255, 255), // foreColor
- GPACK_RGBA5551(0, 0, 0, 0), // backColor
- 22, // cursorX
- 16, // cursorY
- sFaultDrawerFont, // font
+ (u16*)(0x80400000 - sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH])), // fb
+ SCREEN_WIDTH, // w
+ SCREEN_HEIGHT, // h
+ 16, // yStart
+ 223, // yEnd
+ 22, // xStart
+ 297, // xEnd
+ GPACK_RGBA5551(255, 255, 255, 255), // foreColor
+ GPACK_RGBA5551(0, 0, 0, 0), // backColor
+ 22, // cursorX
+ 16, // cursorY
+ sFaultDrawerFont, // font
8,
8,
0,
@@ -302,5 +302,5 @@ void FaultDrawer_WritebackFBDCache() {
void FaultDrawer_SetDefault() {
bcopy(&sFaultDrawerDefault, &sFaultDrawerStruct, sizeof(FaultDrawer));
- sFaultDrawerStruct.fb = (u16*)((osMemSize | 0x80000000) - 0x25800);
+ sFaultDrawerStruct.fb = (u16*)((osMemSize | 0x80000000) - sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH]));
}
diff --git a/src/code/graph.c b/src/code/graph.c
index aa35b5287..be788f5f5 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -156,7 +156,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
D_8016A528 = osGetTime() - sGraphSetTaskTime - D_8016A558;
- osSetTimer(&timer, 140625000, 0, &gfxCtx->queue, (OSMesg)666);
+ osSetTimer(&timer, OS_USEC_TO_CYCLES(3000000), 0, &gfxCtx->queue, (OSMesg)666);
osRecvMesg(&gfxCtx->queue, &msg, OS_MESG_BLOCK);
osStopTimer(&timer);
@@ -322,7 +322,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
GfxPool* pool = &gGfxPools[gfxCtx->gfxPoolIdx & 1];
if (pool->headMagic != GFXPOOL_HEAD_MAGIC) {
- //! @bug (?) : devs might've forgotten "problem = true;"
+ //! @bug (?) : "problem = true;" may be missing
osSyncPrintf("%c", 7);
// "Dynamic area head is destroyed"
osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域先頭が破壊されています\n" VT_RST);
diff --git a/src/code/main.c b/src/code/main.c
index 932114df5..7afc30081 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 {
@@ -74,7 +74,7 @@ void Main(void* arg) {
Main_LogSystemHeap();
- osCreateMesgQueue(&irqMgrMsgQ, irqMgrMsgBuf, 0x3c);
+ osCreateMesgQueue(&irqMgrMsgQ, irqMgrMsgBuf, 0x3C);
StackCheck_Init(&sIrqMgrStackInfo, sIrqMgrStack, sIrqMgrStack + sizeof(sIrqMgrStack), 0, 0x100, "irqmgr");
IrqMgr_Init(&gIrqMgr, &sGraphStackInfo, Z_PRIORITY_IRQMGR, 1);
@@ -85,7 +85,7 @@ void Main(void* arg) {
IrqMgr_AddClient(&gIrqMgr, &irqClient, &irqMgrMsgQ);
StackCheck_Init(&sAudioStackInfo, sAudioStack, sAudioStack + sizeof(sAudioStack), 0, 0x100, "audio");
- AudioMgr_Init(&gAudioMgr, sAudioStack + sizeof(sAudioStack), Z_PRIORITY_AUDIOMGR, 0xa, &gSchedContext, &gIrqMgr);
+ AudioMgr_Init(&gAudioMgr, sAudioStack + sizeof(sAudioStack), Z_PRIORITY_AUDIOMGR, 0xA, &gSchedContext, &gIrqMgr);
StackCheck_Init(&sPadMgrStackInfo, sPadMgrStack, sPadMgrStack + sizeof(sPadMgrStack), 0, 0x100, "padmgr");
PadMgr_Init(&gPadMgr, &sSiIntMsgQ, &gIrqMgr, 7, Z_PRIORITY_PADMGR, &sIrqMgrStack);
diff --git a/src/code/sched.c b/src/code/sched.c
index c478114f6..ef582449c 100644
--- a/src/code/sched.c
+++ b/src/code/sched.c
@@ -46,10 +46,10 @@ void Sched_SwapFrameBuffer(CfbInfo* cfbInfo) {
HREG(95) = 0xD;
}
if (HREG(80) == 0xD && HREG(81) == 2) {
- osViSetSpecialFeatures(HREG(82) != 0 ? 1 : 2);
- osViSetSpecialFeatures(HREG(83) != 0 ? 0x40 : 0x80);
- osViSetSpecialFeatures(HREG(84) != 0 ? 0x4 : 0x8);
- osViSetSpecialFeatures(HREG(85) != 0 ? 0x10 : 0x20);
+ osViSetSpecialFeatures(HREG(82) != 0 ? OS_VI_GAMMA_ON : OS_VI_GAMMA_OFF);
+ osViSetSpecialFeatures(HREG(83) != 0 ? OS_VI_DITHER_FILTER_ON : OS_VI_DITHER_FILTER_OFF);
+ osViSetSpecialFeatures(HREG(84) != 0 ? OS_VI_GAMMA_DITHER_ON : OS_VI_GAMMA_DITHER_OFF);
+ osViSetSpecialFeatures(HREG(85) != 0 ? OS_VI_DIVOT_ON : OS_VI_DIVOT_OFF);
}
}
cfbInfo->unk_10 = 0;
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index 4e81327ea..3c65b7aec 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("８Ｍバイト以上のメモリが搭載されています\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 {
@@ -27,7 +27,7 @@ void SysCfb_Init(s32 n64dd) {
}
screenSize = SCREEN_WIDTH * SCREEN_HEIGHT;
- sSysCfbEnd &= ~0x3f;
+ sSysCfbEnd &= ~0x3F;
// "The final address used by the system is %08x"
osSyncPrintf("システムが使用する最終アドレスは %08x です\n", sSysCfbEnd);
sSysCfbFbPtr[0] = sSysCfbEnd - (screenSize * 4);
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 72a46b90b..9890f0fd3 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -2694,7 +2694,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId
objBankIndex = Object_GetIndex(&globalCtx->objectCtx, actorInit->objectId);
if ((objBankIndex < 0) ||
- ((actorInit->category == ACTORCAT_ENEMY) && (Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num)))) {
+ ((actorInit->category == ACTORCAT_ENEMY) && Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num))) {
// "No data bank!! <data bank＝%d> (profilep->bank=%d)"
osSyncPrintf(VT_COL(RED, WHITE) "データバンク無し！！<データバンク＝%d>(profilep->bank=%d)\n" VT_RST,
objBankIndex, actorInit->objectId);
@@ -4372,7 +4372,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
if (Flags_GetEventChkInf(0x5C)) {
retTextId = 0x1079;
} else {
- retTextId = 0x104e;
+ retTextId = 0x104E;
}
}
break;
@@ -4402,7 +4402,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
}
} else {
if (Flags_GetEventChkInf(0x5C)) {
- retTextId = 0x107b;
+ retTextId = 0x107B;
} else {
retTextId = 0x1051;
}
@@ -4462,7 +4462,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 17:
if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
- if (Flags_GetInfTable(0x6c)) {
+ if (Flags_GetInfTable(0x6C)) {
retTextId = 0x7008;
} else {
retTextId = 0x7007;
@@ -4524,7 +4524,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
retTextId = 0x7046;
} else {
- Flags_GetInfTable(0xc2);
+ Flags_GetInfTable(0xC2);
retTextId = 0x7018;
}
break;
@@ -4547,7 +4547,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
retTextId = 0x7048;
} else {
- Flags_GetInfTable(0xca);
+ Flags_GetInfTable(0xCA);
retTextId = 0x701D;
}
break;
@@ -4555,7 +4555,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
retTextId = 0x7049;
} else {
- Flags_GetInfTable(0xcc);
+ Flags_GetInfTable(0xCC);
retTextId = 0x701F;
}
break;
@@ -5044,7 +5044,7 @@ void func_80036E50(u16 textId, s16 arg1) {
}
return;
case 34:
- if (textId == 0x403c) {
+ if (textId == 0x403C) {
Flags_SetInfTable(0xD6);
}
return;
diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c
index 1e74f49fd..dc1ba816d 100644
--- a/src/code/z_kaleido_manager.c
+++ b/src/code/z_kaleido_manager.c
@@ -76,7 +76,7 @@ void KaleidoManager_Destroy() {
sKaleidoAreaPtr = NULL;
}
-// NOTE: this function looks messed up and probably doesn't work like how the devs wanted it to work
+// NOTE: this function looks messed up and probably doesn't work how it was intended to
void* KaleidoManager_GetRamAddr(void* vram) {
KaleidoMgrOverlay* iter = gKaleidoMgrCurOvl;
KaleidoMgrOverlay* ovl = iter;
@@ -90,7 +90,7 @@ void* KaleidoManager_GetRamAddr(void* vram) {
ovl = iter;
goto KaleidoManager_GetRamAddr_end;
}
- //! @bug Devs probably forgot iter++ here
+ //! @bug Probably missing iter++ here
}
osSyncPrintf("異常\n"); // "Abnormal"
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 6d45532ae..7933d67f7 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_player_lib.c b/src/code/z_player_lib.c
index 8ce855350..8c9eec2a0 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -683,10 +683,10 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable,
if (LINK_IS_ADULT) {
s32 strengthUpgrade = CUR_UPG_VALUE(UPG_STRENGTH);
- if (strengthUpgrade >= PLAYER_STR_SILVER_G) {
+ if (strengthUpgrade >= 2) { // silver or gold gauntlets
gDPPipeSync(POLY_OPA_DISP++);
- color = &sGauntletColors[strengthUpgrade - PLAYER_STR_SILVER_G];
+ color = &sGauntletColors[strengthUpgrade - 2];
gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0);
gSPDisplayList(POLY_OPA_DISP++, D_06025218);
@@ -697,6 +697,7 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable,
if (boots != 0) {
Gfx** bootDLists = sBootDListGroups[boots - 1];
+
gSPDisplayList(POLY_OPA_DISP++, bootDLists[0]);
gSPDisplayList(POLY_OPA_DISP++, bootDLists[1]);
}
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 356ffee17..44287017b 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;
}
diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c
index 1b34c0944..9de42d966 100644
--- a/src/code/z_vismono.c
+++ b/src/code/z_vismono.c
@@ -1,7 +1,7 @@
#include "global.h"
// (Note: 80 = SCREEN_HEIGHT/3, see VisMono_DrawTexture)
-// Did the devs forget to update this? 1+1+1+80*(7+2+2+3)+1+1 makes more sense
+// This may not have been kept up-to-date with the code, 1+1+1+80*(7+2+2+3)+1+1 makes more sense
#define DLSIZE (1 + 3 + 1 + 1 + 80 * (7 + 2 + 2 + 3) + 1)
// framebuffer
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-04 09:48:36 +0000