mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-02 00:14:10 -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/setupame.c
+5 -5
View File
@@ -1735,7 +1735,7 @@ u8 func0414_programmer[] = {
restart_timer
set_stage_flag(STAGEFLAG_PROGRAMMER_RAN_TO_GUARD)
try_set_chrpreset_to_unalerted_teammate(0, /*goto*/ LABEL_RUN_TO_GUARD)
unset_object_flag2(OBJ_LAPTOPGUNDOOR, OBJFLAG2_20000000)
unset_object_flag2(OBJ_LAPTOPGUNDOOR, OBJFLAG2_AICANNOTUSE)
jog_to_pad(0x0086)
beginloop(0x97)
@@ -2295,8 +2295,8 @@ u8 func1008_doorswitch[] = {
// A and SA
unlock_door(OBJ_OFFICEDOOR1, 0x01)
unlock_door(OBJ_OFFICEDOOR2, 0x01)
unset_object_flag2(OBJ_OFFICEDOOR1, OBJFLAG2_20000000)
unset_object_flag2(OBJ_OFFICEDOOR2, OBJFLAG2_20000000)
unset_object_flag2(OBJ_OFFICEDOOR1, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(OBJ_OFFICEDOOR2, OBJFLAG2_AICANNOTUSE)
set_stage_flag(STAGEFLAG_OFFICE_DOOR_UNLOCKED)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2313,8 +2313,8 @@ u8 func1008_doorswitch[] = {
set_stage_flag(STAGEFLAG_OFFICE_DOOR_UNLOCKED)
unlock_door(OBJ_OFFICEDOOR1, 0x01)
unlock_door(OBJ_OFFICEDOOR2, 0x01)
unset_object_flag2(OBJ_OFFICEDOOR1, OBJFLAG2_20000000)
unset_object_flag2(OBJ_OFFICEDOOR2, OBJFLAG2_20000000)
unset_object_flag2(OBJ_OFFICEDOOR1, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(OBJ_OFFICEDOOR2, OBJFLAG2_AICANNOTUSE)
yield
restart_timer
src/files/setup/setupark.c
+6 -6
View File
@@ -1463,7 +1463,7 @@ u8 func1005_check_bodyguards_dead[] = {
set_stage_flag(STAGEFLAG_TOP_BODYGUARDS_DEAD)
unlock_door(OBJ_TOPROOMDOOR, 0x02)
unset_object_flag2(OBJ_TOPROOMDOOR, OBJFLAG2_20000000)
unset_object_flag2(OBJ_TOPROOMDOOR, OBJFLAG2_AICANNOTUSE)
if_difficulty_lt(DIFF_SA, /*goto*/ 0x26)
if_alive_goto_00(0x16, 0x20)
@@ -1584,7 +1584,7 @@ u8 func1009_init_top_room[] = {
endloop(0x1f)
label(0x00)
set_object_flag(OBJ_TOPROOMDOOR, OBJFLAG_02000000)
set_object_flag(OBJ_TOPROOMDOOR, OBJFLAG_CANNOT_ACTIVATE)
set_chr_target_chr(CHR_CASS, CHR_P1P2)
set_chr_target_chr(CHR_TOPGUARD1, CHR_P1P2)
set_chr_target_chr(CHR_TOPGUARD2, CHR_P1P2)
@@ -1959,7 +1959,7 @@ u8 func040d_cass[] = {
endloop(0x25)
label(0x26)
unset_object_flag(OBJ_TOPROOMDOOR, OBJFLAG_02000000)
unset_object_flag(OBJ_TOPROOMDOOR, OBJFLAG_CANNOT_ACTIVATE)
grant_control(CHR_BOND)
close_door(OBJ_TOPROOMDOOR)
if_chr_in_room(CHR_BOND, 0x00, 0x0045, /*goto*/ 0x20)
@@ -1975,7 +1975,7 @@ u8 func040d_cass[] = {
goto_next(0x00)
label(0x89)
unset_object_flag(OBJ_TOPROOMDOOR, OBJFLAG_02000000)
unset_object_flag(OBJ_TOPROOMDOOR, OBJFLAG_CANNOT_ACTIVATE)
restart_timer
beginloop(0x8a)
@@ -2108,7 +2108,7 @@ u8 func101f_unlock_top_door[] = {
label(0x20)
unlock_door(OBJ_TOPROOMDOOR, 0x02)
unset_object_flag2(OBJ_TOPROOMDOOR, OBJFLAG2_20000000)
unset_object_flag2(OBJ_TOPROOMDOOR, OBJFLAG2_AICANNOTUSE)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
@@ -2931,7 +2931,7 @@ u8 func101a_set_rocketlauncher_flag[] = {
if_difficulty_lt(DIFF_SA, /*goto*/ 0x20)
// SA and PA
set_object_flag2(OBJ_ROCKETLAUNCHER, OBJFLAG2_20000000)
set_object_flag2(OBJ_ROCKETLAUNCHER, OBJFLAG2_AICANNOTUSE)
label(0x20)
set_ailist(CHR_SELF, GAILIST_IDLE)
src/files/setup/setupcave.c
+8 -8
View File
@@ -3525,17 +3525,17 @@ u8 func1018_safe_switch[] = {
set_object_flag(OBJ_SAFEDOOR, OBJFLAG_40000000)
unset_object_flag2(OBJ_FLIGHTPLANS, OBJFLAG2_INVISIBLE)
unset_object_flag(OBJ_FLIGHTPLANS, OBJFLAG_00100000)
unset_object_flag(OBJ_FLIGHTPLANS, OBJFLAG_UNCOLLECTABLE)
set_object_flag(OBJ_FLIGHTPLANS, OBJFLAG_COLLECTABLE)
set_object_flag2(OBJ_FLIGHTPLANS, OBJFLAG2_00001000)
// 0x32 = a shield
set_object_flag2(0x34, OBJFLAG2_00001000)
unset_object_flag(0x34, OBJFLAG_00100000)
unset_object_flag(0x34, OBJFLAG_UNCOLLECTABLE)
// 0x32 = invalid object
unset_object_flag2(0x32, OBJFLAG2_INVISIBLE)
unset_object_flag(0x32, OBJFLAG_00100000)
unset_object_flag(0x32, OBJFLAG_UNCOLLECTABLE)
label(0x31)
@@ -3568,7 +3568,7 @@ u8 func1018_safe_switch_cover[] = {
endloop(0x04)
label(0x31)
set_object_flag(OBJ_SAFE_SWITCH_COVER, OBJFLAG_02000000)
set_object_flag(OBJ_SAFE_SWITCH_COVER, OBJFLAG_CANNOT_ACTIVATE)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
@@ -3953,9 +3953,9 @@ u8 func1023_check_office2_dead[] = {
};
u8 func1024_double_dy357[] = {
set_object_flag(0x30, OBJFLAG_00100000)
set_object_flag(0x30, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(0x30, OBJFLAG2_INVISIBLE)
set_object_flag(0x31, OBJFLAG_00100000)
set_object_flag(0x31, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(0x31, OBJFLAG2_INVISIBLE)
beginloop(0x00)
@@ -3967,9 +3967,9 @@ u8 func1024_double_dy357[] = {
endloop(0x00)
label(0x31)
unset_object_flag(0x30, OBJFLAG_00100000)
unset_object_flag(0x30, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x30, OBJFLAG2_INVISIBLE)
unset_object_flag(0x31, OBJFLAG_00100000)
unset_object_flag(0x31, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(0x31, OBJFLAG2_INVISIBLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
src/files/setup/setupdam.c
+2 -2
View File
@@ -2843,8 +2843,8 @@ u8 func101e_alarm_images[] = {
endloop(0x00)
label(0x07)
set_object_flag(0x27, OBJFLAG_00100000)
set_object_flag(0x28, OBJFLAG_00100000)
set_object_flag(0x27, OBJFLAG_UNCOLLECTABLE)
set_object_flag(0x28, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(0x27, OBJFLAG2_INVISIBLE)
set_object_flag2(0x28, OBJFLAG2_INVISIBLE)
set_object_image(0x21, 0x00, 0x0f)
src/files/setup/setupdepo.c
+24 -24
View File
@@ -1110,12 +1110,12 @@ u8 func0402_init_swat2[] = {
};
u8 func100a_give_keycards[] = {
set_object_flag(OBJ_KEYCARD1, OBJFLAG_00100000)
set_object_flag(OBJ_KEYCARD1, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(OBJ_KEYCARD1, OBJFLAG2_INVISIBLE)
set_object_flag(OBJ_KEYCARD2, OBJFLAG_00100000)
set_object_flag(OBJ_KEYCARD2, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(OBJ_KEYCARD2, OBJFLAG2_INVISIBLE)
set_object_flag2(OBJ_CROSSBOW, OBJFLAG2_INVISIBLE)
set_object_flag(OBJ_CROSSBOW, OBJFLAG_00100000)
set_object_flag(OBJ_CROSSBOW, OBJFLAG_UNCOLLECTABLE)
set_chr_chrflag(CHR_CLOAK_1A, CHRCFLAG_KILLCOUNTABLE)
set_chr_chrflag(CHR_CLOAK_1B, CHRCFLAG_KILLCOUNTABLE)
@@ -1147,10 +1147,10 @@ u8 func100a_give_keycards[] = {
set_target_chr(CHR_CLOAK_1B)
label(0x2c)
unset_object_flag(OBJ_KEYCARD1, OBJFLAG_00100000)
unset_object_flag(OBJ_KEYCARD1, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(OBJ_KEYCARD1, OBJFLAG2_INVISIBLE)
unset_object_flag2(OBJ_CROSSBOW, OBJFLAG2_INVISIBLE)
unset_object_flag(OBJ_CROSSBOW, OBJFLAG_00100000)
unset_object_flag(OBJ_CROSSBOW, OBJFLAG_UNCOLLECTABLE)
// Wait for the chr who holds the keycard to die
beginloop(0x55)
@@ -1161,7 +1161,7 @@ u8 func100a_give_keycards[] = {
label(0x2c)
set_object_flag2(OBJ_CROSSBOW, OBJFLAG2_INVISIBLE)
set_object_flag(OBJ_CROSSBOW, OBJFLAG_00100000)
set_object_flag(OBJ_CROSSBOW, OBJFLAG_UNCOLLECTABLE)
hide_object(OBJ_CROSSBOW)
beginloop(0x08)
@@ -1204,7 +1204,7 @@ u8 func100a_give_keycards[] = {
dprint 'G','I','V','E',' ','T','O','7',0,
label(0x2c)
unset_object_flag(OBJ_KEYCARD2, OBJFLAG_00100000)
unset_object_flag(OBJ_KEYCARD2, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(OBJ_KEYCARD2, OBJFLAG2_INVISIBLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -1248,18 +1248,18 @@ u8 func100e_check_conspirators_alerted[] = {
// These objects are doors
label(0x06)
unset_object_flag2(0x3f, OBJFLAG2_20000000)
unset_object_flag2(0x40, OBJFLAG2_20000000)
unset_object_flag2(0x41, OBJFLAG2_20000000)
unset_object_flag2(0x42, OBJFLAG2_20000000)
unset_object_flag2(0x43, OBJFLAG2_20000000)
unset_object_flag2(0x44, OBJFLAG2_20000000)
unset_object_flag2(0x45, OBJFLAG2_20000000)
unset_object_flag2(0x46, OBJFLAG2_20000000)
unset_object_flag2(0x34, OBJFLAG2_20000000)
unset_object_flag2(0x35, OBJFLAG2_20000000)
unset_object_flag2(0x36, OBJFLAG2_20000000)
unset_object_flag2(0x37, OBJFLAG2_20000000)
unset_object_flag2(0x3f, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x40, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x41, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x42, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x43, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x44, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x45, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x46, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x34, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x35, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x36, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x37, OBJFLAG2_AICANNOTUSE)
set_stage_flag(STAGEFLAG_ALARM_SOUNDING)
if_stage_flag_eq(STAGEFLAG_MEETING_STARTED, TRUE, /*goto*/ 0x06)
@@ -1375,7 +1375,7 @@ u8 func1010_safe_cracking[] = {
control_sound_from_object(CHANNEL_1, OBJ_SAFEKEYPAD, TRUE)
message(CHR_P1P2, 0x1825) // "Door Decoder finished - door unlocked."
unlock_door(OBJ_SAFEDOOR, 0x40)
unset_object_flag2(OBJ_SAFEDOOR, OBJFLAG2_20000000)
unset_object_flag2(OBJ_SAFEDOOR, OBJFLAG2_AICANNOTUSE)
open_door(OBJ_SAFEDOOR)
hide_countdown_timer
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2377,10 +2377,10 @@ u8 func101b_cloak2_entry[] = {
lock_door(0x35, 0x10)
lock_door(0x36, 0x10)
lock_door(0x37, 0x10)
set_object_flag2(0x34, OBJFLAG2_10000000)
set_object_flag2(0x35, OBJFLAG2_10000000)
set_object_flag2(0x36, OBJFLAG2_08000000)
set_object_flag2(0x37, OBJFLAG2_10000000)
set_object_flag2(0x34, OBJFLAG2_LOCKEDBACK)
set_object_flag2(0x35, OBJFLAG2_LOCKEDBACK)
set_object_flag2(0x36, OBJFLAG2_LOCKEDFRONT)
set_object_flag2(0x37, OBJFLAG2_LOCKEDBACK)
close_door(0x34)
close_door(0x35)
close_door(0x36)
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)
src/files/setup/setupear.c
+2 -2
View File
@@ -1309,9 +1309,9 @@ u8 func1009_weaponscache[] = {
control_sound_from_object(CHANNEL_5, OBJ_CMP150_1, TRUE)
hide_object(OBJ_CACHEDOOR1)
hide_object(OBJ_CACHEDOOR2)
unset_object_flag(OBJ_CMP150_1, OBJFLAG_00100000)
unset_object_flag(OBJ_CMP150_1, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(OBJ_CMP150_1, OBJFLAG2_INVISIBLE)
unset_object_flag(OBJ_CMP150_2, OBJFLAG_00100000)
unset_object_flag(OBJ_CMP150_2, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(OBJ_CMP150_2, OBJFLAG2_INVISIBLE)
set_object_flag2(OBJ_CMP150_1, OBJFLAG2_00001000)
set_object_flag2(OBJ_CMP150_2, OBJFLAG2_00001000)
src/files/setup/setupeld.c
+5 -5
View File
@@ -2082,7 +2082,7 @@ u8 func1009_windmill_switch[] = {
message(CHR_P1P2, 0x2012) // "Windmill has been reactivated."
yield
set_stage_flag(STAGEFLAG_WINDMILL_ACTIVATED)
set_object_flag2(OBJ_WINDMILL, OBJFLAG2_20000000)
set_object_flag2(OBJ_WINDMILL, OBJFLAG2_AICANNOTUSE)
unlock_door(0x06, 0x02)
unlock_door(0x07, 0x02)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2423,7 +2423,7 @@ u8 func1014_give_keycard[] = {
set_chr_chrflag(CHR_BASEMENT7, CHRCFLAG_KILLCOUNTABLE)
set_chr_chrflag(CHR_BASEMENT8, CHRCFLAG_KILLCOUNTABLE)
set_chr_chrflag(CHR_BASEMENT9, CHRCFLAG_KILLCOUNTABLE)
set_object_flag(OBJ_KEYCARD, OBJFLAG_00100000)
set_object_flag(OBJ_KEYCARD, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(OBJ_KEYCARD, OBJFLAG2_INVISIBLE)
// Wait until one basement guard remaining
@@ -2458,7 +2458,7 @@ u8 func1014_give_keycard[] = {
// Gave key
label(0x09)
unset_object_flag(OBJ_KEYCARD, OBJFLAG_00100000)
unset_object_flag(OBJ_KEYCARD, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(OBJ_KEYCARD, OBJFLAG2_INVISIBLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -2931,8 +2931,8 @@ u8 func101d_dual_cmp150[] = {
endloop(0x08)
label(0x2d)
unset_object_flag(OBJ_CMP150_1, OBJFLAG_00100000)
unset_object_flag(OBJ_CMP150_2, OBJFLAG_00100000)
unset_object_flag(OBJ_CMP150_1, OBJFLAG_UNCOLLECTABLE)
unset_object_flag(OBJ_CMP150_2, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(OBJ_CMP150_1, OBJFLAG2_INVISIBLE)
unset_object_flag2(OBJ_CMP150_1, OBJFLAG2_INVISIBLE)
src/files/setup/setupimp.c
+3 -3
View File
@@ -2956,7 +2956,7 @@ u8 func1015_firingrange_pc[] = {
label(0x08)
message(CHR_P1P2, 0x221f) // "Emergency overrides have been engaged."
unset_object_flag(OBJ_RCP120, OBJFLAG_00100000)
unset_object_flag(OBJ_RCP120, OBJFLAG_UNCOLLECTABLE)
unset_object_flag(OBJ_RCP120_GLASS, OBJFLAG_INVINCIBLE)
destroy_object(OBJ_RCP120_GLASS)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -3686,8 +3686,8 @@ u8 func100e_setup_firingrange_doors[] = {
// Unset some flags on them
label(0x2e)
unset_object_flag2(0x23, OBJFLAG2_20000000)
unset_object_flag2(0x24, OBJFLAG2_20000000)
unset_object_flag2(0x23, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x24, OBJFLAG2_AICANNOTUSE)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
src/files/setup/setuplee.c
+18 -18
View File
@@ -575,10 +575,10 @@ u8 func1019_check_shields_lowered[] = {
u8 func1004_check_hangar_doors_opened[] = {
yield
set_object_flag(OBJ_HANGARDOOR1, OBJFLAG_02000000)
set_object_flag(OBJ_HANGARDOOR2, OBJFLAG_02000000)
set_object_flag(OBJ_HANGARDOOR3, OBJFLAG_02000000)
set_object_flag(OBJ_HANGARDOOR4, OBJFLAG_02000000)
set_object_flag(OBJ_HANGARDOOR1, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(OBJ_HANGARDOOR2, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(OBJ_HANGARDOOR3, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(OBJ_HANGARDOOR4, OBJFLAG_CANNOT_ACTIVATE)
beginloop(0x04)
chr_toggle_p1p2(CHR_SELF)
@@ -1385,8 +1385,8 @@ u8 func1008_hangar_lifts[] = {
// attempting to warp him.
beginloop(0x64)
set_object_flag(OBJ_HANGARLIFT_ELVIS, OBJFLAG_DEACTIVATED)
unset_object_flag(0x3b, OBJFLAG_02000000)
unset_object_flag(0x3c, OBJFLAG_02000000)
unset_object_flag(0x3b, OBJFLAG_CANNOT_ACTIVATE)
unset_object_flag(0x3c, OBJFLAG_CANNOT_ACTIVATE)
unset_chr_hiddenflag(CHR_BOND, CHRHFLAG_TRIGGER_BUDDY_WARP)
if_chr_y(CHR_ELVIS, 400, OPERATOR_LESS_THAN, /*goto*/ 0x06)
goto_next(0x68)
@@ -1974,8 +1974,8 @@ u8 func100d_prebridgelift[] = {
label(0x2c)
label(0x64)
set_object_flag(OBJ_PREBRIDGELIFT, OBJFLAG_DEACTIVATED)
unset_object_flag(0x3d, OBJFLAG_02000000)
unset_object_flag(0x3e, OBJFLAG_02000000)
unset_object_flag(0x3d, OBJFLAG_CANNOT_ACTIVATE)
unset_object_flag(0x3e, OBJFLAG_CANNOT_ACTIVATE)
// Wait until lift called at bottom by buddy or counterop
beginloop(0x68)
@@ -2056,8 +2056,8 @@ u8 func100e_bridgelift[] = {
// Deactive lift
label(0x64)
set_object_flag(OBJ_BRIDGELIFT, OBJFLAG_DEACTIVATED)
unset_object_flag(0x2f, OBJFLAG_02000000)
unset_object_flag(0x30, OBJFLAG_02000000)
unset_object_flag(0x2f, OBJFLAG_CANNOT_ACTIVATE)
unset_object_flag(0x30, OBJFLAG_CANNOT_ACTIVATE)
// Wait until lift called from below by buddy or counterop
beginloop(0x68)
@@ -3481,10 +3481,10 @@ u8 func040c_elvis_run_from_engineroom[] = {
u8 func101f_enable_bridge_skedar[] = {
lock_door(0x41, 0x80)
lock_door(0x42, 0x80)
set_object_flag2(0x41, OBJFLAG2_10000000)
set_object_flag2(0x42, OBJFLAG2_08000000)
set_object_flag2(0x41, OBJFLAG2_20000000)
set_object_flag2(0x42, OBJFLAG2_20000000)
set_object_flag2(0x41, OBJFLAG2_LOCKEDBACK)
set_object_flag2(0x42, OBJFLAG2_LOCKEDFRONT)
set_object_flag2(0x41, OBJFLAG2_AICANNOTUSE)
set_object_flag2(0x42, OBJFLAG2_AICANNOTUSE)
// Wait until first 4 objectives complete
beginloop(0x04)
@@ -3508,10 +3508,10 @@ u8 func101f_enable_bridge_skedar[] = {
label(0x2c)
unlock_door(0x41, 0x80)
unlock_door(0x42, 0x80)
unset_object_flag2(0x41, OBJFLAG2_10000000)
unset_object_flag2(0x42, OBJFLAG2_08000000)
unset_object_flag2(0x41, OBJFLAG2_20000000)
unset_object_flag2(0x42, OBJFLAG2_20000000)
unset_object_flag2(0x41, OBJFLAG2_LOCKEDBACK)
unset_object_flag2(0x42, OBJFLAG2_LOCKEDFRONT)
unset_object_flag2(0x41, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x42, OBJFLAG2_AICANNOTUSE)
show_chr(0x21)
show_chr(0x22)
show_chr(CHR_BRIDGE1)
src/files/setup/setuplip.c
+10 -10
View File
@@ -1597,14 +1597,14 @@ u8 func100a_random_doors[] = {
endloop(0x04)
label(0x06)
set_object_flag(0x07, OBJFLAG_02000000)
set_object_flag(0x09, OBJFLAG_02000000)
set_object_flag(0x0b, OBJFLAG_02000000)
set_object_flag(0x0d, OBJFLAG_02000000)
set_object_flag(0x08, OBJFLAG_02000000)
set_object_flag(0x0a, OBJFLAG_02000000)
set_object_flag(0x0c, OBJFLAG_02000000)
set_object_flag(0x0e, OBJFLAG_02000000)
set_object_flag(0x07, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(0x09, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(0x0b, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(0x0d, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(0x08, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(0x0a, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(0x0c, OBJFLAG_CANNOT_ACTIVATE)
set_object_flag(0x0e, OBJFLAG_CANNOT_ACTIVATE)
beginloop(0x03)
// 55 in 256 chance of doing anything on a given frame
@@ -1812,8 +1812,8 @@ u8 func0418_doorman[] = {
// Unlocking
label(0x06)
unset_object_flag2(0x4a, OBJFLAG2_20000000)
unset_object_flag2(0x4b, OBJFLAG2_20000000)
unset_object_flag2(0x4a, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x4b, OBJFLAG2_AICANNOTUSE)
unlock_door(0x4a, 0x40)
unlock_door(0x4b, 0x40)
open_door(0x4a)
src/files/setup/setuppam.c
+5 -5
View File
@@ -4475,7 +4475,7 @@ u8 func102b_proxymines[] = {
endloop(0x04)
label(0x2e)
set_object_flag(OBJ_PROXYMINES, OBJFLAG_00100000)
set_object_flag(OBJ_PROXYMINES, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(OBJ_PROXYMINES, OBJFLAG2_INVISIBLE)
label(0x06)
@@ -4491,8 +4491,8 @@ u8 func102c_lock_doors[] = {
// PA
lock_door(0xb1, 0x80)
lock_door(0xb2, 0x80)
set_object_flag2(0xb1, OBJFLAG2_20000000)
set_object_flag2(0xb2, OBJFLAG2_20000000)
set_object_flag2(0xb1, OBJFLAG2_AICANNOTUSE)
set_object_flag2(0xb2, OBJFLAG2_AICANNOTUSE)
// A and SA
label(0x2e)
@@ -4591,8 +4591,8 @@ u8 func102f_unlock_drcaroll_door[] = {
label(0x2e)
unlock_door(0x75, 0x02)
unlock_door(0x76, 0x02)
unset_object_flag2(0x75, OBJFLAG2_20000000)
unset_object_flag2(0x76, OBJFLAG2_20000000)
unset_object_flag2(0x75, OBJFLAG2_AICANNOTUSE)
unset_object_flag2(0x76, OBJFLAG2_AICANNOTUSE)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
src/files/setup/setuprit.c
+4 -4
View File
@@ -572,13 +572,13 @@ u8 func1024_give_objects[] = {
label(0x2d)
set_object_flag2(OBJ_DATAUPLINK_BOND, OBJFLAG2_INVISIBLE)
set_object_flag(OBJ_DATAUPLINK_BOND, OBJFLAG_00100000)
set_object_flag(OBJ_DATAUPLINK_BOND, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(OBJ_REMOTEMINE_BOND, OBJFLAG2_INVISIBLE)
set_object_flag(OBJ_REMOTEMINE_BOND, OBJFLAG_00100000)
set_object_flag(OBJ_REMOTEMINE_BOND, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(OBJ_DATAUPLINK_COOP, OBJFLAG2_INVISIBLE)
set_object_flag(OBJ_DATAUPLINK_COOP, OBJFLAG_00100000)
set_object_flag(OBJ_DATAUPLINK_COOP, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(OBJ_REMOTEMINE_COOP, OBJFLAG2_INVISIBLE)
set_object_flag(OBJ_REMOTEMINE_COOP, OBJFLAG_00100000)
set_object_flag(OBJ_REMOTEMINE_COOP, OBJFLAG_UNCOLLECTABLE)
beginloop(0x04)
chr_toggle_p1p2(CHR_SELF)
src/files/setup/setupsho.c
+8 -8
View File
@@ -1055,8 +1055,8 @@ u8 func100c_check_army_defeated[] = {
endloop(0x91)
label(0x2d)
unset_object_flag2(0x45, OBJFLAG2_08000000)
unset_object_flag2(0x46, OBJFLAG2_10000000)
unset_object_flag2(0x45, OBJFLAG2_LOCKEDFRONT)
unset_object_flag2(0x46, OBJFLAG2_LOCKEDBACK)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
@@ -3585,9 +3585,9 @@ u8 func1020_show_phoenix[] = {
if_object_in_good_condition(0x2c, /*goto*/ 0x2d)
if_object_in_good_condition(0x2d, /*goto*/ 0x2d)
if_object_in_good_condition(0x2e, /*goto*/ 0x2d)
unset_object_flag(OBJ_PHOENIX1, OBJFLAG_00100000)
unset_object_flag(OBJ_PHOENIX1, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(OBJ_PHOENIX1, OBJFLAG2_INVISIBLE)
unset_object_flag(OBJ_PHOENIX2, OBJFLAG_00100000)
unset_object_flag(OBJ_PHOENIX2, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(OBJ_PHOENIX2, OBJFLAG2_INVISIBLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
label(0x2d)
@@ -3615,8 +3615,8 @@ u8 func1021_handle_mine[] = {
u8 func1022_armyroom_exitdoors[] = {
yield
set_object_flag2(0x45, OBJFLAG2_08000000)
set_object_flag2(0x46, OBJFLAG2_10000000)
set_object_flag2(0x45, OBJFLAG2_LOCKEDFRONT)
set_object_flag2(0x46, OBJFLAG2_LOCKEDBACK)
if_difficulty_gt(DIFF_SA, /*goto*/ 0x2d)
// A and SA
@@ -3625,8 +3625,8 @@ u8 func1022_armyroom_exitdoors[] = {
endloop(0x91)
label(0x06)
unset_object_flag2(0x45, OBJFLAG2_08000000)
unset_object_flag2(0x46, OBJFLAG2_10000000)
unset_object_flag2(0x45, OBJFLAG2_LOCKEDFRONT)
unset_object_flag2(0x46, OBJFLAG2_LOCKEDBACK)
// All difficulties
label(0x2d)
src/files/setup/setuptra.c
+4 -4
View File
@@ -742,8 +742,8 @@ u8 func1005_jon_msgs_meetup[] = {
label(0x06)
set_stage_flag(STAGEFLAG_ELVIS_STASHED)
mute_channel(CHANNEL_0)
unset_object_flag2(0x0d, OBJFLAG2_08000000)
set_object_flag2(0x0d, OBJFLAG2_10000000)
unset_object_flag2(0x0d, OBJFLAG2_LOCKEDFRONT)
set_object_flag2(0x0d, OBJFLAG2_LOCKEDBACK)
unlock_door(0x0d, 0x20)
release_grabbed_object(CHR_BOND)
yield
@@ -2967,7 +2967,7 @@ u8 func0c01_midcutscene[] = {
set_object_flag3(0x11, OBJFLAG3_00000010)
object_do_animation(0x01cf, 0x11, 0x04ff, 0xfe)
unset_object_flag2(0x0a, OBJFLAG2_20000000)
unset_object_flag2(0x0a, OBJFLAG2_AICANNOTUSE)
unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_INVINCIBLE_TO_GUNFIRE)
unset_chr_chrflag(CHR_JONATHAN, CHRCFLAG_INVINCIBLE_TO_GUNFIRE)
set_ailist(CHR_JONATHAN, AILIST_JONATHAN_HANGAR)
@@ -3581,7 +3581,7 @@ u8 func102f_toggle_remotemines[] = {
set_ailist(CHR_SELF, GAILIST_IDLE)
label(0x06)
unset_object_flag(OBJ_REMOTEMINES, OBJFLAG_00100000)
unset_object_flag(OBJ_REMOTEMINES, OBJFLAG_UNCOLLECTABLE)
unset_object_flag2(OBJ_REMOTEMINES, OBJFLAG2_INVISIBLE)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist