diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index b3fb53091..c9bcc0cdd 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -43,6 +43,11 @@ #include "types.h" char g_CheatMarqueeString[252]; + +#if VERSION >= VERSION_PAL_FINAL +u8 fill3[0x2c]; +#endif + u32 var8009dfbc; s32 var8009dfc0; u32 var8009dfc4; @@ -127,7 +132,7 @@ const struct menucolourpalette g_MenuColourPalettes3[] = { const u32 var7f1b23e8[] = {0x544d0000}; char *g_StringPointer = g_CheatMarqueeString; -char *g_StringPointer2 = &g_CheatMarqueeString[125]; +char *g_StringPointer2 = &g_CheatMarqueeString[150]; s32 g_MpPlayerNum = 0; void menuPlaySound(s32 menusound) diff --git a/src/game/menu/items.c b/src/game/menu/items.c index 2f63f3a0e..1e909b890 100644 --- a/src/game/menu/items.c +++ b/src/game/menu/items.c @@ -23,10 +23,6 @@ u8 g_MpSelectedPlayersForStats[4]; -#if VERSION >= VERSION_PAL_FINAL -u8 fill3[0x30]; -#endif - const char var7f1adfa0[] = "brcol"; const char var7f1adfa8[] = "%d: "; const char var7f1adfb0[] = "%s"; diff --git a/src/romheader/romheader.s b/src/romheader/romheader.s index 14ae7cbda..589084523 100644 --- a/src/romheader/romheader.s +++ b/src/romheader/romheader.s @@ -7,7 +7,6 @@ .set VERSION_PAL_FINAL, 4 .set VERSION_JPN_FINAL, 5 - .word 0x80371240 # Identifier .word 0x0000000F # Clock rate .word 0x80001000 # Program counter @@ -22,9 +21,18 @@ .byte 0x00 .byte 0x00 .byte 0x00 -.ascii "NPDE" -# Version +.if VERSION == VERSION_JPN_FINAL +.ascii "NPDJ" +.elseif VERSION == VERSION_PAL_BETA +.ascii "NPDP" +.elseif VERSION == VERSION_PAL_FINAL +.ascii "NPDP" +.else +.ascii "NPDE" +.endif + +# ROM version byte .if VERSION == VERSION_NTSC_BETA .byte 0x01 .elseif VERSION == VERSION_NTSC_FINAL @@ -32,4 +40,3 @@ .else .byte 0x00 .endif - diff --git a/tools/extract b/tools/extract index 57c7334db..bb31f77ea 100755 --- a/tools/extract +++ b/tools/extract @@ -458,7 +458,7 @@ class Extractor: vals = { # ntsc-beta ntsc-1.0 ntsc-final pal-beta pal-final jpn-final 'game': [0x43c40, 0x4fc40, 0x4fc40, 0x4fc40, 0x4fc40, 0x4fc40, ], - 'garbage1': [0x0, 0x2ea22, 0x2ea6c, 0x0, 0x2ea6c, 0x0, ], + 'garbage1': [0x0, 0x2ea22, 0x2ea6c, 0x0, 0x2eb21, 0x0, ], 'files': [0x29160, 0x28080, 0x28080, 0x29b90, 0x28910, 0x28800, ], 'data': [0x30850, 0x39850, 0x39850, 0x39850, 0x39850, 0x39850, ], 'garbage2': [0x0, 0x1574a0, 0x157800, 0x0, 0x157800, 0x0, ], diff --git a/tools/packrom b/tools/packrom index 7d418f2d7..8ca5dd0dc 100755 --- a/tools/packrom +++ b/tools/packrom @@ -107,7 +107,9 @@ def write_garbage_part(fd, addr, filename): fd.write(binary) def write_garbage(fd): - if os.environ['ROMID'] == 'ntsc-final': + if os.environ['ROMID'] == 'pal-final': + write_garbage_part(fd, 0x2eb21, 'garbage1.bin') + elif os.environ['ROMID'] == 'ntsc-final': write_garbage_part(fd, 0x2ea6c, 'garbage1.bin') write_garbage_part(fd, 0x157800, 'garbage2.bin') else: