Merge pull request #170 from PikalaxALT/pikalax_work

Decompile move table access routines

7 files changed, 42 insertions, 166 deletions

diff --git a/arm9/asm/unk_0206AB04.s b/arm9/asm/unk_0206AB04.s
deleted file mode 100644
index c523eb3b..00000000
--- a/arm9/asm/unk_0206AB04.s
+++ /dev/null
@@ -1,124 +0,0 @@
-    .include "asm/macros.inc"
-    .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_0206E5B4.s b/arm9/asm/unk_0206E5B4.s
index 316ba0db..5cba23c1 100644
--- a/arm9/asm/unk_0206E5B4.s
+++ b/arm9/asm/unk_0206E5B4.s
@@ -5,35 +5,35 @@
 
 	.global UNK_020F8454
 UNK_020F8454: ; 0x020F8454
-	.byte 0x89, 0x00, 0x8A, 0x00, 0x8B, 0x00, 0x8C, 0x00, 0x8D, 0x00, 0x8E, 0x00, 0x8F, 0x00, 0x90, 0x00
-	.byte 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00
+	.short 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 0x0090
+	.short 0x0091, 0x0092, 0x0093, 0x0094
 
 	.global UNK_020F846C
 UNK_020F846C: ; 0x020F846C
-	.byte 0x95, 0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9A, 0x00, 0x9B, 0x00, 0x9C, 0x00
-	.byte 0x9D, 0x00, 0x9E, 0x00, 0x9F, 0x00, 0xA0, 0x00, 0xA1, 0x00, 0xA2, 0x00, 0xA3, 0x00, 0xA4, 0x00
-	.byte 0xA5, 0x00, 0xA6, 0x00, 0xA7, 0x00, 0xA8, 0x00, 0xA9, 0x00, 0xAA, 0x00, 0xAB, 0x00, 0xAC, 0x00
-	.byte 0xAD, 0x00, 0xAE, 0x00, 0xAF, 0x00, 0xB0, 0x00, 0xB1, 0x00, 0xB2, 0x00, 0xB3, 0x00, 0xB4, 0x00
-	.byte 0xB5, 0x00, 0xB6, 0x00, 0xB7, 0x00, 0xB8, 0x00, 0xB9, 0x00, 0xBA, 0x00, 0xBB, 0x00, 0xBC, 0x00
-	.byte 0xBD, 0x00, 0xBE, 0x00, 0xBF, 0x00, 0xC0, 0x00, 0xC1, 0x00, 0xC2, 0x00, 0xC3, 0x00, 0xC4, 0x00
-	.byte 0xC5, 0x00, 0xC6, 0x00, 0xC7, 0x00, 0xC8, 0x00, 0xC9, 0x00, 0xCA, 0x00, 0xCB, 0x00, 0xCC, 0x00
-	.byte 0xCD, 0x00, 0xCE, 0x00, 0xCF, 0x00, 0xD0, 0x00, 0xD1, 0x00, 0xD2, 0x00, 0xD3, 0x00, 0xD4, 0x00
+	.short 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C
+	.short 0x009D, 0x009E, 0x009F, 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4
+	.short 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC
+	.short 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4
+	.short 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC
+	.short 0x00BD, 0x00BE, 0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4
+	.short 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC
+	.short 0x00CD, 0x00CE, 0x00CF, 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4
 
 	.global UNK_020F84EC
 UNK_020F84EC: ; 0x020F84EC
