diff --git a/asm/kpad/KMPLS_80070390.s b/asm/kpad/KMPLS.s
similarity index 98%
rename from asm/kpad/KMPLS_80070390.s
rename to asm/kpad/KMPLS.s
index 90b6c230..a7d5bcb1 100644
--- a/asm/kpad/KMPLS_80070390.s
+++ b/asm/kpad/KMPLS.s
@@ -2421,3 +2421,169 @@ KMPLSSetSamplingCallback:
 /* 800724B4 0006E2F4  00 00 00 00 */	.4byte 0x00000000
 /* 800724B8 0006E2F8  00 00 00 00 */	.4byte 0x00000000
 /* 800724BC 0006E2FC  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global mpls_assign_deg
+mpls_assign_deg:
+
+	.4byte 0x00000640
+	.4byte 0x00000640
+	.4byte 0x00000640
+	.4byte 0x00000640
+	.4byte 0x00000640
+	.4byte 0x00000640
+	.4byte 0x00000640
+	.4byte 0x00000640
+	.4byte 0x00000640
+
+.global mpls_assign_ct
+mpls_assign_ct:
+
+	.4byte 0x007FFFFF
+	.4byte 0x007FFFFF
+	.4byte 0x007FFFFF
+	.4byte 0x007FFFFF
+	.4byte 0x007FFFFF
+	.4byte 0x007FFFFF
+	.4byte 0x007FFFFF
+	.4byte 0x007FFFFF
+	.4byte 0x007FFFFF
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global kmpls
+kmpls:
+	.skip 0x8
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@2647_8055E870"
+"@2647_8055E870":
+
+	.4byte 0
+
+.global "@2648_8055E874"
+"@2648_8055E874":
+
+	.4byte 0x3F800000
+
+.global "@2649_8055E878"
+"@2649_8055E878":
+
+	.4byte 0x3C23D70A
+	.4byte 0
+
+.global "@2679"
+"@2679":
+
+	.4byte 0
+	.4byte 0
+
+.global "@2680"
+"@2680":
+
+	.4byte 0x3FF00000
+	.4byte 0
+
+.global "@2681"
+"@2681":
+
+	.4byte 0x40768000
+	.4byte 0
+
+.global "@2685_8055E898"
+"@2685_8055E898":
+
+	.4byte 0x43300000
+	.4byte 0x80000000
+
+.global "@2757_8055E8A0"
+"@2757_8055E8A0":
+
+	.4byte 0x3F000000
+
+.global "@2758"
+"@2758":
+
+	.4byte 0x3CF5C28F
+
+.global "@2817_8055E8A8"
+"@2817_8055E8A8":
+
+	.4byte 0xBF800000
+
+.global "@3075"
+"@3075":
+
+	.4byte 0xBE4CCCCD
+
+.global "@3076"
+"@3076":
+
+	.4byte 0x3E4CCCCD
+
+.global "@3077"
+"@3077":
+
+	.4byte 0x3F400000
+
+.global "@3168"
+"@3168":
+
+	.4byte 0x3A83126F
+
+.global "@3197_8055E8BC"
+"@3197_8055E8BC":
+
+	.4byte 0x403FEF9E
+
+.global "@3230"
+"@3230":
+
+	.4byte 0x3EC489D2
+
+.global "@3248_8055E8C4"
+"@3248_8055E8C4":
+
+	.4byte 0x38D1B717
+
+.global "@3259"
+"@3259":
+
+	.4byte 0x40490000
+	.4byte 0
+
+.global "@3260"
+"@3260":
+
+	.4byte 0x3FB99999
+	.4byte 0x9999999A
+
+.global "@3261"
+"@3261":
+
+	.4byte 0x3FE00000
+	.4byte 0
+
+.global "@3463"
+"@3463":
+
+	.4byte 0x44BB8000
+
+.global "@3464"
+"@3464":
+
+	.4byte 0x3F666666
+
+.global "@3492_8055E8E8"
+"@3492_8055E8E8":
+
+	.4byte 0x40B47AE1
+	.4byte 0x1EB851EC
+
+.global "@3563"
+"@3563":
+
+	.4byte 0x401921FB
+	.4byte 0x54442D18
diff --git a/asm/kpad/KMPLS_80439fc8.s b/asm/kpad/KMPLS_80439fc8.s
deleted file mode 100644
index 413740b4..00000000
--- a/asm/kpad/KMPLS_80439fc8.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global mpls_assign_deg
-mpls_assign_deg:
-
-	.4byte 0x00000640
-	.4byte 0x00000640
-	.4byte 0x00000640
-	.4byte 0x00000640
-	.4byte 0x00000640
-	.4byte 0x00000640
-	.4byte 0x00000640
-	.4byte 0x00000640
-	.4byte 0x00000640
-
-.global mpls_assign_ct
-mpls_assign_ct:
-
-	.4byte 0x007FFFFF
-	.4byte 0x007FFFFF
-	.4byte 0x007FFFFF
-	.4byte 0x007FFFFF
-	.4byte 0x007FFFFF
-	.4byte 0x007FFFFF
-	.4byte 0x007FFFFF
-	.4byte 0x007FFFFF
-	.4byte 0x007FFFFF
diff --git a/asm/kpad/KMPLS_8055ceb8.s b/asm/kpad/KMPLS_8055ceb8.s
deleted file mode 100644
index 55cf4ce8..00000000
--- a/asm/kpad/KMPLS_8055ceb8.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global kmpls
-kmpls:
-	.skip 0x8
diff --git a/asm/kpad/KMPLS_8055e870.s b/asm/kpad/KMPLS_8055e870.s
deleted file mode 100644
index 57e21a5b..00000000
--- a/asm/kpad/KMPLS_8055e870.s
+++ /dev/null
@@ -1,132 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@2647_8055E870"
-"@2647_8055E870":
-
-	.4byte 0
-
-.global "@2648_8055E874"
-"@2648_8055E874":
-
-	.4byte 0x3F800000
-
-.global "@2649_8055E878"
-"@2649_8055E878":
-
-	.4byte 0x3C23D70A
-	.4byte 0
-
-.global "@2679"
-"@2679":
-
-	.4byte 0
-	.4byte 0
-
-.global "@2680"
-"@2680":
-
-	.4byte 0x3FF00000
-	.4byte 0
-
-.global "@2681"
-"@2681":
-
-	.4byte 0x40768000
-	.4byte 0
-
-.global "@2685_8055E898"
-"@2685_8055E898":
-
-	.4byte 0x43300000
-	.4byte 0x80000000
-
-.global "@2757_8055E8A0"
-"@2757_8055E8A0":
-
-	.4byte 0x3F000000
-
-.global "@2758"
-"@2758":
-
-	.4byte 0x3CF5C28F
-
-.global "@2817_8055E8A8"
-"@2817_8055E8A8":
-
-	.4byte 0xBF800000
-
-.global "@3075"
-"@3075":
-
-	.4byte 0xBE4CCCCD
-
-.global "@3076"
-"@3076":
-
-	.4byte 0x3E4CCCCD
-
-.global "@3077"
-"@3077":
-
-	.4byte 0x3F400000
-
-.global "@3168"
-"@3168":
-
-	.4byte 0x3A83126F
-
-.global "@3197_8055E8BC"
-"@3197_8055E8BC":
-
-	.4byte 0x403FEF9E
-
-.global "@3230"
-"@3230":
-
-	.4byte 0x3EC489D2
-
-.global "@3248_8055E8C4"
-"@3248_8055E8C4":
-
-	.4byte 0x38D1B717
-
-.global "@3259"
-"@3259":
-
-	.4byte 0x40490000
-	.4byte 0
-
-.global "@3260"
-"@3260":
-
-	.4byte 0x3FB99999
-	.4byte 0x9999999A
-
-.global "@3261"
-"@3261":
-
-	.4byte 0x3FE00000
-	.4byte 0
-
-.global "@3463"
-"@3463":
-
-	.4byte 0x44BB8000
-
-.global "@3464"
-"@3464":
-
-	.4byte 0x3F666666
-
-.global "@3492_8055E8E8"
-"@3492_8055E8E8":
-
-	.4byte 0x40B47AE1
-	.4byte 0x1EB851EC
-
-.global "@3563"
-"@3563":
-
-	.4byte 0x401921FB
-	.4byte 0x54442D18
diff --git a/asm/kpad/KPAD_8006b280.s b/asm/kpad/KPAD.s
similarity index 97%
rename from asm/kpad/KPAD_8006b280.s
rename to asm/kpad/KPAD.s
index b9059d93..0c78073b 100644
--- a/asm/kpad/KPAD_8006b280.s
+++ b/asm/kpad/KPAD.s
@@ -6123,3 +6123,501 @@ lbl_80070368:
 /* 80070384 0006C1C4  7C 08 03 A6 */	mtlr r0
 /* 80070388 0006C1C8  38 21 00 60 */	addi r1, r1, 0x60
 /* 8007038C 0006C1CC  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@1614"
+"@1614":
+
+	.4byte 0x3C3C2052
+	.4byte 0x564C5F53
+	.4byte 0x444B202D
+	.4byte 0x204B5041
+	.4byte 0x44200972
+	.4byte 0x656C6561
+	.4byte 0x73652062
+	.4byte 0x75696C64
+	.4byte 0x3A204175
+	.4byte 0x67203233
+	.4byte 0x20323031
+	.4byte 0x30203139
+	.4byte 0x3A34383A
+	.4byte 0x32332028
+	.4byte 0x30783433
+	.4byte 0x30325F31
+	.4byte 0x34352920
+	.4byte 0x3E3E0000
+
+.global "@4805"
+"@4805":
+
+	.4byte lbl_8006BBDC
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBDC
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBDC
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBDC
+	.4byte lbl_8006BBDC
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBDC
+	.4byte lbl_8006BBDC
+	.4byte lbl_8006BBDC
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBDC
+	.4byte lbl_8006BBE0
+	.4byte lbl_8006BBE0
+
+.global "@LOCAL@KPADiSamplingCallback__Fl@table"
+"@LOCAL@KPADiSamplingCallback__Fl@table":
+
+	.4byte 0x00010302
+	.4byte 0x00040105
+	.4byte 0x00070108
+	.4byte 0x000B010B
+	.4byte 0x000F010F
+	.4byte 0x000C000C
+	.4byte 0x000A000A
+	.4byte 0x00110111
+	.4byte 0x00100110
+	.4byte 0x00130013
+	.4byte 0x00140014
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global inside_kpads
+inside_kpads:
+	.skip 0x1A20
+
+.global kp_fs_rot
+kp_fs_rot:
+	.skip 0x30
+
+.global kp_wbc_weight_ave
+kp_wbc_weight_ave:
+	.skip 0x20
+
+.global kp_wbc_ave_sample
+kp_wbc_ave_sample:
+	.skip 0x30
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __KPADVersion
+__KPADVersion:
+
+	.4byte "@1614"
+
+.global idist_org
+idist_org:
+
+	.4byte 0x3F800000
+
+.global iaccXY_nrm_hori
+iaccXY_nrm_hori:
+
+	.4byte 0
+
+.global lbl_80556814
+lbl_80556814:
+
+	.4byte 0xBF800000
+
+.global isec_nrm_hori
+isec_nrm_hori:
+
+	.4byte 0x3F800000
+
+.global lbl_8055681C
+lbl_8055681C:
+
+	.4byte 0
+
+.global kp_obj_interval
+kp_obj_interval:
+
+	.4byte 0x3E4CCCCD
+
+.global kp_acc_horizon_pw
+kp_acc_horizon_pw:
+
+	.4byte 0x3D4CCCCD
+
+.global kp_ah_circle_radius
+kp_ah_circle_radius:
+
+	.4byte 0x3D8F5C29
+
+.global kp_ah_circle_pw
+kp_ah_circle_pw:
+
+	.4byte 0x3D75C28F
+
+.global kp_ah_circle_ct
+kp_ah_circle_ct:
+
+	.4byte 0x00640000
+
+.global kp_err_outside_frame
+kp_err_outside_frame:
+
+	.4byte 0x3D4CCCCD
+
+.global kp_err_dist_max
+kp_err_dist_max:
+
+	.4byte 0x40400000
+
+.global kp_err_dist_speed
+kp_err_dist_speed:
+
+	.4byte 0x3D23D70A
+
+.global kp_err_first_inpr
+kp_err_first_inpr:
+
+	.4byte 0x3F666666
+
+.global kp_err_next_inpr
+kp_err_next_inpr:
+
+	.4byte 0x3F666666
+
+.global kp_err_acc_inpr
+kp_err_acc_inpr:
+
+	.4byte 0x3F666666
+
+.global kp_err_up_inpr
+kp_err_up_inpr:
+
+	.4byte 0x3F333333
+
+.global kp_err_near_pos
+kp_err_near_pos:
+
+	.4byte 0x3DCCCCCD
+
+.global kp_fs_fstick_min
+kp_fs_fstick_min:
+
+	.4byte 0x0000000F
+
+.global kp_fs_fstick_max
+kp_fs_fstick_max:
+
+	.4byte 0x00000047
+
+.global kp_cl_stick_min
+kp_cl_stick_min:
+
+	.4byte 0x0000003C
+
+.global kp_cl_stick_max
+kp_cl_stick_max:
+
+	.4byte 0x00000134
+
+.global kp_cl_trigger_min
+kp_cl_trigger_min:
+
+	.4byte 0x0000001E
+
+.global kp_cl_trigger_max
+kp_cl_trigger_max:
+
+	.4byte 0x000000B4
+
+.global kp_rm_acc_max
+kp_rm_acc_max:
+
+	.4byte 0x4059999A
+
+.global kp_fs_acc_max
+kp_fs_acc_max:
+
+	.4byte 0x40066666
+
+.global kp_ex_trigger_max
+kp_ex_trigger_max:
+
+	.4byte 0x00000100
+
+.global kp_ex_analog_max
+kp_ex_analog_max:
+
+	.4byte 0x00000400
+
+.global kp_wbc_ave_count
+kp_wbc_ave_count:
+
+	.4byte 0x43C80000
+
+.global kp_wbc_calib_count
+kp_wbc_calib_count:
+
+	.4byte 0xC8000000
+
+.global kp_wbc_stable_count
+kp_wbc_stable_count:
+
+	.4byte 0x02020305
+	.4byte 0x05050000
+
+.global kp_fs_revise_deg
+kp_fs_revise_deg:
+
+	.4byte 0x41C00000
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global icenter_org
+icenter_org:
+	.skip 0x4
+
+.global lbl_8055CE64
+lbl_8055CE64:
+	.skip 0x4
+
+.global kp_stick_clamp_cross
+kp_stick_clamp_cross:
+	.skip 0x4
+
+.global kp_ex_trigger_min
+kp_ex_trigger_min:
+	.skip 0x4
+
+.global kp_ex_analog_min
+kp_ex_analog_min:
+	.skip 0x4
+
+.global kp_initialized
+kp_initialized:
+	.skip 0x4
+
+.global Vec2_0
+Vec2_0:
+	.skip 0x4
+
+.global lbl_8055CE7C
+lbl_8055CE7C:
+	.skip 0x4
+
+.global kp_wbc_stable_width
+kp_wbc_stable_width:
+	.skip 0x8
+
+.global kp_wbc_max_weight
+kp_wbc_max_weight:
+	.skip 0x8
+
+.global kp_wbc_min_weight
+kp_wbc_min_weight:
+	.skip 0x8
+
+.global kp_wbc_tgc_weight
+kp_wbc_tgc_weight:
+	.skip 0x8
+
+.global kp_wbc_ave_sample_count
+kp_wbc_ave_sample_count:
+	.skip 0x2
+
+.global kp_wbc_failure_count
+kp_wbc_failure_count:
+	.skip 0x1
+
+.global kp_wbc_zero_point_done
+kp_wbc_zero_point_done:
+	.skip 0x1
+
+.global kp_wbc_zero_point_wait
+kp_wbc_zero_point_wait:
+	.skip 0x1
+
+.global kp_wbc_tgc_weight_done
+kp_wbc_tgc_weight_done:
+	.skip 0x1
+
+.global kp_wbc_tgc_weight_wait
+kp_wbc_tgc_weight_wait:
+	.skip 0x2
+
+.global kp_wbc_tgc_weight_err
+kp_wbc_tgc_weight_err:
+	.skip 0x1
+
+.global kp_wbc_enabled
+kp_wbc_enabled:
+	.skip 0x1
+
+.global kp_wbc_issued
+kp_wbc_issued:
+	.skip 0x2
+
+.global kp_dist_vv1
+kp_dist_vv1:
+	.skip 0x4
+
+.global kp_err_dist_min
+kp_err_dist_min:
+	.skip 0x8
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@4535"
+"@4535":
+
+	.4byte 0
+
+.global "@4536"
+"@4536":
+
+	.4byte 0x3F000000
+
+.global "@4537"
+"@4537":
+
+	.4byte 0x43480000
+
+.global "@4580"
+"@4580":
+
+	.4byte 0xBF800000
+
+.global "@4581"
+"@4581":
+
+	.4byte 0x3F800000
+
+.global "@4582"
+"@4582":
+
+	.4byte 0xBF400000
+
+.global "@4583"
+"@4583":
+
+	.4byte 0x3F400000
+
+.global "@4712"
+"@4712":
+
+	.4byte 0x40000000
+
+.global "@4806"
+"@4806":
+
+	.4byte 0x43300000
+	.4byte 0x80000000
+
+.global "@5024"
+"@5024":
+
+	.4byte 0x3B000000
+
+.global "@5025_8055E7FC"
+"@5025_8055E7FC":
+
+	.4byte 0x3F7FC000
+
+.global "@5026_8055E800"
+"@5026_8055E800":
+
+	.4byte 0x3F3FC000
+	.4byte 0
+
+.global "@5391"
+"@5391":
+
+	.4byte 0x4062C000
+	.4byte 0
+
+.global "@5392"
+"@5392":
+
+	.4byte 0x3E4CCCCD
+	.4byte 0
+
+.global "@5393"
+"@5393":
+
+	.4byte 0x40410000
+	.4byte 0
+
+.global "@5394"
+"@5394":
+
+	.4byte 0x40000000
+	.4byte 0
+
+.global "@5395"
+"@5395":
+
+	.4byte 0
+	.4byte 0
+
+.global "@5396"
+"@5396":
+
+	.4byte 0xBFF00000
+	.4byte 0
+
+.global "@5397"
+"@5397":
+
+	.4byte 0x3FE00000
+	.4byte 0
+
+.global "@5403"
+"@5403":
+
+	.4byte 0x43300000
+	.4byte 0
+
+.global "@5550"
+"@5550":
+
+	.4byte 0x3FD33333
+	.4byte 0x33333333
+
+.global "@5613"
+"@5613":
+
+	.4byte 0x3EC489D2
+
+.global "@5614"
+"@5614":
+
+	.4byte 0x3C8EFA35
+
+.global "@5799"
+"@5799":
+
+	.4byte 0x3BA3D70A
+
+.global "@5800"
+"@5800":
+
+	.4byte 0x3C23D70A
+
+.global "@3159"
+"@3159":
+
+	.4byte 0x00010001
+
+.global lbl_8055E864
+lbl_8055E864:
+
+	.4byte 0x00010000
+
+.global "@6007"
+"@6007":
+
+	.4byte 0xBE4CCCCD
+	.4byte 0
diff --git a/asm/kpad/KPAD_80439f00.s b/asm/kpad/KPAD_80439f00.s
deleted file mode 100644
index a8ee661c..00000000
--- a/asm/kpad/KPAD_80439f00.s
+++ /dev/null
@@ -1,64 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@1614"
-"@1614":
-
-	.4byte 0x3C3C2052
-	.4byte 0x564C5F53
-	.4byte 0x444B202D
-	.4byte 0x204B5041
-	.4byte 0x44200972
-	.4byte 0x656C6561
-	.4byte 0x73652062
-	.4byte 0x75696C64
-	.4byte 0x3A204175
-	.4byte 0x67203233
-	.4byte 0x20323031
-	.4byte 0x30203139
-	.4byte 0x3A34383A
-	.4byte 0x32332028
-	.4byte 0x30783433
-	.4byte 0x30325F31
-	.4byte 0x34352920
-	.4byte 0x3E3E0000
-
-.global "@4805"
-"@4805":
-
-	.4byte lbl_8006BBDC
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBDC
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBDC
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBDC
-	.4byte lbl_8006BBDC
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBDC
-	.4byte lbl_8006BBDC
-	.4byte lbl_8006BBDC
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBDC
-	.4byte lbl_8006BBE0
-	.4byte lbl_8006BBE0
-
-.global "@LOCAL@KPADiSamplingCallback__Fl@table"
-"@LOCAL@KPADiSamplingCallback__Fl@table":
-
-	.4byte 0x00010302
-	.4byte 0x00040105
-	.4byte 0x00070108
-	.4byte 0x000B010B
-	.4byte 0x000F010F
-	.4byte 0x000C000C
-	.4byte 0x000A000A
-	.4byte 0x00110111
-	.4byte 0x00100110
-	.4byte 0x00130013
-	.4byte 0x00140014
diff --git a/asm/kpad/KPAD_804c7c08.s b/asm/kpad/KPAD_804c7c08.s
deleted file mode 100644
index b43eb8b0..00000000
--- a/asm/kpad/KPAD_804c7c08.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global inside_kpads
-inside_kpads:
-	.skip 0x1A20
-
-.global kp_fs_rot
-kp_fs_rot:
-	.skip 0x30
-
-.global kp_wbc_weight_ave
-kp_wbc_weight_ave:
-	.skip 0x20
-
-.global kp_wbc_ave_sample
-kp_wbc_ave_sample:
-	.skip 0x30
diff --git a/asm/kpad/KPAD_80556808.s b/asm/kpad/KPAD_80556808.s
deleted file mode 100644
index 04bb1777..00000000
--- a/asm/kpad/KPAD_80556808.s
+++ /dev/null
@@ -1,168 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __KPADVersion
-__KPADVersion:
-
-	.4byte "@1614"
-
-.global idist_org
-idist_org:
-
-	.4byte 0x3F800000
-
-.global iaccXY_nrm_hori
-iaccXY_nrm_hori:
-
-	.4byte 0
-
-.global lbl_80556814
-lbl_80556814:
-
-	.4byte 0xBF800000
-
-.global isec_nrm_hori
-isec_nrm_hori:
-
-	.4byte 0x3F800000
-
-.global lbl_8055681C
-lbl_8055681C:
-
-	.4byte 0
-
-.global kp_obj_interval
-kp_obj_interval:
-
-	.4byte 0x3E4CCCCD
-
-.global kp_acc_horizon_pw
-kp_acc_horizon_pw:
-
-	.4byte 0x3D4CCCCD
-
-.global kp_ah_circle_radius
-kp_ah_circle_radius:
-
-	.4byte 0x3D8F5C29
-
-.global kp_ah_circle_pw
-kp_ah_circle_pw:
-
-	.4byte 0x3D75C28F
-
-.global kp_ah_circle_ct
-kp_ah_circle_ct:
-
-	.4byte 0x00640000
-
-.global kp_err_outside_frame
-kp_err_outside_frame:
-
-	.4byte 0x3D4CCCCD
-
-.global kp_err_dist_max
-kp_err_dist_max:
-
-	.4byte 0x40400000
-
-.global kp_err_dist_speed
-kp_err_dist_speed:
-
-	.4byte 0x3D23D70A
-
-.global kp_err_first_inpr
-kp_err_first_inpr:
-
-	.4byte 0x3F666666
-
-.global kp_err_next_inpr
-kp_err_next_inpr:
-
-	.4byte 0x3F666666
-
-.global kp_err_acc_inpr
-kp_err_acc_inpr:
-
-	.4byte 0x3F666666
-
-.global kp_err_up_inpr
-kp_err_up_inpr:
-
-	.4byte 0x3F333333
-
-.global kp_err_near_pos
-kp_err_near_pos:
-
-	.4byte 0x3DCCCCCD
-
-.global kp_fs_fstick_min
-kp_fs_fstick_min:
-
-	.4byte 0x0000000F
-
-.global kp_fs_fstick_max
-kp_fs_fstick_max:
-
-	.4byte 0x00000047
-
-.global kp_cl_stick_min
-kp_cl_stick_min:
-
-	.4byte 0x0000003C
-
-.global kp_cl_stick_max
-kp_cl_stick_max:
-
-	.4byte 0x00000134
-
-.global kp_cl_trigger_min
-kp_cl_trigger_min:
-
-	.4byte 0x0000001E
-
-.global kp_cl_trigger_max
-kp_cl_trigger_max:
-
-	.4byte 0x000000B4
-
-.global kp_rm_acc_max
-kp_rm_acc_max:
-
-	.4byte 0x4059999A
-
-.global kp_fs_acc_max
-kp_fs_acc_max:
-
-	.4byte 0x40066666
-
-.global kp_ex_trigger_max
-kp_ex_trigger_max:
-
-	.4byte 0x00000100
-
-.global kp_ex_analog_max
-kp_ex_analog_max:
-
-	.4byte 0x00000400
-
-.global kp_wbc_ave_count
-kp_wbc_ave_count:
-
-	.4byte 0x43C80000
-
-.global kp_wbc_calib_count
-kp_wbc_calib_count:
-
-	.4byte 0xC8000000
-
-.global kp_wbc_stable_count
-kp_wbc_stable_count:
-
-	.4byte 0x02020305
-	.4byte 0x05050000
-
-.global kp_fs_revise_deg
-kp_fs_revise_deg:
-
-	.4byte 0x41C00000
diff --git a/asm/kpad/KPAD_8055ce60.s b/asm/kpad/KPAD_8055ce60.s
deleted file mode 100644
index 484a33f8..00000000
--- a/asm/kpad/KPAD_8055ce60.s
+++ /dev/null
@@ -1,94 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global icenter_org
-icenter_org:
-	.skip 0x4
-
-.global lbl_8055CE64
-lbl_8055CE64:
-	.skip 0x4
-
-.global kp_stick_clamp_cross
-kp_stick_clamp_cross:
-	.skip 0x4
-
-.global kp_ex_trigger_min
-kp_ex_trigger_min:
-	.skip 0x4
-
-.global kp_ex_analog_min
-kp_ex_analog_min:
-	.skip 0x4
-
-.global kp_initialized
-kp_initialized:
-	.skip 0x4
-
-.global Vec2_0
-Vec2_0:
-	.skip 0x4
-
-.global lbl_8055CE7C
-lbl_8055CE7C:
-	.skip 0x4
-
-.global kp_wbc_stable_width
-kp_wbc_stable_width:
-	.skip 0x8
-
-.global kp_wbc_max_weight
-kp_wbc_max_weight:
-	.skip 0x8
-
-.global kp_wbc_min_weight
-kp_wbc_min_weight:
-	.skip 0x8
-
-.global kp_wbc_tgc_weight
-kp_wbc_tgc_weight:
-	.skip 0x8
-
-.global kp_wbc_ave_sample_count
-kp_wbc_ave_sample_count:
-	.skip 0x2
-
-.global kp_wbc_failure_count
-kp_wbc_failure_count:
-	.skip 0x1
-
-.global kp_wbc_zero_point_done
-kp_wbc_zero_point_done:
-	.skip 0x1
-
-.global kp_wbc_zero_point_wait
-kp_wbc_zero_point_wait:
-	.skip 0x1
-
-.global kp_wbc_tgc_weight_done
-kp_wbc_tgc_weight_done:
-	.skip 0x1
-
-.global kp_wbc_tgc_weight_wait
-kp_wbc_tgc_weight_wait:
-	.skip 0x2
-
-.global kp_wbc_tgc_weight_err
-kp_wbc_tgc_weight_err:
-	.skip 0x1
-
-.global kp_wbc_enabled
-kp_wbc_enabled:
-	.skip 0x1
-
-.global kp_wbc_issued
-kp_wbc_issued:
-	.skip 0x2
-
-.global kp_dist_vv1
-kp_dist_vv1:
-	.skip 0x4
-
-.global kp_err_dist_min
-kp_err_dist_min:
-	.skip 0x8
diff --git a/asm/kpad/KPAD_8055e7d0.s b/asm/kpad/KPAD_8055e7d0.s
deleted file mode 100644
index 6cb4229a..00000000
--- a/asm/kpad/KPAD_8055e7d0.s
+++ /dev/null
@@ -1,154 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@4535"
-"@4535":
-
-	.4byte 0
-
-.global "@4536"
-"@4536":
-
-	.4byte 0x3F000000
-
-.global "@4537"
-"@4537":
-
-	.4byte 0x43480000
-
-.global "@4580"
-"@4580":
-
-	.4byte 0xBF800000
-
-.global "@4581"
-"@4581":
-
-	.4byte 0x3F800000
-
-.global "@4582"
-"@4582":
-
-	.4byte 0xBF400000
-
-.global "@4583"
-"@4583":
-
-	.4byte 0x3F400000
-
-.global "@4712"
-"@4712":
-
-	.4byte 0x40000000
-
-.global "@4806"
-"@4806":
-
-	.4byte 0x43300000
-	.4byte 0x80000000
-
-.global "@5024"
-"@5024":
-
-	.4byte 0x3B000000
-
-.global "@5025_8055E7FC"
-"@5025_8055E7FC":
-
-	.4byte 0x3F7FC000
-
-.global "@5026_8055E800"
-"@5026_8055E800":
-
-	.4byte 0x3F3FC000
-	.4byte 0
-
-.global "@5391"
-"@5391":
-
-	.4byte 0x4062C000
-	.4byte 0
-
-.global "@5392"
-"@5392":
-
-	.4byte 0x3E4CCCCD
-	.4byte 0
-
-.global "@5393"
-"@5393":
-
-	.4byte 0x40410000
-	.4byte 0
-
-.global "@5394"
-"@5394":
-
-	.4byte 0x40000000
-	.4byte 0
-
-.global "@5395"
-"@5395":
-
-	.4byte 0
-	.4byte 0
-
-.global "@5396"
-"@5396":
-
-	.4byte 0xBFF00000
-	.4byte 0
-
-.global "@5397"
-"@5397":
-
-	.4byte 0x3FE00000
-	.4byte 0
-
-.global "@5403"
-"@5403":
-
-	.4byte 0x43300000
-	.4byte 0
-
-.global "@5550"
-"@5550":
-
-	.4byte 0x3FD33333
-	.4byte 0x33333333
-
-.global "@5613"
-"@5613":
-
-	.4byte 0x3EC489D2
-
-.global "@5614"
-"@5614":
-
-	.4byte 0x3C8EFA35
-
-.global "@5799"
-"@5799":
-
-	.4byte 0x3BA3D70A
-
-.global "@5800"
-"@5800":
-
-	.4byte 0x3C23D70A
-
-.global "@3159"
-"@3159":
-
-	.4byte 0x00010001
-
-.global lbl_8055E864
-lbl_8055E864:
-
-	.4byte 0x00010000
-
-.global "@6007"
-"@6007":
-
-	.4byte 0xBE4CCCCD
-	.4byte 0
diff --git a/asm/kpad/KZMplsTestSub_800724c0.s b/asm/kpad/KZMplsTestSub.s
similarity index 98%
rename from asm/kpad/KZMplsTestSub_800724c0.s
rename to asm/kpad/KZMplsTestSub.s
index 5915e9e3..99dd0bf2 100644
--- a/asm/kpad/KZMplsTestSub_800724c0.s
+++ b/asm/kpad/KZMplsTestSub.s
@@ -669,3 +669,41 @@ __KMPLS_linear_Direction:
 /* 80072EC4 0006ED04  00 00 00 00 */	.4byte 0x00000000
 /* 80072EC8 0006ED08  00 00 00 00 */	.4byte 0x00000000
 /* 80072ECC 0006ED0C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global e_dir
+e_dir:
+
+	.4byte 0x3F800000
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0x3F800000
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0x3F800000
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@2972_8055E8F8"
+"@2972_8055E8F8":
+
+	.4byte 0x3F000000
+
+.global "@2973_8055E8FC"
+"@2973_8055E8FC":
+
+	.4byte 0
+
+.global "@2982_8055E900"
+"@2982_8055E900":
+
+	.4byte 0x3F800000
+
+.global "@3054"
+"@3054":
+
+	.4byte 0x403FEF9E
diff --git a/asm/kpad/KZMplsTestSub_8043a010.s b/asm/kpad/KZMplsTestSub_8043a010.s
deleted file mode 100644
index d30e9733..00000000
--- a/asm/kpad/KZMplsTestSub_8043a010.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global e_dir
-e_dir:
-
-	.4byte 0x3F800000
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0x3F800000
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0x3F800000
-	.4byte 0
diff --git a/asm/kpad/KZMplsTestSub_8055e8f8.s b/asm/kpad/KZMplsTestSub_8055e8f8.s
deleted file mode 100644
index e3da81bf..00000000
--- a/asm/kpad/KZMplsTestSub_8055e8f8.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@2972_8055E8F8"
-"@2972_8055E8F8":
-
-	.4byte 0x3F000000
-
-.global "@2973_8055E8FC"
-"@2973_8055E8FC":
-
-	.4byte 0
-
-.global "@2982_8055E900"
-"@2982_8055E900":
-
-	.4byte 0x3F800000
-
-.global "@3054"
-"@3054":
-
-	.4byte 0x403FEF9E
diff --git a/obj_files.mk b/obj_files.mk
index cd4abab2..8c8562d4 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -249,11 +249,12 @@ $(BUILD_DIR)/asm/wpad/lint.o \
 $(BUILD_DIR)/asm/wpad/WUD.o \
 $(BUILD_DIR)/asm/wpad/WUDHidHost.o \
 \
+$(BUILD_DIR)/asm/kpad/KPAD.o \
+$(BUILD_DIR)/asm/kpad/KMPLS.o \
+$(BUILD_DIR)/asm/kpad/KZMplsTestSub.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/kpad/KPAD_8006b280.o \
-$(BUILD_DIR)/asm/kpad/KMPLS_80070390.o \
-$(BUILD_DIR)/asm/kpad/KZMplsTestSub_800724c0.o \
 $(BUILD_DIR)/asm/euart/euart_80072ed0.o \
 $(BUILD_DIR)/asm/usb/usb_80073250.o \
 $(BUILD_DIR)/asm/bte/gki_buffer_80074790.o \
@@ -3231,9 +3232,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \
 $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \
 $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
 $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \
-$(BUILD_DIR)/asm/kpad/KPAD_80439f00.o \
-$(BUILD_DIR)/asm/kpad/KMPLS_80439fc8.o \
-$(BUILD_DIR)/asm/kpad/KZMplsTestSub_8043a010.o \
 $(BUILD_DIR)/asm/usb/usb_8043a038.o \
 $(BUILD_DIR)/asm/bte/gki_buffer_8043a868.o \
 $(BUILD_DIR)/asm/bte/hcisu_h2_8043a9b0.o \
@@ -5009,7 +5007,6 @@ $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \
 $(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \
 $(BUILD_DIR)/asm/src/Alarm_804966e0.o \
 $(BUILD_DIR)/asm/src/StateChanger_804966f0.o \
-$(BUILD_DIR)/asm/kpad/KPAD_804c7c08.o \
 $(BUILD_DIR)/asm/bte/gki_ppc_804c96a8.o \
 $(BUILD_DIR)/asm/bte/hcisu_h2_804f2188.o \
 $(BUILD_DIR)/asm/bte/uusb_ppc_804f21c0.o \
@@ -5130,7 +5127,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \
 $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \
 $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
 $(BUILD_DIR)/asm/src/Table_80556398.o \
-$(BUILD_DIR)/asm/kpad/KPAD_80556808.o \
 $(BUILD_DIR)/asm/usb/usb_80556890.o \
 $(BUILD_DIR)/asm/bte/uusb_ppc_805568a0.o \
 $(BUILD_DIR)/asm/bte/bta_dm_cfg_805568b0.o \
@@ -5553,8 +5549,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \
 $(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \
 $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
 $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \
-$(BUILD_DIR)/asm/kpad/KPAD_8055ce60.o \
-$(BUILD_DIR)/asm/kpad/KMPLS_8055ceb8.o \
 $(BUILD_DIR)/asm/euart/euart_8055cec0.o \
 $(BUILD_DIR)/asm/usb/usb_8055ced0.o \
 $(BUILD_DIR)/asm/bte/uusb_ppc_8055cee0.o \
@@ -5747,9 +5741,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \
 $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \
 $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
 $(BUILD_DIR)/asm/src/Alarm_8055df68.o \
-$(BUILD_DIR)/asm/kpad/KPAD_8055e7d0.o \
-$(BUILD_DIR)/asm/kpad/KMPLS_8055e870.o \
-$(BUILD_DIR)/asm/kpad/KZMplsTestSub_8055e8f8.o \
 $(BUILD_DIR)/asm/bte/hcisu_h2_8055e908.o \
 $(BUILD_DIR)/asm/bte/bta_sys_cfg_8055e918.o \
 $(BUILD_DIR)/asm/bte/bta_dm_act_8055e920.o \