diff --git a/src/Fade.cpp b/src/Fade.cpp index 096629ff..aabaa236 100644 --- a/src/Fade.cpp +++ b/src/Fade.cpp @@ -16,9 +16,9 @@ struct FADE int mode; BOOL bMask; int count; - char ani_no[FADE_HEIGHT][FADE_WIDTH]; - char flag[FADE_HEIGHT][FADE_WIDTH]; // Not a BOOLEAN (those are unsigned) - char dir; + signed char ani_no[FADE_HEIGHT][FADE_WIDTH]; + signed char flag[FADE_HEIGHT][FADE_WIDTH]; // Not a BOOLEAN (those are unsigned) + signed char dir; }; static FADE gFade; @@ -41,7 +41,7 @@ void ClearFade() gFade.mode = 0; } -void StartFadeOut(char dir) +void StartFadeOut(signed char dir) { gFade.mode = 2; gFade.count = 0; @@ -58,7 +58,7 @@ void StartFadeOut(char dir) } } -void StartFadeIn(char dir) +void StartFadeIn(signed char dir) { int x; int y; diff --git a/src/Fade.h b/src/Fade.h index 793372e7..c6f6dbb1 100644 --- a/src/Fade.h +++ b/src/Fade.h @@ -5,8 +5,8 @@ void InitFade(); void SetFadeMask(); void ClearFade(); -void StartFadeOut(char dir); -void StartFadeIn(char dir); +void StartFadeOut(signed char dir); +void StartFadeIn(signed char dir); void ProcFade(); void PutFade(); BOOL GetFadeActive(); diff --git a/src/Organya.cpp b/src/Organya.cpp index 28d4a76b..1b6c769f 100644 --- a/src/Organya.cpp +++ b/src/Organya.cpp @@ -303,7 +303,7 @@ void ChangeDramVolume(int32_t volume, int8_t track) lpDRAMBUFFER[track]->SetVolume((volume - 0xFF) * 8); } -void PlayDramObject(unsigned char key, int mode,char track) +void PlayDramObject(unsigned char key, int mode, signed char track) { switch(mode) { diff --git a/src/PixTone.cpp b/src/PixTone.cpp index 4e37e515..02b3da2a 100644 --- a/src/PixTone.cpp +++ b/src/PixTone.cpp @@ -56,7 +56,7 @@ void MakeWaveTables(void) // White noise wave rep_srand(0); for (i = 0; i < 256; ++i) - gWaveModelTable[5][i] = (char)(rep_rand() & 0xFF) / 2; + gWaveModelTable[5][i] = (signed char)(rep_rand() & 0xFF) / 2; } BOOL MakePixelWaveData(const PIXTONEPARAMETER *ptp, unsigned char *pData) diff --git a/src/Profile.h b/src/Profile.h index d9f527a1..3b70c1c5 100644 --- a/src/Profile.h +++ b/src/Profile.h @@ -25,7 +25,7 @@ struct PROFILE ARMS arms[8]; ITEM items[32]; PERMIT_STAGE permitstage[8]; - char permit_mapping[0x80]; + signed char permit_mapping[0x80]; char FLAG[4]; uint8_t flags[1000]; }; diff --git a/src/Stage.h b/src/Stage.h index d0ef23cb..f1324a53 100644 --- a/src/Stage.h +++ b/src/Stage.h @@ -10,7 +10,7 @@ struct STAGE_TABLE char back[0x20]; char npc[0x20]; char boss[0x20]; - char boss_no; + signed char boss_no; char name[0x20]; }; diff --git a/src/TextScr.h b/src/TextScr.h index ca575e96..77553220 100644 --- a/src/TextScr.h +++ b/src/TextScr.h @@ -16,10 +16,10 @@ struct TEXT_SCRIPT char *data; //Mode (ex. NOD, WAI) - char mode; + signed char mode; //Flags - char flags; + signed char flags; //Current positions (read position in buffer, x position in line) unsigned int p_read; @@ -37,7 +37,7 @@ struct TEXT_SCRIPT int next_event; //Yes/no selected - char select; + signed char select; //Current face int face;