mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-06 20:42:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename/annotate object flags with editor's names

Browse Source
This commit is contained in:
Ryan Dwyer
2020-01-25 12:42:56 +10:00
parent 662663703b
commit bdae3055a4
19 changed files with 210 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/setup/setupdish.c
+25 -25
View File
@@ -810,7 +810,7 @@ u8 func1002_devicetraining_camspy[] = {
lock_door(0x89, 0x40)
show_object(OBJ_CAMSPY)
move_object_to_pad(OBJ_CAMSPY, 0x011d)
unset_object_flag(OBJ_CAMSPY, OBJFLAG_00100000)
unset_object_flag(OBJ_CAMSPY, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(OBJ_CAMSPY, OBJFLAG2_INVISIBLE)
unset_stage_flag(STAGEFLAG_TRIGGER_CANNOTEXIT_MSG)
close_door(0x31)
@@ -924,7 +924,7 @@ u8 func1003_devicetraining_nightvision[] = {
lock_door(0x89, 0x40)
show_object(0x27)
move_object_to_pad(0x27, 0x011d)
unset_object_flag(0x27, OBJFLAG_00100000)
unset_object_flag(0x27, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x27, OBJFLAG2_INVISIBLE)
unset_stage_flag(STAGEFLAG_TRIGGER_CANNOTEXIT_MSG)
close_door(0x31)
@@ -1058,7 +1058,7 @@ u8 func1004_devicetraining_doordecoder[] = {
lock_door(0x89, 0x40)
show_object(0x28)
move_object_to_pad(0x28, 0x011d)
unset_object_flag(0x28, OBJFLAG_00100000)
unset_object_flag(0x28, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x28, OBJFLAG2_INVISIBLE)
unset_stage_flag(STAGEFLAG_TRIGGER_CANNOTEXIT_MSG)
close_door(0x31)
@@ -1221,7 +1221,7 @@ u8 func1005_devicetraining_xray[] = {
dprint 't','r','a','i','n','i','n','g',0,
show_object(0x29)
move_object_to_pad(0x29, 0x011d)
unset_object_flag(0x29, OBJFLAG_00100000)
unset_object_flag(0x29, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x29, OBJFLAG2_INVISIBLE)
unset_object_flag2(0x38, OBJFLAG2_00000001)
unset_object_flag2(0x39, OBJFLAG2_00000001)
@@ -1244,13 +1244,13 @@ u8 func1005_devicetraining_xray[] = {
beginloop(0x86)
if_chr_has_weapon_equipped(CHR_BOND, WEAPON_XRAYSCANNER, /*goto*/ 0x2f)
set_object_flag(0x38, OBJFLAG_02000000)
set_object_flag(0x39, OBJFLAG_02000000)
set_object_flag(0x38, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(0x39, OBJFLAG_CANNOT_ACTIVATE)
goto_next(0x30)
label(0x2f)
unset_object_flag(0x38, OBJFLAG_02000000)
unset_object_flag(0x39, OBJFLAG_02000000)
unset_object_flag(0x38, OBJFLAG_CANNOT_ACTIVATE)
unset_object_flag(0x39, OBJFLAG_CANNOT_ACTIVATE)
label(0x30)
if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90)
if_chr_activated_object(CHR_BOND, 0x31, /*goto*/ 0x57)
@@ -1298,13 +1298,13 @@ u8 func1005_devicetraining_xray[] = {
set_stage_flag(STAGEFLAG_TRIGGER_CANNOTEXIT_MSG)
label(0x59)
if_chr_has_weapon_equipped(CHR_BOND, WEAPON_XRAYSCANNER, /*goto*/ 0x2f)
set_object_flag(0x38, OBJFLAG_02000000)
set_object_flag(0x39, OBJFLAG_02000000)
set_object_flag(0x38, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(0x39, OBJFLAG_CANNOT_ACTIVATE)
goto_next(0x30)
label(0x2f)
unset_object_flag(0x38, OBJFLAG_02000000)
unset_object_flag(0x39, OBJFLAG_02000000)
unset_object_flag(0x38, OBJFLAG_CANNOT_ACTIVATE)
unset_object_flag(0x39, OBJFLAG_CANNOT_ACTIVATE)
label(0x30)
if_chr_activated_object(CHR_BOND, 0x38, /*goto*/ 0x5b)
if_chr_activated_object(CHR_BOND, 0x39, /*goto*/ 0x5c)
@@ -1433,7 +1433,7 @@ u8 func1006_devicetraining_disguise[] = {
dprint 't','r','a','i','n','i','n','g',0,
show_object(0x2a)
move_object_to_pad(0x2a, 0x011d)
unset_object_flag(0x2a, OBJFLAG_00100000)
unset_object_flag(0x2a, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x2a, OBJFLAG2_INVISIBLE)
set_ailist(0x03, AILIST_GRIMSHAW_DISGUISE)
unset_stage_flag(STAGEFLAG_TRIGGER_CANNOTEXIT_MSG)
@@ -1576,7 +1576,7 @@ u8 func1007_devicetrainign_ir[] = {
dprint 't','r','a','i','n','i','n','g',0,
show_object(0x2b)
move_object_to_pad(0x2b, 0x011d)
unset_object_flag(0x2b, OBJFLAG_00100000)
unset_object_flag(0x2b, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x2b, OBJFLAG2_INVISIBLE)
unset_stage_flag(STAGEFLAG_TRIGGER_CANNOTEXIT_MSG)
close_door(0x31)
@@ -1597,10 +1597,10 @@ u8 func1007_devicetrainign_ir[] = {
beginloop(0x86)
if_chr_has_weapon_equipped(CHR_BOND, WEAPON_IRSCANNER, /*goto*/ 0x2f)
set_object_flag(0x37, OBJFLAG_02000000)
set_object_flag(0x37, OBJFLAG_CANNOT_ACTIVATE)
goto_next(0x30)
label(0x2f)
unset_object_flag(0x37, OBJFLAG_02000000)
unset_object_flag(0x37, OBJFLAG_CANNOT_ACTIVATE)
label(0x30)
if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90)
if_chr_activated_object(CHR_BOND, 0x31, /*goto*/ 0x57)
@@ -1626,11 +1626,11 @@ u8 func1007_devicetrainign_ir[] = {
beginloop(0x8e)
if_chr_has_weapon_equipped(CHR_BOND, WEAPON_IRSCANNER, /*goto*/ 0x2f)
set_object_flag(0x37, OBJFLAG_02000000)
set_object_flag(0x37, OBJFLAG_CANNOT_ACTIVATE)
goto_next(0x30)
label(0x2f)
unset_object_flag(0x37, OBJFLAG_02000000)
unset_object_flag(0x37, OBJFLAG_CANNOT_ACTIVATE)
label(0x30)
if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90)
if_chr_has_weapon_equipped(CHR_BOND, WEAPON_IRSCANNER, /*goto*/ 0x2f)
@@ -1646,10 +1646,10 @@ u8 func1007_devicetrainign_ir[] = {
beginloop(0x82)
if_chr_has_weapon_equipped(CHR_BOND, WEAPON_IRSCANNER, /*goto*/ 0x2f)
set_object_flag(0x37, OBJFLAG_02000000)
set_object_flag(0x37, OBJFLAG_CANNOT_ACTIVATE)
goto_next(0x30)
label(0x2f)
unset_object_flag(0x37, OBJFLAG_02000000)
unset_object_flag(0x37, OBJFLAG_CANNOT_ACTIVATE)
label(0x30)
if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90)
if_door_state(0x31, (DOORSTATE_OPEN | DOORSTATE_OPENING), /*goto*/ 0x85)
@@ -1714,7 +1714,7 @@ u8 func1008_devicetraining_rtracker[] = {
dprint 't','r','a','i','n','i','n','g',0,
show_object(0x2c)
move_object_to_pad(0x2c, 0x011d)
unset_object_flag(0x2c, OBJFLAG_00100000)
unset_object_flag(0x2c, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x2c, OBJFLAG2_INVISIBLE)
unset_stage_flag(STAGEFLAG_TRIGGER_CANNOTEXIT_MSG)
close_door(0x31)
@@ -1767,7 +1767,7 @@ u8 func1008_devicetraining_rtracker[] = {
goto_first(0x8d)
label(0x2f)
unset_object_flag(0x36, OBJFLAG_00100000)
unset_object_flag(0x36, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x36, OBJFLAG2_INVISIBLE)
show_object(0x36)
move_object_to_pad(0x36, 0x011e)
@@ -1845,7 +1845,7 @@ u8 func1009_devicetraining_cloak[] = {
move_object_to_pad(0x2d, 0x011d)
unset_stage_flag(STAGEFLAG_CLOAK_FAILED)
unset_stage_flag(STAGEFLAG_CLOAK_COMPLETE)
unset_object_flag(0x2d, OBJFLAG_00100000)
unset_object_flag(0x2d, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x2d, OBJFLAG2_INVISIBLE)
unset_stage_flag(STAGEFLAG_TRIGGER_CANNOTEXIT_MSG)
close_door(0x31)
@@ -1994,7 +1994,7 @@ u8 func100a_devicetraining_ecmmine[] = {
lock_door(0x89, 0x40)
show_object(0x2e)
move_object_to_pad(0x2e, 0x011d)
unset_object_flag(0x2e, OBJFLAG_00100000)
unset_object_flag(0x2e, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x2e, OBJFLAG2_INVISIBLE)
unset_stage_flag(STAGEFLAG_TRIGGER_CANNOTEXIT_MSG)
close_door(0x31)
@@ -2141,7 +2141,7 @@ u8 func100b_devicetraining_uplink[] = {
unset_stage_flag(STAGEFLAG_TRIGGER_DEVICE_FAILURE)
show_object(0x2f)
move_object_to_pad(0x2f, 0x0131)
unset_object_flag(0x2f, OBJFLAG_00100000)
unset_object_flag(0x2f, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x2f, OBJFLAG2_INVISIBLE)
dprint 't','r','a','i','n','i','n','g',0,
close_door(0x31)