From 9ebd2a7e8eeae971904451b298b3e73262bb1377 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 27 Jan 2025 18:20:13 -0500 Subject: [PATCH] Fix clang-format of `sectionTypeInfo` array --- src/linkdefs.cpp | 86 +++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/src/linkdefs.cpp b/src/linkdefs.cpp index 8f5eea4f..6e00b01b 100644 --- a/src/linkdefs.cpp +++ b/src/linkdefs.cpp @@ -6,64 +6,66 @@ using namespace std::literals; // The default values are the most lax, as they are used as-is by RGBASM; only RGBLINK has the full // info, so RGBASM's job is only to catch unconditional errors earlier. +// clang-format off: nested initializers SectionTypeInfo sectionTypeInfo[SECTTYPE_INVALID] = { { - .name = "WRAM0"s, - .startAddr = 0xC000, - .size = 0x2000, // Patched to 0x1000 if !isWRAM0Mode - .firstBank = 0, - .lastBank = 0, + .name = "WRAM0"s, + .startAddr = 0xC000, + .size = 0x2000, // Patched to 0x1000 if !isWRAM0Mode + .firstBank = 0, + .lastBank = 0, }, { - .name = "VRAM"s, - .startAddr = 0x8000, - .size = 0x2000, - .firstBank = 0, - .lastBank = 1, // Patched to 0 if isDmgMode + .name = "VRAM"s, + .startAddr = 0x8000, + .size = 0x2000, + .firstBank = 0, + .lastBank = 1, // Patched to 0 if isDmgMode + }, + { + .name = "ROMX"s, + .startAddr = 0x4000, + .size = 0x4000, + .firstBank = 1, + .lastBank = 65535, }, { - .name = "ROMX"s, - .startAddr = 0x4000, - .size = 0x4000, - .firstBank = 1, - .lastBank = 65535, + .name = "ROM0"s, + .startAddr = 0x0000, + .size = 0x8000, // Patched to 0x4000 if !is32kMode + .firstBank = 0, + .lastBank = 0, }, { - .name = "ROM0"s, - .startAddr = 0x0000, - .size = 0x8000, // Patched to 0x4000 if !is32kMode - .firstBank = 0, - .lastBank = 0, + .name = "HRAM"s, + .startAddr = 0xFF80, + .size = 0x007F, + .firstBank = 0, + .lastBank = 0, }, { - .name = "HRAM"s, - .startAddr = 0xFF80, - .size = 0x007F, - .firstBank = 0, - .lastBank = 0, + .name = "WRAMX"s, + .startAddr = 0xD000, + .size = 0x1000, + .firstBank = 1, + .lastBank = 7, }, { - .name = "WRAMX"s, - .startAddr = 0xD000, - .size = 0x1000, - .firstBank = 1, - .lastBank = 7, + .name = "SRAM"s, + .startAddr = 0xA000, + .size = 0x2000, + .firstBank = 0, + .lastBank = 255, }, { - .name = "SRAM"s, - .startAddr = 0xA000, - .size = 0x2000, - .firstBank = 0, - .lastBank = 255, - }, - { - .name = "OAM"s, - .startAddr = 0xFE00, - .size = 0x00A0, - .firstBank = 0, - .lastBank = 0, + .name = "OAM"s, + .startAddr = 0xFE00, + .size = 0x00A0, + .firstBank = 0, + .lastBank = 0, }, }; +// clang-format on char const * const sectionModNames[] = { "regular", // SECTION_NORMAL