falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ntsc-beta: Get it building without errors

This commit is contained in:
Ryan Dwyer 2020-12-20 22:06:23 +10:00
parent d50d8c15f6
commit be09d69402
5 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

File diff suppressed because one or more lines are too long

3
ld/filesegments.inc
View File

@ -2017,4 +2017,7 @@ FILE(07d9, CheadphelpsZ, _file_CheadphelpsZ);
FILE(07da, Ap29_15_joM, _file_Ap29_15_joM);
FILE(07db, Ap16_03_joM, _file_Ap16_03_joM);
FILE(07dc, Acarrbye02M, _file_Acarrbye02M);
#if VERSION >= VERSION_NTSC_1_0
FILE(07dd, Asaucerexp1M, _file_Asaucerexp1M);
#endif

8
ld/pd.ld
View File

@ -392,7 +392,10 @@ SECTIONS
FONT(handelgothicmd)
FONT(handelgothiclg)
FONT(ocramd)
#if VERSION >= VERSION_NTSC_1_0
FONT(ocralg)
#endif
/***************************************************************************
* sfxctl
@ -552,11 +555,16 @@ SECTIONS
* -------------------------------------------------------------------------
*/
#if VERSION >= VERSION_NTSC_1_0
BEGIN_SEG(accessingpak)
{
build/ROMID/accessingpak.o (.data);
}
END_SEG(accessingpak)
#else
_accessingpakSegmentRomStart = 0;
_accessingpakSegmentRomEnd = 0;
#endif
/DISCARD/ : {
* (.MIPS.abiflags);

4
src/game/data/data_0258c0.c
View File

@ -2031,7 +2031,9 @@ extern void *_file_CheadphelpsZ;
extern void *_file_Ap29_15_joM;
extern void *_file_Ap16_03_joM;
extern void *_file_Acarrbye02M;
#if VERSION >= VERSION_NTSC_1_0
extern void *_file_Asaucerexp1M;
#endif
extern void *_filenamesSegmentRomStart;
u32 var8007f8a0 = 0x3e19999a;
@ -4755,7 +4757,9 @@ void *filetable[] = {
/*0x07da*/ &_file_Ap29_15_joM,
/*0x07db*/ &_file_Ap16_03_joM,
/*0x07dc*/ &_file_Acarrbye02M,
#if VERSION >= VERSION_NTSC_1_0
/*0x07dd*/ &_file_Asaucerexp1M,
#endif
/*0x07de*/ &_filenamesSegmentRomStart,
};

2
tools/mkgamezips
View File

@ -80,6 +80,7 @@ def zip(binary):
return b'\x11\x73' + len(binary).to_bytes(3, 'big') + obj.compress(binary) + obj.flush()
checksumsmaybe = {
'ntsc-beta': [],
'ntsc-1.0': [
0x8771, 0xa4fb, 0x5c84, 0xfd94, 0x1701, 0xe0aa, 0x6ada, 0xe275,
0x6ef7, 0xefff, 0x66fc, 0xc431, 0x181b, 0x9b35, 0x0dd8, 0xc3db,
@ -199,6 +200,7 @@ checksumsmaybe = {
}
padding = {
'ntsc-beta': [],
'ntsc-1.0': [
0x00, 0x00, 0x00, 0x73, 0x75, 0x47, 0xa4, 0x79,
0x91, 0x1e, 0xd8, 0xd8, 0x7b, 0xe2, 0x13, 0x51,