From 428ebc60be6092ee3cd39367284a1209cec30074 Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Wed, 15 Dec 2021 14:58:05 -0500
Subject: [PATCH] Rename ALL NON_MATCHING to NON_EQUIVALENT. We will enable
 NON_MATCHING on a case by case basis going forward

---
 lib/src/libc/ldiv.c             |  2 +-
 lib/src/mips1/al/alSynAllocFX.c |  2 +-
 lib/src/mips1/al/synthesizer.c  |  2 +-
 lib/src/os/osTimer.c            |  2 +-
 lib/src/os/osViMgr.c            |  2 +-
 src/asset_loading.c             |  2 +-
 src/camera.c                    | 10 +++----
 src/controller_pak.c            | 14 ++++-----
 src/fade_transition.c           |  6 ++--
 src/font.c                      | 10 +++----
 src/main.c                      |  6 ++--
 src/memory.c                    | 16 +++++-----
 src/menu.c                      | 52 ++++++++++++++++-----------------
 src/object_models.c             |  2 +-
 src/particles.c                 |  6 ++--
 src/printf.c                    |  2 +-
 src/textures_sprites.c          | 16 +++++-----
 src/thread0_epc.c               |  4 +--
 src/unknown_00BC20.c            |  4 +--
 src/unknown_0255E0.c            | 17 +++++------
 src/unknown_032760.c            |  6 ++--
 src/unknown_0348C0.c            |  8 ++---
 src/unknown_043920.c            |  6 ++--
 src/unknown_06B2B0.c            | 10 +++----
 src/unknown_077C50.c            |  2 +-
 src/unknown_078050.c            |  4 +--
 src/video.c                     |  2 +-
 27 files changed, 107 insertions(+), 108 deletions(-)

