diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c index 15ff4a951..5e667d8f8 100644 --- a/src/files/setup/setupdam.c +++ b/src/files/setup/setupdam.c @@ -529,13 +529,13 @@ u32 props[] = { singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FE, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_00200000, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 20) singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FF, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_00200000, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 20) tag(0x17, 1) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0200, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_00000001, OBJFLAG3_INTERACTABLE, 1000, 3) #else singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0200, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 3) #endif tag(0x1a, 1) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0201, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_00000001, OBJFLAG3_INTERACTABLE, 1000, 3) #else singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0201, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 3) diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c index e907c2ba1..8d7d05ded 100644 --- a/src/files/setup/setupdepo.c +++ b/src/files/setup/setupdepo.c @@ -221,35 +221,35 @@ u32 props[] = { chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x11, PAD_DEPO_0069, BODY_G5_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, PAD_DEPO_0074, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_CAN_TRAVEL | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_06, -1, 0, 2, 0, 7, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0011, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x12, PAD_DEPO_003F, BODY_G5_GUARD, HEAD_RANDOM, 0x040b, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_06, -1, 0, 2, 0, 7, 0) #else chr(SPAWNFLAG_00000200, 0x12, PAD_DEPO_003F, BODY_G5_GUARD, HEAD_RANDOM, 0x040b, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_06, -1, 0, 2, 0, 7, 0) #endif weapon(0x0100, MODEL_CHRCMP150, 0x0012, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x13, PAD_DEPO_006A, BODY_G5_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) #else chr(SPAWNFLAG_00000200, 0x13, PAD_DEPO_006A, BODY_G5_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) #endif weapon(0x0100, MODEL_CHRCMP150, 0x0013, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x14, PAD_DEPO_006B, BODY_G5_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) #else chr(SPAWNFLAG_00000200, 0x14, PAD_DEPO_006B, BODY_G5_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) #endif weapon(0x0100, MODEL_CHRCMP150, 0x0014, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x15, PAD_DEPO_006C, BODY_G5_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) #else chr(SPAWNFLAG_00000200, 0x15, PAD_DEPO_006C, BODY_G5_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) #endif weapon(0x0100, MODEL_CHRCMP150, 0x0015, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x16, PAD_DEPO_006D, BODY_G5_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) #else chr(SPAWNFLAG_00000200, 0x16, PAD_DEPO_006D, BODY_G5_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c index f376809bd..dbb02c105 100644 --- a/src/files/setup/setupdish.c +++ b/src/files/setup/setupdish.c @@ -3366,7 +3366,7 @@ u8 func042e_devicegirl_reply_to_carrington[] = { }; u8 func1013_msg_hovercrate[] = { -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA beginloop(0x8f) if_savefile_flag_is_unset(GAMEFILEFLAG_HOWTO_HOVERCRATE, /*goto*/ 0x04) endloop(0x8f) @@ -3389,7 +3389,7 @@ u8 func1013_msg_hovercrate[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2f) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA set_savefile_flag(GAMEFILEFLAG_HOWTO_HOVERCRATE) #endif remove_hudmsgs @@ -3408,7 +3408,7 @@ u8 func1013_msg_hovercrate[] = { }; u8 func1014_msg_hoverbike[] = { -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA beginloop(0x8f) if_savefile_flag_is_unset(GAMEFILEFLAG_HOWTO_HOVERBIKE, /*goto*/ 0x04) endloop(0x8f) @@ -3431,7 +3431,7 @@ u8 func1014_msg_hoverbike[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2f) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA set_savefile_flag(GAMEFILEFLAG_HOWTO_HOVERBIKE) #endif remove_hudmsgs @@ -3450,7 +3450,7 @@ u8 func1014_msg_hoverbike[] = { }; u8 func1015_msg_doors[] = { -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA beginloop(0x8f) if_savefile_flag_is_unset(GAMEFILEFLAG_HOWTO_DOORS, /*goto*/ 0x04) endloop(0x8f) @@ -3471,7 +3471,7 @@ u8 func1015_msg_doors[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2f) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA set_savefile_flag(GAMEFILEFLAG_HOWTO_DOORS) #endif remove_hudmsgs @@ -3490,7 +3490,7 @@ u8 func1015_msg_doors[] = { }; u8 func1016_msg_elevators[] = { -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA beginloop(0x8f) if_savefile_flag_is_unset(GAMEFILEFLAG_HOWTO_ELEVATORS, /*goto*/ 0x04) endloop(0x8f) @@ -3512,7 +3512,7 @@ u8 func1016_msg_elevators[] = { #endif label(0x2f) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA set_savefile_flag(GAMEFILEFLAG_HOWTO_ELEVATORS) #endif remove_hudmsgs @@ -3523,7 +3523,7 @@ u8 func1016_msg_elevators[] = { }; u8 func1017_msg_terminals[] = { -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA beginloop(0x8f) if_savefile_flag_is_unset(GAMEFILEFLAG_HOWTO_TERMINALS, /*goto*/ 0x04) endloop(0x8f) @@ -3555,7 +3555,7 @@ u8 func1017_msg_terminals[] = { #endif label(0x2f) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA set_savefile_flag(GAMEFILEFLAG_HOWTO_TERMINALS) #endif remove_hudmsgs diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c index 688850479..0297a7e7f 100644 --- a/src/files/setup/setuplue.c +++ b/src/files/setup/setuplue.c @@ -1251,7 +1251,7 @@ u8 func1006_lift_switches[] = { label(0x0a) assign_sound(SFX_043F, CHANNEL_7) play_sound_from_entity(CHANNEL_7, OBJ_LIFT2_SWITCH, 0x012c, 0x0190, 0x00) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA if_chr_has_object(CHR_P1P2, OBJ_KEYCARD, /*goto*/ 0x2e) #else if_chr_has_object(CHR_BOND, OBJ_KEYCARD, /*goto*/ 0x2e) diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c index a998fc23c..162d12a48 100644 --- a/src/files/setup/setuppam.c +++ b/src/files/setup/setuppam.c @@ -143,7 +143,7 @@ u32 props[] = { chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x40, PAD_PAM_01B3, BODY_DDSNIPER, HEAD_RANDOM, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_SKIPSAFETYCHECKS, CHRFLAG1_AIVSAI_ADVANTAGED | CHRFLAG1_NOOP_00200000 | CHRFLAG1_IGNORECOVER | CHRFLAG1_PUNCHHARDER, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x0040, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x00, PAD_PAM_002E, BODY_THEKING, HEAD_ELVIS, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_SKIPSAFETYCHECKS, CHRFLAG1_AIVSAI_ADVANTAGED | CHRFLAG1_NOOP_00200000 | CHRFLAG1_IGNORECOVER | CHRFLAG1_PUNCHHARDER, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) #else chr(SPAWNFLAG_BLUESIGHT, 0x00, PAD_PAM_002E, BODY_THEKING, HEAD_ELVIS, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_SKIPSAFETYCHECKS, CHRFLAG1_AIVSAI_ADVANTAGED | CHRFLAG1_NOOP_00200000 | CHRFLAG1_IGNORECOVER | CHRFLAG1_PUNCHHARDER, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) diff --git a/src/files/setup/setupsev.c b/src/files/setup/setupsev.c index 39bee7faa..20d713ee6 100644 --- a/src/files/setup/setupsev.c +++ b/src/files/setup/setupsev.c @@ -674,7 +674,7 @@ u32 props[] = { stdobject(0x0100, MODEL_DD_CHAIR, PAD_SEV_048F, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED, 0, 0, 1000) stdobject(0x0100, MODEL_DD_CHAIR, PAD_SEV_0490, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED, 0, 0, 1000) tag(OBJ_CONSOLE, 1) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0435, OBJFLAG_00000001 | OBJFLAG_00000100, OBJFLAG2_00000001, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 0, 0) #else multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0435, OBJFLAG_00000001 | OBJFLAG_00000100, 0, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 0, 0) diff --git a/src/files/setup/setupsho.c b/src/files/setup/setupsho.c index e16f102ea..aff9c06d4 100644 --- a/src/files/setup/setupsho.c +++ b/src/files/setup/setupsho.c @@ -1076,7 +1076,7 @@ u8 func1005_5e0c[] = { beginloop(0x04) chr_toggle_p1p2(CHR_SELF) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA if_object_distance_to_pad_lt(OBJ_PUZZLEROCK, 50, PAD_SHO_00D4, /*goto*/ 0x41) #else if_object_distance_to_pad_lt(OBJ_PUZZLEROCK, 50, PAD_SHO_00D4, /*goto*/ 0x2d) @@ -1092,7 +1092,7 @@ u8 func1005_5e0c[] = { set_stage_flag(STAGEFLAG_CROSSED_RAVINE_WITHOUT_BRIDGE) set_stage_flag(STAGEFLAG_TRIGGER_BRIDGE) -#if VERSION >= VERSION_PAL_FINAL +#if VERSION >= VERSION_PAL_BETA label(0x41) if_num_human_players_lt(2, /*goto*/ 0x2d) unset_object_flag3(OBJ_PUZZLEROCK, OBJFLAG3_PUSHABLE)