From 3296d525470b9009a2033bc3b3ca086f7b2fa7dd Mon Sep 17 00:00:00 2001 From: Reonu Date: Mon, 12 Jul 2021 16:56:36 +0100 Subject: [PATCH] The ROM name can be set in config.h --- README.md | 1 + asm/rom_header.s | 6 +++--- include/config.h | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index deae0867..a3313c79 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin - The "far" variable is now u16, allowing you to increase the farclip (the max distance at which geometry is rendered). However, when increasing the farclip, make sure to increase the nearclip by the same ratio, or rendering will break on console and LLE plugins. - Many general use defines for object struct members, meant for use in custom object behaviors. Check `object_fields.h` for more info on this. (By MrComit) - Included `actors/group0.c` in `behavior_data.c` +- The internal ROM name is now set with a define in `config.h` to make it simpler **Other Bugfixes:** - Castle music fix (Fixes the castle music sometimes triggering after getting a dialog) * diff --git a/asm/rom_header.s b/asm/rom_header.s index 4eeaa07f..667b6b92 100644 --- a/asm/rom_header.s +++ b/asm/rom_header.s @@ -2,7 +2,7 @@ * Super Mario 64 ROM header * Only the first 0x18 bytes matter to the console. */ - +#include "config.h" .byte 0x80, 0x37, 0x12, 0x40 /* PI BSD Domain 1 register */ .word 0x0000000F /* Clockrate setting*/ .word entry_point /* Entrypoint */ @@ -15,9 +15,9 @@ .word 0x00000000 /* Unknown */ .word 0x00000000 /* Unknown */ .if VERSION_SH == 1 -.ascii "SUPERMARIO64 " /* Internal ROM name */ +.ascii INTERNAL_ROM_NAME /* Internal ROM name */ .else -.ascii "SUPER MARIO 64 " /* Internal ROM name */ +.ascii INTERNAL_ROM_NAME /* Internal ROM name */ .endif .word 0x00000000 /* Unknown */ .word 0x0000004E /* Cartridge */ diff --git a/include/config.h b/include/config.h index bfee81f4..6a226f67 100644 --- a/include/config.h +++ b/include/config.h @@ -49,6 +49,9 @@ // -- ultrasm64-extbounds specific settings -- // COMMON HACK CHANGES +// Internal ROM name. NEEDS TO BE **EXACTLY** 20 CHARACTERS. Can't be 19 characters, can't be 21 characters. You can fill it with spaces. +// The end quote should be here: " +#define INTERNAL_ROM_NAME "SUPERMARIO64 " // Disable lives and hide the lives counter #define DISABLE_LIVES // Skip peach letter cutscene