From 07285e7e82db008b1f322879f3b22c8eb437a8de Mon Sep 17 00:00:00 2001
From: AnonymousRandomPerson <chenghanngan.us@gmail.com>
Date: Mon, 28 Feb 2022 21:04:40 -0500
Subject: Decomped HasDisabledMove()

---
 asm/code_805D810.s | 82 ------------------------------------------------------
 asm/code_805D850.s | 42 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 82 deletions(-)
 delete mode 100644 asm/code_805D810.s
 create mode 100644 asm/code_805D850.s

(limited to 'asm')

diff --git a/asm/code_805D810.s b/asm/code_805D810.s
deleted file mode 100644
index 3630c29..0000000
--- a/asm/code_805D810.s
+++ /dev/null
@@ -1,82 +0,0 @@
-	#include "asm/constants/gba_constants.inc"
-  	#include "asm/macros.inc"
-
-  	.syntax unified
-
-  	.text
-  
-	thumb_func_start HasDisabledMove
-HasDisabledMove:
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	movs r3, 0
-	movs r6, 0x1
-	movs r5, 0x20
-	adds r2, r4, 0
-_0805D81C:
-	ldrb r1, [r2]
-	adds r0, r6, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0805D82E
-	adds r0, r5, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _0805D848
-_0805D82E:
-	adds r2, 0x8
-	adds r3, 0x1
-	cmp r3, 0x3
-	ble _0805D81C
-	adds r0, r4, 0
-	adds r0, 0x20
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	bne _0805D848
-	movs r0, 0
-	b _0805D84A
-_0805D848:
-	movs r0, 0x1
-_0805D84A:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end HasDisabledMove
-
-	thumb_func_start LastMoveOutOfPP
-LastMoveOutOfPP:
-	push {r4,r5,lr}
-	movs r3, 0
-	movs r5, 0x1
-	adds r2, r0, 0
-	movs r4, 0x10
-_0805D85A:
-	ldrb r1, [r2]
-	adds r0, r5, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0805D876
-	adds r0, r4, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0805D876
-	ldrb r0, [r2, 0x4]
-	cmp r0, 0
-	bne _0805D876
-	movs r0, 0x1
-	b _0805D880
-_0805D876:
-	adds r2, 0x8
-	adds r3, 0x1
-	cmp r3, 0x3
-	ble _0805D85A
-	movs r0, 0
-_0805D880:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end LastMoveOutOfPP
-
-	.align 2, 0
\ No newline at end of file
diff --git a/asm/code_805D850.s b/asm/code_805D850.s
new file mode 100644
index 0000000..be2ae85
--- /dev/null
+++ b/asm/code_805D850.s
@@ -0,0 +1,42 @@
+	#include "asm/constants/gba_constants.inc"
+  	#include "asm/macros.inc"
+
+  	.syntax unified
+
+  	.text
+  
+	thumb_func_start LastMoveOutOfPP
+LastMoveOutOfPP:
+	push {r4,r5,lr}
+	movs r3, 0
+	movs r5, 0x1
+	adds r2, r0, 0
+	movs r4, 0x10
+_0805D85A:
+	ldrb r1, [r2]
+	adds r0, r5, 0
+	ands r0, r1
+	cmp r0, 0
+	beq _0805D876
+	adds r0, r4, 0
+	ands r0, r1
+	cmp r0, 0
+	beq _0805D876
+	ldrb r0, [r2, 0x4]
+	cmp r0, 0
+	bne _0805D876
+	movs r0, 0x1
+	b _0805D880
+_0805D876:
+	adds r2, 0x8
+	adds r3, 0x1
+	cmp r3, 0x3
+	ble _0805D85A
+	movs r0, 0
+_0805D880:
+	pop {r4,r5}
+	pop {r1}
+	bx r1
+	thumb_func_end LastMoveOutOfPP
+
+	.align 2, 0
\ No newline at end of file
-- 
cgit v1.2.3