From 35c6989914e84e67b19fcdc78b5ddb15eeed7e8f Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Mon, 14 Feb 2022 22:35:58 +0200
Subject: [PATCH] match sub_08054524

---
 asm/non_matching/sub_08054524.inc | 31 -------------------------------
 src/code_0805436C.c               |  7 +++----
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 asm/non_matching/sub_08054524.inc

diff --git a/asm/non_matching/sub_08054524.inc b/asm/non_matching/sub_08054524.inc
deleted file mode 100644
index 05ac3f4e..00000000
--- a/asm/non_matching/sub_08054524.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-    .syntax unified
-	push {lr}
-	ldr r0, _08054550 @ =gArea
-	ldrb r1, [r0, #1]
-	cmp r1, #0
-	bne _08054534
-	ldr r0, _08054554 @ =gRoomTransition
-	adds r0, #0x2e
-	ldrb r1, [r0]
-_08054534:
-	cmp r1, #0x16
-	bls _0805453A
-	movs r1, #0
-_0805453A:
-	ldr r0, _08054558 @ =gUnk_080FE1C6
-	adds r0, r1, r0
-	ldrb r1, [r0]
-	lsls r0, r1, #5
-	ldr r1, _0805455C @ =gAreaDroptables
-	adds r0, r0, r1
-	ldr r1, _08054560 @ =gRoomVars+0x48
-	movs r2, #0x20
-	bl MemCopy
-	pop {pc}
-	.align 2, 0
-_08054550: .4byte gArea
-_08054554: .4byte gRoomTransition
-_08054558: .4byte gUnk_080FE1C6
-_0805455C: .4byte gAreaDroptables
-_08054560: .4byte gRoomVars+0x48
-    .syntax divided
diff --git a/src/code_0805436C.c b/src/code_0805436C.c
index 452c2ddf..699feeb1 100644
--- a/src/code_0805436C.c
+++ b/src/code_0805436C.c
@@ -165,8 +165,7 @@ u32 GetBottleContaining(u32 id) {
     }
 }
 
-NONMATCH("asm/non_matching/sub_08054524.inc", void sub_08054524(void)) {
-    // reg-alloc
+void sub_08054524(void) {
     u32 bVar1;
 
     bVar1 = gArea.locationIndex;
@@ -177,9 +176,9 @@ NONMATCH("asm/non_matching/sub_08054524.inc", void sub_08054524(void)) {
         bVar1 = 0;
     }
 
-    MemCopy(&gAreaDroptables[0] + gUnk_080FE1C6[bVar1] * 0x8, &gRoomVars.currentAreaDroptable, 0x20);
+    bVar1 = gUnk_080FE1C6[bVar1];
+    MemCopy(&gAreaDroptables[bVar1], &gRoomVars.currentAreaDroptable, 0x20);
 }
-END_NONMATCH
 
 void sub_08054564(void) {
     gRoomVars.field_0x2 = 1;