From cc5414b013cf33b3cb98c89c74728060bc2ecc5d Mon Sep 17 00:00:00 2001
From: coco875 <59367621+coco875@users.noreply.github.com>
Date: Mon, 29 Jul 2024 00:29:10 +0200
Subject: [PATCH] fix missing header or not correctly formed header (#24)

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
---
 include/align_asset_macro.h | 2 ++
 src/code_80091750.c         | 3 +++
 src/course_metadata.h       | 8 ++++----
 src/port/Engine.h           | 5 +++++
 src/racing/memory.c         | 2 ++
 src/racing/memory.h         | 1 +
 src/update_objects.h        | 2 +-
 yamls/us/data_segment2.yml  | 4 ++--
 8 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/include/align_asset_macro.h b/include/align_asset_macro.h
index 554f383b0..457efe5ad 100644
--- a/include/align_asset_macro.h
+++ b/include/align_asset_macro.h
@@ -1,5 +1,7 @@
 #pragma once
 
+uint8_t GameEngine_OTRSigCheck(char* imgData);
+
 #if defined(_WIN32)
     #define ALIGN_ASSET(x) __declspec(align(x))
 #else
diff --git a/src/code_80091750.c b/src/code_80091750.c
index 289a00c9b..6f9e4156f 100644
--- a/src/code_80091750.c
+++ b/src/code_80091750.c
@@ -40,6 +40,9 @@
 // Unfortunately that's not a small effort due to weird import structure in this project
 #include "main.h"
 
+#include "stdio.h"
+#include "port/Engine.h"
+
 u16 *D_8018D9B0;
 u8 *D_8018D9B4;
 u8 *D_8018D9B8;
diff --git a/src/course_metadata.h b/src/course_metadata.h
index 511cc67db..d62a2984b 100644
--- a/src/course_metadata.h
+++ b/src/course_metadata.h
@@ -3,7 +3,7 @@
 #include <libultraship.h>
 #include <common_structs.h>
 
-Vec4f D_0D009418[];
-Vec4f D_0D009568[];
-Vec4f D_0D0096B8[];
-Vec4f D_0D009808[];
\ No newline at end of file
+extern Vec4f D_0D009418[];
+extern Vec4f D_0D009568[];
+extern Vec4f D_0D0096B8[];
+extern Vec4f D_0D009808[];
\ No newline at end of file
diff --git a/src/port/Engine.h b/src/port/Engine.h
index 19d419a8d..60cfb1272 100644
--- a/src/port/Engine.h
+++ b/src/port/Engine.h
@@ -37,4 +37,9 @@ class GameEngine {
 void GameEngine_ProcessGfxCommands(Gfx* commands);
 float GameEngine_GetAspectRatio();
 uint8_t GameEngine_OTRSigCheck(char* imgData);
+float OTRGetAspectRatio(void);
+float OTRGetDimensionFromLeftEdge(float v);
+float OTRGetDimensionFromRightEdge(float v);
+int16_t OTRGetRectDimensionFromLeftEdge(float v);
+int16_t OTRGetRectDimensionFromRightEdge(float v);
 #endif
\ No newline at end of file
diff --git a/src/racing/memory.c b/src/racing/memory.c
index 6a7a75be4..3d67081a0 100644
--- a/src/racing/memory.c
+++ b/src/racing/memory.c
@@ -25,6 +25,8 @@
 #include <assert.h>
 #include <course_offsets.h>
 
+#include <stdio.h>
+
 s32 sGfxSeekPosition;
 s32 sPackedSeekPosition;
 
diff --git a/src/racing/memory.h b/src/racing/memory.h
index f8c26e652..8360224a8 100644
--- a/src/racing/memory.h
+++ b/src/racing/memory.h
@@ -94,6 +94,7 @@ void  unpack_tile_load_sync(Gfx*, u8*, s8);
 void  unpack_texture_on(Gfx*, u8*, s8);
 void  unpack_texture_off(Gfx*, u8*, s8);
 void load_course(s32);
+uintptr_t set_segment_base_addr_x64(s32, void *);
 
 extern u8 _other_texturesSegmentRomStart[];
 
diff --git a/src/update_objects.h b/src/update_objects.h
index 76b7a1b7a..5ad12ad4a 100644
--- a/src/update_objects.h
+++ b/src/update_objects.h
@@ -104,7 +104,7 @@ void func_80074478(s32);
 void func_800744A0(s32);
 void func_800744CC(void);
 void func_80074510(uintptr_t, void*, size_t);
-void func_800745C8(s32, s32);
+void func_800745C8(s32, uintptr_t);
 void func_8007466C(s32, uintptr_t);
 void func_80074704(s32, uintptr_t);
 u8  *func_80074790(s32, u8*);
diff --git a/yamls/us/data_segment2.yml b/yamls/us/data_segment2.yml
index c998b2392..c17f16979 100644
--- a/yamls/us/data_segment2.yml
+++ b/yamls/us/data_segment2.yml
@@ -1,7 +1,7 @@
 :config:
   external_files:
-    - "yamls/us\\startup_logo.yml"
-    - "yamls/us\\common_data.yml"
+    - "yamls/us/startup_logo.yml"
+    - "yamls/us/common_data.yml"
   segments:
     - [0x02, 0x12AAE0]
     - [0x0D, 0x132B50]