diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f5a2f73f47..e98274d2f6 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,4 +1,4 @@ -#include "config.h" +#include "config/general.h" #include "config/battle.h" #include "constants/battle.h" #include "constants/battle_anim.h" diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 95ae9bc1a7..1775e3607f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1,4 +1,4 @@ -#include "config.h" +#include "config/general.h" #include "config/battle.h" #include "constants/global.h" #include "constants/battle.h" diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index affaf31d6d..f04e022bb5 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -1,4 +1,4 @@ -#include "config.h" +#include "config/general.h" #include "constants/global.h" #include "constants/contest.h" .include "asm/macros.inc" diff --git a/data/event_scripts.s b/data/event_scripts.s index 4893132981..07eafe1c35 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,4 +1,4 @@ -#include "config.h" +#include "config/general.h" #include "config/battle.h" #include "config/item.h" #include "constants/global.h" diff --git a/include/config.h b/include/config/general.h similarity index 92% rename from include/config.h rename to include/config/general.h index 0f1b64bd13..a374ee97a1 100644 --- a/include/config.h +++ b/include/config/general.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONFIG_H -#define GUARD_CONFIG_H +#ifndef GUARD_CONFIG_GENERAL_H +#define GUARD_CONFIG_GENERAL_H // In the Generation 3 games, Asserts were used in various debug builds. // Ruby/Sapphire and Emerald do not have these asserts while Fire Red @@ -53,7 +53,7 @@ #define POKEMON_EXPANSION #define ITEM_EXPANSION -// Generation constants used in configs to define behavior +// Generation constants used in configs to define behavior. #define GEN_1 0 #define GEN_2 1 #define GEN_3 2 @@ -63,6 +63,7 @@ #define GEN_7 6 #define GEN_8 7 #define GEN_9 8 +// Changing GEN_LATEST's value to a different Generation will change every default setting that uses it at once. #define GEN_LATEST GEN_9 // General settings @@ -79,4 +80,4 @@ #define UNITS UNITS_IMPERIAL #define CHAR_DEC_SEPARATOR CHAR_PERIOD // CHAR_PERIOD is used as a decimal separator only in the UK and the US. The rest of the world uses CHAR_COMMA. -#endif // GUARD_CONFIG_H +#endif // GUARD_CONFIG_GENERAL_H diff --git a/include/constants/global.h b/include/constants/global.h index f389c44d53..6d2fbe81c7 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -1,6 +1,7 @@ #ifndef GUARD_CONSTANTS_GLOBAL_H #define GUARD_CONSTANTS_GLOBAL_H +#include "config/general.h" #include "config/battle.h" #include "config/debug.h" #include "config/item.h" diff --git a/include/global.h b/include/global.h index 16bf107efc..a378f15a1d 100644 --- a/include/global.h +++ b/include/global.h @@ -3,7 +3,7 @@ #include #include -#include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines. +#include "config/general.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines. #include "gba/gba.h" #include "fpmath.h" #include "metaprogram.h" diff --git a/src/libisagbprn.c b/src/libisagbprn.c index fab9b5990b..6724059ff8 100644 --- a/src/libisagbprn.c +++ b/src/libisagbprn.c @@ -1,7 +1,7 @@ #include #include #include "gba/gba.h" -#include "config.h" +#include "config/general.h" #include "malloc.h" #include "mini_printf.h" diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 4da57a26ee..67a0d6373f 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -20,8 +20,8 @@ #include "constants/layouts.h" #include "constants/region_map_sections.h" #include "constants/weather.h" +#include "config/general.h" #include "config/overworld.h" -#include "config.h" // enums enum MapPopUp_Themes diff --git a/src/mini_printf.c b/src/mini_printf.c index cab78d7611..7432395b79 100644 --- a/src/mini_printf.c +++ b/src/mini_printf.c @@ -35,7 +35,7 @@ #include "mini_printf.h" #include "gba/types.h" #include "gba/defines.h" -#include "config.h" +#include "config/general.h" #include "characters.h" #include "string_util.h" diff --git a/src/siirtc.c b/src/siirtc.c index 1536aecb42..a29a62da26 100644 --- a/src/siirtc.c +++ b/src/siirtc.c @@ -4,7 +4,7 @@ #include "gba/gba.h" #include "siirtc.h" -#include "config.h" +#include "config/general.h" #define STATUS_INTFE 0x02 // frequency interrupt enable #define STATUS_INTME 0x08 // per-minute interrupt enable