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

pal-beta: Make it build

This commit is contained in:
Ryan Dwyer 2022-03-11 08:18:03 +10:00
parent a3d56e74e8
commit 1bb2f7ebc3
14 changed files with 534 additions and 529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -44,6 +44,7 @@ endif
ifeq ($(ROMID),pal-beta)
PAL=1
VERSION=3
PIRACYCHECKS=0
ZIPMAGIC=0x0c00
endif
ifeq ($(ROMID),pal-final)

25
ld/pd.ld
View File

@ -5,15 +5,15 @@
#define VERSION_PAL_FINAL 4
#define VERSION_JPN_FINAL 5
#if VERSION == VERSION_NTSC_BETA
#include "gamefiles.ntsc-beta.inc"
#include "libfiles.ntsc-beta.inc"
#elif VERSION == VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
#include "gamefiles.pal-final.inc"
#include "libfiles.pal-final.inc"
#else
#elif VERSION >= VERSION_NTSC_1_0
#include "gamefiles.ntsc-final.inc"
#include "libfiles.ntsc-final.inc"
#else
#include "gamefiles.ntsc-beta.inc"
#include "libfiles.ntsc-beta.inc"
#endif
#define BEGIN_SEG(name) \
@ -73,7 +73,7 @@
* increased.
*/
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
#define ROMALLOCATION_LIB 0x038800
#define ROMALLOCATION_DATA 0x015000
#define ROMALLOCATION_GAME 0x1306f0
@ -91,7 +91,7 @@ OUTPUT_ARCH (mips)
SECTIONS
{
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
_gamecode = 0x4450;
_jpndata1 = 0x17fc40;
_jpndata2 = 0x18b340;
@ -105,24 +105,15 @@ SECTIONS
_jpndata2 = 0x154340;
#endif
#if VERSION >= VERSION_PAL_FINAL
_val7f116f34 = 0x0339;
_val7f1183f8 = 0x070a;
_val7f118a44 = 0x0801;
#if VERSION >= VERSION_PAL_BETA
_val7f11aa14 = 0x0e4d;
_val7f11aae4 = 0x0e5b;
_val7f11c1d0 = 0x128d;
#elif VERSION >= VERSION_NTSC_FINAL
_val7f116f34 = 0x0339;
_val7f1183f8 = 0x070a;
_val7f118a44 = 0x0801;
_val7f11aa14 = 0x0e46;
_val7f11aae4 = 0x0e54;
_val7f11c1d0 = 0x1286;
#else
_val7f116f34 = 0x0336;
_val7f1183f8 = 0x06fc;
_val7f118a44 = 0x07e0;
_val7f11aa14 = 0x0d83;
_val7f11aae4 = 0x0d91;
_val7f11c1d0 = 0x11c3;

440
src/assets/pal-beta/lang/misc.json
View File

File diff suppressed because it is too large Load Diff

542
src/assets/pal-beta/lang/mpweapons.json
View File

File diff suppressed because it is too large Load Diff

2
src/game/credits.c
View File

@ -494,7 +494,7 @@ struct credit g_Credits[] = {
{ 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_131, L_TITLE_132 }, // "armond williams junior", "henry sterchi"
{ 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_133, L_TITLE_000 }, // "ed ridgeway", ""
#if PAL
#if VERSION >= VERSION_PAL_FINAL
{ 1, 0, 1, 0, CREDITSTYLE_L_BIG, L_TITLE_151, L_TITLE_000 }, // "testing (noe)"
{ 1, 0, 0, 0, CREDITSTYLE_11, L_TITLE_152, L_TITLE_153 }, // "supervisor", "kai 'jellybean' neumann"
{ 0, 0, 0, 0, CREDITSTYLE_11, L_TITLE_154, L_TITLE_155 }, // "deputy supervisor", "maurice 'pathfinder' tisdale"

2
src/game/lang.c
View File

@ -11,7 +11,7 @@
* NTSC appears to use a boolean for Japanese support.
* PAL ignores this mostly and introduces g_LanguageId.
*/
#if VERSION >= VERSION_PAL_FINAL
#if PAL
bool g_Jpn = false;
u32 var80084664pf = 0;
u32 var80084668pf = 0;

15
src/game/mainmenu.c
View File

@ -156,7 +156,11 @@ s32 menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdat
u16 options[2][2] = {
{ L_OPTIONS_201, L_OPTIONS_202 }, // "Hold", "Toggle"
#if VERSION >= VERSION_PAL_FINAL
{ L_MPWEAPONS_276, L_MPWEAPONS_277 }, // "Hold", "Toggle"
#else
{ 0, 0 }, // TODO
#endif
};
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL && PLAYERCOUNT() >= 2) {
@ -265,7 +269,7 @@ s32 menuhandlerScreenRatio(s32 operation, struct menuitem *item, union handlerda
return 0;
}
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
u16 var80071ce0pf[] = { 0x5507, 0x5508, 0x5509, 0x550a, 0x550b };
GLOBAL_ASM(
@ -4539,12 +4543,21 @@ struct menudialogdef g_MissionControlOptionsMenuDialog = {
#if PAL
struct menuitem g_CiControlOptionsMenuItems2[] = {
#if VERSION >= VERSION_PAL_FINAL
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS_270, (u32)&func0f105664, menuhandlerControlStyle }, // "Control Style"
{ MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_271, 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch"
{ MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_272, 0x00000004, menuhandlerLookAhead }, // "Look Ahead"
{ MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_273, 0x00000004, menuhandlerHeadRoll }, // "Head Roll"
{ MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_274, 0x00000004, menuhandlerAutoAim }, // "Auto-Aim"
{ MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS_275, 0x00000004, menuhandlerAimControl }, // "Aim Control"
#else
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0, (u32)&func0f105664, menuhandlerControlStyle }, // "Control Style"
{ MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0, 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch"
{ MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0, 0x00000004, menuhandlerLookAhead }, // "Look Ahead"
{ MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0, 0x00000004, menuhandlerHeadRoll }, // "Head Roll"
{ MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0, 0x00000004, menuhandlerAutoAim }, // "Auto-Aim"
{ MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0, 0x00000004, menuhandlerAimControl }, // "Aim Control"
#endif
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_200, 0x00000000, NULL }, // "Back"
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },

4
src/game/mplayer/mplayer.c
View File

@ -519,7 +519,7 @@ void mpSetDefaultSetup(void)
g_MpSetup.chrslots = 0;
}
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
void mpGetTeamsWithDefaultName(u8 *mask)
{
s32 i;
@ -534,7 +534,7 @@ void mpGetTeamsWithDefaultName(u8 *mask)
}
#endif
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
void mpSetTeamNamesToDefault(u8 mask)
{
s32 i;

2
src/game/mplayer/scenarios.c
View File

@ -1172,7 +1172,7 @@ s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop)
g_ScenarioData.ctc.tokens[weapon->team] = chr->prop;
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
// "%shas the %s Briefcase"
sprintf(text1, langGet(L_MPWEAPONS_000_3), mpchr->name, g_BossFile.teamnames[weapon->team]);

2
src/game/mplayer/setup.c
View File

@ -330,7 +330,7 @@ s32 menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union han
s32 menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerdata *data)
{
u16 labels[] = {
#if PAL
#if VERSION >= VERSION_PAL_FINAL
L_MPWEAPONS_276, // "Hold"
L_MPWEAPONS_277, // "Toggle"
#else

22
src/game/training/training.c
View File

@ -2553,7 +2553,7 @@ char *frGetWeaponDescription(void)
u32 weapon = frGetWeaponBySlot(g_FrData.slot);
switch (weapon) {
#if PAL
#if VERSION >= VERSION_PAL_BETA
case WEAPON_FALCON2: return langGet(L_DISH_283);
case WEAPON_FALCON2_SCOPE: return langGet(L_DISH_284);
case WEAPON_FALCON2_SILENCER: return langGet(L_DISH_285);
@ -7054,7 +7054,7 @@ struct chrbio *ciGetChrBioByBodynum(u32 bodynum)
{
struct chrbio bios[] = {
// name, race, age, profile
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
/*0*/ { L_DISH_125, L_DISH_126, L_DISH_127, L_DISH_128 }, // Joanna Dark
/*1*/ { L_DISH_129, L_DISH_130, L_DISH_131, L_DISH_132 }, // Jonathan
/*2*/ { L_DISH_133, L_DISH_134, L_DISH_135, L_DISH_136 }, // Daniel Carrington
@ -7148,7 +7148,7 @@ struct miscbio *ciGetMiscBio(s32 index)
{
struct miscbio bios[] = {
// name, description
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
{ L_DISH_165, L_DISH_166 },
{ L_DISH_167, L_DISH_168 },
{ L_DISH_169, L_DISH_170 },
@ -7237,7 +7237,7 @@ struct hangarbio *ciGetHangarBio(s32 index)
{
struct hangarbio bios[] = {
// name, description
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
{ L_DISH_196, L_DISH_219 }, // Carrington Institute
{ L_DISH_197, L_DISH_220 }, // Lucerne Tower
{ L_DISH_198, L_DISH_221 }, // Laboratory Basement
@ -7663,7 +7663,7 @@ u32 ciGetStageFlagByDeviceIndex(u32 deviceindex)
char *dtGetDescription(void)
{
u32 texts[] = {
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
/*0*/ L_DISH_186, // Data uplink
/*1*/ L_DISH_185, // ECM mine
/*2*/ L_DISH_177, // CamSpy
@ -7694,7 +7694,7 @@ char *dtGetDescription(void)
char *dtGetTip1(void)
{
u32 texts[] = {
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
/*0*/ L_DISH_263,
/*1*/ L_DISH_264,
/*2*/ L_DISH_265,
@ -7725,7 +7725,7 @@ char *dtGetTip1(void)
char *dtGetTip2(void)
{
u32 texts[] = {
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
/*0*/ L_DISH_273,
/*1*/ L_DISH_274,
/*2*/ L_DISH_275,
@ -7933,7 +7933,7 @@ s32 htGetIndexBySlot(s32 slot)
char *htGetName(s32 index)
{
u32 texts[] = {
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
L_DISH_316, // "Holo 1 - Looking Around"
L_DISH_317, // "Holo 2 - Movement 1"
L_DISH_318, // "Holo 3 - Movement 2"
@ -7974,7 +7974,7 @@ u32 func0f1a25c0(s32 index)
char *htGetDescription(void)
{
u32 texts[] = {
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
L_DISH_242,
L_DISH_243,
L_DISH_244,
@ -7999,7 +7999,7 @@ char *htGetDescription(void)
char *htGetTip1(void)
{
u32 texts[] = {
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
L_DISH_249, // "For greater precision..."
L_DISH_250, // "Think about where you want to go..."
L_DISH_251, // "Ducking enables you to..."
@ -8024,7 +8024,7 @@ char *htGetTip1(void)
char *htGetTip2(void)
{
u32 texts[] = {
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
L_DISH_256, // "For greater precision..."
L_DISH_257, // "Sidestepping and strafing..."
L_DISH_258, // "Ducking enables you to..."

2
src/include/data.h
View File

@ -454,7 +454,7 @@ extern s32 g_MusicAge60;
extern s32 g_MusicLife60;
extern s32 g_MusicSilenceTimer60;
extern bool g_Jpn;
#if VERSION >= VERSION_PAL_FINAL
#if PAL
extern s32 g_LanguageId;
#endif
extern struct surfacetype *g_SurfaceTypes[15];

2
src/lib/ultra/os/initialize.c
View File

@ -61,7 +61,7 @@ void osInitialize(void)
bzero(&osAppNMIBuffer, 0x40);
}
#if VERSION >= VERSION_PAL_FINAL
#if VERSION >= VERSION_PAL_BETA
// empty
#elif VERSION >= VERSION_NTSC_1_0
if (osTvType == OS_TV_PAL) {

2
tools/extract
View File

@ -455,7 +455,7 @@ class Extractor:
'files': [0x29160, 0x28080, 0x28080, 0x29b90, 0x28910, 0x28800, ],
'data': [0x30850, 0x39850, 0x39850, 0x39850, 0x39850, 0x39850, ],
'game': [0x43c40, 0x4fc40, 0x4fc40, 0x4fc40, 0x4fc40, 0x4fc40, ],
'garbage': [0x148c40, 0x194b20, 0x194b20, 0x0, 0x180330, 0x0, ],
'garbage': [0x148c40, 0x194b20, 0x194b20, 0x180330, 0x180330, 0x0, ],
'animations': [0x155dc0, 0x1a15c0, 0x1a15c0, 0x18cdc0, 0x18cdc0, 0x190c50, ],
'mpconfigs': [0x785130, 0x7d0a40, 0x7d0a40, 0x7bc240, 0x7bc240, 0x7c00d0, ],
'firingrange': [0x79e410, 0x7e9d20, 0x7e9d20, 0x7d5520, 0x7d5520, 0x7d93b0, ],