From 97aecd23b88060691bbfb7fcb36b7c3c88c254d2 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Thu, 29 Dec 2016 13:48:52 -0800
Subject: more bugfix ifdefs

---
 include/config.h         | 5 +++++
 src/save_failed_screen.c | 2 +-
 src/text.c               | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/config.h b/include/config.h
index 22f5647c3..65f176e19 100644
--- a/include/config.h
+++ b/include/config.h
@@ -9,6 +9,11 @@
 #define BUGFIX_BERRY
 #endif
 
+#if REVISION >= 1
+#define BUGFIX_GLYPHWIDTH
+#define BUGFIX_SAVEFAILEDSCREEN
+#endif
+
 // European editions of Ruby/Sapphire and all editions of Emerald have this fix.
 // #define BUGFIX_TRAINERAPPROACH
 
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index bc38c4629..7d5483fbf 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -12,7 +12,7 @@
 
 // In 1.0, the text window is too small, causing text to overflow.
 
-#if (REVISION >= 1)
+#ifdef BUGFIX_SAVEFAILEDSCREEN
 #define MSG_WIN_TOP 10
 #else
 #define MSG_WIN_TOP 12
diff --git a/src/text.c b/src/text.c
index 2fa573051..265ef5493 100644
--- a/src/text.c
+++ b/src/text.c
@@ -3334,7 +3334,7 @@ static u8 GetGlyphWidth(struct Window *win, u32 glyph)
 {
     u8 width = 8;
 
-#if REVISION >= 1
+#ifdef BUGFIX_GLYPHWIDTH
     if (win->language != LANGUAGE_JAPANESE)
 #else
     if (win->language == LANGUAGE_ENGLISH)
-- 
cgit v1.2.3