Update makefile, and include many new matches (#421)

* Fix the sins of the past

* Fix makefile extra messages, and add a patching option

* Match func_8001955C

* Match func_80016500

* Match func_8000C8F8

* WIP func_8000CC7C

* Removed old competing misc asset enums, and migrated to the better standard.

* Fix last commit

* Minor documenting of an unused asset.

* Match func_8001B4FC

* Match func_8009963C

* Match render_enter_filename_ui

* Match randomise_ai_racer_slots

* Fix NON_EQUIVALENT builds

* Update README

* A little text documenting

* Update src/menu.c

Co-authored-by: David Benepe <benepe96@gmail.com>

* Remove already matched asm file

---------

Co-authored-by: David Benepe <benepe96@gmail.com>

include/asset_enums.h

@@ -3054,13 +3054,13 @@ typedef enum {
     ASSET_MISC_2,
     ASSET_MISC_3,
     ASSET_MISC_4,
-    ASSET_MISC_5,
-    ASSET_MISC_6,
-    ASSET_MISC_7,
+    ASSET_MISC_TRICKY_BOSS_DATA,
+    ASSET_MISC_BLUEY_BOSS_DATA,
+    ASSET_MISC_SMOKEY_BOSS_DATA,
     ASSET_MISC_8,
-    ASSET_MISC_9,
-    ASSET_MISC_10,
-    ASSET_MISC_11,
+    ASSET_MISC_RACER_WEIGHT,
+    ASSET_MISC_RACER_HANDLING,
+    ASSET_MISC_RACER_UNUSED_11,
     ASSET_MISC_12,
     ASSET_MISC_13,
     ASSET_MISC_14,
@@ -3070,8 +3070,8 @@ typedef enum {
     ASSET_MISC_18,
     ASSET_MISC_19,
     ASSET_MISC_20,
-    ASSET_MISC_21,
-    ASSET_MISC_22,
+    ASSET_MISC_SHIELD_DATA,
+    ASSET_MISC_MAGNET_DATA,
     ASSET_MISC_23,
     ASSET_MISC_24,
     ASSET_MISC_25,
@@ -3105,7 +3105,7 @@ typedef enum {
     ASSET_MISC_53,
     ASSET_MISC_54,
     ASSET_MISC_55,
-    ASSET_MISC_56,
+    ASSET_MISC_RACER_HITBOX_SIZE,
     ASSET_MISC_57,
     ASSET_MISC_58,
     ASSET_MISC_59,

include/enums.h

@@ -102,86 +102,6 @@ typedef enum AlignmentFlags {
     ALIGN_BOTTOM_RIGHT  = VERT_ALIGN_BOTTOM | HORZ_ALIGN_RIGHT
 } AlignmentFlags;
 
-typedef enum MiscAsset {
-    MISC_ASSET_UNK00,
-    MISC_ASSET_UNK01,
-    MISC_ASSET_UNK02,
-    MISC_ASSET_UNK03,
-    MISC_ASSET_UNK04,
-    MISC_ASSET_UNK05, //Tricky boss
-    MISC_ASSET_UNK06, //Bluey boss
-    MISC_ASSET_UNK07, //Smokey boss
-    MISC_ASSET_UNK08,
-    MISC_RACER_WEIGHT,
-    MISC_RACER_HANDLING,
-    MISC_ASSET_UNK0B,
-    MISC_ASSET_UNK0C,
-    MISC_ASSET_UNK0D,
-    MISC_ASSET_UNK0E,
-    MISC_ASSET_UNK0F,
-    MISC_ASSET_UNK10,
-    MISC_ASSET_UNK11,
-    MISC_ASSET_UNK12,
-    MISC_ASSET_UNK13,
-    MISC_ASSET_UNK14,
-    MISC_ASSET_SHIELD_DATA,
-    MISC_ASSET_MAGNET_DATA,
-    MISC_ASSET_UNK17,
-    MISC_ASSET_UNK18,
-    MISC_ASSET_UNK19,
-    MISC_ASSET_UNK1A,
-    MISC_ASSET_UNK1B,
-    MISC_ASSET_UNK1C,
-    MISC_ASSET_UNK1D,
-    MISC_ASSET_UNK1E,
-    MISC_ASSET_UNK1F,
-    MISC_ASSET_UNK20,
-    MISC_ASSET_UNK21,
-    MISC_ASSET_UNK22,
-    MISC_ASSET_UNK23,
-    MISC_ASSET_UNK24,
-    MISC_ASSET_UNK25,
-    MISC_ASSET_UNK26,
-    MISC_ASSET_UNK27,
-    MISC_ASSET_UNK28,
-    MISC_ASSET_UNK29,
-    MISC_ASSET_UNK2A,
-    MISC_ASSET_UNK2B,
-    MISC_ASSET_UNK2C,
-    MISC_ASSET_UNK2D,
-    MISC_ASSET_UNK2E,
-    MISC_ASSET_UNK2F,
-    MISC_ASSET_UNK30,
-    MISC_ASSET_UNK31,
-    MISC_ASSET_UNK32,
-    MISC_ASSET_UNK33,
-    MISC_ASSET_UNK34,
-    MISC_ASSET_UNK35,
-    MISC_ASSET_UNK36,
-    MISC_ASSET_UNK37,
-    MISC_ASSET_RACER_HITBOX_SIZE,
-    MISC_ASSET_UNK39,
-    MISC_ASSET_UNK3A,
-    MISC_ASSET_UNK3B,
-    MISC_ASSET_UNK3C,
-    MISC_ASSET_UNK3D,
-    MISC_ASSET_UNK3E,
-    MISC_ASSET_UNK3F,
-    MISC_ASSET_UNK40,
-    MISC_ASSET_UNK41,
-    MISC_ASSET_TITLE_DEMOS,
-    MISC_ASSET_UNK43,
-    MISC_ASSET_UNK44,
-    MISC_ASSET_UNK45,
-    MISC_ASSET_UNK46,
-    MISC_ASSET_UNK47,
-    MISC_ASSET_UNK48,
-    MISC_ASSET_UNK49,
-    MISC_ASSET_UNK4A,
-    MISC_ASSET_UNK4B,
-    MISC_ASSET_UNK4C
-} MiscAsset;
-
 typedef enum SurfaceType {
     SURFACE_DEFAULT,
     SURFACE_GRASS,

include/level_object_entries.h

@@ -702,6 +702,15 @@ typedef struct LevelObjectEntry_CharacterSelect {
     s8 unk30;
 } LevelObjectEntry_CharacterSelect;
 
+// Size: 0x10 bytes
+typedef struct LevelObjectEntry_Unk8000CC7C {
+    LevelObjectEntryCommon common;
+    s16 unk8;
+    s16 unkA;
+    s16 unkC;
+    s16 unkE;
+} LevelObjectEntry_Unk8000CC7C;
+
 typedef struct LevelObjectEntry {
     union {
         LevelObjectEntry_Racer racer;

include/object_properties.h

@@ -150,8 +150,8 @@ typedef struct ObjPropertyRacer {
 } ObjPropertyRacer;
 
 typedef struct ObjPropertySetupPoint {
- s32 unk0; 
- s32 unk4; 
+    s32 unk0; 
+    s32 unk4; 
 } ObjPropertySetupPoint;
 
 typedef struct ObjProperties {

include/sound_ids.h

@@ -29,7 +29,7 @@ enum SoundID {
 /* 0x000A */ SOUND_UNK_0A,
 /* 0x000B */ SOUND_UNK_0B,
 /* 0x000C */ SOUND_CRASH,
-/* 0x000D */ SOUND_CRASH2, // Not the same as the last, sounds like a cymbal or something.
+/* 0x000D */ SOUND_CRASH_CHARACTER,
 /* 0x000E */ SOUND_BALLOON_POP,
 /* 0x000F */ SOUND_PLOP, // Dropping a landmine
 /* 0x0010 */ SOUND_UNK_10,

include/structs.h

@@ -720,7 +720,7 @@ typedef struct ObjectHeader {
   /* 0x0C */ f32 scale;
   /* 0x10 */ s32 *modelIds;
   /* 0x14 */ s32 *vehiclePartIds;
-  /* 0x18 */ s8  *vehiclePartIndices;
+  /* 0x18 */ s8 *vehiclePartIndices;
   /* 0x1C */ ObjHeaderParticleEntry *objectParticles;
              s32 pad20;
   /* 0x24 */ ObjectHeader24 *unk24;
@@ -761,7 +761,7 @@ typedef struct ObjectHeader {
   /* 0x60 */ char internalName[16];
   /* 0x70 */ u8 unk70;
   /* 0x71 */ u8 unk71;
-  /* 0x71 */ u8 unk72;
+  /* 0x72 */ u8 unk72;
              u8 pad73[0x5];
 } ObjectHeader;