diff --git a/lib/src/libc/ldiv.c b/lib/src/libc/ldiv.c
index 395591ee..8d13b556 100644
--- a/lib/src/libc/ldiv.c
+++ b/lib/src/libc/ldiv.c
@@ -3,7 +3,7 @@
 
 #include "macros.h"
 #include <stdlib.h>
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 //This needs to be compiled with mips3, which isn't yet supported
 ldiv_t ldiv(long num, long denom)
 {
diff --git a/lib/src/mips1/al/alSynAllocFX.c b/lib/src/mips1/al/alSynAllocFX.c
index ba08be57..e13e08d5 100644
--- a/lib/src/mips1/al/alSynAllocFX.c
+++ b/lib/src/mips1/al/alSynAllocFX.c
@@ -5,7 +5,7 @@
 #include "macros.h"
 #include "audio_internal.h"
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void alFxNew(ALFx *r, ALSynConfig *c, s16 bus);
 s32 alFxParam(void *filter, s32 paramID, void *param);
 s32 alMainBusParam(void *filter, s32 paramID, void *param);
diff --git a/lib/src/mips1/al/synthesizer.c b/lib/src/mips1/al/synthesizer.c
index 5396d50f..f7d7eebb 100644
--- a/lib/src/mips1/al/synthesizer.c
+++ b/lib/src/mips1/al/synthesizer.c
@@ -5,7 +5,7 @@
 #include "audio_internal.h"
 #include "macros.h"
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 s32 __nextSampleTime(ALSynth *drvr, ALPlayer **client);
 s32 _timeToSamplesNoRound(ALSynth *ALSynth, s32 micros);
diff --git a/lib/src/os/osTimer.c b/lib/src/os/osTimer.c
index 7eaa0272..62238420 100644
--- a/lib/src/os/osTimer.c
+++ b/lib/src/os/osTimer.c
@@ -15,7 +15,7 @@ extern u32 __osTimerCounter;
 
 OSTime __osInsertTimer(OSTimer *t);
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 //Seems to be a mismatch based on where __osCurrentTime is defined.
 //Scratch proving that: https://decomp.me/scratch/OB3iP
 void __osTimerServicesInit(void) {
diff --git a/lib/src/os/osViMgr.c b/lib/src/os/osViMgr.c
index 0789aec4..f12328f0 100644
--- a/lib/src/os/osViMgr.c
+++ b/lib/src/os/osViMgr.c
@@ -64,7 +64,7 @@ void osCreateViManager(OSPri pri) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void __osTimerInterrupt(void);
 //Fails due to how retrace is declared. Not sure how to fix it.
 void viMgrMain(void *arg) {
diff --git a/src/asset_loading.c b/src/asset_loading.c
index e2887511..e3263520 100644
--- a/src/asset_loading.c
+++ b/src/asset_loading.c
@@ -56,7 +56,7 @@ s32 *load_asset_section_from_rom(u32 assetIndex) {
     return out;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Unused.
 // This has regalloc & stack issues.
 u8 *load_compressed_asset_from_rom(u32 assetIndex, s32 arg1) {
diff --git a/src/camera.c b/src/camera.c
index 628841dc..9ba7b4c9 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -144,7 +144,7 @@ u8 sPlayerID[16];
 
 /******************************/
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 extern s32 D_B0000578;
 
 void func_80065EA0(void) {
@@ -362,7 +362,7 @@ void func_800665E8(s32 arg0) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Has regalloc/stack issues
 // Proposed name: init_viewports
@@ -574,10 +574,10 @@ UNUSED void copy_framebuffer_size_to_coords(s32 *x1, s32 *y1, s32 *x2, s32 *y2)
     *y2 = GET_VIDEO_HEIGHT(widthAndHeight);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Still a work-in-progress but it doesn't seem to cause any problems,
-// which is why it is labeled under NON_MATCHING
+// which is why it is labeled under NON_EQUIVALENT
 
 #define SCISSOR_INTERLACE G_SC_NON_INTERLACE
 
@@ -889,7 +889,7 @@ void func_80069F28(f32 arg0) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 /**
  * Unused function that prints out the passed matrix values to the debug output.
  * This function prints in fixed point.
diff --git a/src/controller_pak.c b/src/controller_pak.c
index 42b11312..0f2a5c68 100644
--- a/src/controller_pak.c
+++ b/src/controller_pak.c
@@ -96,7 +96,7 @@ void func_80072298(u8 arg0) {
     func_80072708();
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Unused. Has regalloc issues.
 s32 func_800722E8(s16 arg0) {
     if (arg0 < 0 || arg0 >= 4) {
@@ -118,7 +118,7 @@ void func_80072708(void) {
 
 GLOBAL_ASM("asm/non_matchings/controller_pak/func_80072718.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 s32 func_80072C54(s32 arg0) {
     // v0 v1 a1 a2 a3 t0 t1 t2 t3 t4 t5 t6 t7 t8
     u32 v0;
@@ -340,7 +340,7 @@ GLOBAL_ASM("asm/non_matchings/controller_pak/func_8007480C.s")
 
 GLOBAL_ASM("asm/non_matchings/controller_pak/func_80074874.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 s64 func_8007480C(u64 arg0);
 // regalloc issues
 s32 func_8007497C(u64 *arg0) {
@@ -359,7 +359,7 @@ s32 func_8007497C(u64 *arg0) {
 GLOBAL_ASM("asm/non_matchings/controller_pak/func_8007497C.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // regalloc issues
 s16 func_80074A4C(GhostHeader *ghostHeader) {
     s16 i;
@@ -388,7 +388,7 @@ void func_80074AA8(GhostHeader *ghostHeader, s16 characterID, s16 time, s16 node
     ghostHeader->checksum = func_80074A4C(ghostHeader);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 s32 func_80074B1C(void) {
     return (0x1100 * 6) + 0x100; // -O2 optimizes this down to "return 0x6700;".
 }
@@ -493,7 +493,7 @@ s32 func_80076194(s32 controllerIndex, s32 *arg1, s32 *arg2) {
     return phi_v1;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // regalloc & stack issues
 // Rename delete_file_from_controller_pak?
 s32 func_800762C8(s32 controllerIndex, s32 fileNum) {
@@ -552,7 +552,7 @@ s32 read_data_from_controller_pak(s32 controllerIndex, s32 fileNum, u8 *data, s3
 
 GLOBAL_ASM("asm/non_matchings/controller_pak/func_800766D4.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Stack issues
 s32 func_80076924(s32 controllerIndex, s32 arg1, s32 *arg2) {
     s32 sp18;
diff --git a/src/fade_transition.c b/src/fade_transition.c
index e96cf9fb..fceee67b 100644
--- a/src/fade_transition.c
+++ b/src/fade_transition.c
@@ -230,7 +230,7 @@ u32 func_800C018C(void) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Regalloc issue.
 s32 func_800C01D8(FadeTransition *transition) {
@@ -438,7 +438,7 @@ void render_fade_barndoor_vertical(Gfx **dlist, UNUSED s32 arg1, UNUSED s32 arg2
 GLOBAL_ASM("asm/non_matchings/fade_transition/func_800C15D4.s")
 GLOBAL_ASM("asm/non_matchings/fade_transition/func_800C1EE8.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void render_fade_circle(Gfx **dlist, s32 arg1, s32 arg2) {
     u8 *addr, *addr2;
     func_8007B3D0(dlist);
@@ -497,7 +497,7 @@ void render_fade_barndoor_diagonal(Gfx **dlist, s32 arg1, s32 arg2) {
 
 GLOBAL_ASM("asm/non_matchings/fade_transition/func_800C2640.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_800C27A0(s32 updateRate) {
     //do {
     if (sTransitionFadeTimer > 0) {
diff --git a/src/font.c b/src/font.c
index bd15a94d..098ec934 100644
--- a/src/font.c
+++ b/src/font.c
@@ -155,7 +155,7 @@ void func_800C4164(s32 arg0) {
     D_8012A7F0 = arg0;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Mostly has regalloc issues.
 void func_800C4170(s32 arg0) {
     if (arg0 < gNumberOfFonts) {
@@ -178,7 +178,7 @@ void func_800C4170(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/font/func_800C4170.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Mostly has regalloc issues.
 void func_800C422C(s32 fontID) {
     if (fontID < gNumberOfFonts) {
@@ -213,7 +213,7 @@ void set_text_font(s32 fontID) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Unused. Has regalloc issues
 TextureHeader *func_800C4318(s32 font, u8 arg1) {
@@ -292,7 +292,7 @@ void func_800C4510(Gfx **displayList, s32 arg1, s32 xpos, s32 ypos, char *text,
 GLOBAL_ASM("asm/non_matchings/font/func_800C45A4.s")
 
 // Should be functionally equivalent.
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 s32 func_800C4DA0(u8 *text, s32 x, s32 font) {
     s32 diffX, thisDiffX;
     FontData *fontData;
@@ -575,7 +575,7 @@ void render_dialogue_boxes(Gfx *dlist, Gfx *mat, VertexList *verts) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void s32_to_string(char **outString, s32 number) {
     u8 digit;
     s32 i;
diff --git a/src/main.c b/src/main.c
index 727c8a8b..6ad5d4ee 100644
--- a/src/main.c
+++ b/src/main.c
@@ -8,7 +8,7 @@
 
 /************ .rodata ************/
 
-#ifndef NON_MATCHING
+#ifndef NON_EQUIVALENT
 // Remove this when func_80065E30 is matching.
 const char D_800E6ED0[] = "WARNING: Stack overflow/underflow!!!\n";
 #endif
@@ -37,7 +37,7 @@ void main(void) {
     osStartThread(&gThread1);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_80065D98(s32 arg0) {
     func_800B6F50();
     osCreateThread(&gThread3, 3, (OSId)&thread3_main, 0, &gThread3StackPointer, (OSPri)10);
@@ -53,7 +53,7 @@ void func_80065D98(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/main/func_80065D98.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_80065E30(void) {
     s32 temp, temp2, temp3, temp4;
     temp = D_8011D758[2049] + 1;
diff --git a/src/memory.c b/src/memory.c
index 27a389df..8bd97cfc 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -78,7 +78,7 @@ MemoryPoolSlot *new_sub_memory_pool(s32 poolDataSize, s32 numSlots) {
     return newPool;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 MemoryPoolSlot *new_memory_pool(MemoryPoolSlot *slots, s32 poolSize, s32 numSlots) {
     s32 i;
     MemoryPool *pool;
@@ -138,7 +138,7 @@ MemoryPoolSlot *allocate_from_main_pool(s32 size, u32 colorTag) {
     return allocate_from_memory_pool(0, size, colorTag);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 MemoryPoolSlot *allocate_from_memory_pool(s32 memoryPoolIndex, s32 size, u32 colorTag) {
     MemoryPool *pool;
     MemoryPoolSlot *curSlot;
@@ -190,7 +190,7 @@ void *allocate_from_pool_containing_slots(MemoryPoolSlot *slots, s32 size) {
     return (void *)NULL;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void *allocate_at_address_in_main_pool(s32 size, u8 *address, u32 colorTag) {
     s32 *sp38;
     s32 s0;
@@ -285,7 +285,7 @@ void clear_free_queue(void) {
     func_8006F53C(sp28);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void free_slot_containing_address(u8 *address) {
     s32 poolIndex;
     s32 slotIndex;
@@ -410,7 +410,7 @@ s32 get_memory_pool_index_containing_address(u8 *address) {
     return i;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Regalloc issues
 void free_memory_pool_slot(s32 poolIndex, s32 slotIndex) {
     s32 nextIndex, prevIndex, tempNextIndex;
@@ -463,7 +463,7 @@ MemoryPoolSlot *func_80071774(s32 poolIndex) {
 GLOBAL_ASM("asm/non_matchings/memory/free_memory_pool_slot.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 s32 allocate_memory_pool_slot(s32 memoryPoolIndex, s32 slotIndex, s32 size, s32 slotIsTaken, s32 newSlotIsTaken, u32 colorTag) {
     s32 slotSize;
     s32 newIndex;
@@ -537,7 +537,7 @@ u8 *align4(u8 *address) {
 
 GLOBAL_ASM("asm/non_matchings/memory/func_800718A4.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 s32 get_memory_color_tag_count(s32 arg0) {
     s32 i, count;
     count = 0;
@@ -586,7 +586,7 @@ void render_memory_color_tags(void) {
     render_printf("ORANGE %d\n\n", get_memory_color_tag_count(COLOR_TAG_ORANGE));
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Unused. Does nothing?
 void func_80071C74(void) {
     s32 i, flags;
diff --git a/src/menu.c b/src/menu.c
index b8aeb175..0d47f5b9 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1479,7 +1479,7 @@ const char D_800E8250[] = "loadFrontEndItem() - Item no %d out of range 0-%d\n";
 
 /*********************************/
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Should be functionally equivalent
 void load_menu_text(s32 language) {
@@ -1660,7 +1660,7 @@ void func_80080E6C(void) {
 
 GLOBAL_ASM("asm/non_matchings/menu/func_80080E90.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Should be functionally equivalent.
 void func_80081218(void) {
     s32 numLevels; // sp34
@@ -1956,7 +1956,7 @@ void func_80081E54(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5) {
 
 GLOBAL_ASM("asm/non_matchings/menu/func_80081F4C.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 void draw_menu_elements(s32 arg0, MenuElement *elem, f32 arg2) {
     s32 s5;
@@ -2370,7 +2370,7 @@ void func_800841B8(s32 arg0) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Should be functionally equivalent
 s32 menu_options_loop(s32 arg0) {
     s32 buttonsPressed;
@@ -2519,7 +2519,7 @@ void menu_audio_options_init(void) {
 
 GLOBAL_ASM("asm/non_matchings/menu/func_80084854.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Almost matching, should be functionally equivalent
 s32 menu_audio_options_loop(s32 arg0) {
@@ -2765,7 +2765,7 @@ void func_800861C8(unk800861C8 *arg0, s32 *arg1) {
 GLOBAL_ASM("asm/non_matchings/menu/func_800862C4.s")
 GLOBAL_ASM("asm/non_matchings/menu/func_800867D4.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_80086A48(s32 arg0) {
     f32 temp, temp2;
     temp = D_80126BD4;
@@ -2875,7 +2875,7 @@ void menu_boot_init(void) {
     D_80126C18 = 0; // D_80126C18 is a timer for the boot screen, counts up to 0x8C frames.
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 s32 menu_boot_loop(s32 arg0) {
     // arg0 = sp30
     s32 out; // sp2C
@@ -3014,7 +3014,7 @@ void menu_magic_codes_init(void) {
     func_800C4170(2);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Close to matching, but should be functionally equivalent.
 void render_magic_codes_ui(s32 arg0) {
@@ -3161,7 +3161,7 @@ void menu_magic_codes_list_init(void) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Should be functionally equivalent
 void render_magic_codes_list_menu_text(s32 arg0) {
@@ -3230,7 +3230,7 @@ void func_8008A8F8(s32 arg0, s32 arg1, s32 arg2) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 s32 menu_magic_codes_list_loop(s32 arg0) {
     s32 phi_a2;
     s32 sp48;
@@ -3346,7 +3346,7 @@ void func_8008AD1C(void) {
     func_800C422C(2);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 extern u8 *__ROM_END;
 
@@ -3506,7 +3506,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8008B358.s")
 GLOBAL_ASM("asm/non_matchings/menu/func_8008B4C8.s")
 GLOBAL_ASM("asm/non_matchings/menu/func_8008B758.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Should be functionally equivalent
 void randomize_ai_racer_slots(s32 arg0) {
@@ -3725,7 +3725,7 @@ void unload_large_font(void) {
     func_800C422C(FONT_LARGE);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 void menu_game_select_init(void) {
     s32 i;
@@ -3770,7 +3770,7 @@ void menu_game_select_init(void) {
 GLOBAL_ASM("asm/non_matchings/menu/menu_game_select_init.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_8008C698(s32 arg0) {
     s32 fade;
     s32 i;
@@ -3811,7 +3811,7 @@ void func_8008C698(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/menu/func_8008C698.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 s32 menu_game_select_loop(s32 arg0) {
     s32 playerInputs;
@@ -3974,7 +3974,7 @@ void render_menu_image(s32 imageID, s32 xOffset, s32 yOffset, s32 red, s32 green
     func_8009CA60(imageID);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Shouldn't have any major issues.
 void render_file_select_menu(UNUSED s32 updateRate) {
     s32 s2;
@@ -4220,7 +4220,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8008E4EC.s")
 GLOBAL_ASM("asm/non_matchings/menu/menu_track_select_init.s")
 GLOBAL_ASM("asm/non_matchings/menu/func_8008F00C.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Close to done with this function. Just a regalloc issue remains.
 
 s32 menu_track_select_loop(s32 arg0) {
@@ -4344,7 +4344,7 @@ void func_80090ED8(s32 arg0) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Somewhat close to matching, but should be functionally equivalent.
 void render_track_select_setup_ui(s32 arg0) {
@@ -4729,7 +4729,7 @@ void menu_5_init(void) {
 
 GLOBAL_ASM("asm/non_matchings/menu/func_80092E94.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Regalloc issues
 s32 menu_5_loop(s32 arg0) {
     s32 temp0;
@@ -4911,7 +4911,7 @@ void func_80094C14(s32 arg0) {
 
 GLOBAL_ASM("asm/non_matchings/menu/func_80094D28.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_80095624(s32 arg0) {
     switch (arg0 & 0xFF) {
         case 1:
@@ -5069,7 +5069,7 @@ s32 compress_filename_string(unsigned char *filename, s32 length) {
     return output;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Not matching, but functionally equivalent.
 // Trims the trailing end of the string, so that spaces won't show up at the end.
@@ -5213,7 +5213,7 @@ void func_80098754(void) {
 GLOBAL_ASM("asm/non_matchings/menu/func_80098774.s")
 GLOBAL_ASM("asm/non_matchings/menu/menu_trophy_race_rankings_init.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_80098EBC(s32 arg0) {
     s32 test;
     s32 fade;
@@ -5261,7 +5261,7 @@ s32 get_trophy_race_world_id(void) {
 GLOBAL_ASM("asm/non_matchings/menu/func_8009963C.s")
 GLOBAL_ASM("asm/non_matchings/menu/func_800998E0.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Should be functionally equivalent
 void menu_ghost_data_init(void) {
@@ -5327,7 +5327,7 @@ GLOBAL_ASM("asm/non_matchings/menu/menu_ghost_data_init.s")
 
 GLOBAL_ASM("asm/non_matchings/menu/func_80099E8C.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Regalloc issue: v0 & v1 need to swap!
 s32 menu_ghost_data_loop(s32 arg0) {
     s32 i;
@@ -5637,7 +5637,7 @@ void reset_controller_sticks(void) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 #define STICK_DEADZONE 35
 #define STICK_DELAY_AMOUNT 15
@@ -6291,7 +6291,7 @@ s32 dialogue_race_defeat(void) {
     return state;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Has a couple minor issues, but should be functionally equivalent.
 s32 tt_menu_loop(void) {
diff --git a/src/object_models.c b/src/object_models.c
index 45d4f6a8..8b1b46d8 100644
--- a/src/object_models.c
+++ b/src/object_models.c
@@ -111,7 +111,7 @@ void func_8005FF40(ObjectModel **modelPtr) {
 GLOBAL_ASM("asm/non_matchings/object_models/func_8005FF40.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Regalloc issues.
 void free_object_model(ObjectModel *model) {
     s32 i;
diff --git a/src/particles.c b/src/particles.c
index 9b41a5ce..ceae9e6e 100644
--- a/src/particles.c
+++ b/src/particles.c
@@ -270,7 +270,7 @@ void func_800AE490(void) {
         gParticleBehaviorsAssetTable = NULL;
     }
 }
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void init_particle_assets(void) {
     s32 i;
 
@@ -521,7 +521,7 @@ void func_800AF29C(unk800AF29C *arg0, s32 arg1, s32 arg2, s16 arg3, s16 arg4, s1
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Should be functionally equivalent.
 void func_800AF404(s32 arg0) {
@@ -584,7 +584,7 @@ void func_800B2260(unk800B2260 *arg0) {
 
 GLOBAL_ASM("asm/non_matchings/particles/func_800B22FC.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Has regalloc issues.
 void func_800B263C(unk800B2260_C *arg0) {
diff --git a/src/printf.c b/src/printf.c
index a2b6d427..53bc8e8f 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -135,7 +135,7 @@ void set_render_printf_background_color(u8 red, u8 green, u8 blue, u8 alpha) {
     RENDER_PRINTF_CMD_SET_BACKGROUND_COLOR(red, green, blue, alpha)
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void set_render_printf_position(u16 xpos, u16 ypos) {
     RENDER_PRINTF_CMD_SET_POSITION(xpos, ypos)
 }
diff --git a/src/textures_sprites.c b/src/textures_sprites.c
index 91f32a8c..6cc66ac0 100644
--- a/src/textures_sprites.c
+++ b/src/textures_sprites.c
@@ -917,7 +917,7 @@ s32 func_8007AE64(void) {
     return D_80126354;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Minor matching issues with loops, but should be functionally the same.
 TextureHeader *load_texture(s32 arg0) {
     s32 assetSection;
@@ -1033,7 +1033,7 @@ TextureHeader *load_texture(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/textures_sprites/load_texture.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void free_texture(TextureHeader *tex) {
     s32 i;
     if (tex != NULL) {
@@ -1057,7 +1057,7 @@ void func_8007B374(s32 arg0) {
     gTexColorTag = arg0;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Unused.
 TextureHeader *func_8007B380(s32 arg0) {
     if ((arg0 < 0) || (arg0 >= gNumberOfLoadedTextures)) {
@@ -1111,7 +1111,7 @@ void func_8007BF1C(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/textures_sprites/func_8007BF34.s")
 GLOBAL_ASM("asm/non_matchings/textures_sprites/func_8007C12C.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Mostly has regalloc issues.
 s32 get_texture_size_from_id(s32 arg0) {
     s32 assetIndex;
@@ -1146,7 +1146,7 @@ GLOBAL_ASM("asm/non_matchings/textures_sprites/get_texture_size_from_id.s")
 
 GLOBAL_ASM("asm/non_matchings/textures_sprites/func_8007C660.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Unused
 s32 func_8007C860(s32 spriteIndex) {
     if ((spriteIndex < 0) || (spriteIndex >= D_80126358)) {
@@ -1159,7 +1159,7 @@ s32 func_8007C860(s32 spriteIndex) {
 GLOBAL_ASM("asm/non_matchings/textures_sprites/func_8007C860.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 s32 load_sprite_info(s32 spriteIndex, s32 *numOfInstancesOut, s32 *unkOut, s32 *numFramesOut, s32 *formatOut, s32 *sizeOut) {
     TextureHeader *tex;
     s32 i, j;
@@ -1200,7 +1200,7 @@ GLOBAL_ASM("asm/non_matchings/textures_sprites/load_sprite_info.s")
 
 GLOBAL_ASM("asm/non_matchings/textures_sprites/func_8007CA68.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void free_sprite(Sprite *sprite) {
     s32 i, j, index;
     if (sprite != NULL) {
@@ -1289,7 +1289,7 @@ void update_pulsating_light_data(PulsatingLightData *data, s32 timeDelta) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_8007F594(Gfx **dlist, u32 index, u32 primitiveColor, u32 environmentColor) {
     if (index >= 2) {
         index = 2;
diff --git a/src/thread0_epc.c b/src/thread0_epc.c
index 35d1e1e8..5c9c5223 100644
--- a/src/thread0_epc.c
+++ b/src/thread0_epc.c
@@ -96,7 +96,7 @@ void func_800B6F30(s32 arg0, s32 arg1, s32 arg2) {
 void func_800B6F40(s32 arg0, s32 arg1, s32 arg2) {
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_800B6F50(void) {
     s32 i;
 
@@ -114,7 +114,7 @@ void func_800B6F50(void) {
 GLOBAL_ASM("asm/non_matchings/thread0_epc/func_800B6F50.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void thread0_Main(s32 arg0) { // Has regalloc issues
     s32 sp34;
     s32 s0 = 0;
diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c
index 8900eea2..9a41c623 100644
--- a/src/unknown_00BC20.c
+++ b/src/unknown_00BC20.c
@@ -601,7 +601,7 @@ void func_8000E1EC(Object *object, s32 arg1) {
     gObjectCount = 0;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 typedef struct LevelObjectEntry8000E2B4 {
     LevelObjectEntryCommon common;
     s16 unk8;
@@ -1769,7 +1769,7 @@ void func_800238BC(Object *arg0, void *arg1) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 s32 func_80023E30(s32 arg0) {
     switch (arg0 - 1) {
         case 0x00:
diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c
index daef1b60..dccfdaf5 100644
--- a/src/unknown_0255E0.c
+++ b/src/unknown_0255E0.c
@@ -345,7 +345,7 @@ void func_80028FA0(s32 arg0) {
     D_8011B0FC = arg0;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Regalloc & stack issues.
 void render_level_geometry_and_objects(void) {
@@ -506,8 +506,7 @@ void render_level_geometry_and_objects(void) {
 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/render_level_geometry_and_objects.s")
 #endif
 
-// Breaks on everdrive.
-#if 0
+#ifdef NON_EQUIVALENT
 // nonOpaque: 0 for solid geometry, 1 for transparent geometry.
 void render_level_segment(s32 segmentId, s32 nonOpaque) {
     LevelModelSegment *segment = &gCurrentLevelModel->segments[segmentId]; // spAC
@@ -610,7 +609,7 @@ void render_level_segment(s32 segmentId, s32 nonOpaque) {
 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/render_level_segment.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Regalloc issues.
 void traverse_segments_bsp_tree(s32 nodeIndex, s32 segmentIndex, s32 segmentIndex2, u8 *segmentsOrder, u32 *segmentsOrderIndex) {
     BspTreeNode *curNode;
@@ -674,7 +673,7 @@ void add_segment_to_order(s32 segmentIndex, u32 *segmentsOrderIndex, u8 *segment
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Unused. Has regalloc issues.
 s32 func_80029DE0(Object *obj, s32 segmentIndex) {
     LevelModelSegmentBoundingBox *bb;
@@ -698,7 +697,7 @@ s32 func_80029DE0(Object *obj, s32 segmentIndex) {
 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80029DE0.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Has regalloc issues.
 s32 get_level_segment_index_from_position(f32 xPos, f32 yPos, f32 zPos) {
     LevelModelSegmentBoundingBox *bb;
@@ -795,7 +794,7 @@ LevelModelSegmentBoundingBox *func_8002A2DC(s32 arg0) {
 
 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A31C.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Has some minor issues, but should be functionally equivalent.
 s32 func_8002A5F8(LevelModelSegmentBoundingBox *bb) {
     s64 sp48;
@@ -919,7 +918,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C7D4.s")
 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C954.s")
 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002CC30.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 typedef struct unk8002D30C_a0 {
     u8 pad00[0x04];
@@ -962,7 +961,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002FF6C.s")
 
 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_800304C8.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Should be functionally equivalent.
 void func_80030664(s32 arg0, s16 arg1, s16 arg2, u8 arg3, u8 arg4, u8 arg5) {
diff --git a/src/unknown_032760.c b/src/unknown_032760.c
index 24e2c1b6..a6559663 100644
--- a/src/unknown_032760.c
+++ b/src/unknown_032760.c
@@ -40,7 +40,7 @@ void func_80031B60(void) {
     D_800DC958 = 0;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Regalloc issues
 void func_80031BB8(s32 count) {
     s32 i;
@@ -135,7 +135,7 @@ s32 func_80032C6C(void) {
     return D_800DC95C;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Close to matching. Should be functionally equivalent.
 void func_80032C7C(Object *object) {
@@ -295,7 +295,7 @@ void func_80032C7C(Object *object) {
 GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80032C7C.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Has regalloc issues
 void func_800337E4(void) {
diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c
index ec03bea1..e268f394 100644
--- a/src/unknown_0348C0.c
+++ b/src/unknown_0348C0.c
@@ -130,7 +130,7 @@ s16 D_8011D4E2;
 
 /******************************/
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 typedef struct LevelObjectEntry80033CC0 {
     LevelObjectEntryCommon common;
     u8 unk8;
@@ -571,7 +571,7 @@ void func_80038248(Object *arg0, s32 arg1) {
     arg0->unk4C->unk12 = 0;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Regalloc issues
 void func_8003827C(Object *obj, s32 arg1) {
     Object_64_8003827C *obj64 = obj->unk64;
@@ -725,7 +725,7 @@ void func_80038AD4(Object *arg0, s32 arg1) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // regalloc issues
 void func_80038B74(Object *obj, unk80038B74 *arg1) {
     s32 temp;
@@ -1278,7 +1278,7 @@ void func_8003F0DC(void) {
 GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003F0F8.s")
 GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003F2E8.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Regalloc issues
 void func_8003FC44(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4, f32 arg5, s32 arg6) {
     Object *someObj;
diff --git a/src/unknown_043920.c b/src/unknown_043920.c
index ad7e380f..ef9c0fa9 100644
--- a/src/unknown_043920.c
+++ b/src/unknown_043920.c
@@ -450,7 +450,7 @@ void func_8004F77C(unk8004F77C *arg0) {
 
 GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8004F7F4.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 typedef struct Object_64_80050754 {
             u8 unk0[0x2C];
@@ -679,7 +679,7 @@ void func_800570A4(Object *obj, s32 arg1, s32 arg2) {
     temp->unk210 = arg2;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 typedef struct Object_64_800570B8 {
     u8 pad0[3];
     s8 unk3;
@@ -788,7 +788,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_043920/func_800581E8.s")
 GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80058B84.s")
 GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80058D5C.s")
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_80058F44(f32 arg0, Object *arg1, Object *arg2) {
     s32 temp0, temp1;
     temp0 = (s32)arg0;
diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c
index ac3acc6d..1995dc32 100644
--- a/src/unknown_06B2B0.c
+++ b/src/unknown_06B2B0.c
@@ -176,7 +176,7 @@ s32 D_80123560[8];
 
 /******************************/
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 void func_8006A6B0(void) {
     s32 i, count, checksumCount;
     s32 temp;
@@ -341,7 +341,7 @@ s32 func_8006B240(void) {
 }
 
 // This isn't matching, but there shouldn't be any issues (hopefully).
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 void load_level(s32 levelId, s32 numberOfPlayers, s32 entranceId, s32 vehicleId, s32 cutsceneId) {
     s32 maxLevelCount;
@@ -1037,7 +1037,7 @@ void func_8006CC14(void) {
     set_free_queue_state(2);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Almost matching except for a couple minor issues.
 void func_8006CCF0(s32 updateRate) {
     s32 i, buttonHeldInputs, sp40, sp3C, buttonPressedInputs, phi_v1_2;
@@ -1505,7 +1505,7 @@ void func_8006DC58(s32 updateRate) {
     }
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Minor & regalloc issues.
 void func_8006DCF8(s32 updateRate) {
     s32 menuLoopResult, temp, temp2, tempResult;
@@ -1871,7 +1871,7 @@ s32 func_8006EFB8(void) {
     return TRUE;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Not close to matching, but should be the same functionality-wise.
 void func_8006EFDC(void) {
diff --git a/src/unknown_077C50.c b/src/unknown_077C50.c
index f52c4328..4749bc95 100644
--- a/src/unknown_077C50.c
+++ b/src/unknown_077C50.c
@@ -9,7 +9,7 @@
 #include "structs.h"
 #include "f3ddkr.h"
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Draws the borders/negative space for multiplayer. Has regalloc issues
 void render_borders_for_multiplayer(Gfx **dlist) {
diff --git a/src/unknown_078050.c b/src/unknown_078050.c
index 424e2c8d..24d59a3f 100644
--- a/src/unknown_078050.c
+++ b/src/unknown_078050.c
@@ -208,7 +208,7 @@ void set_background_fill_colour(s32 red, s32 green, s32 blue) {
     sBackgroundFillColour |= (sBackgroundFillColour << 16);
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // Stack issues
 void render_background(Gfx **dlist, s32 *arg1, s32 arg2) {
     s32 x1;
@@ -332,7 +332,7 @@ void func_80078AAC(void *arg0) {
     D_800DE4D0.ptr = arg0;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 
 // Regalloc & stack issues.
 void render_textured_rectangle(Gfx **dlist, DrawTexture *arg1, s32 arg2, s32 arg3, u8 red, u8 green, u8 blue, u8 alpha) {
diff --git a/src/video.c b/src/video.c
index 5afa44d4..3a6a6fa6 100644
--- a/src/video.c
+++ b/src/video.c
@@ -257,7 +257,7 @@ void func_8007A974(void) {
     D_80126309 = 2;
 }
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 // regalloc & stack issues
 s32 func_8007A98C(s32 arg0) {
     s32 tempUpdateRate;