Decompile poketch resident code at 0204BE14

12 files changed, 61 insertions, 72 deletions

diff --git a/arm9/modules/05/asm/mod05_021E3340.s b/arm9/modules/05/asm/mod05_021E3340.s
index 264edb7b..8fb0d143 100644
--- a/arm9/modules/05/asm/mod05_021E3340.s
+++ b/arm9/modules/05/asm/mod05_021E3340.s
@@ -57,7 +57,7 @@ _021E33A0:
 	cmp r0, #0
 	beq _021E3414
 	ldr r0, [r5, #0xc]
-	bl FUN_0204C1A8
+	bl Sav2_Poketch_get
 	add r6, r0, #0
 	ldr r0, _021E341C ; =SDK_OVERLAY_MODULE_19_ID
 	bl UnloadOverlayByID
@@ -65,7 +65,7 @@ _021E33A0:
 	mov r1, #2
 	bl HandleLoadOverlay
 	add r0, r6, #0
-	bl FUN_0204BEB8
+	bl Sav2_Poketch_Give
 	mov r0, #1
 	bl FUN_0200A03C
 	str r0, [sp]
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index daf46f68..dabce6d4 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -21362,13 +21362,13 @@ MOD05_021EFAAC: ; 0x021EFAAC
 	sub sp, #4
 	add r5, r0, #0
 	ldr r0, [r5, #0xc]
-	bl FUN_0204C1A8
+	bl Sav2_Poketch_get
 	add r4, r0, #0
 	ldr r0, [r5, #0xc]
 	bl SavArray_Flags_get
 	add r6, r0, #0
 	add r0, r4, #0
-	bl FUN_0204BEC8
+	bl Sav2_Poketch_IsGiven
 	cmp r0, #0
 	beq _021EFAF8
 	add r0, r6, #0
@@ -21406,13 +21406,13 @@ MOD05_021EFB14: ; 0x021EFB14
 	push {r4, r5, r6, lr}
 	add r5, r0, #0
 	ldr r0, [r5, #0xc]
-	bl FUN_0204C1A8
+	bl Sav2_Poketch_get
 	add r4, r0, #0
 	ldr r0, [r5, #0xc]
 	bl SavArray_Flags_get
 	add r6, r0, #0
 	add r0, r4, #0
-	bl FUN_0204BEC8
+	bl Sav2_Poketch_IsGiven
 	cmp r0, #0
 	beq _021EFB46
 	add r0, r6, #0
@@ -21434,13 +21434,13 @@ MOD05_021EFB50: ; 0x021EFB50
 	push {r4, r5, r6, lr}
 	add r5, r0, #0
 	ldr r0, [r5, #0xc]
-	bl FUN_0204C1A8
+	bl Sav2_Poketch_get
 	add r4, r0, #0
 	ldr r0, [r5, #0xc]
 	bl SavArray_Flags_get
 	add r6, r0, #0
 	add r0, r4, #0
-	bl FUN_0204BEC8
+	bl Sav2_Poketch_IsGiven
 	cmp r0, #0
 	beq _021EFB94
 	add r0, r6, #0
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index 9c5b85ce..ba099f93 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -3805,7 +3805,7 @@ MOD11_02230F88: ; 0x02230F88
 	add r4, #0x98
 	add r1, r0, #0
 	ldr r0, [r4]
-	bl FUN_0204C104
+	bl Sav2_Poketch_PokemonHistoryAddMon
 _02230FA4:
 	pop {r4, pc}
 	.align 2, 0
diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s
index fbe1a1e2..a42eeb6f 100644
--- a/arm9/modules/20/asm/module_20.s
+++ b/arm9/modules/20/asm/module_20.s
@@ -35,7 +35,7 @@ MOD20_02252448: ; 0x02252448
 	ldr r0, [sp]
 	str r6, [r4, #0x5c]
 	str r0, [r4, #0x54]
-	bl FUN_0204C1A8
+	bl Sav2_Poketch_get
 	str r0, [r4, #0x58]
 	ldr r0, [sp, #0x18]
 	str r7, [r4, #0x4c]
@@ -114,7 +114,7 @@ _022524FC:
 	pop {r4, pc}
 _02252502:
 	ldr r0, [r4, #0x58]
-	bl FUN_0204BF84
+	bl Sav2_Poketch_GetStepCounter
 	add r1, r0, #1
 	ldr r0, _02252530 ; =0x0001869F
 	cmp r1, r0
@@ -122,7 +122,7 @@ _02252502:
 	mov r1, #0
 _02252512:
 	ldr r0, [r4, #0x58]
-	bl FUN_0204BF88
+	bl Sav2_Poketch_SetStepCounter
 	mov r0, #1
 	strb r0, [r4, #7]
 	pop {r4, pc}
@@ -295,7 +295,7 @@ _0225262E:
 	cmp r0, #0
 	beq _02252684
 	ldr r0, [r4, #0x58]
-	bl FUN_0204BF14
+	bl Sav2_Poketch_GetSelectedApp
 	add r5, r0, #0
 	add r0, r4, #0
 	add r1, r5, #0
@@ -388,7 +388,7 @@ _022526E2:
 	cmp r0, #0
 	beq _022527AA
 	ldr r0, [r4, #0x58]
-	bl FUN_0204BF1C
+	bl Sav2_Poketch_CycleNextApp
 	str r0, [r4, #0x20]
 	ldr r0, [r4, #0xc]
 	cmp r0, #0
@@ -457,7 +457,7 @@ _0225276C:
 	bne _0225278C
 _02252776:
 	ldr r0, [r4, #0x58]
-	bl FUN_0204BF1C
+	bl Sav2_Poketch_CycleNextApp
 	str r0, [r4, #0x20]
 	mov r0, #0x1e
 	str r0, [r4, #0x10]
@@ -500,7 +500,7 @@ _022527C0:
 	mov r0, #1
 	strb r0, [r4, #6]
 	ldr r0, [r4, #0x58]
-	bl FUN_0204BF14
+	bl Sav2_Poketch_GetSelectedApp
 	add r5, r0, #0
 	add r0, r4, #0
 	add r1, r5, #0
@@ -1363,7 +1363,7 @@ MOD20_02252D7C: ; 0x02252D7C
 	lsl r0, r0, #2
 	ldr r0, [r4, r0]
 	bl MOD20_02252C3C
-	bl FUN_0204BF44
+	bl Sav2_Poketch_GetScreenTint
 	mov r1, #0x62
 	lsl r1, r1, #2
 	add r5, r4, r1
@@ -1388,7 +1388,7 @@ MOD20_02252DB4: ; 0x02252DB4
 	lsl r0, r0, #2
 	ldr r0, [r4, r0]
 	bl MOD20_02252C3C
-	bl FUN_0204BF44
+	bl Sav2_Poketch_GetScreenTint
 	mov r1, #0x62
 	lsl r0, r0, #5
 	lsl r1, r1, #2
@@ -1416,7 +1416,7 @@ MOD20_02252DEC: ; 0x02252DEC
 	lsl r0, r0, #2
 	ldr r0, [r4, r0]
 	bl MOD20_02252C3C
-	bl FUN_0204BF44
+	bl Sav2_Poketch_GetScreenTint
 	mov r1, #0x62
 	lsl r1, r1, #2
 	add r1, r4, r1
@@ -2295,7 +2295,7 @@ MOD20_022534D4: ; 0x022534D4
 	ldr r0, [r5, r0]
 	add r4, r1, #0
 	bl MOD20_02252C3C
-	bl FUN_0204BF44
+	bl Sav2_Poketch_GetScreenTint
 	mov r1, #0x62
 	lsl r0, r0, #5
 	lsl r1, r1, #2
diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s
index 45536bcf..6d8828a0 100644
--- a/arm9/modules/26/asm/module_26.s
+++ b/arm9/modules/26/asm/module_26.s
@@ -90,7 +90,7 @@ MOD26_022548E8: ; 0x022548E8
 	add r4, r1, #0
 	bl MOD20_02252C3C
 	add r6, r0, #0
-	bl FUN_0204C0CC
+	bl Sav2_Poketch_DotArtistIsEnabled
 	cmp r0, #0
 	beq _0225490E
 	add r0, r5, #0
@@ -114,7 +114,7 @@ MOD26_02254918: ; 0x02254918
 	lsl r1, r1, #2
 	add r0, r2, #0
 	add r1, r5, r1
-	bl FUN_0204C0D4
+	bl Sav2_Poketch_DotArtistGetDrawing
 	mov r3, #0
 	mov r7, #0x7d
 	mov ip, r3
@@ -207,7 +207,7 @@ _0225498A:
 	lsl r2, r2, #2
 	ldr r0, [sp]
 	add r1, r1, r2
-	bl FUN_0204C0E8
+	bl Sav2_Poketch_DotArtistSetDrawingAndEnable
 	add sp, #8
 	pop {r3, r4, r5, r6, r7, pc}
 	thumb_func_end MOD26_0225496C
@@ -784,37 +784,26 @@ MOD26_02254DE4: ; 0x02254DE4
 
 	.global MOD26_02254DF0
 MOD26_02254DF0: ; 0x02254DF0
-	.byte 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x04, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x01, 0x01, 0x01, 0x01, 0x04
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x04, 0x01, 0x01, 0x01, 0x01, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x01, 0x01, 0x01, 0x04, 0x01, 0x01, 0x01, 0x01, 0x04
-	.byte 0x01, 0x01, 0x04, 0x04, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x04, 0x04, 0x01, 0x04, 0x04
-	.byte 0x04, 0x01, 0x04, 0x01, 0x01, 0x01, 0x01, 0x04, 0x01, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01
-	.byte 0x04, 0x01, 0x04, 0x01, 0x01, 0x01, 0x04, 0x01, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04
-	.byte 0x01, 0x01, 0x04, 0x04, 0x04, 0x01, 0x04, 0x04, 0x04, 0x01, 0x04, 0x04, 0x04, 0x01, 0x04, 0x01
-	.byte 0x04, 0x01, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1
+	.byte 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1
+	.byte 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 4, 1
+	.byte 1, 1, 1, 4, 1, 1, 4, 4, 4, 1, 4, 1, 4, 1, 4, 4, 4, 1, 4, 4, 4, 1, 4, 1
+	.byte 1, 1, 1, 4, 1, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 1, 1, 4, 1, 4, 1, 1, 1
+	.byte 1, 1, 1, 4, 1, 1, 4, 4, 4, 1, 4, 4, 4, 1, 4, 4, 4, 1, 4, 1, 4, 1, 4, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+	.byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
 
 	.global MOD26_02254FD0
 MOD26_02254FD0: ; 0x02254FD0
diff --git a/arm9/modules/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s
index 8bdedda5..7dcd4e3a 100644
--- a/arm9/modules/31/asm/module_31.s
+++ b/arm9/modules/31/asm/module_31.s
@@ -52,7 +52,7 @@ MOD31_0225489C: ; 0x0225489C
 	mov r0, #1
 	str r0, [r5, #8]
 	ldr r0, [r5, #0x1c]
-	bl FUN_0204BF84
+	bl Sav2_Poketch_GetStepCounter
 	str r0, [r5, #4]
 	add r0, r5, #0
 	add r0, #0xc
@@ -236,7 +236,7 @@ _022549EE:
 	cmp r0, #0
 	beq _02254A4C
 	ldr r0, [r4, #0x1c]
-	bl FUN_0204BF84
+	bl Sav2_Poketch_GetStepCounter
 	str r0, [r4, #4]
 	ldr r0, [r4, #0xc]
 	mov r1, #3
@@ -263,7 +263,7 @@ _02254A24:
 	mov r1, #0
 	str r1, [r4, #4]
 	ldr r0, [r4, #0x1c]
-	bl FUN_0204BF88
+	bl Sav2_Poketch_SetStepCounter
 	ldr r0, [r4, #0xc]
 	mov r1, #2
 	bl MOD31_02254BBC
diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s
index 90fc4ebd..713e9ec7 100644
--- a/arm9/modules/40/asm/module_40.s
+++ b/arm9/modules/40/asm/module_40.s
@@ -50,12 +50,12 @@ MOD40_0225489C: ; 0x0225489C
 	add r6, r2, #0
 	bl MOD20_02252C3C
 	str r0, [r5, #0x10]
-	bl FUN_0204BF94
+	bl Sav2_Poketch_GetAlarmState
 	strb r0, [r5, #3]
 	ldr r0, [r5, #0x10]
 	add r1, sp, #8
 	add r2, sp, #4
-	bl FUN_0204BF9C
+	bl Sav2_Poketch_GetAlarmSetTime
 	ldr r0, [sp, #8]
 	strb r0, [r5, #6]
 	ldr r0, [sp, #4]
@@ -300,7 +300,7 @@ _02254A60:
 	ldrsb r3, [r4, r3]
 	ldr r0, [r4, #0x10]
 	mov r1, #1
-	bl FUN_0204BFB0
+	bl Sav2_Poketch_SetAlarm
 	ldr r0, [r4, #8]
 	mov r1, #2
 	bl MOD40_02254F98
diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s
index 3e0b6d71..8e41c6cc 100644
--- a/arm9/modules/42/asm/module_42.s
+++ b/arm9/modules/42/asm/module_42.s
@@ -66,7 +66,7 @@ _022548BE:
 	ldr r3, [sp, #8]
 	add r1, r6, #0
 	add r2, r7, #0
-	bl FUN_0204C0A4
+	bl Sav2_Poketch_MarkingMapGetPos
 	ldrb r0, [r4, #0x10]
 	add r7, r7, #4
 	add r0, #0x10
@@ -205,7 +205,7 @@ _022549D4:
 	add r1, r4, #0
 	lsr r2, r2, #0x18
 	lsr r3, r3, #0x18
-	bl FUN_0204C080
+	bl Sav2_Poketch_MarkingMapSetPos
 	add r4, r4, #1
 	add r5, r5, #4
 	cmp r4, #6
diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s
index 5c50d9f1..bf007af4 100644
--- a/arm9/modules/44/asm/module_44.s
+++ b/arm9/modules/44/asm/module_44.s
@@ -49,7 +49,7 @@ MOD44_0225489C: ; 0x0225489C
 	add r6, r2, #0
 	bl MOD20_02252C3C
 	str r0, [r5, #0x10]
-	bl FUN_0204BF44
+	bl Sav2_Poketch_GetScreenTint
 	str r0, [r5, #4]
 	strb r0, [r5, #3]
 	add r0, r5, #0
@@ -248,7 +248,7 @@ _02254A02:
 	str r1, [r4, #4]
 	strb r1, [r4, #3]
 	ldr r0, [r4, #0x10]
-	bl FUN_0204BF58
+	bl Sav2_Poketch_SetScreenTint
 	add sp, #8
 	mov r0, #1
 	pop {r4, pc}
diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s
index e3115193..d8d9bf36 100644
--- a/arm9/modules/45/asm/module_45.s
+++ b/arm9/modules/45/asm/module_45.s
@@ -173,7 +173,7 @@ _0225499A:
 	add r0, #0x98
 	ldr r0, [r0]
 	ldr r1, [r6]
-	bl FUN_0204C064
+	bl Sav2_Poketch_CalendarDateIsHighlighted
 	strb r0, [r5, #0xf]
 	add r0, r7, r4
 	strb r0, [r5, #0xe]
@@ -362,7 +362,7 @@ _02254AB8:
 	ldr r0, [r0]
 	ldr r1, [r5, #4]
 	add r2, r4, #1
-	bl FUN_0204C064
+	bl Sav2_Poketch_CalendarDateIsHighlighted
 	cmp r0, #0
 	beq _02254B08
 	add r0, r5, #0
@@ -370,7 +370,7 @@ _02254AB8:
 	ldr r0, [r0]
 	ldr r1, [r5, #4]
 	add r2, r4, #1
-	bl FUN_0204C02C
+	bl Sav2_Poketch_CalendarDateUnhighlight
 	b _02254B16
 _02254B08:
 	add r0, r5, #0
@@ -378,7 +378,7 @@ _02254B08:
 	ldr r0, [r0]
 	ldr r1, [r5, #4]
 	add r2, r4, #1
-	bl FUN_0204BFF0
+	bl Sav2_Poketch_CalendarDateHighlight
 _02254B16:
 	add r3, r5, #0
 	add r3, #0x13
diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s
index 6527f0f7..bce289da 100644
--- a/arm9/modules/49/asm/module_49.s
+++ b/arm9/modules/49/asm/module_49.s
@@ -50,7 +50,7 @@ MOD49_0225489C: ; 0x0225489C
 	str r2, [sp, #8]
 	bl MOD20_02252C3C
 	str r0, [sp, #0xc]
-	bl FUN_0204C158
+	bl Sav2_Poketch_PokemonHistoryGetFirstEmptySlot
 	mov r6, #0
 	str r0, [r7, #0x64]
 	cmp r0, #0
@@ -63,7 +63,7 @@ _022548C0:
 	add r1, r6, #0
 	add r2, r5, #0
 	add r3, r4, #0
-	bl FUN_0204C174
+	bl Sav2_Poketch_PokemonHistoryGetSlotN
 	ldr r0, [r7, #0x64]
 	add r6, r6, #1
 	add r4, #8
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index ca96ae65..d45b6251 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -17449,7 +17449,7 @@ _02235FDE:
 	beq _02236052
 	ldr r5, [r4]
 	ldr r0, [r5, #0x20]
-	bl FUN_0204C1A8
+	bl Sav2_Poketch_get
 	ldr r1, [r5, #0x3c]
 	ldr r2, [sp, #0x24]
 	str r1, [sp]
@@ -17540,7 +17540,7 @@ _022360B6:
 	beq _02236118
 	ldr r5, [r4]
 	ldr r0, [r5, #0x20]
-	bl FUN_0204C1A8
+	bl Sav2_Poketch_get
 	ldr r1, [r5, #0x3c]
 	ldr r2, [sp, #0x28]
 	str r1, [sp]