diff --git a/asm/include/main_0200C4CC.inc b/asm/include/main_0200C4CC.inc
index 22cbe815..c4060cbd 100644
--- a/asm/include/main_0200C4CC.inc
+++ b/asm/include/main_0200C4CC.inc
@@ -25,7 +25,11 @@
 .public GetDebugLogFlag
 .public GetFileLengthInPackWithPackNb
 .public GetHeldButtons
+.public GetKeyM2N
+.public GetKeyM2NBaseForm
 .public GetKeyM2NSwitch
+.public GetKeyN2M
+.public GetKeyN2MBaseForm
 .public GetKeyN2MSwitch
 .public GetMonsterName
 .public GetPressedButtons
diff --git a/asm/include/overlay_00.inc b/asm/include/overlay_00.inc
index e9cf227c..060a1dea 100644
--- a/asm/include/overlay_00.inc
+++ b/asm/include/overlay_00.inc
@@ -69,6 +69,7 @@
 .public strncmp
 .public strncpy
 .public strstr
+.public sub_01FF95E8
 .public sub_02002448
 .public sub_020024B0
 .public sub_020024C0
diff --git a/asm/include/overlay_29_022DC240.inc b/asm/include/overlay_29_022DC240.inc
index dffe19fa..4efc8db4 100644
--- a/asm/include/overlay_29_022DC240.inc
+++ b/asm/include/overlay_29_022DC240.inc
@@ -280,6 +280,9 @@
 .public sub_01FF8130
 .public sub_01FF81CC
 .public sub_01FF8C60
+.public sub_01FF9BA0
+.public sub_01FF9E14
+.public sub_01FF9F80
 .public sub_02001808
 .public sub_02008BF4
 .public sub_02009194
diff --git a/asm/itcm.s b/asm/itcm.s
index 79295f15..ee6406dd 100644
--- a/asm/itcm.s
+++ b/asm/itcm.s
@@ -91,7 +91,10 @@ _01FF811C:
 	ldmia sp!, {r0, r1, r2, r3, r4, r5, r6, r7, pc}
 	arm_func_end sub_01FF80B0
 _01FF8120:
-	.byte 0x24, 0x82, 0xFF, 0x01, 0x9C, 0x84, 0xFF, 0x01, 0x28, 0x87, 0xFF, 0x01, 0x28, 0x8C, 0xFF, 0x01
+	.word sub_01FF8224
+	.word sub_01FF849C
+	.word sub_01FF8728
+	.word sub_01FF8C28
 
 	arm_func_start sub_01FF8130
 sub_01FF8130: ; 0x01FF8130
diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s
index 79ef5797..59efec43 100644
--- a/asm/main_0200C4CC.s
+++ b/asm/main_0200C4CC.s
@@ -170551,8 +170551,10 @@ _020A2CF4:
 	.byte 0x43, 0x00, 0x00, 0x00
 	.global _020A2CF8
 _020A2CF8:
-	.byte 0x68, 0x94, 0xFF, 0x01, 0xD4, 0x94, 0xFF, 0x01, 0x40, 0x95, 0xFF, 0x01
-	.byte 0xAC, 0x95, 0xFF, 0x01
+	.word GetKeyN2M
+	.word GetKeyN2MBaseForm
+	.word GetKeyM2N
+	.word GetKeyM2NBaseForm
 	.global MONSTER_SPRITE_DATA
 MONSTER_SPRITE_DATA:
 	.byte 0x00
