From b42f5c0f7fc9ac0161a6b6e2d764911ef375d040 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 29 Dec 2016 13:13:07 -0800 Subject: use BUGFIX ifdefs --- include/config.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 include/config.h (limited to 'include/config.h') diff --git a/include/config.h b/include/config.h new file mode 100644 index 000000000..251cbc6c2 --- /dev/null +++ b/include/config.h @@ -0,0 +1,15 @@ +#ifndef GUARD_CONFIG_H +#define GUARD_CONFIG_H + +#ifndef REVISION +#define REVISION 0 +#endif + +#if REVISION == 2 +#define BUGFIX_BERRY +#endif + +// European editions of Ruby/Sapphire and all editions of Emerald have this fix. +// #define BUGFIX_TRAINERAPPROACH + +#endif // GUARD_CONFIG_H -- cgit v1.2.3 From 4f4b6a3f5b6a205eed811fe8f0371ac2a2b27fc9 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 29 Dec 2016 13:31:25 -0800 Subject: add conditional bugfix for setting mon IVs --- include/config.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/config.h') diff --git a/include/config.h b/include/config.h index 251cbc6c2..22f5647c3 100644 --- a/include/config.h +++ b/include/config.h @@ -12,4 +12,7 @@ // European editions of Ruby/Sapphire and all editions of Emerald have this fix. // #define BUGFIX_TRAINERAPPROACH +// Fixed in Emerald. +// #define BUGFIX_SETMONIVS + #endif // GUARD_CONFIG_H -- cgit v1.2.3 From 97aecd23b88060691bbfb7fcb36b7c3c88c254d2 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 29 Dec 2016 13:48:52 -0800 Subject: more bugfix ifdefs --- include/config.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/config.h') 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 -- cgit v1.2.3 From 47f0942e21381b871d95a9e4e25c9ddd810c542f Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 29 Dec 2016 15:16:03 -0800 Subject: second save_failed_screen.c bugfix --- include/config.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/config.h') diff --git a/include/config.h b/include/config.h index 65f176e19..5ee062006 100644 --- a/include/config.h +++ b/include/config.h @@ -11,9 +11,11 @@ #if REVISION >= 1 #define BUGFIX_GLYPHWIDTH -#define BUGFIX_SAVEFAILEDSCREEN +#define BUGFIX_SAVEFAILEDSCREEN1 #endif +// #define BUGFIX_SAVEFAILEDSCREEN2 + // European editions of Ruby/Sapphire and all editions of Emerald have this fix. // #define BUGFIX_TRAINERAPPROACH -- cgit v1.2.3 From 084dc5134cedbb7e1b2ae280ecbcb3884993a7be Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 5 May 2017 16:46:59 -0700 Subject: some German differences --- include/config.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'include/config.h') diff --git a/include/config.h b/include/config.h index 5ee062006..4afee1e49 100644 --- a/include/config.h +++ b/include/config.h @@ -5,19 +5,23 @@ #define REVISION 0 #endif -#if REVISION == 2 +#if (ENGLISH && REVISION == 2) || (GERMAN && REVISION == 1) #define BUGFIX_BERRY #endif -#if REVISION >= 1 +#if (ENGLISH && REVISION >= 1) || GERMAN #define BUGFIX_GLYPHWIDTH #define BUGFIX_SAVEFAILEDSCREEN1 #endif -// #define BUGFIX_SAVEFAILEDSCREEN2 +#if GERMAN +#define BUGFIX_SAVEFAILEDSCREEN2 +#endif // European editions of Ruby/Sapphire and all editions of Emerald have this fix. -// #define BUGFIX_TRAINERAPPROACH +#if GERMAN +#define BUGFIX_TRAINERAPPROACH +#endif // Fixed in Emerald. // #define BUGFIX_SETMONIVS -- cgit v1.2.3 From e22b9c54f123d4443829b96948b4110d9379a816 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 5 May 2017 22:09:13 -0700 Subject: decompile some pokemon functions --- include/config.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/config.h') diff --git a/include/config.h b/include/config.h index 4afee1e49..205f53f16 100644 --- a/include/config.h +++ b/include/config.h @@ -23,6 +23,10 @@ #define BUGFIX_TRAINERAPPROACH #endif +#if (ENGLISH && REVISION >= 1) || GERMAN +#define BUGFIX_EVO_NAME +#endif + // Fixed in Emerald. // #define BUGFIX_SETMONIVS -- cgit v1.2.3 From 524b2c20082031c07490070601d22708a8010904 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 22 May 2017 20:05:20 +0200 Subject: Make berry_tag_screen match German build --- include/config.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/config.h') diff --git a/include/config.h b/include/config.h index 205f53f16..6a77c4c74 100644 --- a/include/config.h +++ b/include/config.h @@ -27,6 +27,12 @@ #define BUGFIX_EVO_NAME #endif +#ifdef ENGLISH +#define UNITS_IMPERIAL +#elif GERMAN +#define UNITS_METRIC +#endif + // Fixed in Emerald. // #define BUGFIX_SETMONIVS -- cgit v1.2.3