gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename isWRA0Mode to isWRAM0Mode

Browse Source
This commit is contained in:
Rangi42
2024-02-28 21:57:56 -05:00
committed by Sylvie
parent cdb9315366
commit e90084ad06
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/link/main.hpp
View File

@@ -27,7 +27,7 @@ extern uint8_t scrambleWRAMX;
extern uint8_t scrambleSRAM; extern uint8_t scrambleSRAM;
extern bool is32kMode; extern bool is32kMode;
extern bool beVerbose; extern bool beVerbose;
extern bool isWRA0Mode; extern bool isWRAM0Mode;
extern bool disablePadding; extern bool disablePadding;
struct FileStackNode { struct FileStackNode {

8
src/link/main.cpp
View File

@@ -44,7 +44,7 @@ uint8_t scrambleWRAMX = 0;
uint8_t scrambleSRAM = 0; uint8_t scrambleSRAM = 0;
bool is32kMode; // -t bool is32kMode; // -t
bool beVerbose; // -v bool beVerbose; // -v
bool isWRA0Mode; // -w bool isWRAM0Mode; // -w
bool disablePadding; // -x bool disablePadding; // -x
FILE *linkerScript; FILE *linkerScript;
@@ -349,7 +349,7 @@ int main(int argc, char *argv[])
switch (ch) { switch (ch) {
case 'd': case 'd':
isDmgMode = true; isDmgMode = true;
isWRA0Mode = true; isWRAM0Mode = true;
break; break;
case 'l': case 'l':
if (linkerScriptName) if (linkerScriptName)
@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
beVerbose = true; beVerbose = true;
break; break;
case 'w': case 'w':
isWRA0Mode = true; isWRAM0Mode = true;
break; break;
case 'x': case 'x':
disablePadding = true; disablePadding = true;
@@ -438,7 +438,7 @@ int main(int argc, char *argv[])
// Patch the size array depending on command-line options // Patch the size array depending on command-line options
if (!is32kMode) if (!is32kMode)
sectionTypeInfo[SECTTYPE_ROM0].size = 0x4000; sectionTypeInfo[SECTTYPE_ROM0].size = 0x4000;
if (!isWRA0Mode) if (!isWRAM0Mode)
sectionTypeInfo[SECTTYPE_WRAM0].size = 0x1000; sectionTypeInfo[SECTTYPE_WRAM0].size = 0x1000;
// Patch the bank ranges array depending on command-line options // Patch the bank ranges array depending on command-line options

2
src/link/section.cpp
View File

@@ -200,7 +200,7 @@ static void doSanityChecks(struct Section *section)
else else
section->type = SECTTYPE_ROM0; section->type = SECTTYPE_ROM0;
} }
if (isWRA0Mode && section->type == SECTTYPE_WRAMX) { if (isWRAM0Mode && section->type == SECTTYPE_WRAMX) {
if (section->isBankFixed && section->bank != 1) if (section->isBankFixed && section->bank != 1)
error(NULL, 0, "%s: WRAMX sections must be in bank 1 with options -w or -d", error(NULL, 0, "%s: WRAMX sections must be in bank 1 with options -w or -d",
section->name.c_str()); section->name.c_str());

2
src/linkdefs.cpp
View File

@@ -11,7 +11,7 @@ struct SectionTypeInfo sectionTypeInfo[SECTTYPE_INVALID] = {
{ // SECTTYPE_WRAM0 { // SECTTYPE_WRAM0
.name = "WRAM0"s, .name = "WRAM0"s,
.startAddr = 0xC000, .startAddr = 0xC000,
.size = 0x2000, // Patched to 0x1000 if !isWRA0Mode .size = 0x2000, // Patched to 0x1000 if !isWRAM0Mode
.firstBank = 0, .firstBank = 0,
.lastBank = 0, .lastBank = 0,
}, },

2
test/gfx/test.sh
View File

@@ -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 # Neither should change anything to how the image is displayed
while [[ "$ofs" -eq 0 ]]; do (( ofs = RANDOM % 256 )); done while [[ "$ofs" -eq 0 ]]; do (( ofs = RANDOM % 256 )); done
while [[ "$size" -eq 0 ]]; do (( size = RANDOM % 256 )); done while [[ "$size" -eq 0 ]]; do (( size = RANDOM % 256 )); done