diff --git a/slinky/src/linker_symbols_style.rs b/slinky/src/linker_symbols_style.rs index 1b638cc..43700fc 100644 --- a/slinky/src/linker_symbols_style.rs +++ b/slinky/src/linker_symbols_style.rs @@ -107,22 +107,22 @@ impl LinkerSymbolsStyle { pub fn vram_class_start(&self, name: &str) -> String { match self { - LinkerSymbolsStyle::Splat => format!("{}_CLASS_VRAM_START", name), - LinkerSymbolsStyle::Makerom => format!("_{}ClassVramStart", name), + LinkerSymbolsStyle::Splat => format!("{}_VRAM_CLASS_START", name), + LinkerSymbolsStyle::Makerom => format!("_{}VramClassStart", name), } } pub fn vram_class_end(&self, name: &str) -> String { match self { - LinkerSymbolsStyle::Splat => format!("{}_CLASS_VRAM_END", name), - LinkerSymbolsStyle::Makerom => format!("_{}ClassVramEnd", name), + LinkerSymbolsStyle::Splat => format!("{}_VRAM_CLASS_END", name), + LinkerSymbolsStyle::Makerom => format!("_{}VramClassEnd", name), } } pub fn vram_class_size(&self, name: &str) -> String { match self { - LinkerSymbolsStyle::Splat => format!("{}_CLASS_VRAM_SIZE", name), - LinkerSymbolsStyle::Makerom => format!("_{}ClassVramSize", name), + LinkerSymbolsStyle::Splat => format!("{}_VRAM_CLASS_SIZE", name), + LinkerSymbolsStyle::Makerom => format!("_{}VramClassSize", name), } } } diff --git a/tests/partial_linking/vram_classes.h b/tests/partial_linking/vram_classes.h new file mode 100644 index 0000000..0491ffd --- /dev/null +++ b/tests/partial_linking/vram_classes.h @@ -0,0 +1,458 @@ +#ifndef HEADER_SYMBOLS_H +#define HEADER_SYMBOLS_H + +extern char boot_ROM_START[]; +extern char boot_VRAM[]; +extern char boot_alloc_VRAM[]; +extern char boot_TEXT_START[]; +extern char boot_TEXT_END[]; +extern char boot_TEXT_SIZE[]; +extern char boot_DATA_START[]; +extern char boot_DATA_END[]; +extern char boot_DATA_SIZE[]; +extern char boot_RODATA_START[]; +extern char boot_RODATA_END[]; +extern char boot_RODATA_SIZE[]; +extern char boot_SDATA_START[]; +extern char boot_SDATA_END[]; +extern char boot_SDATA_SIZE[]; +extern char boot_alloc_VRAM_END[]; +extern char boot_alloc_VRAM_SIZE[]; +extern char boot_noload_VRAM[]; +extern char boot_SBSS_START[]; +extern char boot_SBSS_END[]; +extern char boot_SBSS_SIZE[]; +extern char boot_SCOMMON_START[]; +extern char boot_SCOMMON_END[]; +extern char boot_SCOMMON_SIZE[]; +extern char boot_BSS_START[]; +extern char boot_BSS_END[]; +extern char boot_BSS_SIZE[]; +extern char bootCOMMON_START[]; +extern char bootCOMMON_END[]; +extern char bootCOMMON_SIZE[]; +extern char boot_noload_VRAM_END[]; +extern char boot_noload_VRAM_SIZE[]; +extern char boot_VRAM_END[]; +extern char boot_VRAM_SIZE[]; +extern char boot_ROM_END[]; +extern char boot_ROM_SIZE[]; +extern char battle_partner_VRAM_CLASS_START[]; +extern char battle_partner_VRAM_CLASS_END[]; +extern char battle_partner_goompa_ROM_START[]; +extern char battle_partner_goompa_VRAM[]; +extern char battle_partner_goompa_alloc_VRAM[]; +extern char battle_partner_goompa_TEXT_START[]; +extern char battle_partner_goompa_TEXT_END[]; +extern char battle_partner_goompa_TEXT_SIZE[]; +extern char battle_partner_goompa_DATA_START[]; +extern char battle_partner_goompa_DATA_END[]; +extern char battle_partner_goompa_DATA_SIZE[]; +extern char battle_partner_goompa_RODATA_START[]; +extern char battle_partner_goompa_RODATA_END[]; +extern char battle_partner_goompa_RODATA_SIZE[]; +extern char battle_partner_goompa_SDATA_START[]; +extern char battle_partner_goompa_SDATA_END[]; +extern char battle_partner_goompa_SDATA_SIZE[]; +extern char battle_partner_goompa_alloc_VRAM_END[]; +extern char battle_partner_goompa_alloc_VRAM_SIZE[]; +extern char battle_partner_goompa_noload_VRAM[]; +extern char battle_partner_goompa_SBSS_START[]; +extern char battle_partner_goompa_SBSS_END[]; +extern char battle_partner_goompa_SBSS_SIZE[]; +extern char battle_partner_goompa_SCOMMON_START[]; +extern char battle_partner_goompa_SCOMMON_END[]; +extern char battle_partner_goompa_SCOMMON_SIZE[]; +extern char battle_partner_goompa_BSS_START[]; +extern char battle_partner_goompa_BSS_END[]; +extern char battle_partner_goompa_BSS_SIZE[]; +extern char battle_partner_goompaCOMMON_START[]; +extern char battle_partner_goompaCOMMON_END[]; +extern char battle_partner_goompaCOMMON_SIZE[]; +extern char battle_partner_goompa_noload_VRAM_END[]; +extern char battle_partner_goompa_noload_VRAM_SIZE[]; +extern char battle_partner_goompa_VRAM_END[]; +extern char battle_partner_goompa_VRAM_SIZE[]; +extern char battle_partner_goompa_ROM_END[]; +extern char battle_partner_goompa_ROM_SIZE[]; +extern char battle_partner_goombario_ROM_START[]; +extern char battle_partner_goombario_VRAM[]; +extern char battle_partner_goombario_alloc_VRAM[]; +extern char battle_partner_goombario_TEXT_START[]; +extern char battle_partner_goombario_TEXT_END[]; +extern char battle_partner_goombario_TEXT_SIZE[]; +extern char battle_partner_goombario_DATA_START[]; +extern char battle_partner_goombario_DATA_END[]; +extern char battle_partner_goombario_DATA_SIZE[]; +extern char battle_partner_goombario_RODATA_START[]; +extern char battle_partner_goombario_RODATA_END[]; +extern char battle_partner_goombario_RODATA_SIZE[]; +extern char battle_partner_goombario_SDATA_START[]; +extern char battle_partner_goombario_SDATA_END[]; +extern char battle_partner_goombario_SDATA_SIZE[]; +extern char battle_partner_goombario_alloc_VRAM_END[]; +extern char battle_partner_goombario_alloc_VRAM_SIZE[]; +extern char battle_partner_goombario_noload_VRAM[]; +extern char battle_partner_goombario_SBSS_START[]; +extern char battle_partner_goombario_SBSS_END[]; +extern char battle_partner_goombario_SBSS_SIZE[]; +extern char battle_partner_goombario_SCOMMON_START[]; +extern char battle_partner_goombario_SCOMMON_END[]; +extern char battle_partner_goombario_SCOMMON_SIZE[]; +extern char battle_partner_goombario_BSS_START[]; +extern char battle_partner_goombario_BSS_END[]; +extern char battle_partner_goombario_BSS_SIZE[]; +extern char battle_partner_goombarioCOMMON_START[]; +extern char battle_partner_goombarioCOMMON_END[]; +extern char battle_partner_goombarioCOMMON_SIZE[]; +extern char battle_partner_goombario_noload_VRAM_END[]; +extern char battle_partner_goombario_noload_VRAM_SIZE[]; +extern char battle_partner_goombario_VRAM_END[]; +extern char battle_partner_goombario_VRAM_SIZE[]; +extern char battle_partner_goombario_ROM_END[]; +extern char battle_partner_goombario_ROM_SIZE[]; +extern char battle_partner_kooper_ROM_START[]; +extern char battle_partner_kooper_VRAM[]; +extern char battle_partner_kooper_alloc_VRAM[]; +extern char battle_partner_kooper_TEXT_START[]; +extern char battle_partner_kooper_TEXT_END[]; +extern char battle_partner_kooper_TEXT_SIZE[]; +extern char battle_partner_kooper_DATA_START[]; +extern char battle_partner_kooper_DATA_END[]; +extern char battle_partner_kooper_DATA_SIZE[]; +extern char battle_partner_kooper_RODATA_START[]; +extern char battle_partner_kooper_RODATA_END[]; +extern char battle_partner_kooper_RODATA_SIZE[]; +extern char battle_partner_kooper_SDATA_START[]; +extern char battle_partner_kooper_SDATA_END[]; +extern char battle_partner_kooper_SDATA_SIZE[]; +extern char battle_partner_kooper_alloc_VRAM_END[]; +extern char battle_partner_kooper_alloc_VRAM_SIZE[]; +extern char battle_partner_kooper_noload_VRAM[]; +extern char battle_partner_kooper_SBSS_START[]; +extern char battle_partner_kooper_SBSS_END[]; +extern char battle_partner_kooper_SBSS_SIZE[]; +extern char battle_partner_kooper_SCOMMON_START[]; +extern char battle_partner_kooper_SCOMMON_END[]; +extern char battle_partner_kooper_SCOMMON_SIZE[]; +extern char battle_partner_kooper_BSS_START[]; +extern char battle_partner_kooper_BSS_END[]; +extern char battle_partner_kooper_BSS_SIZE[]; +extern char battle_partner_kooperCOMMON_START[]; +extern char battle_partner_kooperCOMMON_END[]; +extern char battle_partner_kooperCOMMON_SIZE[]; +extern char battle_partner_kooper_noload_VRAM_END[]; +extern char battle_partner_kooper_noload_VRAM_SIZE[]; +extern char battle_partner_kooper_VRAM_END[]; +extern char battle_partner_kooper_VRAM_SIZE[]; +extern char battle_partner_kooper_ROM_END[]; +extern char battle_partner_kooper_ROM_SIZE[]; +extern char battle_code_VRAM_CLASS_START[]; +extern char battle_code_VRAM_CLASS_END[]; +extern char battle_code_ROM_START[]; +extern char battle_code_VRAM[]; +extern char battle_code_alloc_VRAM[]; +extern char battle_code_TEXT_START[]; +extern char battle_code_TEXT_END[]; +extern char battle_code_TEXT_SIZE[]; +extern char battle_code_DATA_START[]; +extern char battle_code_DATA_END[]; +extern char battle_code_DATA_SIZE[]; +extern char battle_code_RODATA_START[]; +extern char battle_code_RODATA_END[]; +extern char battle_code_RODATA_SIZE[]; +extern char battle_code_SDATA_START[]; +extern char battle_code_SDATA_END[]; +extern char battle_code_SDATA_SIZE[]; +extern char battle_code_alloc_VRAM_END[]; +extern char battle_code_alloc_VRAM_SIZE[]; +extern char battle_code_noload_VRAM[]; +extern char battle_code_SBSS_START[]; +extern char battle_code_SBSS_END[]; +extern char battle_code_SBSS_SIZE[]; +extern char battle_code_SCOMMON_START[]; +extern char battle_code_SCOMMON_END[]; +extern char battle_code_SCOMMON_SIZE[]; +extern char battle_code_BSS_START[]; +extern char battle_code_BSS_END[]; +extern char battle_code_BSS_SIZE[]; +extern char battle_codeCOMMON_START[]; +extern char battle_codeCOMMON_END[]; +extern char battle_codeCOMMON_SIZE[]; +extern char battle_code_noload_VRAM_END[]; +extern char battle_code_noload_VRAM_SIZE[]; +extern char battle_code_VRAM_END[]; +extern char battle_code_VRAM_SIZE[]; +extern char battle_code_ROM_END[]; +extern char battle_code_ROM_SIZE[]; +extern char heaps2_VRAM_CLASS_START[]; +extern char heaps2_VRAM_CLASS_END[]; +extern char heaps2_ROM_START[]; +extern char heaps2_VRAM[]; +extern char heaps2_alloc_VRAM[]; +extern char heaps2_TEXT_START[]; +extern char heaps2_TEXT_END[]; +extern char heaps2_TEXT_SIZE[]; +extern char heaps2_DATA_START[]; +extern char heaps2_DATA_END[]; +extern char heaps2_DATA_SIZE[]; +extern char heaps2_RODATA_START[]; +extern char heaps2_RODATA_END[]; +extern char heaps2_RODATA_SIZE[]; +extern char heaps2_SDATA_START[]; +extern char heaps2_SDATA_END[]; +extern char heaps2_SDATA_SIZE[]; +extern char heaps2_alloc_VRAM_END[]; +extern char heaps2_alloc_VRAM_SIZE[]; +extern char heaps2_noload_VRAM[]; +extern char heaps2_SBSS_START[]; +extern char heaps2_SBSS_END[]; +extern char heaps2_SBSS_SIZE[]; +extern char heaps2_SCOMMON_START[]; +extern char heaps2_SCOMMON_END[]; +extern char heaps2_SCOMMON_SIZE[]; +extern char heaps2_BSS_START[]; +extern char heaps2_BSS_END[]; +extern char heaps2_BSS_SIZE[]; +extern char heaps2COMMON_START[]; +extern char heaps2COMMON_END[]; +extern char heaps2COMMON_SIZE[]; +extern char heaps2_noload_VRAM_END[]; +extern char heaps2_noload_VRAM_SIZE[]; +extern char heaps2_VRAM_END[]; +extern char heaps2_VRAM_SIZE[]; +extern char heaps2_ROM_END[]; +extern char heaps2_ROM_SIZE[]; +extern char world_script_api_VRAM_CLASS_START[]; +extern char world_script_api_VRAM_CLASS_END[]; +extern char world_script_api_ROM_START[]; +extern char world_script_api_VRAM[]; +extern char world_script_api_alloc_VRAM[]; +extern char world_script_api_TEXT_START[]; +extern char world_script_api_TEXT_END[]; +extern char world_script_api_TEXT_SIZE[]; +extern char world_script_api_DATA_START[]; +extern char world_script_api_DATA_END[]; +extern char world_script_api_DATA_SIZE[]; +extern char world_script_api_RODATA_START[]; +extern char world_script_api_RODATA_END[]; +extern char world_script_api_RODATA_SIZE[]; +extern char world_script_api_SDATA_START[]; +extern char world_script_api_SDATA_END[]; +extern char world_script_api_SDATA_SIZE[]; +extern char world_script_api_alloc_VRAM_END[]; +extern char world_script_api_alloc_VRAM_SIZE[]; +extern char world_script_api_noload_VRAM[]; +extern char world_script_api_SBSS_START[]; +extern char world_script_api_SBSS_END[]; +extern char world_script_api_SBSS_SIZE[]; +extern char world_script_api_SCOMMON_START[]; +extern char world_script_api_SCOMMON_END[]; +extern char world_script_api_SCOMMON_SIZE[]; +extern char world_script_api_BSS_START[]; +extern char world_script_api_BSS_END[]; +extern char world_script_api_BSS_SIZE[]; +extern char world_script_apiCOMMON_START[]; +extern char world_script_apiCOMMON_END[]; +extern char world_script_apiCOMMON_SIZE[]; +extern char world_script_api_noload_VRAM_END[]; +extern char world_script_api_noload_VRAM_SIZE[]; +extern char world_script_api_VRAM_END[]; +extern char world_script_api_VRAM_SIZE[]; +extern char world_script_api_ROM_END[]; +extern char world_script_api_ROM_SIZE[]; +extern char texture_memory_VRAM_CLASS_START[]; +extern char texture_memory_VRAM_CLASS_END[]; +extern char texture_memory_ROM_START[]; +extern char texture_memory_VRAM[]; +extern char texture_memory_alloc_VRAM[]; +extern char texture_memory_TEXT_START[]; +extern char texture_memory_TEXT_END[]; +extern char texture_memory_TEXT_SIZE[]; +extern char texture_memory_DATA_START[]; +extern char texture_memory_DATA_END[]; +extern char texture_memory_DATA_SIZE[]; +extern char texture_memory_RODATA_START[]; +extern char texture_memory_RODATA_END[]; +extern char texture_memory_RODATA_SIZE[]; +extern char texture_memory_SDATA_START[]; +extern char texture_memory_SDATA_END[]; +extern char texture_memory_SDATA_SIZE[]; +extern char texture_memory_alloc_VRAM_END[]; +extern char texture_memory_alloc_VRAM_SIZE[]; +extern char texture_memory_noload_VRAM[]; +extern char texture_memory_SBSS_START[]; +extern char texture_memory_SBSS_END[]; +extern char texture_memory_SBSS_SIZE[]; +extern char texture_memory_SCOMMON_START[]; +extern char texture_memory_SCOMMON_END[]; +extern char texture_memory_SCOMMON_SIZE[]; +extern char texture_memory_BSS_START[]; +extern char texture_memory_BSS_END[]; +extern char texture_memory_BSS_SIZE[]; +extern char texture_memoryCOMMON_START[]; +extern char texture_memoryCOMMON_END[]; +extern char texture_memoryCOMMON_SIZE[]; +extern char texture_memory_noload_VRAM_END[]; +extern char texture_memory_noload_VRAM_SIZE[]; +extern char texture_memory_VRAM_END[]; +extern char texture_memory_VRAM_SIZE[]; +extern char texture_memory_ROM_END[]; +extern char texture_memory_ROM_SIZE[]; +extern char segment_05_VRAM_CLASS_START[]; +extern char segment_05_VRAM_CLASS_END[]; +extern char assets1_ROM_START[]; +extern char assets1_VRAM[]; +extern char assets1_alloc_VRAM[]; +extern char assets1_TEXT_START[]; +extern char assets1_TEXT_END[]; +extern char assets1_TEXT_SIZE[]; +extern char assets1_DATA_START[]; +extern char assets1_DATA_END[]; +extern char assets1_DATA_SIZE[]; +extern char assets1_RODATA_START[]; +extern char assets1_RODATA_END[]; +extern char assets1_RODATA_SIZE[]; +extern char assets1_SDATA_START[]; +extern char assets1_SDATA_END[]; +extern char assets1_SDATA_SIZE[]; +extern char assets1_alloc_VRAM_END[]; +extern char assets1_alloc_VRAM_SIZE[]; +extern char assets1_noload_VRAM[]; +extern char assets1_SBSS_START[]; +extern char assets1_SBSS_END[]; +extern char assets1_SBSS_SIZE[]; +extern char assets1_SCOMMON_START[]; +extern char assets1_SCOMMON_END[]; +extern char assets1_SCOMMON_SIZE[]; +extern char assets1_BSS_START[]; +extern char assets1_BSS_END[]; +extern char assets1_BSS_SIZE[]; +extern char assets1COMMON_START[]; +extern char assets1COMMON_END[]; +extern char assets1COMMON_SIZE[]; +extern char assets1_noload_VRAM_END[]; +extern char assets1_noload_VRAM_SIZE[]; +extern char assets1_VRAM_END[]; +extern char assets1_VRAM_SIZE[]; +extern char assets1_ROM_END[]; +extern char assets1_ROM_SIZE[]; +extern char assets2_ROM_START[]; +extern char assets2_VRAM[]; +extern char assets2_alloc_VRAM[]; +extern char assets2_TEXT_START[]; +extern char assets2_TEXT_END[]; +extern char assets2_TEXT_SIZE[]; +extern char assets2_DATA_START[]; +extern char assets2_DATA_END[]; +extern char assets2_DATA_SIZE[]; +extern char assets2_RODATA_START[]; +extern char assets2_RODATA_END[]; +extern char assets2_RODATA_SIZE[]; +extern char assets2_SDATA_START[]; +extern char assets2_SDATA_END[]; +extern char assets2_SDATA_SIZE[]; +extern char assets2_alloc_VRAM_END[]; +extern char assets2_alloc_VRAM_SIZE[]; +extern char assets2_noload_VRAM[]; +extern char assets2_SBSS_START[]; +extern char assets2_SBSS_END[]; +extern char assets2_SBSS_SIZE[]; +extern char assets2_SCOMMON_START[]; +extern char assets2_SCOMMON_END[]; +extern char assets2_SCOMMON_SIZE[]; +extern char assets2_BSS_START[]; +extern char assets2_BSS_END[]; +extern char assets2_BSS_SIZE[]; +extern char assets2COMMON_START[]; +extern char assets2COMMON_END[]; +extern char assets2COMMON_SIZE[]; +extern char assets2_noload_VRAM_END[]; +extern char assets2_noload_VRAM_SIZE[]; +extern char assets2_VRAM_END[]; +extern char assets2_VRAM_SIZE[]; +extern char assets2_ROM_END[]; +extern char assets2_ROM_SIZE[]; +extern char assets3_ROM_START[]; +extern char assets3_VRAM[]; +extern char assets3_alloc_VRAM[]; +extern char assets3_TEXT_START[]; +extern char assets3_TEXT_END[]; +extern char assets3_TEXT_SIZE[]; +extern char assets3_DATA_START[]; +extern char assets3_DATA_END[]; +extern char assets3_DATA_SIZE[]; +extern char assets3_RODATA_START[]; +extern char assets3_RODATA_END[]; +extern char assets3_RODATA_SIZE[]; +extern char assets3_SDATA_START[]; +extern char assets3_SDATA_END[]; +extern char assets3_SDATA_SIZE[]; +extern char assets3_alloc_VRAM_END[]; +extern char assets3_alloc_VRAM_SIZE[]; +extern char assets3_noload_VRAM[]; +extern char assets3_SBSS_START[]; +extern char assets3_SBSS_END[]; +extern char assets3_SBSS_SIZE[]; +extern char assets3_SCOMMON_START[]; +extern char assets3_SCOMMON_END[]; +extern char assets3_SCOMMON_SIZE[]; +extern char assets3_BSS_START[]; +extern char assets3_BSS_END[]; +extern char assets3_BSS_SIZE[]; +extern char assets3COMMON_START[]; +extern char assets3COMMON_END[]; +extern char assets3COMMON_SIZE[]; +extern char assets3_noload_VRAM_END[]; +extern char assets3_noload_VRAM_SIZE[]; +extern char assets3_VRAM_END[]; +extern char assets3_VRAM_SIZE[]; +extern char assets3_ROM_END[]; +extern char assets3_ROM_SIZE[]; +extern char segment_06_VRAM_CLASS_START[]; +extern char segment_06_VRAM_CLASS_END[]; +extern char assets4_ROM_START[]; +extern char assets4_VRAM[]; +extern char assets4_alloc_VRAM[]; +extern char assets4_TEXT_START[]; +extern char assets4_TEXT_END[]; +extern char assets4_TEXT_SIZE[]; +extern char assets4_DATA_START[]; +extern char assets4_DATA_END[]; +extern char assets4_DATA_SIZE[]; +extern char assets4_RODATA_START[]; +extern char assets4_RODATA_END[]; +extern char assets4_RODATA_SIZE[]; +extern char assets4_SDATA_START[]; +extern char assets4_SDATA_END[]; +extern char assets4_SDATA_SIZE[]; +extern char assets4_alloc_VRAM_END[]; +extern char assets4_alloc_VRAM_SIZE[]; +extern char assets4_noload_VRAM[]; +extern char assets4_SBSS_START[]; +extern char assets4_SBSS_END[]; +extern char assets4_SBSS_SIZE[]; +extern char assets4_SCOMMON_START[]; +extern char assets4_SCOMMON_END[]; +extern char assets4_SCOMMON_SIZE[]; +extern char assets4_BSS_START[]; +extern char assets4_BSS_END[]; +extern char assets4_BSS_SIZE[]; +extern char assets4COMMON_START[]; +extern char assets4COMMON_END[]; +extern char assets4COMMON_SIZE[]; +extern char assets4_noload_VRAM_END[]; +extern char assets4_noload_VRAM_SIZE[]; +extern char assets4_VRAM_END[]; +extern char assets4_VRAM_SIZE[]; +extern char assets4_ROM_END[]; +extern char assets4_ROM_SIZE[]; +extern char battle_partner_VRAM_CLASS_SIZE[]; +extern char battle_code_VRAM_CLASS_SIZE[]; +extern char heaps2_VRAM_CLASS_SIZE[]; +extern char world_script_api_VRAM_CLASS_SIZE[]; +extern char texture_memory_VRAM_CLASS_SIZE[]; +extern char segment_05_VRAM_CLASS_SIZE[]; +extern char segment_06_VRAM_CLASS_SIZE[]; + +#endif diff --git a/tests/partial_linking/vram_classes.ld b/tests/partial_linking/vram_classes.ld index 1f2e874..5fc0bb8 100644 --- a/tests/partial_linking/vram_classes.ld +++ b/tests/partial_linking/vram_classes.ld @@ -75,14 +75,14 @@ SECTIONS boot_ROM_END = __romPos; boot_ROM_SIZE = ABSOLUTE(boot_ROM_END - boot_ROM_START); - battle_partner_CLASS_VRAM_START = 0x80238000; - battle_partner_CLASS_VRAM_END = 0x00000000; + battle_partner_VRAM_CLASS_START = 0x80238000; + battle_partner_VRAM_CLASS_END = 0x00000000; battle_partner_goompa_ROM_START = __romPos; battle_partner_goompa_VRAM = ADDR(.battle_partner_goompa); battle_partner_goompa_alloc_VRAM = .; - .battle_partner_goompa battle_partner_CLASS_VRAM_START : AT(battle_partner_goompa_ROM_START) SUBALIGN(16) + .battle_partner_goompa battle_partner_VRAM_CLASS_START : AT(battle_partner_goompa_ROM_START) SUBALIGN(16) { FILL(0x00000000); battle_partner_goompa_TEXT_START = .; @@ -151,13 +151,13 @@ SECTIONS battle_partner_goompa_ROM_END = __romPos; battle_partner_goompa_ROM_SIZE = ABSOLUTE(battle_partner_goompa_ROM_END - battle_partner_goompa_ROM_START); - battle_partner_CLASS_VRAM_END = MAX(battle_partner_CLASS_VRAM_END, battle_partner_goompa_VRAM_END); + battle_partner_VRAM_CLASS_END = MAX(battle_partner_VRAM_CLASS_END, battle_partner_goompa_VRAM_END); battle_partner_goombario_ROM_START = __romPos; battle_partner_goombario_VRAM = ADDR(.battle_partner_goombario); battle_partner_goombario_alloc_VRAM = .; - .battle_partner_goombario battle_partner_CLASS_VRAM_START : AT(battle_partner_goombario_ROM_START) SUBALIGN(16) + .battle_partner_goombario battle_partner_VRAM_CLASS_START : AT(battle_partner_goombario_ROM_START) SUBALIGN(16) { FILL(0x00000000); battle_partner_goombario_TEXT_START = .; @@ -226,13 +226,13 @@ SECTIONS battle_partner_goombario_ROM_END = __romPos; battle_partner_goombario_ROM_SIZE = ABSOLUTE(battle_partner_goombario_ROM_END - battle_partner_goombario_ROM_START); - battle_partner_CLASS_VRAM_END = MAX(battle_partner_CLASS_VRAM_END, battle_partner_goombario_VRAM_END); + battle_partner_VRAM_CLASS_END = MAX(battle_partner_VRAM_CLASS_END, battle_partner_goombario_VRAM_END); battle_partner_kooper_ROM_START = __romPos; battle_partner_kooper_VRAM = ADDR(.battle_partner_kooper); battle_partner_kooper_alloc_VRAM = .; - .battle_partner_kooper battle_partner_CLASS_VRAM_START : AT(battle_partner_kooper_ROM_START) SUBALIGN(16) + .battle_partner_kooper battle_partner_VRAM_CLASS_START : AT(battle_partner_kooper_ROM_START) SUBALIGN(16) { FILL(0x00000000); battle_partner_kooper_TEXT_START = .; @@ -301,17 +301,17 @@ SECTIONS battle_partner_kooper_ROM_END = __romPos; battle_partner_kooper_ROM_SIZE = ABSOLUTE(battle_partner_kooper_ROM_END - battle_partner_kooper_ROM_START); - battle_partner_CLASS_VRAM_END = MAX(battle_partner_CLASS_VRAM_END, battle_partner_kooper_VRAM_END); + battle_partner_VRAM_CLASS_END = MAX(battle_partner_VRAM_CLASS_END, battle_partner_kooper_VRAM_END); - battle_code_CLASS_VRAM_START = 0x00000000; - battle_code_CLASS_VRAM_START = MAX(battle_code_CLASS_VRAM_START, battle_partner_CLASS_VRAM_END); - battle_code_CLASS_VRAM_END = 0x00000000; + battle_code_VRAM_CLASS_START = 0x00000000; + battle_code_VRAM_CLASS_START = MAX(battle_code_VRAM_CLASS_START, battle_partner_VRAM_CLASS_END); + battle_code_VRAM_CLASS_END = 0x00000000; battle_code_ROM_START = __romPos; battle_code_VRAM = ADDR(.battle_code); battle_code_alloc_VRAM = .; - .battle_code battle_code_CLASS_VRAM_START : AT(battle_code_ROM_START) SUBALIGN(16) + .battle_code battle_code_VRAM_CLASS_START : AT(battle_code_ROM_START) SUBALIGN(16) { FILL(0x00000000); battle_code_TEXT_START = .; @@ -380,16 +380,16 @@ SECTIONS battle_code_ROM_END = __romPos; battle_code_ROM_SIZE = ABSOLUTE(battle_code_ROM_END - battle_code_ROM_START); - battle_code_CLASS_VRAM_END = MAX(battle_code_CLASS_VRAM_END, battle_code_VRAM_END); + battle_code_VRAM_CLASS_END = MAX(battle_code_VRAM_CLASS_END, battle_code_VRAM_END); - heaps2_CLASS_VRAM_START = 0x80267FF0; - heaps2_CLASS_VRAM_END = 0x00000000; + heaps2_VRAM_CLASS_START = 0x80267FF0; + heaps2_VRAM_CLASS_END = 0x00000000; heaps2_ROM_START = __romPos; heaps2_VRAM = ADDR(.heaps2); heaps2_alloc_VRAM = .; - .heaps2 heaps2_CLASS_VRAM_START : AT(heaps2_ROM_START) SUBALIGN(16) + .heaps2 heaps2_VRAM_CLASS_START : AT(heaps2_ROM_START) SUBALIGN(16) { FILL(0x00000000); heaps2_TEXT_START = .; @@ -458,17 +458,17 @@ SECTIONS heaps2_ROM_END = __romPos; heaps2_ROM_SIZE = ABSOLUTE(heaps2_ROM_END - heaps2_ROM_START); - heaps2_CLASS_VRAM_END = MAX(heaps2_CLASS_VRAM_END, heaps2_VRAM_END); + heaps2_VRAM_CLASS_END = MAX(heaps2_VRAM_CLASS_END, heaps2_VRAM_END); - world_script_api_CLASS_VRAM_START = 0x00000000; - world_script_api_CLASS_VRAM_START = MAX(world_script_api_CLASS_VRAM_START, heaps2_CLASS_VRAM_END); - world_script_api_CLASS_VRAM_END = 0x00000000; + world_script_api_VRAM_CLASS_START = 0x00000000; + world_script_api_VRAM_CLASS_START = MAX(world_script_api_VRAM_CLASS_START, heaps2_VRAM_CLASS_END); + world_script_api_VRAM_CLASS_END = 0x00000000; world_script_api_ROM_START = __romPos; world_script_api_VRAM = ADDR(.world_script_api); world_script_api_alloc_VRAM = .; - .world_script_api world_script_api_CLASS_VRAM_START : AT(world_script_api_ROM_START) SUBALIGN(16) + .world_script_api world_script_api_VRAM_CLASS_START : AT(world_script_api_ROM_START) SUBALIGN(16) { FILL(0x00000000); world_script_api_TEXT_START = .; @@ -537,18 +537,18 @@ SECTIONS world_script_api_ROM_END = __romPos; world_script_api_ROM_SIZE = ABSOLUTE(world_script_api_ROM_END - world_script_api_ROM_START); - world_script_api_CLASS_VRAM_END = MAX(world_script_api_CLASS_VRAM_END, world_script_api_VRAM_END); + world_script_api_VRAM_CLASS_END = MAX(world_script_api_VRAM_CLASS_END, world_script_api_VRAM_END); - texture_memory_CLASS_VRAM_START = 0x00000000; - texture_memory_CLASS_VRAM_START = MAX(texture_memory_CLASS_VRAM_START, battle_code_CLASS_VRAM_END); - texture_memory_CLASS_VRAM_START = MAX(texture_memory_CLASS_VRAM_START, world_script_api_CLASS_VRAM_END); - texture_memory_CLASS_VRAM_END = 0x00000000; + texture_memory_VRAM_CLASS_START = 0x00000000; + texture_memory_VRAM_CLASS_START = MAX(texture_memory_VRAM_CLASS_START, battle_code_VRAM_CLASS_END); + texture_memory_VRAM_CLASS_START = MAX(texture_memory_VRAM_CLASS_START, world_script_api_VRAM_CLASS_END); + texture_memory_VRAM_CLASS_END = 0x00000000; texture_memory_ROM_START = __romPos; texture_memory_VRAM = ADDR(.texture_memory); texture_memory_alloc_VRAM = .; - .texture_memory texture_memory_CLASS_VRAM_START : AT(texture_memory_ROM_START) SUBALIGN(16) + .texture_memory texture_memory_VRAM_CLASS_START : AT(texture_memory_ROM_START) SUBALIGN(16) { FILL(0x00000000); texture_memory_TEXT_START = .; @@ -617,16 +617,16 @@ SECTIONS texture_memory_ROM_END = __romPos; texture_memory_ROM_SIZE = ABSOLUTE(texture_memory_ROM_END - texture_memory_ROM_START); - texture_memory_CLASS_VRAM_END = MAX(texture_memory_CLASS_VRAM_END, texture_memory_VRAM_END); + texture_memory_VRAM_CLASS_END = MAX(texture_memory_VRAM_CLASS_END, texture_memory_VRAM_END); - segment_05_CLASS_VRAM_START = 0x05000000; - segment_05_CLASS_VRAM_END = 0x00000000; + segment_05_VRAM_CLASS_START = 0x05000000; + segment_05_VRAM_CLASS_END = 0x00000000; assets1_ROM_START = __romPos; assets1_VRAM = ADDR(.assets1); assets1_alloc_VRAM = .; - .assets1 segment_05_CLASS_VRAM_START : AT(assets1_ROM_START) SUBALIGN(16) + .assets1 segment_05_VRAM_CLASS_START : AT(assets1_ROM_START) SUBALIGN(16) { FILL(0x00000000); assets1_TEXT_START = .; @@ -695,13 +695,13 @@ SECTIONS assets1_ROM_END = __romPos; assets1_ROM_SIZE = ABSOLUTE(assets1_ROM_END - assets1_ROM_START); - segment_05_CLASS_VRAM_END = MAX(segment_05_CLASS_VRAM_END, assets1_VRAM_END); + segment_05_VRAM_CLASS_END = MAX(segment_05_VRAM_CLASS_END, assets1_VRAM_END); assets2_ROM_START = __romPos; assets2_VRAM = ADDR(.assets2); assets2_alloc_VRAM = .; - .assets2 segment_05_CLASS_VRAM_START : AT(assets2_ROM_START) SUBALIGN(16) + .assets2 segment_05_VRAM_CLASS_START : AT(assets2_ROM_START) SUBALIGN(16) { FILL(0x00000000); assets2_TEXT_START = .; @@ -770,13 +770,13 @@ SECTIONS assets2_ROM_END = __romPos; assets2_ROM_SIZE = ABSOLUTE(assets2_ROM_END - assets2_ROM_START); - segment_05_CLASS_VRAM_END = MAX(segment_05_CLASS_VRAM_END, assets2_VRAM_END); + segment_05_VRAM_CLASS_END = MAX(segment_05_VRAM_CLASS_END, assets2_VRAM_END); assets3_ROM_START = __romPos; assets3_VRAM = ADDR(.assets3); assets3_alloc_VRAM = .; - .assets3 segment_05_CLASS_VRAM_START : AT(assets3_ROM_START) SUBALIGN(16) + .assets3 segment_05_VRAM_CLASS_START : AT(assets3_ROM_START) SUBALIGN(16) { FILL(0x00000000); assets3_TEXT_START = .; @@ -845,16 +845,16 @@ SECTIONS assets3_ROM_END = __romPos; assets3_ROM_SIZE = ABSOLUTE(assets3_ROM_END - assets3_ROM_START); - segment_05_CLASS_VRAM_END = MAX(segment_05_CLASS_VRAM_END, assets3_VRAM_END); + segment_05_VRAM_CLASS_END = MAX(segment_05_VRAM_CLASS_END, assets3_VRAM_END); - segment_06_CLASS_VRAM_START = 0x06000000; - segment_06_CLASS_VRAM_END = 0x00000000; + segment_06_VRAM_CLASS_START = 0x06000000; + segment_06_VRAM_CLASS_END = 0x00000000; assets4_ROM_START = __romPos; assets4_VRAM = ADDR(.assets4); assets4_alloc_VRAM = .; - .assets4 segment_06_CLASS_VRAM_START : AT(assets4_ROM_START) SUBALIGN(16) + .assets4 segment_06_VRAM_CLASS_START : AT(assets4_ROM_START) SUBALIGN(16) { FILL(0x00000000); assets4_TEXT_START = .; @@ -923,15 +923,15 @@ SECTIONS assets4_ROM_END = __romPos; assets4_ROM_SIZE = ABSOLUTE(assets4_ROM_END - assets4_ROM_START); - segment_06_CLASS_VRAM_END = MAX(segment_06_CLASS_VRAM_END, assets4_VRAM_END); + segment_06_VRAM_CLASS_END = MAX(segment_06_VRAM_CLASS_END, assets4_VRAM_END); - battle_partner_CLASS_VRAM_SIZE = battle_partner_CLASS_VRAM_END - battle_partner_CLASS_VRAM_START; - battle_code_CLASS_VRAM_SIZE = battle_code_CLASS_VRAM_END - battle_code_CLASS_VRAM_START; - heaps2_CLASS_VRAM_SIZE = heaps2_CLASS_VRAM_END - heaps2_CLASS_VRAM_START; - world_script_api_CLASS_VRAM_SIZE = world_script_api_CLASS_VRAM_END - world_script_api_CLASS_VRAM_START; - texture_memory_CLASS_VRAM_SIZE = texture_memory_CLASS_VRAM_END - texture_memory_CLASS_VRAM_START; - segment_05_CLASS_VRAM_SIZE = segment_05_CLASS_VRAM_END - segment_05_CLASS_VRAM_START; - segment_06_CLASS_VRAM_SIZE = segment_06_CLASS_VRAM_END - segment_06_CLASS_VRAM_START; + battle_partner_VRAM_CLASS_SIZE = battle_partner_VRAM_CLASS_END - battle_partner_VRAM_CLASS_START; + battle_code_VRAM_CLASS_SIZE = battle_code_VRAM_CLASS_END - battle_code_VRAM_CLASS_START; + heaps2_VRAM_CLASS_SIZE = heaps2_VRAM_CLASS_END - heaps2_VRAM_CLASS_START; + world_script_api_VRAM_CLASS_SIZE = world_script_api_VRAM_CLASS_END - world_script_api_VRAM_CLASS_START; + texture_memory_VRAM_CLASS_SIZE = texture_memory_VRAM_CLASS_END - texture_memory_VRAM_CLASS_START; + segment_05_VRAM_CLASS_SIZE = segment_05_VRAM_CLASS_END - segment_05_VRAM_CLASS_START; + segment_06_VRAM_CLASS_SIZE = segment_06_VRAM_CLASS_END - segment_06_VRAM_CLASS_START; .shstrtab 0 : { diff --git a/tests/test_cases/vram_classes.h b/tests/test_cases/vram_classes.h index 714f476..0491ffd 100644 --- a/tests/test_cases/vram_classes.h +++ b/tests/test_cases/vram_classes.h @@ -37,8 +37,8 @@ extern char boot_VRAM_END[]; extern char boot_VRAM_SIZE[]; extern char boot_ROM_END[]; extern char boot_ROM_SIZE[]; -extern char battle_partner_CLASS_VRAM_START[]; -extern char battle_partner_CLASS_VRAM_END[]; +extern char battle_partner_VRAM_CLASS_START[]; +extern char battle_partner_VRAM_CLASS_END[]; extern char battle_partner_goompa_ROM_START[]; extern char battle_partner_goompa_VRAM[]; extern char battle_partner_goompa_alloc_VRAM[]; @@ -147,8 +147,8 @@ extern char battle_partner_kooper_VRAM_END[]; extern char battle_partner_kooper_VRAM_SIZE[]; extern char battle_partner_kooper_ROM_END[]; extern char battle_partner_kooper_ROM_SIZE[]; -extern char battle_code_CLASS_VRAM_START[]; -extern char battle_code_CLASS_VRAM_END[]; +extern char battle_code_VRAM_CLASS_START[]; +extern char battle_code_VRAM_CLASS_END[]; extern char battle_code_ROM_START[]; extern char battle_code_VRAM[]; extern char battle_code_alloc_VRAM[]; @@ -185,8 +185,8 @@ extern char battle_code_VRAM_END[]; extern char battle_code_VRAM_SIZE[]; extern char battle_code_ROM_END[]; extern char battle_code_ROM_SIZE[]; -extern char heaps2_CLASS_VRAM_START[]; -extern char heaps2_CLASS_VRAM_END[]; +extern char heaps2_VRAM_CLASS_START[]; +extern char heaps2_VRAM_CLASS_END[]; extern char heaps2_ROM_START[]; extern char heaps2_VRAM[]; extern char heaps2_alloc_VRAM[]; @@ -223,8 +223,8 @@ extern char heaps2_VRAM_END[]; extern char heaps2_VRAM_SIZE[]; extern char heaps2_ROM_END[]; extern char heaps2_ROM_SIZE[]; -extern char world_script_api_CLASS_VRAM_START[]; -extern char world_script_api_CLASS_VRAM_END[]; +extern char world_script_api_VRAM_CLASS_START[]; +extern char world_script_api_VRAM_CLASS_END[]; extern char world_script_api_ROM_START[]; extern char world_script_api_VRAM[]; extern char world_script_api_alloc_VRAM[]; @@ -261,8 +261,8 @@ extern char world_script_api_VRAM_END[]; extern char world_script_api_VRAM_SIZE[]; extern char world_script_api_ROM_END[]; extern char world_script_api_ROM_SIZE[]; -extern char texture_memory_CLASS_VRAM_START[]; -extern char texture_memory_CLASS_VRAM_END[]; +extern char texture_memory_VRAM_CLASS_START[]; +extern char texture_memory_VRAM_CLASS_END[]; extern char texture_memory_ROM_START[]; extern char texture_memory_VRAM[]; extern char texture_memory_alloc_VRAM[]; @@ -299,8 +299,8 @@ extern char texture_memory_VRAM_END[]; extern char texture_memory_VRAM_SIZE[]; extern char texture_memory_ROM_END[]; extern char texture_memory_ROM_SIZE[]; -extern char segment_05_CLASS_VRAM_START[]; -extern char segment_05_CLASS_VRAM_END[]; +extern char segment_05_VRAM_CLASS_START[]; +extern char segment_05_VRAM_CLASS_END[]; extern char assets1_ROM_START[]; extern char assets1_VRAM[]; extern char assets1_alloc_VRAM[]; @@ -409,8 +409,8 @@ extern char assets3_VRAM_END[]; extern char assets3_VRAM_SIZE[]; extern char assets3_ROM_END[]; extern char assets3_ROM_SIZE[]; -extern char segment_06_CLASS_VRAM_START[]; -extern char segment_06_CLASS_VRAM_END[]; +extern char segment_06_VRAM_CLASS_START[]; +extern char segment_06_VRAM_CLASS_END[]; extern char assets4_ROM_START[]; extern char assets4_VRAM[]; extern char assets4_alloc_VRAM[]; @@ -447,12 +447,12 @@ extern char assets4_VRAM_END[]; extern char assets4_VRAM_SIZE[]; extern char assets4_ROM_END[]; extern char assets4_ROM_SIZE[]; -extern char battle_partner_CLASS_VRAM_SIZE[]; -extern char battle_code_CLASS_VRAM_SIZE[]; -extern char heaps2_CLASS_VRAM_SIZE[]; -extern char world_script_api_CLASS_VRAM_SIZE[]; -extern char texture_memory_CLASS_VRAM_SIZE[]; -extern char segment_05_CLASS_VRAM_SIZE[]; -extern char segment_06_CLASS_VRAM_SIZE[]; +extern char battle_partner_VRAM_CLASS_SIZE[]; +extern char battle_code_VRAM_CLASS_SIZE[]; +extern char heaps2_VRAM_CLASS_SIZE[]; +extern char world_script_api_VRAM_CLASS_SIZE[]; +extern char texture_memory_VRAM_CLASS_SIZE[]; +extern char segment_05_VRAM_CLASS_SIZE[]; +extern char segment_06_VRAM_CLASS_SIZE[]; #endif diff --git a/tests/test_cases/vram_classes.ld b/tests/test_cases/vram_classes.ld index 251e8a7..9ab9949 100644 --- a/tests/test_cases/vram_classes.ld +++ b/tests/test_cases/vram_classes.ld @@ -83,14 +83,14 @@ SECTIONS boot_ROM_END = __romPos; boot_ROM_SIZE = ABSOLUTE(boot_ROM_END - boot_ROM_START); - battle_partner_CLASS_VRAM_START = 0x80238000; - battle_partner_CLASS_VRAM_END = 0x00000000; + battle_partner_VRAM_CLASS_START = 0x80238000; + battle_partner_VRAM_CLASS_END = 0x00000000; battle_partner_goompa_ROM_START = __romPos; battle_partner_goompa_VRAM = ADDR(.battle_partner_goompa); battle_partner_goompa_alloc_VRAM = .; - .battle_partner_goompa battle_partner_CLASS_VRAM_START : AT(battle_partner_goompa_ROM_START) SUBALIGN(16) + .battle_partner_goompa battle_partner_VRAM_CLASS_START : AT(battle_partner_goompa_ROM_START) SUBALIGN(16) { FILL(0x00000000); battle_partner_goompa_TEXT_START = .; @@ -159,13 +159,13 @@ SECTIONS battle_partner_goompa_ROM_END = __romPos; battle_partner_goompa_ROM_SIZE = ABSOLUTE(battle_partner_goompa_ROM_END - battle_partner_goompa_ROM_START); - battle_partner_CLASS_VRAM_END = MAX(battle_partner_CLASS_VRAM_END, battle_partner_goompa_VRAM_END); + battle_partner_VRAM_CLASS_END = MAX(battle_partner_VRAM_CLASS_END, battle_partner_goompa_VRAM_END); battle_partner_goombario_ROM_START = __romPos; battle_partner_goombario_VRAM = ADDR(.battle_partner_goombario); battle_partner_goombario_alloc_VRAM = .; - .battle_partner_goombario battle_partner_CLASS_VRAM_START : AT(battle_partner_goombario_ROM_START) SUBALIGN(16) + .battle_partner_goombario battle_partner_VRAM_CLASS_START : AT(battle_partner_goombario_ROM_START) SUBALIGN(16) { FILL(0x00000000); battle_partner_goombario_TEXT_START = .; @@ -234,13 +234,13 @@ SECTIONS battle_partner_goombario_ROM_END = __romPos; battle_partner_goombario_ROM_SIZE = ABSOLUTE(battle_partner_goombario_ROM_END - battle_partner_goombario_ROM_START); - battle_partner_CLASS_VRAM_END = MAX(battle_partner_CLASS_VRAM_END, battle_partner_goombario_VRAM_END); + battle_partner_VRAM_CLASS_END = MAX(battle_partner_VRAM_CLASS_END, battle_partner_goombario_VRAM_END); battle_partner_kooper_ROM_START = __romPos; battle_partner_kooper_VRAM = ADDR(.battle_partner_kooper); battle_partner_kooper_alloc_VRAM = .; - .battle_partner_kooper battle_partner_CLASS_VRAM_START : AT(battle_partner_kooper_ROM_START) SUBALIGN(16) + .battle_partner_kooper battle_partner_VRAM_CLASS_START : AT(battle_partner_kooper_ROM_START) SUBALIGN(16) { FILL(0x00000000); battle_partner_kooper_TEXT_START = .; @@ -309,17 +309,17 @@ SECTIONS battle_partner_kooper_ROM_END = __romPos; battle_partner_kooper_ROM_SIZE = ABSOLUTE(battle_partner_kooper_ROM_END - battle_partner_kooper_ROM_START); - battle_partner_CLASS_VRAM_END = MAX(battle_partner_CLASS_VRAM_END, battle_partner_kooper_VRAM_END); + battle_partner_VRAM_CLASS_END = MAX(battle_partner_VRAM_CLASS_END, battle_partner_kooper_VRAM_END); - battle_code_CLASS_VRAM_START = 0x00000000; - battle_code_CLASS_VRAM_START = MAX(battle_code_CLASS_VRAM_START, battle_partner_CLASS_VRAM_END); - battle_code_CLASS_VRAM_END = 0x00000000; + battle_code_VRAM_CLASS_START = 0x00000000; + battle_code_VRAM_CLASS_START = MAX(battle_code_VRAM_CLASS_START, battle_partner_VRAM_CLASS_END); + battle_code_VRAM_CLASS_END = 0x00000000; battle_code_ROM_START = __romPos; battle_code_VRAM = ADDR(.battle_code); battle_code_alloc_VRAM = .; - .battle_code battle_code_CLASS_VRAM_START : AT(battle_code_ROM_START) SUBALIGN(16) + .battle_code battle_code_VRAM_CLASS_START : AT(battle_code_ROM_START) SUBALIGN(16) { FILL(0x00000000); battle_code_TEXT_START = .; @@ -412,16 +412,16 @@ SECTIONS battle_code_ROM_END = __romPos; battle_code_ROM_SIZE = ABSOLUTE(battle_code_ROM_END - battle_code_ROM_START); - battle_code_CLASS_VRAM_END = MAX(battle_code_CLASS_VRAM_END, battle_code_VRAM_END); + battle_code_VRAM_CLASS_END = MAX(battle_code_VRAM_CLASS_END, battle_code_VRAM_END); - heaps2_CLASS_VRAM_START = 0x80267FF0; - heaps2_CLASS_VRAM_END = 0x00000000; + heaps2_VRAM_CLASS_START = 0x80267FF0; + heaps2_VRAM_CLASS_END = 0x00000000; heaps2_ROM_START = __romPos; heaps2_VRAM = ADDR(.heaps2); heaps2_alloc_VRAM = .; - .heaps2 heaps2_CLASS_VRAM_START : AT(heaps2_ROM_START) SUBALIGN(16) + .heaps2 heaps2_VRAM_CLASS_START : AT(heaps2_ROM_START) SUBALIGN(16) { FILL(0x00000000); heaps2_TEXT_START = .; @@ -490,17 +490,17 @@ SECTIONS heaps2_ROM_END = __romPos; heaps2_ROM_SIZE = ABSOLUTE(heaps2_ROM_END - heaps2_ROM_START); - heaps2_CLASS_VRAM_END = MAX(heaps2_CLASS_VRAM_END, heaps2_VRAM_END); + heaps2_VRAM_CLASS_END = MAX(heaps2_VRAM_CLASS_END, heaps2_VRAM_END); - world_script_api_CLASS_VRAM_START = 0x00000000; - world_script_api_CLASS_VRAM_START = MAX(world_script_api_CLASS_VRAM_START, heaps2_CLASS_VRAM_END); - world_script_api_CLASS_VRAM_END = 0x00000000; + world_script_api_VRAM_CLASS_START = 0x00000000; + world_script_api_VRAM_CLASS_START = MAX(world_script_api_VRAM_CLASS_START, heaps2_VRAM_CLASS_END); + world_script_api_VRAM_CLASS_END = 0x00000000; world_script_api_ROM_START = __romPos; world_script_api_VRAM = ADDR(.world_script_api); world_script_api_alloc_VRAM = .; - .world_script_api world_script_api_CLASS_VRAM_START : AT(world_script_api_ROM_START) SUBALIGN(16) + .world_script_api world_script_api_VRAM_CLASS_START : AT(world_script_api_ROM_START) SUBALIGN(16) { FILL(0x00000000); world_script_api_TEXT_START = .; @@ -593,18 +593,18 @@ SECTIONS world_script_api_ROM_END = __romPos; world_script_api_ROM_SIZE = ABSOLUTE(world_script_api_ROM_END - world_script_api_ROM_START); - world_script_api_CLASS_VRAM_END = MAX(world_script_api_CLASS_VRAM_END, world_script_api_VRAM_END); + world_script_api_VRAM_CLASS_END = MAX(world_script_api_VRAM_CLASS_END, world_script_api_VRAM_END); - texture_memory_CLASS_VRAM_START = 0x00000000; - texture_memory_CLASS_VRAM_START = MAX(texture_memory_CLASS_VRAM_START, battle_code_CLASS_VRAM_END); - texture_memory_CLASS_VRAM_START = MAX(texture_memory_CLASS_VRAM_START, world_script_api_CLASS_VRAM_END); - texture_memory_CLASS_VRAM_END = 0x00000000; + texture_memory_VRAM_CLASS_START = 0x00000000; + texture_memory_VRAM_CLASS_START = MAX(texture_memory_VRAM_CLASS_START, battle_code_VRAM_CLASS_END); + texture_memory_VRAM_CLASS_START = MAX(texture_memory_VRAM_CLASS_START, world_script_api_VRAM_CLASS_END); + texture_memory_VRAM_CLASS_END = 0x00000000; texture_memory_ROM_START = __romPos; texture_memory_VRAM = ADDR(.texture_memory); texture_memory_alloc_VRAM = .; - .texture_memory texture_memory_CLASS_VRAM_START : AT(texture_memory_ROM_START) SUBALIGN(16) + .texture_memory texture_memory_VRAM_CLASS_START : AT(texture_memory_ROM_START) SUBALIGN(16) { FILL(0x00000000); texture_memory_TEXT_START = .; @@ -673,16 +673,16 @@ SECTIONS texture_memory_ROM_END = __romPos; texture_memory_ROM_SIZE = ABSOLUTE(texture_memory_ROM_END - texture_memory_ROM_START); - texture_memory_CLASS_VRAM_END = MAX(texture_memory_CLASS_VRAM_END, texture_memory_VRAM_END); + texture_memory_VRAM_CLASS_END = MAX(texture_memory_VRAM_CLASS_END, texture_memory_VRAM_END); - segment_05_CLASS_VRAM_START = 0x05000000; - segment_05_CLASS_VRAM_END = 0x00000000; + segment_05_VRAM_CLASS_START = 0x05000000; + segment_05_VRAM_CLASS_END = 0x00000000; assets1_ROM_START = __romPos; assets1_VRAM = ADDR(.assets1); assets1_alloc_VRAM = .; - .assets1 segment_05_CLASS_VRAM_START : AT(assets1_ROM_START) SUBALIGN(16) + .assets1 segment_05_VRAM_CLASS_START : AT(assets1_ROM_START) SUBALIGN(16) { FILL(0x00000000); assets1_TEXT_START = .; @@ -759,13 +759,13 @@ SECTIONS assets1_ROM_END = __romPos; assets1_ROM_SIZE = ABSOLUTE(assets1_ROM_END - assets1_ROM_START); - segment_05_CLASS_VRAM_END = MAX(segment_05_CLASS_VRAM_END, assets1_VRAM_END); + segment_05_VRAM_CLASS_END = MAX(segment_05_VRAM_CLASS_END, assets1_VRAM_END); assets2_ROM_START = __romPos; assets2_VRAM = ADDR(.assets2); assets2_alloc_VRAM = .; - .assets2 segment_05_CLASS_VRAM_START : AT(assets2_ROM_START) SUBALIGN(16) + .assets2 segment_05_VRAM_CLASS_START : AT(assets2_ROM_START) SUBALIGN(16) { FILL(0x00000000); assets2_TEXT_START = .; @@ -842,13 +842,13 @@ SECTIONS assets2_ROM_END = __romPos; assets2_ROM_SIZE = ABSOLUTE(assets2_ROM_END - assets2_ROM_START); - segment_05_CLASS_VRAM_END = MAX(segment_05_CLASS_VRAM_END, assets2_VRAM_END); + segment_05_VRAM_CLASS_END = MAX(segment_05_VRAM_CLASS_END, assets2_VRAM_END); assets3_ROM_START = __romPos; assets3_VRAM = ADDR(.assets3); assets3_alloc_VRAM = .; - .assets3 segment_05_CLASS_VRAM_START : AT(assets3_ROM_START) SUBALIGN(16) + .assets3 segment_05_VRAM_CLASS_START : AT(assets3_ROM_START) SUBALIGN(16) { FILL(0x00000000); assets3_TEXT_START = .; @@ -925,16 +925,16 @@ SECTIONS assets3_ROM_END = __romPos; assets3_ROM_SIZE = ABSOLUTE(assets3_ROM_END - assets3_ROM_START); - segment_05_CLASS_VRAM_END = MAX(segment_05_CLASS_VRAM_END, assets3_VRAM_END); + segment_05_VRAM_CLASS_END = MAX(segment_05_VRAM_CLASS_END, assets3_VRAM_END); - segment_06_CLASS_VRAM_START = 0x06000000; - segment_06_CLASS_VRAM_END = 0x00000000; + segment_06_VRAM_CLASS_START = 0x06000000; + segment_06_VRAM_CLASS_END = 0x00000000; assets4_ROM_START = __romPos; assets4_VRAM = ADDR(.assets4); assets4_alloc_VRAM = .; - .assets4 segment_06_CLASS_VRAM_START : AT(assets4_ROM_START) SUBALIGN(16) + .assets4 segment_06_VRAM_CLASS_START : AT(assets4_ROM_START) SUBALIGN(16) { FILL(0x00000000); assets4_TEXT_START = .; @@ -1011,15 +1011,15 @@ SECTIONS assets4_ROM_END = __romPos; assets4_ROM_SIZE = ABSOLUTE(assets4_ROM_END - assets4_ROM_START); - segment_06_CLASS_VRAM_END = MAX(segment_06_CLASS_VRAM_END, assets4_VRAM_END); + segment_06_VRAM_CLASS_END = MAX(segment_06_VRAM_CLASS_END, assets4_VRAM_END); - battle_partner_CLASS_VRAM_SIZE = battle_partner_CLASS_VRAM_END - battle_partner_CLASS_VRAM_START; - battle_code_CLASS_VRAM_SIZE = battle_code_CLASS_VRAM_END - battle_code_CLASS_VRAM_START; - heaps2_CLASS_VRAM_SIZE = heaps2_CLASS_VRAM_END - heaps2_CLASS_VRAM_START; - world_script_api_CLASS_VRAM_SIZE = world_script_api_CLASS_VRAM_END - world_script_api_CLASS_VRAM_START; - texture_memory_CLASS_VRAM_SIZE = texture_memory_CLASS_VRAM_END - texture_memory_CLASS_VRAM_START; - segment_05_CLASS_VRAM_SIZE = segment_05_CLASS_VRAM_END - segment_05_CLASS_VRAM_START; - segment_06_CLASS_VRAM_SIZE = segment_06_CLASS_VRAM_END - segment_06_CLASS_VRAM_START; + battle_partner_VRAM_CLASS_SIZE = battle_partner_VRAM_CLASS_END - battle_partner_VRAM_CLASS_START; + battle_code_VRAM_CLASS_SIZE = battle_code_VRAM_CLASS_END - battle_code_VRAM_CLASS_START; + heaps2_VRAM_CLASS_SIZE = heaps2_VRAM_CLASS_END - heaps2_VRAM_CLASS_START; + world_script_api_VRAM_CLASS_SIZE = world_script_api_VRAM_CLASS_END - world_script_api_VRAM_CLASS_START; + texture_memory_VRAM_CLASS_SIZE = texture_memory_VRAM_CLASS_END - texture_memory_VRAM_CLASS_START; + segment_05_VRAM_CLASS_SIZE = segment_05_VRAM_CLASS_END - segment_05_VRAM_CLASS_START; + segment_06_VRAM_CLASS_SIZE = segment_06_VRAM_CLASS_END - segment_06_VRAM_CLASS_START; .shstrtab 0 : {