diff --git a/src/Cheats.cpp b/src/Cheats.cpp
index 9b6e728b..147c3f1c 100644
--- a/src/Cheats.cpp
+++ b/src/Cheats.cpp
@@ -196,7 +196,7 @@
 #define CHEATS_16_BIT_WRITE           114
 #define CHEATS_32_BIT_WRITE           115
 
-CheatsData cheatsList[1000];
+CheatsData cheatsList[100];
 int cheatsNumber = 0;
 u32 rompatch2addr [4];
 u16 rompatch2val [4];
@@ -1332,7 +1332,7 @@ void cheatsAdd(const char *codeStr,
                int code,
                int size)
 {
-  if(cheatsNumber < 1000) {
+  if(cheatsNumber < 100) {
     int x = cheatsNumber;
     cheatsList[x].code = code;
     cheatsList[x].size = size;
diff --git a/src/Cheats.h b/src/Cheats.h
index 096a38d2..ce966872 100644
--- a/src/Cheats.h
+++ b/src/Cheats.h
@@ -51,5 +51,5 @@ extern void cheatsWriteHalfWord(u32, u16);
 extern void cheatsWriteByte(u32, u8);
 extern int cheatsCheckKeys(u32,u32);
 extern int cheatsNumber;
-extern CheatsData cheatsList[1000];
+extern CheatsData cheatsList[100];
 #endif // GBA_CHEATS_H
diff --git a/src/gb/gbCheats.cpp b/src/gb/gbCheats.cpp
index 7b93658a..2463d282 100644
--- a/src/gb/gbCheats.cpp
+++ b/src/gb/gbCheats.cpp
@@ -29,7 +29,7 @@
 #include "gbGlobals.h"
 #include "gb.h"
 
-gbCheat gbCheatList[1000];
+gbCheat gbCheatList[100];
 int gbCheatNumber = 0;
 int gbNextCheat = 0;
 bool gbCheatMap[0x10000];
@@ -187,7 +187,7 @@ bool gbVerifyGsCode(const char *code)
 
 bool gbAddGsCheat(const char *code, const char *desc)
 {
-  if(gbCheatNumber > 999) {
+  if(gbCheatNumber > 99) {
     systemMessage(MSG_MAXIMUM_NUMBER_OF_CHEATS,
                   N_("Maximum number of cheats reached."));
     return false;
@@ -307,7 +307,7 @@ bool gbVerifyGgCode(const char *code)
 
 bool gbAddGgCheat(const char *code, const char *desc)
 {
-  if(gbCheatNumber > 999) {
+  if(gbCheatNumber > 99) {
     systemMessage(MSG_MAXIMUM_NUMBER_OF_CHEATS,
                   N_("Maximum number of cheats reached."));
     return false;
diff --git a/src/gb/gbCheats.h b/src/gb/gbCheats.h
index a9c4517b..42e53c6f 100644
--- a/src/gb/gbCheats.h
+++ b/src/gb/gbCheats.h
@@ -56,7 +56,7 @@ bool gbVerifyGgCode(const char *code);
 
 
 extern int gbCheatNumber;
-extern gbCheat gbCheatList[1000];
+extern gbCheat gbCheatList[100];
 extern bool gbCheatMap[0x10000];
 #endif