From 8f1d3a753c206a185d3ec222989e13049da6d262 Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Fri, 19 Feb 2021 01:14:12 -0800
Subject: [PATCH] build fix

---
 Makefile        |  2 +-
 linker.ld       |  2 +-
 src/arm_proxy.c | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f4a8d93b..f243bea8 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ NODEP := 1
 endif
 
 #$(C_BUILDDIR)/need_interworking_file_name.o: CFLAGS += -mthumb-interwork
-$(C_BUILDDIR)/code_08016DF8.o: CFLAGS += -mthumb-interwork
+$(C_BUILDDIR)/arm_proxy.o: CFLAGS += -mthumb-interwork
 
 C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c)
 C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
diff --git a/linker.ld b/linker.ld
index f17fe5e0..cbb86757 100644
--- a/linker.ld
+++ b/linker.ld
@@ -301,7 +301,7 @@ SECTIONS {
         /* C source compiled with interworking */
         asm/code_08016B30.o(.text);
         asm/updateBackgroundRegisters.o(.text);
-        src/code_08016DF8.o(.text);
+        src/arm_proxy.o(.text);
         asm/code_08016DF8.o(.text);
         /* C source compiled without interworking */
         asm/code_08018500.o(.text);
diff --git a/src/arm_proxy.c b/src/arm_proxy.c
index 80a59a42..aebfa3f2 100644
--- a/src/arm_proxy.c
+++ b/src/arm_proxy.c
@@ -304,7 +304,7 @@ void sub_08017338(Entity *this) {
 }
 
 // tiny regalloc
-NONMATCH("asm/non_matching/sub_080173A4.inc", void sub_080173A4(Entity* this)) {
+NONMATCH("asm/non_matching/arm_proxy/sub_080173A4.inc", void sub_080173A4(Entity* this)) {
     ItemFrame* entry;
 
     entry = &gUnk_08126DA8[this->entityType.subtype];
@@ -358,7 +358,7 @@ void sub_08017508(Entity* this) {
 }
 
 // regalloc
-NONMATCH("asm/non_matching/sub_08017530.inc", void sub_08017530(Entity* this)) {
+NONMATCH("asm/non_matching/arm_proxy/sub_08017530.inc", void sub_08017530(Entity* this)) {
     if ((this->currentHealth & 0x7f) &&
        !ReadBit(&gUnk_020342F8, this->currentHealth - 1)) {
         DeleteThisEntity();
@@ -419,7 +419,7 @@ void sub_08017640(void) {
 }
 
 // Loop declaration seems wrong
-NONMATCH("asm/non_matching/sub_0801766C.inc", u32 sub_0801766C(Entity* this)) {
+NONMATCH("asm/non_matching/arm_proxy/sub_0801766C.inc", u32 sub_0801766C(Entity* this)) {
     u32 uVar1;
     LinkedList2* puVar3;
     LinkedList2* puVar2;
@@ -462,7 +462,7 @@ NONMATCH("asm/non_matching/sub_0801766C.inc", u32 sub_0801766C(Entity* this)) {
 END_NONMATCH
 
 // same loop issue
-NONMATCH("asm/non_matching/sub_080176E4.inc", u32 sub_080176E4(Entity* this)) {
+NONMATCH("asm/non_matching/arm_proxy/sub_080176E4.inc", u32 sub_080176E4(Entity* this)) {
     u32 uVar1;
     LinkedList2* j;
     LinkedList2* i;
@@ -491,7 +491,7 @@ NONMATCH("asm/non_matching/sub_080176E4.inc", u32 sub_080176E4(Entity* this)) {
 END_NONMATCH
 
 // you guessed it
-NONMATCH("asm/non_matching/sub_08016DF8.inc", void sub_08017744(Entity* this)) {
+NONMATCH("asm/non_matching/arm_proxy/sub_08016DF8.inc", void sub_08017744(Entity* this)) {
     LinkedList2* i;
     for (i = &gUnk_03003C70[0]; i < &gUnk_03003C70[16]; ++i) {
         if (i->node == this) {
@@ -510,7 +510,7 @@ NONMATCH("asm/non_matching/sub_08016DF8.inc", void sub_08017744(Entity* this)) {
 END_NONMATCH
 
 // regalloc
-NONMATCH("asm/non_matching/sub_080177A0.inc", bool32 sub_080177A0(Entity* this, Entity* that)) {
+NONMATCH("asm/non_matching/arm_proxy/sub_080177A0.inc", bool32 sub_080177A0(Entity* this, Entity* that)) {
     u32 this_d;
     u32 depth;