From 4bdb84546e82bd63ba8b6072801ec46cdf0bf309 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 31 Dec 2022 15:02:47 +1000 Subject: [PATCH] Fix lifts again --- src/ailists/setupcave.c | 2 ++ src/ailists/setuplip.c | 8 ++++++++ src/ailists/setuplue.c | 1 + src/ailists/setuprit.c | 10 ++++++++++ src/ailists/setupsev.c | 8 ++++++++ src/ailists/setupsho.c | 7 +++++++ src/ailists/setupstat.c | 7 +++++++ src/ailists/setuptra.c | 8 ++++++++ src/include/constants.h | 2 +- 9 files changed, 52 insertions(+), 1 deletion(-) diff --git a/src/ailists/setupcave.c b/src/ailists/setupcave.c index 136a2ac3e..a899c8a09 100644 --- a/src/ailists/setupcave.c +++ b/src/ailists/setupcave.c @@ -3437,6 +3437,8 @@ u8 func041a_draw_magnum[] = { u8 func141b_setup_lifts[] = { activate_lift(1, 0x20) activate_lift(2, 0x21) + activate_lift(3, 0x04) + activate_lift(4, 0x1f) activate_lift(9, 0x36) terminate endlist diff --git a/src/ailists/setuplip.c b/src/ailists/setuplip.c index 03e40c6f4..c47f1f88e 100644 --- a/src/ailists/setuplip.c +++ b/src/ailists/setuplip.c @@ -4344,8 +4344,16 @@ u8 func042e_biotech_guard_alerted[] = { u8 func142d_start_lifts[] = { activate_lift(1, 0x35) + activate_lift(2, 0x1a) + activate_lift(3, 0x1b) activate_lift(4, 0x38) activate_lift(5, 0x39) + activate_lift(6, 0x1c) + activate_lift(7, 0x1d) + activate_lift(8, 0x1e) + activate_lift(9, 0x1f) + activate_lift(10, 0x20) + activate_lift(11, 0x21) terminate endlist }; diff --git a/src/ailists/setuplue.c b/src/ailists/setuplue.c index 1c1ec7814..d2f591b71 100644 --- a/src/ailists/setuplue.c +++ b/src/ailists/setuplue.c @@ -2834,6 +2834,7 @@ u8 func0420_dragon_alerted[] = { }; u8 func141f_start_lifts[] = { + activate_lift(1, 0x07) activate_lift(2, 0x31) activate_lift(3, 0x32) activate_lift(4, 0x33) diff --git a/src/ailists/setuprit.c b/src/ailists/setuprit.c index 958b36c4f..ab25a6da0 100644 --- a/src/ailists/setuprit.c +++ b/src/ailists/setuprit.c @@ -4047,6 +4047,15 @@ u8 func1026_buddy_floor_hatch[] = { endlist }; +u8 func1427_start_lifts[] = { + activate_lift(1, 0x1b) + activate_lift(2, 0x1f) + activate_lift(3, 0x05) + activate_lift(4, 0x06) + terminate + endlist +}; + struct ailist ailists[] = { { func1400_setup_counterop, 0x1400 }, { func1001_objectives_failed_msg, 0x1001 }, @@ -4084,6 +4093,7 @@ struct ailist ailists[] = { { func1024_give_objects, 0x1024 }, { func1025_disable_buddy_warp, 0x1025 }, { func1026_buddy_floor_hatch, 0x1026 }, + { func1427_start_lifts, 0x1427 }, { func1002_intro, 0x0c00 }, { func1019_midcutscene_from_menu, 0x0c01 }, { func0c02_outro_from_menu, 0x0c02 }, diff --git a/src/ailists/setupsev.c b/src/ailists/setupsev.c index 0281312de..43bea68a2 100644 --- a/src/ailists/setupsev.c +++ b/src/ailists/setupsev.c @@ -1146,8 +1146,16 @@ u8 func0418_init_alerted_guard[] = { u8 func100d_start_lifts[] = { activate_lift(1, 0x35) + activate_lift(2, 0x1a) + activate_lift(3, 0x1b) activate_lift(4, 0x38) activate_lift(5, 0x39) + activate_lift(6, 0x1c) + activate_lift(7, 0x1d) + activate_lift(8, 0x1e) + activate_lift(9, 0x1f) + activate_lift(10, 0x20) + activate_lift(11, 0x21) terminate endlist }; diff --git a/src/ailists/setupsho.c b/src/ailists/setupsho.c index 17c1631e9..1aa8aef7f 100644 --- a/src/ailists/setupsho.c +++ b/src/ailists/setupsho.c @@ -3897,6 +3897,12 @@ u8 func1028_buddybridge[] = { endlist }; +u8 func1429_start_lifts[] = { + activate_lift(1, 0x05) + terminate + endlist +}; + struct ailist ailists[] = { { func0401_init_unarmed_skedar, 0x0401 }, { func0402_unarmed_skedar, 0x0402 }, @@ -3960,6 +3966,7 @@ struct ailist ailists[] = { { func1426_setup_portals, 0x1426 }, { func1427_setup_environment, 0x1427 }, { func1028_buddybridge, 0x1028 }, + { func1429_start_lifts, 0x1429 }, { NULL, 0 }, }; diff --git a/src/ailists/setupstat.c b/src/ailists/setupstat.c index f31dccf11..4229d376e 100644 --- a/src/ailists/setupstat.c +++ b/src/ailists/setupstat.c @@ -1359,6 +1359,12 @@ u8 func1010_init_lighting[] = { endlist }; +u8 func1411_start_lifts[] = { + activate_lift(1, 0x05) + terminate + endlist +}; + struct ailist ailists[] = { { func1000_counterop, 0x1000 }, { func1001_objectives_failed_msg, 0x1001 }, @@ -1375,6 +1381,7 @@ struct ailist ailists[] = { { func100d_king1_invincible, 0x100d }, { func100f_blow_mines, 0x100f }, { func1010_init_lighting, 0x1010 }, + { func1411_start_lifts, 0x1411 }, { func100f_blow_mines, 0x040d }, { func040c_hide, 0x040c }, { func0401_defend, 0x0401 }, diff --git a/src/ailists/setuptra.c b/src/ailists/setuptra.c index be7119bf2..8b356f5a1 100644 --- a/src/ailists/setuptra.c +++ b/src/ailists/setuptra.c @@ -3658,6 +3658,14 @@ u8 func1032_unlock_door_after_hangar[] = { */ u8 func1433_start_lift[] = { activate_lift(1, 0x4e) + activate_lift(2, 0x46) + activate_lift(3, 0x47) + activate_lift(4, 0x48) + activate_lift(5, 0x49) + activate_lift(6, 0x4a) + activate_lift(7, 0x4b) + activate_lift(8, 0x4c) + activate_lift(9, 0x4d) terminate endlist }; diff --git a/src/include/constants.h b/src/include/constants.h index e6c0059ab..6f54a5be4 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -1506,7 +1506,7 @@ #define MAX_ARTIFACTS 120 #define MAX_CHRWAYPOINTS 6 #define MAX_DANGEROUSPROPS 12 -#define MAX_LIFTS 10 +#define MAX_LIFTS 12 #define MAX_MPCHRS (4 + MAX_BOTS) #define MAX_OBJECTIVES 10 #define MAX_BOTS 8