From 5dd8bb6078105d1508094fdac705492ab7198f5a Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Tue, 24 May 2022 16:55:30 +0300
Subject: [PATCH] Match Object12_Action2

---
 .../object12/Object12_Action2.inc             | 70 -------------------
 src/object/object12.c                         | 16 +++--
 2 files changed, 10 insertions(+), 76 deletions(-)
 delete mode 100644 asm/non_matching/object12/Object12_Action2.inc

diff --git a/asm/non_matching/object12/Object12_Action2.inc b/asm/non_matching/object12/Object12_Action2.inc
deleted file mode 100644
index 77e17507..00000000
--- a/asm/non_matching/object12/Object12_Action2.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-	.syntax unified
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080850A6
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	movs r0, #0x1e
-	strb r0, [r4, #0xe]
-	adds r1, r4, #0
-	adds r1, #0x63
-	movs r0, #4
-	strb r0, [r1]
-	ldr r0, _080850A8 @ =gScreen
-	mov ip, r0
-	ldrh r1, [r0]
-	movs r2, #0x80
-	lsls r2, r2, #6
-	adds r0, r2, #0
-	orrs r0, r1
-	mov r1, ip
-	strh r0, [r1]
-	adds r1, #0x60
-	movs r0, #0x1f
-	strh r0, [r1]
-	adds r1, #2
-	movs r0, #0xf
-	strh r0, [r1]
-	movs r2, #0x2e
-	ldrsh r0, [r4, r2]
-	ldr r3, _080850AC @ =gRoomControls
-	movs r2, #0xa
-	ldrsh r1, [r3, r2]
-	subs r0, r0, r1
-	adds r1, r0, #0
-	subs r1, #0x18
-	movs r2, #0xff
-	ands r1, r2
-	lsls r1, r1, #8
-	adds r0, #0x18
-	ands r0, r2
-	orrs r1, r0
-	mov r0, ip
-	adds r0, #0x58
-	strh r1, [r0]
-	movs r1, #0x32
-	ldrsh r0, [r4, r1]
-	movs r4, #0xc
-	ldrsh r1, [r3, r4]
-	subs r0, r0, r1
-	adds r1, r0, #0
-	subs r1, #0x18
-	ands r1, r2
-	lsls r1, r1, #8
-	adds r0, #0x18
-	ands r0, r2
-	orrs r1, r0
-	mov r0, ip
-	adds r0, #0x5c
-	strh r1, [r0]
-_080850A6:
-	pop {r4, pc}
-	.align 2, 0
-_080850A8: .4byte gScreen
-_080850AC: .4byte gRoomControls
-	.syntax divided
diff --git a/src/object/object12.c b/src/object/object12.c
index 2b1ce0c5..d99bc2ad 100644
--- a/src/object/object12.c
+++ b/src/object/object12.c
@@ -51,8 +51,9 @@ void Object12_Init(Object12Entity* this) {
 void Object12_Action1(Object12Entity* this) {
 }
 
-NONMATCH("asm/non_matching/object12/Object12_Action2.inc", void Object12_Action2(Object12Entity* this)) {
+void Object12_Action2(Object12Entity* this) {
     u32 tmp;
+    u32 tmp2;
     if (--super->timer == 0) {
         super->action = 3;
         super->timer = 0x1e;
@@ -60,13 +61,16 @@ NONMATCH("asm/non_matching/object12/Object12_Action2.inc", void Object12_Action2
         gScreen.lcd.displayControl |= 0x2000;
         gScreen.controls.windowInsideControl = 0x1f;
         gScreen.controls.windowOutsideControl = 0xf;
-        tmp = super->x.HALF.HI - gRoomControls.scroll_x;
-        gScreen.controls.window0HorizontalDimensions = (((tmp - 0x18) & 0xff) << 8) | ((tmp + 0x18) & 0xff);
-        tmp = super->y.HALF.HI - gRoomControls.scroll_y;
-        gScreen.controls.window0VerticalDimensions = (((tmp - 0x18) & 0xff) << 8) | ((tmp + 0x18) & 0xff);
+        tmp2 = super->x.HALF.HI;
+        tmp = gRoomControls.scroll_x;
+        tmp2 = tmp2 - tmp;
+        gScreen.controls.window0HorizontalDimensions = (((tmp2 - 0x18) & 0xff) << 8) | ((tmp2 + 0x18) & 0xff);
+        tmp2 = super->y.HALF.HI;
+        tmp = gRoomControls.scroll_y;
+        tmp2 = tmp2 - tmp;
+        gScreen.controls.window0VerticalDimensions = (((tmp2 - 0x18) & 0xff) << 8) | ((tmp2 + 0x18) & 0xff);
     }
 }
-END_NONMATCH
 
 void Object12_Action3(Object12Entity* this) {
     if (--super->timer == 0) {