Decompile move table access routines

6 files changed, 19 insertions, 139 deletions

diff --git a/arm9/asm/unk_0206AB04.s b/arm9/asm/unk_0206AB04.s
index c523eb3b..05ded05f 100644
--- a/arm9/asm/unk_0206AB04.s
+++ b/arm9/asm/unk_0206AB04.s
@@ -2,123 +2,3 @@
     .include "global.inc"
 
 	.text
-
-	thumb_func_start FUN_0206AB04
-FUN_0206AB04: ; 0x0206AB04
-	push {r3, lr}
-	mov r1, #0x75
-	lsl r1, r1, #0x6
-	mov r2, #0x0
-	str r1, [sp, #0x0]
-	mov r1, #0x9
-	add r3, r2, #0x0
-	bl ReadFromNarcMemberByIdPair
-	pop {r3, pc}
-
-	thumb_func_start FUN_0206AB18
-FUN_0206AB18: ; 0x0206AB18
-	push {r4, lr}
-	sub sp, #0x10
-	add r4, r1, #0x0
-	add r1, sp, #0x0
-	bl FUN_0206ABB4
-	add r0, sp, #0x0
-	add r1, r4, #0x0
-	bl FUN_0206AB58
-	add sp, #0x10
-	pop {r4, pc}
-
-	thumb_func_start FUN_0206AB30
-FUN_0206AB30: ; 0x0206AB30
-	push {r3-r5, lr}
-	add r5, r1, #0x0
-	cmp r5, #0x3
-	bls _0206AB3A
-	mov r5, #0x3
-_0206AB3A:
-	mov r1, #0x5
-	bl FUN_0206AB18
-	lsl r0, r0, #0x18
-	lsr r4, r0, #0x18
-	mov r0, #0x14
-	mul r0, r4
-	mul r0, r5
-	mov r1, #0x64
-	bl _s32_div_f
-	add r0, r4, r0
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_0206AB58
-FUN_0206AB58: ; 0x0206AB58
-	cmp r1, #0xb
-	bhi _0206ABB0
-	add r1, r1, r1
-	add r1, pc
-	ldrh r1, [r1, #0x6]
-	lsl r1, r1, #0x10
-	asr r1, r1, #0x10
-	add pc, r1
-_0206AB68: ; jump table (using 16-bit offset)
-	.short _0206AB80 - _0206AB68 - 2; case 0
-	.short _0206AB84 - _0206AB68 - 2; case 1
-	.short _0206AB88 - _0206AB68 - 2; case 2
-	.short _0206AB8C - _0206AB68 - 2; case 3
-	.short _0206AB90 - _0206AB68 - 2; case 4
-	.short _0206AB94 - _0206AB68 - 2; case 5
-	.short _0206AB98 - _0206AB68 - 2; case 6
-	.short _0206AB9C - _0206AB68 - 2; case 7
-	.short _0206ABA0 - _0206AB68 - 2; case 8
-	.short _0206ABA6 - _0206AB68 - 2; case 9
-	.short _0206ABAA - _0206AB68 - 2; case 10
-	.short _0206ABAE - _0206AB68 - 2; case 11
-_0206AB80:
-	ldrh r0, [r0, #0x0]
-	bx lr
-_0206AB84:
-	ldrb r0, [r0, #0x2]
-	bx lr
-_0206AB88:
-	ldrb r0, [r0, #0x3]
-	bx lr
-_0206AB8C:
-	ldrb r0, [r0, #0x4]
-	bx lr
-_0206AB90:
-	ldrb r0, [r0, #0x5]
-	bx lr
-_0206AB94:
-	ldrb r0, [r0, #0x6]
-	bx lr
-_0206AB98:
-	ldrb r0, [r0, #0x7]
-	bx lr
-_0206AB9C:
-	ldrh r0, [r0, #0x8]
-	bx lr
-_0206ABA0:
-	mov r1, #0xa
-	ldrsb r0, [r0, r1]
-	bx lr
-_0206ABA6:
-	ldrb r0, [r0, #0xb]
-	bx lr
-_0206ABAA:
-	ldrb r0, [r0, #0xc]
-	bx lr
-_0206ABAE:
-	ldrb r0, [r0, #0xd]
-_0206ABB0:
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_0206ABB4
-FUN_0206ABB4: ; 0x0206ABB4
-	ldr r3, _0206ABC0 ; =ReadWholeNarcMemberByIdPair
-	add r2, r0, #0x0
-	add r0, r1, #0x0
-	mov r1, #0x9
-	bx r3
-	nop
-_0206ABC0: .word ReadWholeNarcMemberByIdPair
diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s
index 995ebf7e..7d275208 100644
--- a/arm9/asm/unk_0207550C.s
+++ b/arm9/asm/unk_0207550C.s
@@ -3092,7 +3092,7 @@ FUN_02076F2C: ; 0x02076F2C
 	mov r1, #0x0
 	ldr r0, [r5, r0]
 	ldrh r0, [r0, #0x26]
-	bl FUN_0206AB30
+	bl WazaGetMaxPp
 	add r6, #0x3a
 	str r0, [sp, #0x0]
 	add r0, r4, #0x0
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index 9da982ce..17374c00 100644
--- a/arm9/asm/unk_02079C70.s
+++ b/arm9/asm/unk_02079C70.s
@@ -2104,7 +2104,7 @@ _0207AD26:
 	lsr r1, r0, #0x18
 	ldr r0, [sp, #0x0]
 	ldrh r0, [r0, #0x34]
-	bl FUN_0206AB30
+	bl WazaGetMaxPp
 	add r1, r5, r4
 	add r1, #0x40
 	strb r0, [r1, #0x0]
@@ -4153,7 +4153,7 @@ FUN_0207BD84: ; 0x0207BD84
 	beq _0207BDCC
 	add r0, r4, #0x0
 	mov r1, #0xa
-	bl FUN_0206AB18
+	bl GetWazaAttr
 	bl FUN_02083114
 	mov r1, #0xa
 	bl _s32_div_f
diff --git a/arm9/asm/unk_0207C328.s b/arm9/asm/unk_0207C328.s
index 5c518aa4..486788c4 100644
--- a/arm9/asm/unk_0207C328.s
+++ b/arm9/asm/unk_0207C328.s
@@ -847,7 +847,7 @@ _0207C7FC:
 	cmp r0, #0x0
 	beq _0207C826
 	add r1, r7, #0x0
-	bl FUN_0206AB18
+	bl GetWazaAttr
 	add r3, r0, #0x0
 	add r1, r4, #0x0
 	add r1, #0xd
@@ -943,7 +943,7 @@ _0207C8BA:
 	cmp r0, #0x0
 	beq _0207C904
 	mov r1, #0x3
-	bl FUN_0206AB18
+	bl GetWazaAttr
 	add r3, r0, #0x0
 	add r1, r4, #0x0
 	add r1, #0xd
@@ -983,7 +983,7 @@ _0207C904:
 	cmp r0, #0x0
 	beq _0207C946
 	mov r1, #0x3
-	bl FUN_0206AB18
+	bl GetWazaAttr
 	add r3, r0, #0x0
 	lsl r3, r3, #0x18
 	add r0, r5, #0x0
@@ -1029,7 +1029,7 @@ _0207C974:
 	cmp r0, #0x0
 	beq _0207C9C0
 	mov r1, #0xb
-	bl FUN_0206AB18
+	bl GetWazaAttr
 	add r3, r0, #0x0
 	add r1, r4, #0x0
 	add r1, #0xd
@@ -1070,7 +1070,7 @@ _0207C9C0:
 	cmp r0, #0x0
 	beq _0207CA04
 	mov r1, #0xb
-	bl FUN_0206AB18
+	bl GetWazaAttr
 	add r3, r0, #0x0
 	add r3, #0x12
 	lsl r3, r3, #0x18
@@ -1270,7 +1270,7 @@ FUN_0207CB70: ; 0x0207CB70
 	add r5, r0, #0x0
 	add r0, r1, #0x0
 	mov r1, #0x1
-	bl FUN_0206AB18
+	bl GetWazaAttr
 	add r4, r0, #0x0
 	bl FUN_0206E2A8
 	add r6, r0, #0x0
diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s
index 26580e37..4893d340 100644
--- a/arm9/asm/unk_0207D5BC.s
+++ b/arm9/asm/unk_0207D5BC.s
@@ -2532,7 +2532,7 @@ _0207EA76:
 	mov r1, #0x0
 	ldrh r0, [r0, #0x18]
 	str r0, [sp, #0x20]
-	bl FUN_0206AB30
+	bl WazaGetMaxPp
 	str r0, [sp, #0x1c]
 	str r0, [sp, #0x18]
 _0207EA88:
@@ -2674,7 +2674,7 @@ FUN_0207EB64: ; 0x0207EB64
 	bl FUN_02019620
 	add r0, r4, #0x0
 	mov r1, #0x2
-	bl FUN_0206AB18
+	bl GetWazaAttr
 	add r2, r0, #0x0
 	cmp r2, #0x1
 	bhi _0207EBD2
@@ -2703,7 +2703,7 @@ _0207EBE0:
 	bl FUN_0207D998
 	add r0, r4, #0x0
 	mov r1, #0x4
-	bl FUN_0206AB18
+	bl GetWazaAttr
 	add r2, r0, #0x0
 	bne _0207EC0E
 	ldr r2, _0207EC88 ; =0x00000674
@@ -2980,7 +2980,7 @@ FUN_0207EE2C: ; 0x0207EE2C
 	bl FUN_02019620
 	add r0, r4, #0x0
 	mov r1, #0xa
-	bl FUN_0206AB18
+	bl GetWazaAttr
 	bl FUN_0208315C
 	add r4, r0, #0x0
 	mov r0, #0x0
diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s
index b4f2fa48..91504fe7 100644
--- a/arm9/asm/unk_020842DC.s
+++ b/arm9/asm/unk_020842DC.s
@@ -210,7 +210,7 @@ _0208447C:
 	lsl r0, r0, #0x10
 	lsr r0, r0, #0x10
 	mov r1, #0x0
-	bl FUN_0206AB30
+	bl WazaGetMaxPp
 	cmp r0, #0x5
 	blo _020844B2
 	add r0, r4, #0x0
@@ -1360,7 +1360,7 @@ _02084E08:
 	lsl r0, r0, #0x18
 	lsr r1, r0, #0x18
 	add r0, r7, #0x0
-	bl FUN_0206AB30
+	bl WazaGetMaxPp
 	cmp r4, r0
 	bhs _02084E36
 	mov r0, #0x1
@@ -1409,7 +1409,7 @@ _02084E5E:
 	lsl r1, r1, #0x18
 	add r0, r7, #0x0
 	lsr r1, r1, #0x18
-	bl FUN_0206AB30
+	bl WazaGetMaxPp
 	add r1, sp, #0x4
 	ldrb r2, [r1, #0x0]
 	cmp r2, r0
@@ -1469,7 +1469,7 @@ _02084EE6:
 	lsr r0, r0, #0x10
 	mov r1, #0x0
 	str r0, [sp, #0x4]
-	bl FUN_0206AB30
+	bl WazaGetMaxPp
 	cmp r0, #0x5
 	bhs _02084F08
 	add sp, #0xc
@@ -1485,7 +1485,7 @@ _02084F08:
 	strb r0, [r1, #0x1]
 	ldrb r1, [r1, #0x0]
 	ldr r0, [sp, #0x4]
-	bl FUN_0206AB30
+	bl WazaGetMaxPp
 	add r7, r0, #0x0
 	add r0, sp, #0x8
 	ldrb r0, [r0, #0x0]
@@ -1502,7 +1502,7 @@ _02084F34:
 	strb r0, [r1, #0x0]
 	ldrb r1, [r1, #0x0]
 	ldr r0, [sp, #0x4]
-	bl FUN_0206AB30
+	bl WazaGetMaxPp
 	add r1, sp, #0x8
 	ldrb r2, [r1, #0x1]
 	add r0, r2, r0