split module 21

4 files changed, 319 insertions, 307 deletions

diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index 6eab7a85..d95024ae 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -664,7 +664,8 @@ Overlay MODULE_21
 	##Pokétch Clock##
 	After MODULE_20
 	Object module_21_sinit.o
-	Object module_21.o
+	Object mod21_02254854.o
+	Object mod21_02254A6C.o
 }
 
 Overlay MODULE_22
diff --git a/arm9/global.inc b/arm9/global.inc
index ba5cc7bf..4845852b 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -7435,6 +7435,11 @@
 .extern MOD20_02254420
 .extern MOD20_02254460
 .extern MOD20_02254488
+.extern MOD21_02254A6C
+.extern MOD21_02254B04
+.extern MOD21_02254B10
+.extern MOD21_02254B34
+.extern MOD21_02254B40
 .extern MOD51_02254A68
 .extern MOD51_02254AB8
 .extern MOD52_021D76C8
diff --git a/arm9/modules/21/asm/mod21_02254854.s b/arm9/modules/21/asm/mod21_02254854.s
new file mode 100644
index 00000000..bcbbf915
--- /dev/null
+++ b/arm9/modules/21/asm/mod21_02254854.s
@@ -0,0 +1,312 @@
+	.include "asm/macros.inc"
+	.include "global.inc"
+	.section .text
+	.balign 4, 0
+
+	thumb_func_start MOD21_02254854
+MOD21_02254854: ; 0x02254854
+	push {r3, r4, r5, r6, r7, lr}
+	add r5, r0, #0
+	add r6, r1, #0
+	mov r0, #8
+	mov r1, #0x2c
+	add r7, r2, #0
+	str r3, [sp]
+	bl AllocFromHeap
+	add r4, r0, #0
+	beq _02254892
+	ldr r3, [sp]
+	add r1, r6, #0
+	add r2, r7, #0
+	bl MOD21_0225489C
+	cmp r0, #0
+	beq _0225488C
+	ldr r0, _02254898 ; =MOD21_02254930
+	add r1, r4, #0
+	mov r2, #1
+	bl FUN_0200CA44
+	cmp r0, #0
+	beq _0225488C
+	str r4, [r5]
+	mov r0, #1
+	pop {r3, r4, r5, r6, r7, pc}
+_0225488C:
+	add r0, r4, #0
+	bl FreeToHeap
+_02254892:
+	mov r0, #0
+	pop {r3, r4, r5, r6, r7, pc}
+	nop
+_02254898: .word MOD21_02254930
+	thumb_func_end MOD21_02254854
+
+	thumb_func_start MOD21_0225489C
+MOD21_0225489C: ; 0x0225489C
+	push {r3, r4, r5, lr}
+	add r5, r0, #0
+	add r4, r1, #0
+	add r1, r5, #0
+	add r0, #0x24
+	add r1, #0x14
+	bl MOD21_02254A6C
+	cmp r0, #0
+	beq _0225490A
+	mov r1, #0
+	strb r1, [r5]
+	strb r1, [r5, #1]
+	strb r1, [r5, #2]
+	mov r0, #1
+	strb r0, [r5, #3]
+	strb r1, [r5, #6]
+	add r0, r5, #0
+	str r1, [r5, #0x20]
+	add r0, #0x14
+	bl GF_RTC_CopyTime
+	ldr r0, [r5, #0x14]
+	cmp r0, #0x18
+	blo _022548D6
+	mov r1, #0x18
+	bl _u32_div_f
+	str r1, [r5, #0x14]
+_022548D6:
+	ldr r0, [r5, #0x18]
+	cmp r0, #0x3c
+	blo _022548E6
+	ldr r0, [r5, #0x14]
+	mov r1, #0x3c
+	bl _u32_div_f
+	str r1, [r5, #0x14]
+_022548E6:
+	ldr r0, [r5, #0x18]
+	ldr r2, _02254910 ; =MOD21_02254974
+	strb r0, [r5, #5]
+	mov r0, #8
+	str r0, [sp]
+	ldr r0, _02254914 ; =MOD21_02254D80
+	mov r1, #1
+	add r3, r5, #0
+	bl MOD20_02254130
+	str r0, [r5, #0x10]
+	cmp r0, #0
+	bne _02254904
+	mov r0, #0
+	pop {r3, r4, r5, pc}
+_02254904:
+	str r4, [r5, #0x28]
+	mov r0, #1
+	pop {r3, r4, r5, pc}
+_0225490A:
+	mov r0, #0
+	pop {r3, r4, r5, pc}
+	nop
+_02254910: .word MOD21_02254974
+_02254914: .word MOD21_02254D80
+	thumb_func_end MOD21_0225489C
+
+	thumb_func_start MOD21_02254918
+MOD21_02254918: ; 0x02254918
+	push {r4, lr}
+	add r4, r0, #0
+	ldr r0, [r4, #0x24]
+	bl MOD21_02254B04
+	ldr r0, [r4, #0x10]
+	bl MOD20_02254198
+	add r0, r4, #0
+	bl FreeToHeap
+	pop {r4, pc}
+	thumb_func_end MOD21_02254918
+
+	thumb_func_start MOD21_02254930
+MOD21_02254930: ; 0x02254930
+	push {r3, r4, r5, lr}
+	add r4, r1, #0
+	add r5, r0, #0
+	ldrb r0, [r4]
+	cmp r0, #3
+	bhs _02254966
+	ldr r0, [r4, #0x28]
+	ldr r1, [r4, #0x10]
+	bl MOD20_02252C14
+	ldrb r1, [r4]
+	add r0, r4, #0
+	lsl r2, r1, #2
+	ldr r1, _02254968 ; =MOD21_02254D84
+	ldr r1, [r1, r2]
+	blx r1
+	cmp r0, #0
+	beq _02254966
+	add r0, r4, #0
+	bl MOD21_02254918
+	add r0, r5, #0
+	bl FUN_0200CAB4
+	ldr r0, [r4, #0x28]
+	bl MOD20_022529A0
+_02254966:
+	pop {r3, r4, r5, pc}
+	.align 2, 0
+_02254968: .word MOD21_02254D84
+	thumb_func_end MOD21_02254930
+
+	thumb_func_start MOD21_0225496C
+MOD21_0225496C: ; 0x0225496C
+	mov r1, #1
+	strb r1, [r0, #2]
+	bx lr
+	.align 2, 0
+	thumb_func_end MOD21_0225496C
+
+	thumb_func_start MOD21_02254974
+MOD21_02254974: ; 0x02254974
+	cmp r2, #0
+	beq _02254984
+	cmp r2, #1
+	bne _0225498C
+	mov r0, #1
+	str r0, [r3, #0x20]
+	strb r0, [r3, #6]
+	bx lr
+_02254984:
+	mov r0, #0
+	str r0, [r3, #0x20]
+	mov r0, #1
+	strb r0, [r3, #6]
+_0225498C:
+	bx lr
+	.align 2, 0
+	thumb_func_end MOD21_02254974
+
+	thumb_func_start MOD21_02254990
+MOD21_02254990: ; 0x02254990
+	ldrb r2, [r0, #2]
+	cmp r2, #0
+	bne _02254998
+	b _0225499A
+_02254998:
+	mov r1, #2
+_0225499A:
+	strb r1, [r0]
+	mov r1, #0
+	strb r1, [r0, #1]
+	bx lr
+	.align 2, 0
+	thumb_func_end MOD21_02254990
+
+	thumb_func_start MOD21_022549A4
+MOD21_022549A4: ; 0x022549A4
+	push {r4, lr}
+	add r4, r0, #0
+	ldrb r0, [r4, #1]
+	cmp r0, #0
+	beq _022549B4
+	cmp r0, #1
+	beq _022549C4
+	b _022549DE
+_022549B4:
+	ldr r0, [r4, #0x24]
+	mov r1, #0
+	bl MOD21_02254B10
+	ldrb r0, [r4, #1]
+	add r0, r0, #1
+	strb r0, [r4, #1]
+	b _022549DE
+_022549C4:
+	ldr r0, [r4, #0x24]
+	mov r1, #0
+	bl MOD21_02254B34
+	cmp r0, #0
+	beq _022549DE
+	ldr r0, [r4, #0x28]
+	bl MOD20_0225298C
+	add r0, r4, #0
+	mov r1, #1
+	bl MOD21_02254990
+_022549DE:
+	mov r0, #0
+	pop {r4, pc}
+	.align 2, 0
+	thumb_func_end MOD21_022549A4
+
+	thumb_func_start MOD21_022549E4
+MOD21_022549E4: ; 0x022549E4
+	push {r4, lr}
+	add r4, r0, #0
+	ldrb r1, [r4, #2]
+	cmp r1, #0
+	beq _022549F8
+	mov r1, #2
+	bl MOD21_02254990
+	mov r0, #0
+	pop {r4, pc}
+_022549F8:
+	ldrb r0, [r4, #6]
+	cmp r0, #0
+	beq _02254A0A
+	mov r0, #0
+	strb r0, [r4, #6]
+	ldr r0, [r4, #0x24]
+	mov r1, #2
+	bl MOD21_02254B10
+_02254A0A:
+	ldr r0, [r4, #0x24]
+	mov r1, #1
+	bl MOD21_02254B34
+	cmp r0, #0
+	beq _02254A32
+	ldr r0, [r4, #0x18]
+	strb r0, [r4, #5]
+	add r0, r4, #0
+	add r0, #0x14
+	bl GF_RTC_CopyTime
+	ldrb r1, [r4, #5]
+	ldr r0, [r4, #0x18]
+	cmp r1, r0
+	beq _02254A32
+	ldr r0, [r4, #0x24]
+	mov r1, #1
+	bl MOD21_02254B10
+_02254A32:
+	mov r0, #0
+	pop {r4, pc}
+	.align 2, 0
+	thumb_func_end MOD21_022549E4
+
+	thumb_func_start MOD21_02254A38
+MOD21_02254A38: ; 0x02254A38
+	push {r4, lr}
+	add r4, r0, #0
+	ldrb r0, [r4, #1]
+	cmp r0, #0
+	beq _02254A48
+	cmp r0, #1
+	beq _02254A58
+	b _02254A66
+_02254A48:
+	ldr r0, [r4, #0x24]
+	mov r1, #3
+	bl MOD21_02254B10
+	ldrb r0, [r4, #1]
+	add r0, r0, #1
+	strb r0, [r4, #1]
+	b _02254A66
+_02254A58:
+	ldr r0, [r4, #0x24]
+	bl MOD21_02254B40
+	cmp r0, #0
+	beq _02254A66
+	mov r0, #1
+	pop {r4, pc}
+_02254A66:
+	mov r0, #0
+	pop {r4, pc}
+	.align 2, 0
+	thumb_func_end MOD21_02254A38
+
+	.section .rodata
+
+	.global MOD21_02254D80
+MOD21_02254D80: ; 0x02254D80
+	.byte 0x10, 0xAF, 0x10, 0xCF
+
+	.global MOD21_02254D84
+MOD21_02254D84: ; 0x02254D84
+	.word MOD21_022549A4, MOD21_022549E4, MOD21_02254A38
diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/mod21_02254A6C.s
index ad12a682..88dcb27c 100644
--- a/arm9/modules/21/asm/module_21.s
+++ b/arm9/modules/21/asm/mod21_02254A6C.s
@@ -3,304 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD21_02254854
-MOD21_02254854: ; 0x02254854
-	push {r3, r4, r5, r6, r7, lr}
-	add r5, r0, #0
-	add r6, r1, #0
-	mov r0, #8
-	mov r1, #0x2c
-	add r7, r2, #0
-	str r3, [sp]
-	bl AllocFromHeap
-	add r4, r0, #0
-	beq _02254892
-	ldr r3, [sp]
-	add r1, r6, #0
-	add r2, r7, #0
-	bl MOD21_0225489C
-	cmp r0, #0
-	beq _0225488C
-	ldr r0, _02254898 ; =MOD21_02254930
-	add r1, r4, #0
-	mov r2, #1
-	bl FUN_0200CA44
-	cmp r0, #0
-	beq _0225488C
-	str r4, [r5]
-	mov r0, #1
-	pop {r3, r4, r5, r6, r7, pc}
-_0225488C:
-	add r0, r4, #0
-	bl FreeToHeap
-_02254892:
-	mov r0, #0
-	pop {r3, r4, r5, r6, r7, pc}
-	nop
-_02254898: .word MOD21_02254930
-	thumb_func_end MOD21_02254854
-
-	thumb_func_start MOD21_0225489C
-MOD21_0225489C: ; 0x0225489C
-	push {r3, r4, r5, lr}
-	add r5, r0, #0
-	add r4, r1, #0
-	add r1, r5, #0
-	add r0, #0x24
-	add r1, #0x14
-	bl MOD21_02254A6C
-	cmp r0, #0
-	beq _0225490A
-	mov r1, #0
-	strb r1, [r5]
-	strb r1, [r5, #1]
-	strb r1, [r5, #2]
-	mov r0, #1
-	strb r0, [r5, #3]
-	strb r1, [r5, #6]
-	add r0, r5, #0
-	str r1, [r5, #0x20]
-	add r0, #0x14
-	bl GF_RTC_CopyTime
-	ldr r0, [r5, #0x14]
-	cmp r0, #0x18
-	blo _022548D6
-	mov r1, #0x18
-	bl _u32_div_f
-	str r1, [r5, #0x14]
-_022548D6:
-	ldr r0, [r5, #0x18]
-	cmp r0, #0x3c
-	blo _022548E6
-	ldr r0, [r5, #0x14]
-	mov r1, #0x3c
-	bl _u32_div_f
-	str r1, [r5, #0x14]
-_022548E6:
-	ldr r0, [r5, #0x18]
-	ldr r2, _02254910 ; =MOD21_02254974
-	strb r0, [r5, #5]
-	mov r0, #8
-	str r0, [sp]
-	ldr r0, _02254914 ; =MOD21_02254D80
-	mov r1, #1
-	add r3, r5, #0
-	bl MOD20_02254130
-	str r0, [r5, #0x10]
-	cmp r0, #0
-	bne _02254904
-	mov r0, #0
-	pop {r3, r4, r5, pc}
-_02254904:
-	str r4, [r5, #0x28]
-	mov r0, #1
-	pop {r3, r4, r5, pc}
-_0225490A:
-	mov r0, #0
-	pop {r3, r4, r5, pc}
-	nop
-_02254910: .word MOD21_02254974
-_02254914: .word MOD21_02254D80
-	thumb_func_end MOD21_0225489C
-
-	thumb_func_start MOD21_02254918
-MOD21_02254918: ; 0x02254918
-	push {r4, lr}
-	add r4, r0, #0
-	ldr r0, [r4, #0x24]
-	bl MOD21_02254B04
-	ldr r0, [r4, #0x10]
-	bl MOD20_02254198
-	add r0, r4, #0
-	bl FreeToHeap
-	pop {r4, pc}
-	thumb_func_end MOD21_02254918
-
-	thumb_func_start MOD21_02254930
-MOD21_02254930: ; 0x02254930
-	push {r3, r4, r5, lr}
-	add r4, r1, #0
-	add r5, r0, #0
-	ldrb r0, [r4]
-	cmp r0, #3
-	bhs _02254966
-	ldr r0, [r4, #0x28]
-	ldr r1, [r4, #0x10]
-	bl MOD20_02252C14
-	ldrb r1, [r4]
-	add r0, r4, #0
-	lsl r2, r1, #2
-	ldr r1, _02254968 ; =MOD21_02254D84
-	ldr r1, [r1, r2]
-	blx r1
-	cmp r0, #0
-	beq _02254966
-	add r0, r4, #0
-	bl MOD21_02254918
-	add r0, r5, #0
-	bl FUN_0200CAB4
-	ldr r0, [r4, #0x28]
-	bl MOD20_022529A0
-_02254966:
-	pop {r3, r4, r5, pc}
-	.align 2, 0
-_02254968: .word MOD21_02254D84
-	thumb_func_end MOD21_02254930
-
-	thumb_func_start MOD21_0225496C
-MOD21_0225496C: ; 0x0225496C
-	mov r1, #1
-	strb r1, [r0, #2]
-	bx lr
-	.align 2, 0
-	thumb_func_end MOD21_0225496C
-
-	thumb_func_start MOD21_02254974
-MOD21_02254974: ; 0x02254974
-	cmp r2, #0
-	beq _02254984
-	cmp r2, #1
-	bne _0225498C
-	mov r0, #1
-	str r0, [r3, #0x20]
-	strb r0, [r3, #6]
-	bx lr
-_02254984:
-	mov r0, #0
-	str r0, [r3, #0x20]
-	mov r0, #1
-	strb r0, [r3, #6]
-_0225498C:
-	bx lr
-	.align 2, 0
-	thumb_func_end MOD21_02254974
-
-	thumb_func_start MOD21_02254990
-MOD21_02254990: ; 0x02254990
-	ldrb r2, [r0, #2]
-	cmp r2, #0
-	bne _02254998
-	b _0225499A
-_02254998:
-	mov r1, #2
-_0225499A:
-	strb r1, [r0]
-	mov r1, #0
-	strb r1, [r0, #1]
-	bx lr
-	.align 2, 0
-	thumb_func_end MOD21_02254990
-
-	thumb_func_start MOD21_022549A4
-MOD21_022549A4: ; 0x022549A4
-	push {r4, lr}
-	add r4, r0, #0
-	ldrb r0, [r4, #1]
-	cmp r0, #0
-	beq _022549B4
-	cmp r0, #1
-	beq _022549C4
-	b _022549DE
-_022549B4:
-	ldr r0, [r4, #0x24]
-	mov r1, #0
-	bl MOD21_02254B10
-	ldrb r0, [r4, #1]
-	add r0, r0, #1
-	strb r0, [r4, #1]
-	b _022549DE
-_022549C4:
-	ldr r0, [r4, #0x24]
-	mov r1, #0
-	bl MOD21_02254B34
-	cmp r0, #0
-	beq _022549DE
-	ldr r0, [r4, #0x28]
-	bl MOD20_0225298C
-	add r0, r4, #0
-	mov r1, #1
-	bl MOD21_02254990
-_022549DE:
-	mov r0, #0
-	pop {r4, pc}
-	.align 2, 0
-	thumb_func_end MOD21_022549A4
-
-	thumb_func_start MOD21_022549E4
-MOD21_022549E4: ; 0x022549E4
-	push {r4, lr}
-	add r4, r0, #0
-	ldrb r1, [r4, #2]
-	cmp r1, #0
-	beq _022549F8
-	mov r1, #2
-	bl MOD21_02254990
-	mov r0, #0
-	pop {r4, pc}
-_022549F8:
-	ldrb r0, [r4, #6]
-	cmp r0, #0
-	beq _02254A0A
-	mov r0, #0
-	strb r0, [r4, #6]
-	ldr r0, [r4, #0x24]
-	mov r1, #2
-	bl MOD21_02254B10
-_02254A0A:
-	ldr r0, [r4, #0x24]
-	mov r1, #1
-	bl MOD21_02254B34
-	cmp r0, #0
-	beq _02254A32
-	ldr r0, [r4, #0x18]
-	strb r0, [r4, #5]
-	add r0, r4, #0
-	add r0, #0x14
-	bl GF_RTC_CopyTime
-	ldrb r1, [r4, #5]
-	ldr r0, [r4, #0x18]
-	cmp r1, r0
-	beq _02254A32
-	ldr r0, [r4, #0x24]
-	mov r1, #1
-	bl MOD21_02254B10
-_02254A32:
-	mov r0, #0
-	pop {r4, pc}
-	.align 2, 0
-	thumb_func_end MOD21_022549E4
-
-	thumb_func_start MOD21_02254A38
-MOD21_02254A38: ; 0x02254A38
-	push {r4, lr}
-	add r4, r0, #0
-	ldrb r0, [r4, #1]
-	cmp r0, #0
-	beq _02254A48
-	cmp r0, #1
-	beq _02254A58
-	b _02254A66
-_02254A48:
-	ldr r0, [r4, #0x24]
-	mov r1, #3
-	bl MOD21_02254B10
-	ldrb r0, [r4, #1]
-	add r0, r0, #1
-	strb r0, [r4, #1]
-	b _02254A66
-_02254A58:
-	ldr r0, [r4, #0x24]
-	bl MOD21_02254B40
-	cmp r0, #0
-	beq _02254A66
-	mov r0, #1
-	pop {r4, pc}
-_02254A66:
-	mov r0, #0
-	pop {r4, pc}
-	.align 2, 0
-	thumb_func_end MOD21_02254A38
-
 	thumb_func_start MOD21_02254A6C
 MOD21_02254A6C: ; 0x02254A6C
 	push {r4, r5, r6, lr}
@@ -711,14 +413,6 @@ _02254D7C: .word 0x040002A8
 
 	.section .rodata
 
-	.global MOD21_02254D80
-MOD21_02254D80: ; 0x02254D80
-	.byte 0x10, 0xAF, 0x10, 0xCF
-
-	.global MOD21_02254D84
-MOD21_02254D84: ; 0x02254D84
-	.word MOD21_022549A4, MOD21_022549E4, MOD21_02254A38
-
 	.global MOD21_02254D90
 MOD21_02254D90: ; 0x02254D90
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00