From 03a6eeeb37dc09cb43f265a172cfef8a0ed71fb1 Mon Sep 17 00:00:00 2001
From: someone2639 <someone2639@gmail.com>
Date: Wed, 26 May 2021 17:52:41 -0400
Subject: [PATCH] fixed up any reference to 8 bit models with the new ModelID
 type

---
 include/special_presets.h        | 2 +-
 src/game/behavior_actions.c      | 6 +++---
 src/game/macro_special_objects.c | 4 ++--
 src/game/object_helpers.h        | 2 +-
 src/game/object_list_processor.c | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/special_presets.h b/include/special_presets.h
index e16ac6a8f..a9be6ec26 100644
--- a/include/special_presets.h
+++ b/include/special_presets.h
@@ -17,7 +17,7 @@ struct SpecialPreset
     /*00*/ u8  preset_id;
     /*01*/ u8  type;      // Determines whether object is 8, 10, 12 or 14 bytes long.
     /*02*/ u8  defParam;  // Default parameter, only used when type is SPTYPE_DEF_PARAM_AND_YROT
-    /*03*/ u8  model;
+    /*03*/ ModelID  model;
     /*04*/ const BehaviorScript *behavior;
 };
 
diff --git a/src/game/behavior_actions.c b/src/game/behavior_actions.c
index 03dbaa1d1..940698a77 100644
--- a/src/game/behavior_actions.c
+++ b/src/game/behavior_actions.c
@@ -57,7 +57,7 @@ struct Struct8032F34C {
     s16 numBridgeSections;
     s16 bridgeRelativeStartingXorZ;
     s16 platformWidth;
-    s16 model;
+    ModelID model;
     const void *segAddr;
 };
 
@@ -73,7 +73,7 @@ struct Struct802C0DF0 {
     u8 unk0;
     u8 unk1;
     u8 unk2;
-    u8 model;
+    ModelID model;
     const BehaviorScript *behavior;
 };
 
@@ -85,7 +85,7 @@ struct Struct8032F754 {
 
 struct OpenableGrill {
     s16 halfWidth;
-    s16 modelID;
+    ModelID modelID;
     const Collision *collision;
 };
 
diff --git a/src/game/macro_special_objects.c b/src/game/macro_special_objects.c
index a0ef16ae1..7f03f97a3 100644
--- a/src/game/macro_special_objects.c
+++ b/src/game/macro_special_objects.c
@@ -95,7 +95,7 @@ static void spawn_macro_coin_unknown(const BehaviorScript *behavior, s16 a1[]) {
 struct LoadedPreset {
     /*0x00*/ const BehaviorScript *behavior;
     /*0x04*/ s16 param; // huh? why does the below function swap these.. just use the struct..
-    /*0x06*/ s16 model;
+    /*0x06*/ ModelID model;
 };
 
 #define MACRO_OBJ_Y_ROT 0
@@ -245,7 +245,7 @@ void spawn_special_objects(s16 areaIndex, s16 **specialObjList) {
     s16 y;
     s16 z;
     s16 extraParams[4];
-    u8 model;
+    ModelID model;
     u8 type;
     u8 presetID;
     u8 defaultParam;
diff --git a/src/game/object_helpers.h b/src/game/object_helpers.h
index 895604fc9..fb2d5ae20 100644
--- a/src/game/object_helpers.h
+++ b/src/game/object_helpers.h
@@ -55,7 +55,7 @@ struct SpawnParticlesInfo
 {
     /*0x00*/ s8 behParam;
     /*0x01*/ s8 count;
-    /*0x02*/ u8 model;
+    /*0x02*/ ModelID model;
     /*0x03*/ s8 offsetY;
     /*0x04*/ s8 forwardVelBase;
     /*0x05*/ s8 forwardVelRange;
diff --git a/src/game/object_list_processor.c b/src/game/object_list_processor.c
index 8e6cf9d00..834cb59b4 100644
--- a/src/game/object_list_processor.c
+++ b/src/game/object_list_processor.c
@@ -188,7 +188,7 @@ s8 sObjectListUpdateOrder[] = { OBJ_LIST_SPAWNER,
 struct ParticleProperties {
     u32 particleFlag;
     u32 activeParticleFlag;
-    u8 model;
+    ModelID model;
     const BehaviorScript *behavior;
 };