-	.byte 0x08, 0x01, 0x51, 0x01, 0x60, 0x01, 0x5B, 0x01, 0x2E, 0x00, 0x5C, 0x00, 0x02, 0x01, 0x53, 0x01
-	.byte 0x4B, 0x01, 0xED, 0x00, 0xF1, 0x00, 0x0D, 0x01, 0x3A, 0x00, 0x3B, 0x00, 0x3F, 0x00, 0x71, 0x00
-	.byte 0xB6, 0x00, 0xF0, 0x00, 0xCA, 0x00, 0xDB, 0x00, 0xDA, 0x00, 0x4C, 0x00, 0xE7, 0x00, 0x55, 0x00
-	.byte 0x57, 0x00, 0x59, 0x00, 0xD8, 0x00, 0x5B, 0x00, 0x5E, 0x00, 0xF7, 0x00, 0x18, 0x01, 0x68, 0x00
-	.byte 0x73, 0x00, 0x5F, 0x01, 0x35, 0x00, 0xBC, 0x00, 0xC9, 0x00, 0x7E, 0x00, 0x3D, 0x01, 0x4C, 0x01
-	.byte 0x03, 0x01, 0x07, 0x01, 0x22, 0x01, 0x9C, 0x00, 0xD5, 0x00, 0xA8, 0x00, 0xD3, 0x00, 0x1D, 0x01
-	.byte 0x21, 0x01, 0x3B, 0x01, 0x63, 0x01, 0x9B, 0x01, 0x9C, 0x01, 0xCE, 0x00, 0x6A, 0x01, 0x76, 0x01
-	.byte 0xC3, 0x01, 0xCB, 0x00, 0x96, 0x01, 0x99, 0x01, 0x05, 0x01, 0x3E, 0x01, 0x75, 0x01, 0x99, 0x00
-	.byte 0xA5, 0x01, 0x73, 0x01, 0x16, 0x01, 0xA0, 0x01, 0x8D, 0x01, 0x94, 0x00, 0xBC, 0x01, 0xA3, 0x01
-	.byte 0x56, 0x00, 0x68, 0x01, 0x0E, 0x00, 0xBE, 0x01, 0xF4, 0x00, 0xBD, 0x01, 0x8F, 0x01, 0x9D, 0x00
-	.byte 0x94, 0x01, 0xD6, 0x00, 0x6B, 0x01, 0x8E, 0x01, 0x8A, 0x00, 0xBF, 0x01, 0xCF, 0x00, 0x6D, 0x01
-	.byte 0x71, 0x01, 0xA4, 0x00, 0xAE, 0x01, 0xB1, 0x01, 0x0F, 0x00, 0x13, 0x00, 0x39, 0x00, 0x46, 0x00
-	.byte 0xB0, 0x01, 0xF9, 0x00, 0x7F, 0x00, 0xAF, 0x01
+	.short 0x0108, 0x0151, 0x0160, 0x015B, 0x002E, 0x005C, 0x0102, 0x0153
+	.short 0x014B, 0x00ED, 0x00F1, 0x010D, 0x003A, 0x003B, 0x003F, 0x0071
+	.short 0x00B6, 0x00F0, 0x00CA, 0x00DB, 0x00DA, 0x004C, 0x00E7, 0x0055
+	.short 0x0057, 0x0059, 0x00D8, 0x005B, 0x005E, 0x00F7, 0x0118, 0x0068
+	.short 0x0073, 0x015F, 0x0035, 0x00BC, 0x00C9, 0x007E, 0x013D, 0x014C
+	.short 0x0103, 0x0107, 0x0122, 0x009C, 0x00D5, 0x00A8, 0x00D3, 0x011D
+	.short 0x0121, 0x013B, 0x0163, 0x019B, 0x019C, 0x00CE, 0x016A, 0x0176
+	.short 0x01C3, 0x00CB, 0x0196, 0x0199, 0x0105, 0x013E, 0x0175, 0x0099
+	.short 0x01A5, 0x0173, 0x0116, 0x01A0, 0x018D, 0x0094, 0x01BC, 0x01A3
+	.short 0x0056, 0x0168, 0x000E, 0x01BE, 0x00F4, 0x01BD, 0x018F, 0x009D
+	.short 0x0194, 0x00D6, 0x016B, 0x018E, 0x008A, 0x01BF, 0x00CF, 0x016D
+	.short 0x0171, 0x00A4, 0x01AE, 0x01B1, 0x000F, 0x0013, 0x0039, 0x0046
+	.short 0x01B0, 0x00F9, 0x007F, 0x01AF
 
 	.global UNK_020F85B4
 UNK_020F85B4: ; 0x020F85B4
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