From 59e2aa2804d45b6f871907f930008222afe975d3 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 10 Dec 2024 13:49:13 -0700
Subject: [PATCH] Implement/match `LegoAct2::FUN_100516b0` and
 `LegoAct2::FUN_100517b0` (#1204)

* Implement/match `LegoAct2::FUN_100516b0` and `LegoAct2::FUN_100517b0`

* Fix
---
 LEGO1/lego/legoomni/src/actors/act2actor.cpp |  2 +-
 LEGO1/lego/legoomni/src/worlds/legoact2.cpp  | 37 +++++++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/LEGO1/lego/legoomni/src/actors/act2actor.cpp b/LEGO1/lego/legoomni/src/actors/act2actor.cpp
index c5dd90e2..42326b2c 100644
--- a/LEGO1/lego/legoomni/src/actors/act2actor.cpp
+++ b/LEGO1/lego/legoomni/src/actors/act2actor.cpp
@@ -291,7 +291,7 @@ void Act2Actor::VTable0x70(float p_time)
 									m_unk0x1e = 3;
 									m_unk0x24 = p_time;
 
-									if (!((LegoAct2*) CurrentWorld())->FUN_100516b0()) {
+									if (((LegoAct2*) CurrentWorld())->FUN_100516b0() == SUCCESS) {
 										FUN_100199f0(1);
 									}
 #ifdef NDEBUG
diff --git a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp
index f25a77ab..7e2e8d62 100644
--- a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp
@@ -659,18 +659,45 @@ MxLong LegoAct2::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 	return 0;
 }
 
-// STUB: LEGO1 0x100516b0
-// STUB: BETA10 0x1003bcbc
+// FUNCTION: LEGO1 0x100516b0
+// FUNCTION: BETA10 0x1003bcbc
 MxResult LegoAct2::FUN_100516b0()
 {
-	// TODO
+	if (m_nextBrick > 4) {
+		return FAILURE;
+	}
+
+	Act2Brick& brick = m_bricks[m_nextBrick];
+	brick.Create(m_nextBrick);
+
+	MxMatrix local2world = m_ambulance->GetLocal2World();
+	MxMatrix local2world2 = local2world;
+
+	LegoPathBoundary* boundary = m_unk0x1138->GetBoundary();
+	local2world[3][1] += 1.3;
+	local2world2[3][1] -= 0.1;
+
+	brick.FUN_1007a670(local2world, local2world2, boundary);
+	m_nextBrick++;
+	m_unk0x10c4 = 9;
+	m_unk0x10d0 = 0;
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x100517b0
+// FUNCTION: LEGO1 0x100517b0
 void LegoAct2::FUN_100517b0()
 {
-	// TODO
+	Act2Brick& brick = m_bricks[m_nextBrick];
+	brick.Create(m_nextBrick);
+
+	MxMatrix local2world = m_ambulance->GetLocal2World();
+	local2world[3][1] += 1.5;
+
+	LegoROI* roi = brick.GetROI();
+	roi->FUN_100a58f0(local2world);
+	roi->VTable0x14();
+	brick.PlayWhistleSound();
+	m_nextBrick++;
 }
 
 // FUNCTION: LEGO1 0x10051840