diff --git a/src/game/botinv.c b/src/game/botinv.c index 44c7c4b9e..2006e55cc 100644 --- a/src/game/botinv.c +++ b/src/game/botinv.c @@ -79,7 +79,11 @@ struct aibotweaponpreference g_AibotWeaponPreferences[] = { /*0x2e*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_EYESPY /*0x2f*/ { 4, 4, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_XRAYSCANNER /*0x30*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_IRSCANNER - /*0x31*/ { 218, 218, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, TICKS(1200), 0, 0, 0, 1, 0 }, // WEAPON_CLOAKINGDEVICE +#if VERSION >= VERSION_PAL_FINAL + /*0x31*/ { 218, 218, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, TICKS(1200), 0, 0, 0, 1, 0 }, // WEAPON_CLOAKINGDEVICE +#else + /*0x31*/ { 218, 218, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 1200, 0, 0, 0, 1, 0 }, // WEAPON_CLOAKINGDEVICE +#endif /*0x32*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_HORIZONSCANNER /*0x33*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_TESTER /*0x34*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_ROCKETLAUNCHER_34 diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 61768b2f5..e3775ab5c 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -62,7 +62,7 @@ bool g_WeatherTickEnabled = true; u32 var80062958 = 0x00000000; u32 var8006295c = 0x00000000; -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA u32 var80062640pf = 99; u32 var80062644pf = 0; u32 var80062648pf = 0; diff --git a/src/game/debug2.c b/src/game/debug2.c index a582c6fab..8757f0e35 100644 --- a/src/game/debug2.c +++ b/src/game/debug2.c @@ -25,6 +25,13 @@ #define DEBUGOPT_ALLBUDDIES 94 #define DEBUGOPT_MANPOS 101 +#if VERSION == VERSION_PAL_BETA +s32 var80075d60 = 2; +s32 var80075d64 = 2; +s32 var80075d68 = 2; +s32 var800786f4nb = 2; +#endif + s32 g_DebugMenuOffsets[] = { 15, 30, @@ -32,8 +39,13 @@ s32 g_DebugMenuOffsets[] = { 59, 72, 84, +#if VERSION == VERSION_PAL_BETA + 96, + 109, +#else 95, 108, +#endif -1, }; @@ -139,6 +151,9 @@ s32 g_DebugMenuPositions[][2] = { { 40, 26 }, { 40, 27 }, { 40, 28 }, +#if VERSION == VERSION_PAL_BETA + { 40, 29 }, +#endif { 57, 18 }, { 57, 19 }, @@ -313,10 +328,14 @@ u32 var800a7950nb; s32 g_DebugCurMenu = DEBUGMENU_MAIN; s32 g_DebugSelectedOptionsByMenu[2] = {0, 0}; + +#if VERSION == VERSION_NTSC_BETA s32 var80075d60 = 2; s32 var80075d64 = 2; s32 var80075d68 = 2; s32 var800786f4nb = 2; +#endif + s32 var800786f8nb = 0; bool g_DebugRenderBg = true; bool g_DebugRenderProps = true; @@ -368,6 +387,9 @@ s32 var800787b4nb = 0; s32 var800787b8nb = 0; s32 var800787bcnb = 0; s32 var800787c0nb = 0; +#if VERSION == VERSION_PAL_BETA +s32 var800781f0pb = 0; +#endif s32 var800787c4nb = 1; s32 var800787c8nb = 0; s32 var800787ccnb = 0; diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index 8006b3b94..4a2334232 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -361,7 +361,11 @@ struct menudialogdef g_MpQuickGo4MbMenuDialog = { }; struct menuitem g_MpConfirmChallenge4MbMenuItems[] = { - { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, PAL ? 65 : 55, NULL }, +#if VERSION >= VERSION_PAL_FINAL + { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 65, NULL }, +#else + { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 55, NULL }, +#endif { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_057, 0x00000000, menuhandler0010cabc }, // "Accept" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_058, 0x00000000, NULL }, // "Cancel" diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 5a6b7b4de..b9eb7a717 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -101,7 +101,7 @@ u32 var8007fbc0 = 0x44444400; u32 var8007fbc4 = 0xffffff00; u32 var8007fbc8 = 0xffffff00; -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA u32 var8007fbd8 = 0x00000000; u32 var80080130pf[4] = {0}; #else diff --git a/src/game/inventory/items.c b/src/game/inventory/items.c index f367d3514..d16f7a9ff 100644 --- a/src/game/inventory/items.c +++ b/src/game/inventory/items.c @@ -2397,7 +2397,11 @@ struct weapon invitem_laptopgun = { 1, // unk38 invf_00012fc8, // fptr invpartvisibility_laptopgun, // part visibility - PAL ? 0x4cfb : L_GUN_024, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_251, // short name +#else + L_GUN_024, // short name +#endif L_GUN_024, // name L_GUN_150, // manufacturer L_GUN_172, // description @@ -2510,7 +2514,11 @@ struct weapon invitem_shotgun = { 1, // unk38 invf_000131dc, // fptr invpartvisibility_shotgun, // part visibility - PAL ? 0x4cfd : L_GUN_025, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_253, // short name +#else + L_GUN_025, // short name +#endif L_GUN_025, // name L_GUN_149, // manufacturer L_GUN_173, // description @@ -3084,7 +3092,11 @@ struct weapon invitem_timedmine = { 1, // unk38 NULL, // fptr NULL, // part visibility - PAL ? 0x4cff : L_GUN_038, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_255, // short name +#else + L_GUN_038, // short name +#endif L_GUN_038, // name L_GUN_000, // manufacturer L_GUN_185, // description @@ -3174,7 +3186,11 @@ struct weapon invitem_remotemine = { 1, // unk38 invf_00013b40, // fptr invpartvisibility_remotemine, // part visibility - PAL ? 0x4cfc : L_GUN_040, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_252, // short name +#else + L_GUN_040, // short name +#endif L_GUN_040, // name L_GUN_000, // manufacturer L_GUN_187, // description @@ -3833,7 +3849,11 @@ struct weapon invitem_tranquilizer = { 1, // unk38 invf_00014314, // fptr invpartvisibility_tranquilizer, // part visibility - PAL ? 0x4cf7 : L_GUN_034, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_247, // short name +#else + L_GUN_034, // short name +#endif L_GUN_034, // name L_GUN_000, // manufacturer L_GUN_181, // description @@ -4000,7 +4020,11 @@ struct weapon invitem_sniperrifle = { 1, // unk38 invf_00014590, // fptr invpartvisibility_sniperrifle, // part visibility - PAL ? 0x4cfe : L_GUN_032, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_254, // short name +#else + L_GUN_032, // short name +#endif L_GUN_032, // name L_GUN_000, // manufacturer L_GUN_179, // description @@ -5010,7 +5034,11 @@ struct weapon invitem_nightvision = { 1, // unk38 NULL, // fptr NULL, // part visibility - PAL ? 0x4cf4 : L_GUN_059, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_244, // short name +#else + L_GUN_059, // short name +#endif L_GUN_059, // name L_GUN_000, // manufacturer L_GUN_191, // description @@ -5195,7 +5223,11 @@ struct weapon invitem_suicidepill = { 1, // unk38 NULL, // fptr NULL, // part visibility - PAL ? 0x4cf6 : L_GUN_072, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_246, // short name +#else + L_GUN_072, // short name +#endif L_GUN_072, // name L_GUN_000, // manufacturer L_GUN_000, // description @@ -5266,7 +5298,11 @@ struct weapon invitem_disguise40 = { 1, // unk38 NULL, // fptr NULL, // part visibility - PAL ? 0x4cfa : L_GUN_043, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_250, // short name +#else + L_GUN_043, // short name +#endif L_GUN_043, // name L_GUN_000, // manufacturer L_GUN_211, // description @@ -5291,7 +5327,11 @@ struct weapon invitem_disguise41 = { 1, // unk38 NULL, // fptr NULL, // part visibility - PAL ? 0x4cfa : L_GUN_043, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_250, // short name +#else + L_GUN_043, // short name +#endif L_GUN_043, // name L_GUN_000, // manufacturer L_GUN_211, // description @@ -5457,7 +5497,11 @@ struct weapon invitem_datauplink = { 1, // unk38 NULL, // fptr NULL, // part visibility - PAL ? 0x4cf3 : L_GUN_075, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_243, // short name +#else + L_GUN_075, // short name +#endif L_GUN_075, // name L_GUN_000, // manufacturer L_GUN_197, // description @@ -5483,7 +5527,11 @@ struct weapon invitem_doordecoder = { 1, // unk38 NULL, // fptr NULL, // part visibility - PAL ? 0x4cf5 : L_GUN_063, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_245, // short name +#else + L_GUN_063, // short name +#endif L_GUN_063, // name L_GUN_000, // manufacturer L_GUN_200, // description @@ -5712,7 +5760,11 @@ struct weapon invitem_autosurgeon = { 1, // unk38 NULL, // fptr NULL, // part visibility - PAL ? 0x4cf8 : L_GUN_220, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_248, // short name +#else + L_GUN_220, // short name +#endif L_GUN_220, // name L_GUN_000, // manufacturer L_GUN_201, // description @@ -5790,7 +5842,11 @@ struct weapon invitem_backupdisk = { 1, // unk38 NULL, // fptr NULL, // part visibility - PAL ? 0x4cf9 : L_GUN_227, // short name +#if VERSION >= VERSION_PAL_FINAL + L_GUN_249, // short name +#else + L_GUN_227, // short name +#endif L_GUN_227, // name L_GUN_000, // manufacturer L_GUN_209, // description diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c index 135cfc817..72acd6c22 100644 --- a/src/game/mainmenu.c +++ b/src/game/mainmenu.c @@ -4380,7 +4380,11 @@ struct menuitem g_AudioOptionsMenuItems[] = { #endif { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_230, 0x00000000, menuhandlerSoundMode }, // "Sound Mode" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_218, 0x00000000, menuhandlerLangFilter }, // "Language Filter" - { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, PAL ? 0xc8 : 0, 0x00000000, NULL }, +#if VERSION >= VERSION_PAL_FINAL + { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 200, 0x00000000, NULL }, +#else + { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0, 0x00000000, NULL }, +#endif { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_231, 0x00000000, NULL }, // "" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -4586,23 +4590,14 @@ struct menudialogdef g_MissionControlOptionsMenuDialog = { NULL, }; -#if PAL +#if VERSINO >= VERSION_PAL_FINAL 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 }, @@ -4697,7 +4692,7 @@ struct menuitem g_2PMissionOptionsHMenuItems[] = { struct menuitem g_2PMissionOptionsVMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_181, 0x00000000, (void *)&g_2PMissionAudioOptionsVMenuDialog }, // "Audio" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_182, 0x00000000, (void *)&g_2PMissionVideoOptionsMenuDialog }, // "Video" -#if PAL +#if VERSION >= VERSION_PAL_FINAL { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_183, 0x00000000, (void *)&g_CiControlOptionsMenuDialog2 }, // "Control" #else { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_183, 0x00000000, (void *)&g_MissionControlOptionsMenuDialog }, // "Control" diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index 1d4f75dbb..570c51214 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -2731,20 +2731,37 @@ struct menudialogdef g_MpAutoTeamMenuDialog = { struct menuitem g_MpTeamsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_071, 0x00000002, menuhandlerMpTeamsEnabled }, // "Teams Enabled" - { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, PAL ? 0x85 : 0, 0x00000000, NULL }, +#if VERSION >= VERSION_PAL_FINAL + { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x85, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_072, 0x00000000, menuhandlerMpTeamsLabel }, // "Teams:" - { MENUITEMTYPE_DROPDOWN, 0, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 1, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 2, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 3, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 4, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 5, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 6, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 7, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 8, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 9, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 10, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, - { MENUITEMTYPE_DROPDOWN, 11, PAL ? 0x00021000 : 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 0, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 1, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 2, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 3, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 4, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 5, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 6, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 7, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 8, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 9, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 10, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 11, 0x00021000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, +#else + { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0, 0x00000000, NULL }, + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_072, 0x00000000, menuhandlerMpTeamsLabel }, // "Teams:" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 1, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 2, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 3, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 4, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 5, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 6, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 7, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 8, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 9, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 10, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 11, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, +#endif { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_073, 0x00000000, (void *)&g_MpAutoTeamMenuDialog }, // "Auto Team..." { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_074, 0x00000000, NULL }, // "Back" diff --git a/src/game/player.c b/src/game/player.c index 1971c03e0..a1f670450 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -121,9 +121,12 @@ struct vimode g_ViModes[] = { // | | | | | | | | | cinemaheight // | | | | | | | | | | cinematop // | | | | | | | | | | | -#if PAL +#if VERSION >= VERSION_PAL_FINAL { 320, 266, 320, 1, 1, 266, 0, 212, 20, 168, 42 }, // default { 448, 266, 448, 0.71428567171097, 1, 266, 0, 212, 20, 168, 42 }, // hi-res +#elif VERSION >= VERSION_PAL_BETA + { 320, 252, 320, 1, 1, 252, 0, 212, 20, 168, 42 }, // default + { 448, 252, 448, 0.71428567171097, 1, 252, 0, 212, 20, 168, 42 }, // hi-res #else { 320, 220, 320, 1, 1, 220, 0, 180, 20, 136, 42 }, // default { 640, 220, 640, 0.5, 1, 220, 0, 180, 20, 136, 42 }, // hi-res @@ -3687,6 +3690,9 @@ void playerConfigureVi(void) #if VERSION == VERSION_PAL_BETA const char var7f1af224pb[] = "tps"; +struct coord var800726acpb = {0, 0, 0}; +struct coord var800726b8pb = {0, 0, 1}; +struct coord var800726c4pb = {0, 1, 0}; GLOBAL_ASM( glabel playerTick diff --git a/src/game/propobj.c b/src/game/propobj.c index a9a225a63..4ece0ae7c 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -159,7 +159,7 @@ struct autogunobj *g_ThrownLaptops = NULL; struct beam *g_ThrownLaptopBeams = NULL; s32 g_MaxThrownLaptops = 0; -#if VERSION < VERSION_PAL_FINAL +#if VERSION < VERSION_PAL_BETA u32 var80069974 = 0x00000000; #endif @@ -220,7 +220,7 @@ u32 var80069a70 = 0x42b40000; u32 var80069a74 = 0x3f800000; u32 var80069a78 = 0x40000000; -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA u32 var80069a7c = 0x3a9d4952; u32 var80069a80 = 0x3f99999a; u32 var80069a84 = 0x3bcddaca; @@ -65774,7 +65774,11 @@ glabel func0f087888pf #define DETERMINER_YOUR 9 struct nameinfo var8006a944pf[] = { +#if VERSION >= VERSION_PAL_FINAL { 999, L_PROPOBJ_009, L_PROPOBJ_070, { DETERMINER_A, DETERMINER_A, DETERMINER_SOME6, 0, DETERMINER_SOME7 } }, +#else + { 999, L_PROPOBJ_009, L_PROPOBJ_070, { DETERMINER_A, DETERMINER_A, DETERMINER_SOME6, 0, DETERMINER_SOME6 } }, +#endif { AMMOTYPE_KNIFE, L_PROPOBJ_020, L_PROPOBJ_021, { DETERMINER_A, DETERMINER_A, DETERMINER_A, DETERMINER_A, DETERMINER_A } }, { AMMOTYPE_CROSSBOW, L_PROPOBJ_042, L_PROPOBJ_065, { DETERMINER_A, DETERMINER_A, DETERMINER_A, DETERMINER_AN, DETERMINER_A } }, { AMMOTYPE_SHOTGUN, L_PROPOBJ_010, L_PROPOBJ_071, { DETERMINER_A, DETERMINER_A, DETERMINER_AN, DETERMINER_A, DETERMINER_AN } }, @@ -65786,7 +65790,11 @@ struct nameinfo var8006a944pf[] = { { AMMOTYPE_REMOTE_MINE, L_PROPOBJ_017, L_PROPOBJ_078, { DETERMINER_A, DETERMINER_A, DETERMINER_AN, DETERMINER_AN, DETERMINER_AN } }, { AMMOTYPE_PROXY_MINE, L_PROPOBJ_018, L_PROPOBJ_079, { DETERMINER_A, DETERMINER_A, DETERMINER_AN, DETERMINER_AN, DETERMINER_AN } }, { AMMOTYPE_TIMED_MINE, L_PROPOBJ_019, L_PROPOBJ_080, { DETERMINER_A, DETERMINER_A, DETERMINER_AN, DETERMINER_AN, DETERMINER_AN } }, +#if VERSION >= VERSION_PAL_FINAL { AMMOTYPE_REAPER, L_PROPOBJ_044, L_PROPOBJ_067, { DETERMINER_A, DETERMINER_A, DETERMINER_SOME6, 0, DETERMINER_SOME7 } }, +#else + { AMMOTYPE_REAPER, L_PROPOBJ_044, L_PROPOBJ_067, { DETERMINER_A, DETERMINER_A, DETERMINER_SOME6, 0, 0 } }, +#endif { AMMOTYPE_HOMINGROCKET, L_PROPOBJ_016, L_PROPOBJ_077, { DETERMINER_A, DETERMINER_A, DETERMINER_AN, DETERMINER_A, DETERMINER_A } }, { AMMOTYPE_DART, L_PROPOBJ_022, L_PROPOBJ_081, { DETERMINER_A, DETERMINER_A, DETERMINER_AN, DETERMINER_A, DETERMINER_AN } }, { AMMOTYPE_NBOMB, L_PROPOBJ_023, L_PROPOBJ_082, { DETERMINER_AN, DETERMINER_A, DETERMINER_AN, DETERMINER_AN, DETERMINER_AN } }, diff --git a/src/game/sparks/sparks.c b/src/game/sparks/sparks.c index ebfc59df8..c3d1e3719 100644 --- a/src/game/sparks/sparks.c +++ b/src/game/sparks/sparks.c @@ -41,7 +41,7 @@ struct sparktype g_SparkTypes[] = { // | max age // | | decel // | | | -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA /*0x00*/ { 100, 28, 100, 1, 0, 0, 2.4, 50, 50, 15, 1, 0xffff80ff, 0xffffffff, 0.024 }, /*0x00*/ { 100, 28, 100, 1, 0, 0, 2.4, 50, 50, 15, 1, 0x80ffffff, 0xffffffff, 0.024 }, /*0x00*/ { 40, -1, 30, 30, 0, 0, 2.4, 29, 29, 5, 1, 0x301010ff, 0x401010ff, 0.024 }, diff --git a/src/game/title.c b/src/game/title.c index 9349a0a74..d28eba997 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -460,7 +460,7 @@ struct legalelement g_LegalElements[] = { { 249, 267, 1, 1, LEGALELEMENTTYPE_BLUETEXTLG, L_OPTIONS_085 }, // "Rare Ltd. (twycross)" { 69, 290, 1, 1, LEGALELEMENTTYPE_LINE, 0 }, { 69, 299, 0, 1, LEGALELEMENTTYPE_WHITETEXTLG, L_OPTIONS_076 }, // "N64 EXPANSION PAK" -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA { -1, 296, 0, 1, LEGALELEMENTTYPE_WHITETEXTSM, L_OPTIONS_075 }, // "tm" { -1, 299, 0, 1, LEGALELEMENTTYPE_WHITETEXTLG, L_OPTIONS_074 }, // "NOT DETECTED" #else @@ -477,6 +477,8 @@ struct legalelement g_LegalElements[] = { }; #if VERSION == VERSION_PAL_BETA +struct modelrenderdata var80063dacpb = { NULL, true, 3 }; + GLOBAL_ASM( glabel titleRenderLegal .late_rodata diff --git a/src/lib/crash.c b/src/lib/crash.c index 9656dabaf..91e4afa60 100644 --- a/src/lib/crash.c +++ b/src/lib/crash.c @@ -128,7 +128,7 @@ struct crashdescription g_CrashFpcsrDescriptions[] = { char (*g_CrashCharBuffer)[71] = NULL; -#if VERSION < VERSION_NTSC_1_0 +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA u32 var8005f138nb = 0; u32 var8005f13cnb[] = { diff --git a/src/lib/main.c b/src/lib/main.c index 322499a6f..9493ded9c 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -3022,6 +3022,11 @@ glabel mainLoop #endif #if VERSION == VERSION_PAL_BETA +u32 var8005f690nb[] = { + 0x00020000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + GLOBAL_ASM( glabel mainTick /* e114: 27bdff68 */ addiu $sp,$sp,-152 diff --git a/src/lib/mema.c b/src/lib/mema.c index 40634c841..22afd5e95 100644 --- a/src/lib/mema.c +++ b/src/lib/mema.c @@ -58,6 +58,10 @@ s32 g_MemaHeapStart; s32 g_MemaHeapSize; struct memaheap g_MemaHeap; +#if VERSION == VERSION_PAL_BETA +u32 var8005f910pb = 1000000; +#endif + void memaSwap(struct memaspace *a, struct memaspace *b) { u32 tempaddr = a->addr; diff --git a/src/lib/model.c b/src/lib/model.c index c27c7d829..df7ac9da5 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -3539,6 +3539,10 @@ void model0001e14c(struct model *model, f32 arg1, f32 arg2) } } +#if VERSION == VERSION_PAL_BETA +u32 var80060670pb = 0; +#endif + bool var8005efdc = true; u32 var8005efe0 = 0x00000000; u32 var8005efe4 = 0x00000000; diff --git a/src/lib/ultra/os/initialize.c b/src/lib/ultra/os/initialize.c index c894069c5..de6b433cb 100644 --- a/src/lib/ultra/os/initialize.c +++ b/src/lib/ultra/os/initialize.c @@ -25,7 +25,7 @@ s32 osViClock = VI_NTSC_CLOCK; u32 _osShutdown = 0; u32 __osGlobalIntMask = OS_IM_ALL; -#if VERSION >= VERSION_NTSC_1_0 && VERSION < VERSION_PAL_FINAL +#if VERSION >= VERSION_NTSC_1_0 && VERSION < VERSION_PAL_BETA u32 var8005cf74 = 0; u32 var8005cf78 = 0; u32 var8005cf7c = 0; diff --git a/src/lib/vm.c b/src/lib/vm.c index 6b8f43c68..995f381ea 100644 --- a/src/lib/vm.c +++ b/src/lib/vm.c @@ -74,9 +74,11 @@ u32 g_VmMarker; u32 g_VmRamEnd; u32 g_VmStateTableEnd; -#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA +#if VERSION == VERSION_NTSC_BETA u8 g_VmShowStats = false; u32 fillnb[2] = {0}; +#elif VERSION == VERSION_PAL_BETA +u8 g_VmShowStats = false; #endif u32 var8005cf80 = 0;