diff --git a/asm/overlay_00.s b/asm/overlay_00.s
index e097886d..ad7bf66f 100644
--- a/asm/overlay_00.s
+++ b/asm/overlay_00.s
@@ -32073,7 +32073,7 @@ ov00_022D73E0: ; 0x022D73E0
 	ldr r2, [r0, #8]
 	cmp r2, #0
 	bne _022D7408
-	ldr r1, _022D742C ; =0x01FF95E8
+	ldr r1, _022D742C ; =sub_01FF95E8
 	str r1, [r0, #8]
 	ldr r1, [r0, #0xc]
 	add r1, r1, #1
@@ -32081,7 +32081,7 @@ ov00_022D73E0: ; 0x022D73E0
 	mov r0, #1
 	bx lr
 _022D7408:
-	ldr r1, _022D742C ; =0x01FF95E8
+	ldr r1, _022D742C ; =sub_01FF95E8
 	cmp r2, r1
 	movne r0, #0
 	bxne lr
@@ -32091,14 +32091,14 @@ _022D7408:
 	mov r0, #1
 	bx lr
 	.align 2, 0
-_022D742C: .word 0x01FF95E8
+_022D742C: .word sub_01FF95E8
 	arm_func_end ov00_022D73E0
 
 	arm_func_start ov00_022D7430
 ov00_022D7430: ; 0x022D7430
 	stmdb sp!, {r3, lr}
 	ldr r2, [r0, #8]
-	ldr r1, _022D7464 ; =0x01FF95E8
+	ldr r1, _022D7464 ; =sub_01FF95E8
 	cmp r2, r1
 	ldmneia sp!, {r3, pc}
 	ldr r1, [r0, #0xc]
@@ -32110,7 +32110,7 @@ ov00_022D7430: ; 0x022D7430
 	bl sub_020798D8
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_022D7464: .word 0x01FF95E8
+_022D7464: .word sub_01FF95E8
 	arm_func_end ov00_022D7430
 
 	arm_func_start ov00_022D7468
diff --git a/asm/overlay_29_022DC240.s b/asm/overlay_29_022DC240.s
index fe5157a2..ac13ecaa 100644
--- a/asm/overlay_29_022DC240.s
+++ b/asm/overlay_29_022DC240.s
@@ -2608,29 +2608,29 @@ ov29_022DE4FC: ; 0x022DE4FC
 	ldr r1, [r1]
 	ldrh r4, [r1, #4]
 	bl sub_02051ED4
-	ldr r2, _022DE560 ; =0x01FF9BA0
+	ldr r2, _022DE560 ; =sub_01FF9BA0
 	mov r1, r4
 	bl ov29_022DE2C8
 	mov r0, #0
 	bl sub_0201BCCC
 	ldr r1, _022DE55C ; =ov29_02353530
-	ldr r2, _022DE564 ; =0x01FF9E14
+	ldr r2, _022DE564 ; =sub_01FF9E14
 	ldr r1, [r1]
 	ldrh r1, [r1, #2]
 	bl ov29_022DE2C8
 	mov r0, #0
 	bl sub_0201BCF4
 	ldr r1, _022DE55C ; =ov29_02353530
-	ldr r2, _022DE568 ; =0x01FF9F80
+	ldr r2, _022DE568 ; =sub_01FF9F80
 	ldr r1, [r1]
 	ldrh r1, [r1, #2]
 	bl ov29_022DE2C8
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _022DE55C: .word ov29_02353530
-_022DE560: .word 0x01FF9BA0
-_022DE564: .word 0x01FF9E14
-_022DE568: .word 0x01FF9F80
+_022DE560: .word sub_01FF9BA0
+_022DE564: .word sub_01FF9E14
+_022DE568: .word sub_01FF9F80
 	arm_func_end ov29_022DE4FC
 
 	arm_func_start ov29_022DE56C
diff --git a/lib/asm/crt0.s b/lib/asm/crt0.s
index 5d997348..ac8c02d4 100644
--- a/lib/asm/crt0.s
+++ b/lib/asm/crt0.s
@@ -76,7 +76,7 @@ _020008D4:
 	ldr r1, _02000930 ; =OS_IRQTable
 	add r1, r1, #0x3fc0
 	add r1, r1, #0x3c
-	ldr r0, _02000948 ; =0x01FF95E8
+	ldr r0, _02000948 ; =sub_01FF95E8
 	str r0, [r1]
 	bl sub_020907F0
 	bl sub_02000B98
@@ -97,7 +97,7 @@ _02000938: .word 0x05000000
 _0200093C: .word 0x07000000
 _02000940: .word _start_ModuleParams
 _02000944: .word 0x027FFF9C
-_02000948: .word 0x01FF95E8
+_02000948: .word sub_01FF95E8
 _0200094C: .word 0x02000C6C
 _02000950: .word 0xFFFF0000
 	arm_func_end _start
diff --git a/lib/asm/include/crt0.inc b/lib/asm/include/crt0.inc
index 2150dc1b..3a941168 100644
--- a/lib/asm/include/crt0.inc
+++ b/lib/asm/include/crt0.inc
@@ -5,5 +5,6 @@
 .public SDK_AUTOLOAD_START
 .public SDK_STATIC_BSS_END
 .public SDK_STATIC_BSS_START
+.public sub_01FF95E8
 .public sub_020907F0
 .public sub_020908A8