diff --git a/include/linkdefs.h b/include/linkdefs.h index a316a40c..d2fa00c7 100644 --- a/include/linkdefs.h +++ b/include/linkdefs.h @@ -15,34 +15,6 @@ #define RGBDS_OBJECT_VERSION_STRING "RGB%1hhu" #define RGBDS_OBJECT_VERSION_NUMBER (uint8_t)6 -#define BANK_COUNT_ROM0 1 -#define BANK_COUNT_ROMX 511 -#define BANK_COUNT_VRAM 2 -#define BANK_COUNT_SRAM 16 -#define BANK_COUNT_WRAM0 1 -#define BANK_COUNT_WRAMX 7 -#define BANK_COUNT_OAM 1 -#define BANK_COUNT_HRAM 1 - -enum eBankGBCount { - BANK_MIN_ROM0 = 0, - BANK_MAX_ROM0 = BANK_COUNT_ROM0 + BANK_MIN_ROM0 - 1, - BANK_MIN_ROMX = 1, - BANK_MAX_ROMX = BANK_COUNT_ROMX + BANK_MIN_ROMX - 1, - BANK_MIN_WRAM0 = 0, - BANK_MAX_WRAM0 = BANK_COUNT_WRAM0 + BANK_MIN_WRAM0 - 1, - BANK_MIN_WRAMX = 1, - BANK_MAX_WRAMX = BANK_COUNT_WRAMX + BANK_MIN_WRAMX - 1, - BANK_MIN_VRAM = 0, - BANK_MAX_VRAM = BANK_COUNT_VRAM + BANK_MIN_VRAM - 1, - BANK_MIN_OAM = 0, - BANK_MAX_OAM = BANK_COUNT_OAM + BANK_MIN_OAM - 1, - BANK_MIN_HRAM = 0, - BANK_MAX_HRAM = BANK_COUNT_HRAM + BANK_MIN_HRAM - 1, - BANK_MIN_SRAM = 0, - BANK_MAX_SRAM = BANK_COUNT_SRAM + BANK_MIN_SRAM - 1 -}; - enum RPNCommand { RPN_ADD = 0x00, RPN_SUB = 0x01, @@ -119,6 +91,23 @@ enum PatchType { PATCHTYPE_INVALID }; +#define BANK_MIN_ROM0 0 +#define BANK_MAX_ROM0 0 +#define BANK_MIN_ROMX 1 +#define BANK_MAX_ROMX 511 +#define BANK_MIN_VRAM 0 +#define BANK_MAX_VRAM 1 +#define BANK_MIN_SRAM 0 +#define BANK_MAX_SRAM 15 +#define BANK_MIN_WRAM0 0 +#define BANK_MAX_WRAM0 0 +#define BANK_MIN_WRAMX 1 +#define BANK_MAX_WRAMX 7 +#define BANK_MIN_OAM 0 +#define BANK_MAX_OAM 0 +#define BANK_MIN_HRAM 0 +#define BANK_MAX_HRAM 0 + extern uint16_t startaddr[]; extern uint16_t maxsize[]; extern uint32_t bankranges[][2];