diff --git a/include/link/main.hpp b/include/link/main.hpp index db429969..6f6d6533 100644 --- a/include/link/main.hpp +++ b/include/link/main.hpp @@ -27,7 +27,7 @@ extern uint8_t scrambleWRAMX; extern uint8_t scrambleSRAM; extern bool is32kMode; extern bool beVerbose; -extern bool isWRA0Mode; +extern bool isWRAM0Mode; extern bool disablePadding; struct FileStackNode { diff --git a/src/link/main.cpp b/src/link/main.cpp index f38204bb..efae9ef4 100644 --- a/src/link/main.cpp +++ b/src/link/main.cpp @@ -44,7 +44,7 @@ uint8_t scrambleWRAMX = 0; uint8_t scrambleSRAM = 0; bool is32kMode; // -t bool beVerbose; // -v -bool isWRA0Mode; // -w +bool isWRAM0Mode; // -w bool disablePadding; // -x FILE *linkerScript; @@ -349,7 +349,7 @@ int main(int argc, char *argv[]) switch (ch) { case 'd': isDmgMode = true; - isWRA0Mode = true; + isWRAM0Mode = true; break; case 'l': if (linkerScriptName) @@ -411,7 +411,7 @@ int main(int argc, char *argv[]) beVerbose = true; break; case 'w': - isWRA0Mode = true; + isWRAM0Mode = true; break; case 'x': disablePadding = true; @@ -438,7 +438,7 @@ int main(int argc, char *argv[]) // Patch the size array depending on command-line options if (!is32kMode) sectionTypeInfo[SECTTYPE_ROM0].size = 0x4000; - if (!isWRA0Mode) + if (!isWRAM0Mode) sectionTypeInfo[SECTTYPE_WRAM0].size = 0x1000; // Patch the bank ranges array depending on command-line options diff --git a/src/link/section.cpp b/src/link/section.cpp index d041cc99..f6bd2e0b 100644 --- a/src/link/section.cpp +++ b/src/link/section.cpp @@ -200,7 +200,7 @@ static void doSanityChecks(struct Section *section) else section->type = SECTTYPE_ROM0; } - if (isWRA0Mode && section->type == SECTTYPE_WRAMX) { + if (isWRAM0Mode && section->type == SECTTYPE_WRAMX) { if (section->isBankFixed && section->bank != 1) error(NULL, 0, "%s: WRAMX sections must be in bank 1 with options -w or -d", section->name.c_str()); diff --git a/src/linkdefs.cpp b/src/linkdefs.cpp index cfd16af8..d940f9dd 100644 --- a/src/linkdefs.cpp +++ b/src/linkdefs.cpp @@ -11,7 +11,7 @@ struct SectionTypeInfo sectionTypeInfo[SECTTYPE_INVALID] = { { // SECTTYPE_WRAM0 .name = "WRAM0"s, .startAddr = 0xC000, - .size = 0x2000, // Patched to 0x1000 if !isWRA0Mode + .size = 0x2000, // Patched to 0x1000 if !isWRAM0Mode .firstBank = 0, .lastBank = 0, }, diff --git a/test/gfx/test.sh b/test/gfx/test.sh index 4e52bd23..46353e8a 100755 --- a/test/gfx/test.sh +++ b/test/gfx/test.sh @@ -28,7 +28,7 @@ fail() { } -# Draw a random tile offset and VRA0 size +# Draw a random tile offset and VRAM0 size # Neither should change anything to how the image is displayed while [[ "$ofs" -eq 0 ]]; do (( ofs = RANDOM % 256 )); done while [[ "$size" -eq 0 ]]; do (( size = RANDOM % 256 )); done