mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-09 18:37:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

ntsc-beta: Get rodata segment matching again

Browse Source
This commit is contained in:
Ryan Dwyer
2021-10-24 20:28:29 +10:00
parent 1c1278a8c3
commit b8ec28bd12
8 changed files with 70 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/setup/setupame.c
-4
View File
@@ -567,11 +567,7 @@ u32 props[] = {
tag(0x00, 1)
key(0x0100, MODEL_CHRCHAIN, CHR_CASS, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_COLLECTABLE | OBJFLAG_00200000 | OBJFLAG_01000000, 0, 0, 32)
#if VERSION >= VERSION_NTSC_1_0
rename_object(-1, WEAPON_NECKLACE, L_AME_011, L_AME_012, L_AME_013, L_AME_014, L_AME_015) // "Obtain De Vries' necklace."
#else
rename_object(-1, 0x004f, L_AME_011, L_AME_012, L_AME_013, L_AME_014, L_AME_015) // "Obtain De Vries' necklace."
#endif
stdobject(0x0100, MODEL_DD_STONEDESK, PAD_AME_0134, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED | OBJFLAG_INVINCIBLE, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_00200000, 0, 1000)
singlemonitor(0x0100, MODEL_PC1, PAD_AME_0132, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_ILLUMINATED, 0, 0, 1000, 33)
src/files/setup/setupear.c
+2 -1
View File
@@ -579,10 +579,11 @@ u32 props[] = {
tag(0x06, 1)
#if VERSION >= VERSION_NTSC_1_0
stdobject(0x0100, MODEL_CHRSHIELD, PAD_EAR_0243, OBJFLAG_00000001 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED | OBJFLAG_INVINCIBLE | OBJFLAG_COLLECTABLE | OBJFLAG_00400000 | OBJFLAG_01000000, OBJFLAG2_00000001 | OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_00400000, 1000)
rename_object(-1, WEAPON_SHIELDTECHITEM, L_EAR_050, L_EAR_051, L_EAR_052, L_EAR_053, L_EAR_054) // "Obtain shield tech item."
#else
stdobject(0x0100, MODEL_CHRSHIELD, PAD_EAR_0243, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED | OBJFLAG_INVINCIBLE | OBJFLAG_COLLECTABLE | OBJFLAG_00400000 | OBJFLAG_01000000, OBJFLAG2_00000001 | OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_00400000, 1000)
rename_object(-1, WEAPON_BRIEFCASE, L_EAR_050, L_EAR_051, L_EAR_052, L_EAR_053, L_EAR_054) // "Obtain shield tech item."
#endif
rename_object(-1, WEAPON_SHIELD, L_EAR_050, L_EAR_051, L_EAR_052, L_EAR_053, L_EAR_054) // "Obtain shield tech item."
tag(0x25, 1)
weapon(0x0180, MODEL_CHRDATATHIEF, -1, OBJFLAG_00000001, 0, 0, WEAPON_DATAUPLINK)
rename_object(-1, WEAPON_DATAUPLINK, L_EAR_055, L_EAR_056, L_EAR_057, L_EAR_058, L_EAR_059) // "Obtain Data Uplink."
src/files/setup/setupimp.c
-4
View File
@@ -418,11 +418,7 @@ u32 props[] = {
weapon(0x0180, MODEL_CHRRCP120, PAD_IMP_011A, OBJFLAG_00000008 | OBJFLAG_UNCOLLECTABLE, 0, OBJFLAG3_00400000 | OBJFLAG3_20000000, WEAPON_RCP120)
tag(0x09, 1)
stdobject(0x0480, MODEL_SENSITIVEINFO, PAD_IMP_010F, OBJFLAG_00000008 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_ILLUMINATED | OBJFLAG_INVINCIBLE, 0, 0, 1000)
#if VERSION >= VERSION_NTSC_1_0
rename_object(-1, WEAPON_BRIEFCASE, L_IMP_010, L_IMP_011, L_IMP_012, L_IMP_013, L_IMP_014) // "Obtain sensitive info."
#else
rename_object(-1, WEAPON_SHIELD, L_IMP_010, L_IMP_011, L_IMP_012, L_IMP_013, L_IMP_014) // "Obtain sensitive info."
#endif
tag(0x4f, 1)
weapon(0x0180, MODEL_CHRDATATHIEF, -1, OBJFLAG_00000001, 0, 0, WEAPON_DATAUPLINK)
rename_object(-1, WEAPON_DATAUPLINK, L_IMP_057, L_IMP_058, L_IMP_059, L_IMP_060, L_IMP_061) // "Obtain Data Uplink."