From 4328930d91dd340d34afd5e5675ccd79dcdab1cd Mon Sep 17 00:00:00 2001
From: Antonio <aatcastelli@gmail.com>
Date: Thu, 14 Apr 2022 18:48:14 -0700
Subject: [PATCH] Remove Object_80035F6C.

---
 include/structs.h      | 6 ------
 src/object_functions.c | 6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/include/structs.h b/include/structs.h
index 2129258c..eb049bcf 100644
--- a/include/structs.h
+++ b/include/structs.h
@@ -665,11 +665,6 @@ typedef struct Object_CharacterFlag {
   /* 0x24 */ u8  *unk24;
 } Object_CharacterFlag;
 
-typedef struct Object_80035F6C {
-  /* 0x0 */ u8 pad0[3];
-  /* 0x3 */ s8 unk3;
-} Object_80035F6C;
-
 typedef struct Object_Snowball {
   /* 0x00 */ u8 pad0[0x20];
   /* 0x20 */ u32 unk20;
@@ -1058,7 +1053,6 @@ typedef struct Object_64 {
         Object_EggCreator egg_creator;
         Object_UnkId58 unkid58;
         Object_CharacterFlag character_flag;
-        Object_80035F6C obj80035F6C;
         Object_Snowball snowball;
         Object_AnimCamera anim_camera;
         Object_AnimCar anim_car;
diff --git a/src/object_functions.c b/src/object_functions.c
index 0601a45d..42c6cc98 100644
--- a/src/object_functions.c
+++ b/src/object_functions.c
@@ -935,14 +935,14 @@ void obj_loop_characterflag(Object *obj, UNUSED s32 speed) {
     s32 temp_t5;
     Object *someObj;
     Object_CharacterFlag *obj64;
-    Object_80035F6C *someObj64;
+    Object_Racer *someObj64;
 
     if (obj->unk7C.word < 0) {
         someObj = get_object_struct(obj->unk78);
         if (someObj != NULL) {
             obj64 = &obj->unk64->character_flag;
-            someObj64 = &someObj->unk64->obj80035F6C;
-            obj->unk7C.word = someObj64->unk3;
+            someObj64 = &someObj->unk64->racer;
+            obj->unk7C.word = someObj64->characterId;
             if (obj->unk7C.word < 0 || obj->unk7C.word >= 0xA) {
                 obj->unk7C.word = 0;
             }