Merge branch 'master' of https://github.com/pret/pokediamond

19 files changed, 872 insertions, 514 deletions

diff --git a/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s b/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s
index 2d51a2ae..a083bf2e 100644
--- a/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s
+++ b/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s
@@ -1,11 +1,11 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
 
-	.extern UNK_021C570C
-	.extern UNK_021C5734
+.section .text
+
+glabel GenerateFontHalfRowLookupTable
+
+.extern UNK_021C570C
+.extern UNK_021C5734
 
-	thumb_func_start GenerateFontHalfRowLookupTable
-GenerateFontHalfRowLookupTable: ; 0x0201C05C
 	push {r3-r7, lr}
 	sub sp, #0x30
 	ldr r3, _0201C0F8 ; =UNK_021C570C
diff --git a/arm9/asm/unk_02024E64.s b/arm9/asm/unk_02024E64.s
deleted file mode 100644
index 0234a504..00000000
--- a/arm9/asm/unk_02024E64.s
+++ /dev/null
@@ -1,118 +0,0 @@
-	.include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02024E64
-FUN_02024E64: ; 0x02024E64
-	ldr r0, _02024E68 ; =0x0000074C
-	bx lr
-	.balign 4
-_02024E68: .word 0x0000074C
-
-	thumb_func_start FUN_02024E6C
-FUN_02024E6C: ; 0x02024E6C
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r2, _02024EA4 ; =0x0000074C
-	mov r0, #0x0
-	add r1, r4, #0x0
-	bl MIi_CpuClearFast
-	add r0, r4, #0x0
-	bl FUN_020250A4
-	mov r0, #0x7
-	lsl r0, r0, #0x8
-	add r0, r4, r0
-	bl FUN_02025484
-	ldr r1, _02024EA8 ; =0x00000724
-	ldr r0, _02024EAC ; =0x0000FFFF
-	add r1, r4, r1
-	mov r2, #0x8
-	bl MIi_CpuClear16
-	ldr r1, _02024EB0 ; =0x00000734
-	ldr r0, _02024EAC ; =0x0000FFFF
-	add r1, r4, r1
-	mov r2, #0xb
-	bl MIi_CpuClear16
-	pop {r4, pc}
-	.balign 4
-_02024EA4: .word 0x0000074C
-_02024EA8: .word 0x00000724
-_02024EAC: .word 0x0000FFFF
-_02024EB0: .word 0x00000734
-
-	thumb_func_start FUN_02024EB4
-FUN_02024EB4: ; 0x02024EB4
-	ldr r3, _02024EBC ; =SavArray_get
-	mov r1, #0xa
-	bx r3
-	nop
-_02024EBC: .word SavArray_get
-
-	thumb_func_start FUN_02024EC0
-FUN_02024EC0: ; 0x02024EC0
-	ldr r3, _02024EC8 ; =FUN_02022634
-	mov r1, #0xa
-	bx r3
-	nop
-_02024EC8: .word FUN_02022634
-
-	thumb_func_start FUN_02024ECC
-FUN_02024ECC: ; 0x02024ECC
-	ldr r3, _02024ED4 ; =SavArray_get
-	mov r1, #0xa
-	bx r3
-	nop
-_02024ED4: .word SavArray_get
-
-	thumb_func_start FUN_02024ED8
-FUN_02024ED8: ; 0x02024ED8
-	push {r3, lr}
-	mov r1, #0xa
-	bl SavArray_get
-	mov r1, #0x7
-	lsl r1, r1, #0x8
-	add r0, r0, r1
-	pop {r3, pc}
-
-	thumb_func_start FUN_02024EE8
-FUN_02024EE8: ; 0x02024EE8
-	ldr r1, _02024EF0 ; =0x00000724
-	add r0, r0, r1
-	bx lr
-	nop
-_02024EF0: .word 0x00000724
-
-	thumb_func_start FUN_02024EF4
-FUN_02024EF4: ; 0x02024EF4
-	add r2, r0, #0x0
-	add r0, r1, #0x0
-	ldr r1, _02024F04 ; =0x00000724
-	ldr r3, _02024F08 ; =CopyStringToU16Array
-	add r1, r2, r1
-	mov r2, #0x8
-	bx r3
-	nop
-_02024F04: .word 0x00000724
-_02024F08: .word CopyStringToU16Array
-
-	thumb_func_start FUN_02024F0C
-FUN_02024F0C: ; 0x02024F0C
-	ldr r1, _02024F14 ; =0x00000734
-	add r0, r0, r1
-	bx lr
-	nop
-_02024F14: .word 0x00000734
-
-	thumb_func_start FUN_02024F18
-FUN_02024F18: ; 0x02024F18
-	add r2, r0, #0x0
-	add r0, r1, #0x0
-	ldr r1, _02024F28 ; =0x00000734
-	ldr r3, _02024F2C ; =CopyStringToU16Array
-	add r1, r2, r1
-	mov r2, #0xb
-	bx r3
-	nop
-_02024F28: .word 0x00000734
-_02024F2C: .word CopyStringToU16Array
diff --git a/arm9/asm/unk_0204AEA8.s b/arm9/asm/unk_0204AEA8.s
deleted file mode 100644
index 018a64e2..00000000
--- a/arm9/asm/unk_0204AEA8.s
+++ /dev/null
@@ -1,67 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_0204AEA8
-FUN_0204AEA8: ; 0x0204AEA8
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	bl FUN_02046528
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl FUN_0204652C
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	cmp r1, #0x0
-	beq _0204AEC6
-	cmp r1, #0x1
-	beq _0204AEE6
-	b _0204AEF4
-_0204AEC6:
-	ldr r0, [r4, #0x8]
-	add r1, r5, #0x0
-	add r2, r4, #0x4
-	bl MOD05_021E3444
-	ldr r1, [r4, #0xc]
-	mov r0, #0x5
-	lsl r1, r1, #0x10
-	lsr r1, r1, #0x10
-	mov r2, #0x1
-	bl FUN_0200433C
-	ldr r0, [r4, #0x0]
-	add r0, r0, #0x1
-	str r0, [r4, #0x0]
-	b _0204AEF4
-_0204AEE6:
-	ldr r1, [r4, #0x4]
-	cmp r1, #0x1
-	bne _0204AEF4
-	bl FreeToHeap
-	mov r0, #0x1
-	pop {r3-r5, pc}
-_0204AEF4:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_0204AEF8
-FUN_0204AEF8: ; 0x0204AEF8
-	push {r4-r6, lr}
-	add r6, r0, #0x0
-	add r5, r1, #0x0
-	mov r0, #0xb
-	mov r1, #0x10
-	add r4, r2, #0x0
-	bl AllocFromHeapAtEnd
-	add r2, r0, #0x0
-	mov r0, #0x0
-	str r0, [r2, #0x0]
-	str r0, [r2, #0x4]
-	str r5, [r2, #0x8]
-	ldr r1, _0204AF20 ; =FUN_0204AEA8
-	add r0, r6, #0x0
-	str r4, [r2, #0xc]
-	bl FUN_0204640C
-	pop {r4-r6, pc}
-	nop
-_0204AF20: .word FUN_0204AEA8
diff --git a/arm9/global.inc b/arm9/global.inc
index ca70f69b..c0bd9b5f 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -1582,8 +1582,8 @@
 .extern FUN_02024EC0
 .extern FUN_02024ECC
 .extern FUN_02024ED8
-.extern FUN_02024EE8
-.extern FUN_02024EF4
+.extern GetRivalNamePtr
+.extern RivalsNameToU16Array
 .extern FUN_02024F0C
 .extern FUN_02024F18
 .extern Options_new
diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s
deleted file mode 100644
index 22824930..00000000
--- a/arm9/modules/52/asm/module_52.s
+++ /dev/null
@@ -1,293 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-	.section .text
-	.balign 4, 0
-
-	thumb_func_start MOD52_021D74E0
-MOD52_021D74E0: ; 0x021D74E0
-	push {r3, lr}
-	mov r2, #2
-	mov r0, #3
-	mov r1, #0x4d
-	lsl r2, r2, #0x10
-	bl FUN_0201681C
-	bl InitializeMainRNG
-	mov r0, #1
-	pop {r3, pc}
-	.align 2, 0
-	thumb_func_end MOD52_021D74E0
-
-	thumb_func_start MOD52_021D74F8
-MOD52_021D74F8: ; 0x021D74F8
-	push {r3, lr}
-	bl OverlayManager_GetField18
-	ldr r1, [r0, #8]
-	mov r0, #0x4d
-	bl MOD52_021D769C
-	mov r0, #1
-	pop {r3, pc}
-	.align 2, 0
-	thumb_func_end MOD52_021D74F8
-
-	thumb_func_start MOD52_021D750C
-MOD52_021D750C: ; 0x021D750C
-	push {r3, lr}
-	mov r0, #0x4d
-	bl FUN_020168D0
-	mov r0, #0
-	ldr r1, _021D7524 ; =UNK_020FD144
-	mvn r0, r0
-	bl RegisterMainOverlay
-	mov r0, #1
-	pop {r3, pc}
-	nop
-_021D7524: .word UNK_020FD144
-	thumb_func_end MOD52_021D750C
-
-	thumb_func_start MOD52_021D7528
-MOD52_021D7528: ; 0x021D7528
-	push {r3, lr}
-	mov r2, #2
-	mov r0, #3
-	mov r1, #0x4d
-	lsl r2, r2, #0x10
-	bl FUN_0201681C
-	bl InitializeMainRNG
-	mov r0, #1
-	pop {r3, pc}
-	.align 2, 0
-	thumb_func_end MOD52_021D7528
-
-	thumb_func_start MOD52_021D7540
-MOD52_021D7540: ; 0x021D7540
-	push {r4, lr}
-	bl OverlayManager_GetField18
-	ldr r4, [r0, #8]
-	mov r0, #0x4d
-	add r1, r4, #0
-	mov r2, #1
-	bl MOD52_021D7604
-	add r0, r4, #0
-	bl Sav2_PlayerData_GetIGTAddr
-	bl FUN_02015E3C
-	mov r0, #1
-	pop {r4, pc}
-	thumb_func_end MOD52_021D7540
-
-	thumb_func_start MOD52_021D7560
-MOD52_021D7560: ; 0x021D7560
-	push {r3, lr}
-	mov r0, #0x4d
-	bl FUN_020168D0
-	mov r0, #0
-	ldr r1, _021D7578 ; =UNK_020F2B7C
-	mvn r0, r0
-	bl RegisterMainOverlay
-	mov r0, #1
-	pop {r3, pc}
-	nop
-_021D7578: .word UNK_020F2B7C
-	thumb_func_end MOD52_021D7560
-
-	thumb_func_start MOD52_021D757C
-MOD52_021D757C: ; 0x021D757C
-	push {r3, lr}
-	mov r2, #2
-	mov r0, #3
-	mov r1, #0x4d
-	lsl r2, r2, #0x10
-	bl FUN_0201681C
-	bl InitializeMainRNG
-	mov r0, #1
-	pop {r3, pc}
-	.align 2, 0
-	thumb_func_end MOD52_021D757C
-
-	thumb_func_start MOD52_021D7594
-MOD52_021D7594: ; 0x021D7594
-	push {r3, r4, r5, lr}
-	bl OverlayManager_GetField18
-	ldr r4, [r0, #8]
-	add r0, r4, #0
-	bl Sav2_SysInfo_get
-	add r5, r0, #0
-	mov r0, #0x4d
-	add r1, r4, #0
-	bl MOD52_021D7688
-	add r0, r4, #0
-	mov r1, #0
-	bl Options_SetButtonModeOnMain
-	add r0, r5, #0
-	bl Sav2_SysInfo_MacAddressIsMine
-	cmp r0, #0
-	beq _021D75C8
-	add r0, r5, #0
-	bl Sav2_SysInfo_RTCOffsetIsMine
-	cmp r0, #0
-	bne _021D75D8
-_021D75C8:
-	add r0, r4, #0
-	bl Sav2_SysInfo_RTC_get
-	bl FUN_020238A4
-	add r0, r5, #0
-	bl Sav2_SysInfo_InitFromSystem
-_021D75D8:
-	add r0, r4, #0
-	bl Sav2_PlayerData_GetIGTAddr
-	bl FUN_02015E3C
-	mov r0, #1
-	pop {r3, r4, r5, pc}
-	.align 2, 0
-	thumb_func_end MOD52_021D7594
-
-	thumb_func_start MOD52_021D75E8
-MOD52_021D75E8: ; 0x021D75E8
-	push {r3, lr}
-	mov r0, #0x4d
-	bl FUN_020168D0
-	mov r0, #0
-	ldr r1, _021D7600 ; =UNK_020F2B8C
-	mvn r0, r0
-	bl RegisterMainOverlay
-	mov r0, #1
-	pop {r3, pc}
-	nop
-_021D7600: .word UNK_020F2B8C
-	thumb_func_end MOD52_021D75E8
-
-	thumb_func_start MOD52_021D7604
-MOD52_021D7604: ; 0x021D7604
-	push {r3, r4, r5, r6, r7, lr}
-	add r5, r1, #0
-	str r0, [sp]
-	add r0, r5, #0
-	add r6, r2, #0
-	bl Sav2_SysInfo_get
-	bl Sav2_SysInfo_InitFromSystem
-	add r0, r5, #0
-	bl Sav2_SysInfo_RTC_get
-	bl Sav2_SysInfo_RTC_init
-	add r0, r5, #0
-	bl FUN_0202881C
-	add r4, r0, #0
-	bl MTRandom
-	add r2, r0, #0
-	add r0, r4, #0
-	mov r1, #1
-	bl FUN_02028788
-	add r0, r5, #0
-	bl FUN_0206007C
-	add r0, r5, #0
-	bl Sav2_PlayerData_GetProfileAddr
-	add r4, r0, #0
-	bl MTRandom
-	add r7, r0, #0
-	cmp r6, #0
-	beq _021D7656
-	add r0, r4, #0
-	add r1, r7, #0
-	bl PlayerProfile_SetTrainerID
-_021D7656:
-	add r0, r4, #0
-	bl PlayerProfile_GetTrainerGender
-	add r1, r0, #0
-	add r0, r7, #0
-	mov r2, #0
-	bl FUN_02053678
-	add r1, r0, #0
-	lsl r1, r1, #0x18
-	add r0, r4, #0
-	lsr r1, r1, #0x18
-	bl PlayerProfile_SetAvatar
-	add r0, r5, #0
-	bl FUN_02024ECC
-	ldr r1, [sp]
-	ldr r2, _021D7684 ; =0x021D76F8
-	mov r3, #0x76
-	bl FUN_020250C4
-	pop {r3, r4, r5, r6, r7, pc}
-	.align 2, 0
-_021D7684: .word MOD52_021D76F8
-	thumb_func_end MOD52_021D7604
-
-	thumb_func_start MOD52_021D7688
-MOD52_021D7688: ; 0x021D7688
-	push {r3, lr}
-	add r0, r1, #0
-	bl FUN_020226FC
-	cmp r0, #0
-	bne _021D769A
-	mov r0, #0
-	bl OS_ResetSystem
-_021D769A:
-	pop {r3, pc}
-	thumb_func_end MOD52_021D7688
-
-	thumb_func_start MOD52_021D769C
-MOD52_021D769C: ; 0x021D769C
-	push {r4, lr}
-	add r4, r1, #0
-	add r0, r4, #0
-	bl Sav2_InitDynamicRegion
-	add r0, r4, #0
-	bl FUN_020377E0
-	add r0, r4, #0
-	bl Sav2_PlayerData_GetProfileAddr
-	ldr r1, _021D76C4 ; =0x00000BB8
-	bl PlayerProfile_SetMoney
-	add r0, r4, #0
-	bl SavArray_Flags_get
-	bl FUN_0205ECD4
-	pop {r4, pc}
-	.align 2, 0
-_021D76C4: .word 0x00000BB8
-	thumb_func_end MOD52_021D769C
-
-	.rodata
-	.global MOD52_021D76C8
-MOD52_021D76C8: ; 0x021D76C8
-	.word MOD52_021D757C, MOD52_021D7594, MOD52_021D75E8, 0xFFFFFFFF
-
-	.global MOD52_021D76D8
-MOD52_021D76D8: ; 0x021D76D8
-	.word MOD52_021D7528, MOD52_021D7540, MOD52_021D7560, 0xFFFFFFFF
-
-	.global MOD52_021D76E8
-MOD52_021D76E8: ; 0x021D76E8
-	.word MOD52_021D74E0, MOD52_021D74F8, MOD52_021D750C, 0xFFFFFFFF
-
-	.global MOD52_021D76F8
-MOD52_021D76F8: ; 0x021D76F8
-	.byte 0x9B, 0x00, 0x01, 0x00, 0x95, 0x00, 0x01, 0x00, 0x96, 0x00, 0x01, 0x00, 0x97, 0x00, 0x01, 0x00
-	.byte 0x9B, 0x00, 0x01, 0x00, 0x97, 0x00, 0x01, 0x00, 0xA4, 0x00, 0x02, 0x00, 0xA5, 0x00, 0x02, 0x00
-	.byte 0x95, 0x00, 0x01, 0x00, 0x9B, 0x00, 0x02, 0x00, 0x9E, 0x00, 0x01, 0x00, 0xA7, 0x00, 0x02, 0x00
-	.byte 0xA7, 0x00, 0x02, 0x00, 0xAA, 0x00, 0x01, 0x00, 0x95, 0x00, 0x01, 0x00, 0x97, 0x00, 0x01, 0x00
-	.byte 0x9B, 0x00, 0x01, 0x00, 0x9B, 0x00, 0x01, 0x00, 0x98, 0x00, 0x01, 0x00, 0x98, 0x00, 0x01, 0x00
-	.byte 0xA4, 0x00, 0x01, 0x00, 0xA4, 0x00, 0x01, 0x00, 0x95, 0x00, 0x01, 0x00, 0x9B, 0x00, 0x01, 0x00
-	.byte 0x9B, 0x00, 0x01, 0x00, 0xA5, 0x00, 0x01, 0x00, 0xA6, 0x00, 0x02, 0x00, 0xA4, 0x00, 0x02, 0x00
-	.byte 0xA5, 0x00, 0x02, 0x00, 0xA8, 0x00, 0x02, 0x00, 0x9A, 0x00, 0x01, 0x00, 0x96, 0x00, 0x01, 0x00
-	.byte 0xA4, 0x00, 0x01, 0x00, 0xA4, 0x00, 0x01, 0x00, 0x9C, 0x00, 0x01, 0x00, 0xA6, 0x00, 0x01, 0x00
-	.byte 0xA6, 0x00, 0x01, 0x00, 0x9F, 0x00, 0x01, 0x00, 0x99, 0x00, 0x01, 0x00, 0x99, 0x00, 0x01, 0x00
-	.byte 0xA4, 0x00, 0x01, 0x00, 0xA8, 0x00, 0x01, 0x00, 0x9E, 0x00, 0x01, 0x00, 0x96, 0x00, 0x01, 0x00
-	.byte 0xA0, 0x00, 0x01, 0x00, 0xA2, 0x00, 0x01, 0x00, 0x97, 0x00, 0x01, 0x00, 0x99, 0x00, 0x01, 0x00
-	.byte 0xA3, 0x00, 0x01, 0x00, 0xAD, 0x00, 0x01, 0x00, 0x9E, 0x00, 0x01, 0x00, 0x99, 0x00, 0x01, 0x00
-	.byte 0xAE, 0x00, 0x01, 0x00, 0x9D, 0x00, 0x01, 0x00, 0x97, 0x00, 0x01, 0x00, 0xA8, 0x00, 0x01, 0x00
-	.byte 0xA8, 0x00, 0x01, 0x00, 0xA8, 0x00, 0x01, 0x00, 0x9C, 0x00, 0x01, 0x00, 0x9C, 0x00, 0x01, 0x00
-	.byte 0xA6, 0x00, 0x01, 0x00, 0xA6, 0x00, 0x01, 0x00, 0xA2, 0x00, 0x01, 0x00, 0xA3, 0x00, 0x01, 0x00
-	.byte 0x98, 0x00, 0x01, 0x00, 0x98, 0x00, 0x01, 0x00, 0x95, 0x00, 0x01, 0x00, 0x9E, 0x00, 0x01, 0x00
-	.byte 0x96, 0x00, 0x01, 0x00, 0xA9, 0x00, 0x01, 0x00, 0x97, 0x00, 0x02, 0x00, 0xA5, 0x00, 0x02, 0x00
-	.byte 0xA0, 0x00, 0x01, 0x00, 0xA1, 0x00, 0x01, 0x00, 0x98, 0x00, 0x01, 0x00, 0x9C, 0x00, 0x01, 0x00
-	.byte 0x9F, 0x00, 0x01, 0x00, 0xA8, 0x00, 0x02, 0x00, 0x9A, 0x00, 0x01, 0x00, 0x97, 0x00, 0x01, 0x00
-	.byte 0xA1, 0x00, 0x01, 0x00, 0xAC, 0x00, 0x01, 0x00, 0xA0, 0x00, 0x02, 0x00, 0xA1, 0x00, 0x02, 0x00
-	.byte 0xA2, 0x00, 0x02, 0x00, 0xAB, 0x00, 0x01, 0x00, 0x9E, 0x00, 0x02, 0x00, 0xA5, 0x00, 0x03, 0x00
-	.byte 0xA6, 0x00, 0x03, 0x00, 0xA7, 0x00, 0x03, 0x00, 0xA9, 0x00, 0x01, 0x00, 0xA9, 0x00, 0x01, 0x00
-	.byte 0xAC, 0x00, 0x02, 0x00, 0xAC, 0x00, 0x02, 0x00, 0xAA, 0x00, 0x01, 0x00, 0xAA, 0x00, 0x01, 0x00
-	.byte 0xAE, 0x00, 0x01, 0x00, 0xAE, 0x00, 0x01, 0x00, 0xAB, 0x00, 0x01, 0x00, 0xAB, 0x00, 0x01, 0x00
-	.byte 0xA9, 0x00, 0x01, 0x00, 0xA9, 0x00, 0x01, 0x00, 0xAC, 0x00, 0x01, 0x00, 0xAC, 0x00, 0x01, 0x00
-	.byte 0xAE, 0x00, 0x01, 0x00, 0xAE, 0x00, 0x01, 0x00, 0xAD, 0x00, 0x01, 0x00, 0xAD, 0x00, 0x01, 0x00
-	.byte 0xAB, 0x00, 0x01, 0x00, 0xAB, 0x00, 0x01, 0x00, 0x9D, 0x00, 0x01, 0x00, 0x9A, 0x00, 0x01, 0x00
-	.byte 0xAB, 0x00, 0x02, 0x00, 0xAD, 0x00, 0x02, 0x00, 0xAA, 0x00, 0x02, 0x00, 0xAA, 0x00, 0x02, 0x00
-	.byte 0xAD, 0x00, 0x01, 0x00, 0xAD, 0x00, 0x01, 0x00
-
-	.data
-	.bss
diff --git a/arm9/modules/52/include/module_52.h b/arm9/modules/52/include/module_52.h
new file mode 100644
index 00000000..4c47a82d
--- /dev/null
+++ b/arm9/modules/52/include/module_52.h
@@ -0,0 +1,42 @@
+#ifndef POKEDIAMOND_MODULE_52_H
+#define POKEDIAMOND_MODULE_52_H
+
+#include "global.h"
+#include "event_data.h"
+#include "main.h"
+#include "math_util.h"
+#include "options.h"
+#include "overlay_manager.h"
+#include "player_data.h"
+#include "sav_system_info.h"
+#include "save_block_2.h"
+#include "unk_02024E64.h"
+#include "unk_020286F8.h"
+
+const u8 MOD52_021D76F8[];
+
+THUMB_FUNC int MOD52_021D74E0();
+THUMB_FUNC int MOD52_021D74F8(struct UnkStruct_02006234 *param0);
+THUMB_FUNC int MOD52_021D750C();
+
+THUMB_FUNC int MOD52_021D7528();
+THUMB_FUNC int MOD52_021D7540(struct UnkStruct_02006234 *param0);
+THUMB_FUNC int MOD52_021D7560();
+
+THUMB_FUNC int MOD52_021D757C();
+THUMB_FUNC int MOD52_021D7594(struct UnkStruct_02006234 *param0);
+THUMB_FUNC int MOD52_021D75E8();
+
+THUMB_FUNC void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_trainerid);
+THUMB_FUNC void MOD52_021D7688(u32 param0, struct SaveBlock2 *sav2);
+THUMB_FUNC void MOD52_021D769C(u32 param0, struct SaveBlock2 *sav2);
+
+struct MOD52_Struct
+{
+    int (*func1)(void);
+    int (*func2)(struct UnkStruct_02006234 *param0);
+    int (*func3)(void);
+    u32 terminator;
+};
+
+#endif // POKEDIAMOND_MODULE_52_H
\ No newline at end of file
diff --git a/arm9/modules/52/src/module_52.c b/arm9/modules/52/src/module_52.c
new file mode 100644
index 00000000..8b00f613
--- /dev/null
+++ b/arm9/modules/52/src/module_52.c
@@ -0,0 +1,647 @@
+#include "module_52.h"
+
+extern struct Unk21DBE18 UNK_020FD144;
+extern struct Unk21DBE18 UNK_020F2B7C;
+extern struct Unk21DBE18 UNK_020F2B8C;
+
+extern void FUN_0201681C(u32 param0, u32 heap_id, u32 param2);
+extern int FUN_020168D0(u32 heap_id);
+extern void FUN_02015E3C(struct IGT *igt);
+extern void FUN_0206007C(struct SaveBlock2 *sav2);
+extern int FUN_02053678(u32 random, u32 gender, u32 param2);
+extern void FUN_020250C4(void *sav_ptr, u32 heap_id, const u8 param2[], u32 param3);
+extern void FUN_020377E0(struct SaveBlock2 *sav2);
+extern void FUN_0205ECD4(struct ScriptState *script_state);
+
+THUMB_FUNC int MOD52_021D74E0()
+{
+    FUN_0201681C(3, 0x4d, 2 << 16);
+    InitializeMainRNG();
+
+    return 1;
+}
+
+THUMB_FUNC int MOD52_021D74F8(struct UnkStruct_02006234 *param0)
+{
+    struct SaveBlock2 *sav2 = (struct SaveBlock2 *)OverlayManager_GetField18(param0)[2]; // weird
+
+    MOD52_021D769C(0x4d, sav2);
+
+    return 1;
+}
+
+THUMB_FUNC int MOD52_021D750C()
+{
+    FUN_020168D0(0x4d);
+    RegisterMainOverlay(0XFFFFFFFF, &UNK_020FD144);
+
+    return 1;
+}
+
+THUMB_FUNC int MOD52_021D7528()
+{
+    FUN_0201681C(3, 0x4d, 2 << 16);
+    InitializeMainRNG();
+
+    return 1;
+}
+
+THUMB_FUNC int MOD52_021D7540(struct UnkStruct_02006234 *param0)
+{
+    struct SaveBlock2 *sav2 = (struct SaveBlock2 *)OverlayManager_GetField18(param0)[2]; // weird
+
+    MOD52_021D7604(0x4d, sav2, 1);
+    struct IGT *igt = Sav2_PlayerData_GetIGTAddr(sav2);
+    FUN_02015E3C(igt);
+
+    return 1;
+}
+
+THUMB_FUNC int MOD52_021D7560()
+{
+    FUN_020168D0(0x4d);
+    RegisterMainOverlay(0xFFFFFFFF, &UNK_020F2B7C);
+
+    return 1;
+}
+
+THUMB_FUNC int MOD52_021D757C()
+{
+    FUN_0201681C(3, 0x4d, 2 << 16);
+    InitializeMainRNG();
+
+    return 1;
+}
+
+THUMB_FUNC int MOD52_021D7594(struct UnkStruct_02006234 *param0)
+{
+    struct SaveBlock2 *sav2 = (struct SaveBlock2 *)OverlayManager_GetField18(param0)[2]; // weird
+
+    struct SavSysInfo *sav2_info = Sav2_SysInfo_get(sav2);
+
+    MOD52_021D7688(0x4d, sav2);
+    Options_SetButtonModeOnMain(sav2, 0);
+
+    if (!Sav2_SysInfo_MacAddressIsMine(sav2_info) || !Sav2_SysInfo_RTCOffsetIsMine(sav2_info))
+    {
+        FUN_020238A4(Sav2_SysInfo_RTC_get(sav2));
+        Sav2_SysInfo_InitFromSystem(sav2_info);
+    }
+
+    FUN_02015E3C(Sav2_PlayerData_GetIGTAddr(sav2));
+
+    return 1;
+}
+
+THUMB_FUNC int MOD52_021D75E8()
+{
+    FUN_020168D0(0x4d);
+    RegisterMainOverlay(0XFFFFFFFF, &UNK_020F2B8C);
+
+    return 1;
+}
+
+THUMB_FUNC void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_trainerid)
+{
+    Sav2_SysInfo_InitFromSystem(Sav2_SysInfo_get(sav2));
+    Sav2_SysInfo_RTC_init(Sav2_SysInfo_RTC_get(sav2));
+
+    struct UnkSaveStruct_020286F8 *unk_sav2 = FUN_0202881C(sav2);
+
+    FUN_02028788(unk_sav2, 1, MTRandom());
+    FUN_0206007C(sav2);
+
+    struct PlayerData *player_data = Sav2_PlayerData_GetProfileAddr(sav2);
+    u32 trainerid = MTRandom();
+
+    if (set_trainerid)
+    {
+        PlayerProfile_SetTrainerID(player_data, trainerid);
+    }
+
+    u32 gender = PlayerProfile_GetTrainerGender(player_data);
+    int avatar = FUN_02053678(trainerid, gender, 0);
+
+    PlayerProfile_SetAvatar(player_data, (u8)avatar);
+
+    FUN_020250C4(FUN_02024ECC(sav2), heap_id, MOD52_021D76F8, 0x76);
+}
+
+THUMB_FUNC void MOD52_021D7688(u32 unused, struct SaveBlock2 *sav2)
+{
+#pragma unused(unused)
+
+    if (FUN_020226FC(sav2))
+    {
+        return;
+    }
+
+    OS_ResetSystem(0);
+}
+
+THUMB_FUNC void MOD52_021D769C(u32 unused, struct SaveBlock2 *sav2)
+{
+#pragma unused(unused)
+
+    Sav2_InitDynamicRegion(sav2);
+    FUN_020377E0(sav2);
+    struct PlayerData *player_data = Sav2_PlayerData_GetProfileAddr(sav2);
+    PlayerProfile_SetMoney(player_data, 3000);
+    FUN_0205ECD4(SavArray_Flags_get(sav2));
+}
+
+const struct MOD52_Struct MOD52_021D76C8 = {
+    MOD52_021D757C,
+    MOD52_021D7594,
+    MOD52_021D75E8,
+    0xFFFFFFFF,
+};
+
+const struct MOD52_Struct MOD52_021D76D8 = {
+    MOD52_021D7528,
+    MOD52_021D7540,
+    MOD52_021D7560,
+    0xFFFFFFFF,
+};
+
+const struct MOD52_Struct MOD52_021D76E8 = {
+    MOD52_021D74E0,
+    MOD52_021D74F8,
+    MOD52_021D750C,
+    0xFFFFFFFF,
+};
+
+const u8 MOD52_021D76F8[] = {
+    0x9B,
+    0x00,
+    0x01,
+    0x00,
+    0x95,
+    0x00,
+    0x01,
+    0x00,
+    0x96,
+    0x00,
+    0x01,
+    0x00,
+    0x97,
+    0x00,
+    0x01,
+    0x00,
+    0x9B,
+    0x00,
+    0x01,
+    0x00,
+    0x97,
+    0x00,
+    0x01,
+    0x00,
+    0xA4,
+    0x00,
+    0x02,
+    0x00,
+    0xA5,
+    0x00,
+    0x02,
+    0x00,
+    0x95,
+    0x00,
+    0x01,
+    0x00,
+    0x9B,
+    0x00,
+    0x02,
+    0x00,
+    0x9E,
+    0x00,
+    0x01,
+    0x00,
+    0xA7,
+    0x00,
+    0x02,
+    0x00,
+    0xA7,
+    0x00,
+    0x02,
+    0x00,
+    0xAA,
+    0x00,
+    0x01,
+    0x00,
+    0x95,
+    0x00,
+    0x01,
+    0x00,
+    0x97,
+    0x00,
+    0x01,
+    0x00,
+    0x9B,
+    0x00,
+    0x01,
+    0x00,
+    0x9B,
+    0x00,
+    0x01,
+    0x00,
+    0x98,
+    0x00,
+    0x01,
+    0x00,
+    0x98,
+    0x00,
+    0x01,
+    0x00,
+    0xA4,
+    0x00,
+    0x01,
+    0x00,
+    0xA4,
+    0x00,
+    0x01,
+    0x00,
+    0x95,
+    0x00,
+    0x01,
+    0x00,
+    0x9B,
+    0x00,
+    0x01,
+    0x00,
+    0x9B,
+    0x00,
+    0x01,
+    0x00,
+    0xA5,
+    0x00,
+    0x01,
+    0x00,
+    0xA6,
+    0x00,
+    0x02,
+    0x00,
+    0xA4,
+    0x00,
+    0x02,
+    0x00,
+    0xA5,
+    0x00,
+    0x02,
+    0x00,
+    0xA8,
+    0x00,
+    0x02,
+    0x00,
+    0x9A,
+    0x00,
+    0x01,
+    0x00,
+    0x96,
+    0x00,
+    0x01,
+    0x00,
+    0xA4,
+    0x00,
+    0x01,
+    0x00,
+    0xA4,
+    0x00,
+    0x01,
+    0x00,
+    0x9C,
+    0x00,
+    0x01,
+    0x00,
+    0xA6,
+    0x00,
+    0x01,
+    0x00,
+    0xA6,
+    0x00,
+    0x01,
+    0x00,
+    0x9F,
+    0x00,
+    0x01,
+    0x00,
+    0x99,
+    0x00,
+    0x01,
+    0x00,
+    0x99,
+    0x00,
+    0x01,
+    0x00,
+    0xA4,
+    0x00,
+    0x01,
+    0x00,
+    0xA8,
+    0x00,
+    0x01,
+    0x00,
+    0x9E,
+    0x00,
+    0x01,
+    0x00,
+    0x96,
+    0x00,
+    0x01,
+    0x00,
+    0xA0,
+    0x00,
+    0x01,
+    0x00,
+    0xA2,
+    0x00,
+    0x01,
+    0x00,
+    0x97,
+    0x00,
+    0x01,
+    0x00,
+    0x99,
+    0x00,
+    0x01,
+    0x00,
+    0xA3,
+    0x00,
+    0x01,
+    0x00,
+    0xAD,
+    0x00,
+    0x01,
+    0x00,
+    0x9E,
+    0x00,
+    0x01,
+    0x00,
+    0x99,
+    0x00,
+    0x01,
+    0x00,
+    0xAE,
+    0x00,
+    0x01,
+    0x00,
+    0x9D,
+    0x00,
+    0x01,
+    0x00,
+    0x97,
+    0x00,
+    0x01,
+    0x00,
+    0xA8,
+    0x00,
+    0x01,
+    0x00,
+    0xA8,
+    0x00,
+    0x01,
+    0x00,
+    0xA8,
+    0x00,
+    0x01,
+    0x00,
+    0x9C,
+    0x00,
+    0x01,
+    0x00,
+    0x9C,
+    0x00,
+    0x01,
+    0x00,
+    0xA6,
+    0x00,
+    0x01,
+    0x00,
+    0xA6,
+    0x00,
+    0x01,
+    0x00,
+    0xA2,
+    0x00,
+    0x01,
+    0x00,
+    0xA3,
+    0x00,
+    0x01,
+    0x00,
+    0x98,
+    0x00,
+    0x01,
+    0x00,
+    0x98,
+    0x00,
+    0x01,
+    0x00,
+    0x95,
+    0x00,
+    0x01,
+    0x00,
+    0x9E,
+    0x00,
+    0x01,
+    0x00,
+    0x96,
+    0x00,
+    0x01,
+    0x00,
+    0xA9,
+    0x00,
+    0x01,
+    0x00,
+    0x97,
+    0x00,
+    0x02,
+    0x00,
+    0xA5,
+    0x00,
+    0x02,
+    0x00,
+    0xA0,
+    0x00,
+    0x01,
+    0x00,
+    0xA1,
+    0x00,
+    0x01,
+    0x00,
+    0x98,
+    0x00,
+    0x01,
+    0x00,
+    0x9C,
+    0x00,
+    0x01,
+    0x00,
+    0x9F,
+    0x00,
+    0x01,
+    0x00,
+    0xA8,
+    0x00,
+    0x02,
+    0x00,
+    0x9A,
+    0x00,
+    0x01,
+    0x00,
+    0x97,
+    0x00,
+    0x01,
+    0x00,
+    0xA1,
+    0x00,
+    0x01,
+    0x00,
+    0xAC,
+    0x00,
+    0x01,
+    0x00,
+    0xA0,
+    0x00,
+    0x02,
+    0x00,
+    0xA1,
+    0x00,
+    0x02,
+    0x00,
+    0xA2,
+    0x00,
+    0x02,
+    0x00,
+    0xAB,
+    0x00,
+    0x01,
+    0x00,
+    0x9E,
+    0x00,
+    0x02,
+    0x00,
+    0xA5,
+    0x00,
+    0x03,
+    0x00,
+    0xA6,
+    0x00,
+    0x03,
+    0x00,
+    0xA7,
+    0x00,
+    0x03,
+    0x00,
+    0xA9,
+    0x00,
+    0x01,
+    0x00,
+    0xA9,
+    0x00,
+    0x01,
+    0x00,
+    0xAC,
+    0x00,
+    0x02,
+    0x00,
+    0xAC,
+    0x00,
+    0x02,
+    0x00,
+    0xAA,
+    0x00,
+    0x01,
+    0x00,
+    0xAA,
+    0x00,
+    0x01,
+    0x00,
+    0xAE,
+    0x00,
+    0x01,
+    0x00,
+    0xAE,
+    0x00,
+    0x01,
+    0x00,
+    0xAB,
+    0x00,
+    0x01,
+    0x00,
+    0xAB,
+    0x00,
+    0x01,
+    0x00,
+    0xA9,
+    0x00,
+    0x01,
+    0x00,
+    0xA9,
+    0x00,
+    0x01,
+    0x00,
+    0xAC,
+    0x00,
+    0x01,
+    0x00,
+    0xAC,
+    0x00,
+    0x01,
+    0x00,
+    0xAE,
+    0x00,
+    0x01,
+    0x00,
+    0xAE,
+    0x00,
+    0x01,
+    0x00,
+    0xAD,
+    0x00,
+    0x01,
+    0x00,
+    0xAD,
+    0x00,
+    0x01,
+    0x00,
+    0xAB,
+    0x00,
+    0x01,
+    0x00,
+    0xAB,
+    0x00,
+    0x01,
+    0x00,
+    0x9D,
+    0x00,
+    0x01,
+    0x00,
+    0x9A,
+    0x00,
+    0x01,
+    0x00,
+    0xAB,
+    0x00,
+    0x02,
+    0x00,
+    0xAD,
+    0x00,
+    0x02,
+    0x00,
+    0xAA,
+    0x00,
+    0x02,
+    0x00,
+    0xAA,
+    0x00,
+    0x02,
+    0x00,
+    0xAD,
+    0x00,
+    0x01,
+    0x00,
+    0xAD,
+    0x00,
+    0x01,
+    0x00,
+};
\ No newline at end of file
diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s
index cd947e57..447b763f 100644
--- a/arm9/modules/59/asm/mod59_021D74E0_asm.s
+++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s
@@ -181,7 +181,7 @@ MOD59_021D76C0: ; 0x021D76C0
 	bl FUN_02024EB4
 	ldr r1, [r4, #0x74]
 	ldr r1, [r1, #0x18]
-	bl FUN_02024EF4
+	bl RivalsNameToU16Array
 	ldr r0, [r4, #0x70]
 	bl FUN_02077AC4
 	ldr r0, [r4, #0x74]
diff --git a/arm9/src/save_arrays.c b/arm9/src/save_arrays.c
index 397f1f69..8520f2c1 100644
--- a/arm9/src/save_arrays.c
+++ b/arm9/src/save_arrays.c
@@ -14,10 +14,10 @@
 #include "pokedex.h"
 #include "seal.h"
 #include "unk_020139D8.h"
+#include "unk_02024E64.h"
 
 extern u32 FUN_0202AC20(void);
 extern u32 FUN_02034D7C(void);
-extern u32 FUN_02024E64(void);
 extern u32 FUN_02034D80(void);
 extern u32 FUN_02025954(void);
 extern u32 FUN_02023AC8(void);
@@ -39,7 +39,6 @@ extern u32 FUN_0202BE98(void);
 extern u32 FUN_0202C0E0(void);
 extern void FUN_0202AC28(void *);
 extern void FUN_02034D98(void *);
-extern void FUN_02024E6C(void *);
 extern void FUN_02034D88(void *);
 extern void FUN_0202597C(void *);
 extern void FUN_02023AD8(void *);
diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c
index 431f63b4..e9a55051 100644
--- a/arm9/src/script_buffers.c
+++ b/arm9/src/script_buffers.c
@@ -11,11 +11,10 @@
 #include "unk_0201B8B8.h"
 #include "trainer_data.h"
 #include "script_buffers.h"
+#include "unk_02024E64.h"
 
 #pragma thumb on
 
-extern void * FUN_02024EC0(struct SaveBlock2 * sav2);
-extern u16 * FUN_02024EE8(void *);
 extern u32 GetCityNamesMsgdataIdByCountry(u32);
 extern void GetECWordIntoStringByIndex(u32 a0, struct String * a1);
 extern void StringCat_HandleTrainerName(struct String * dest, const struct String * src);
@@ -131,7 +130,7 @@ void BufferPlayersName(struct ScrStrBufs * mgr, u32 idx, struct PlayerData * dat
 
 void BufferRivalsName(struct ScrStrBufs * mgr, u32 idx, struct SaveBlock2 * sav2)
 {
-    u16 * name = FUN_02024EE8(FUN_02024EC0(sav2));
+    u16 * name = GetRivalNamePtr(FUN_02024EC0(sav2));
     CopyU16ArrayToString(mgr->tmpbuf, name);
     SetStringAsPlaceholder(mgr, idx, mgr->tmpbuf, NULL);
 }
diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c
index 7af4b2ce..f161b302 100644
--- a/arm9/src/trainer_data.c
+++ b/arm9/src/trainer_data.c
@@ -6,11 +6,10 @@
 #include "proto.h"
 #include "msgdata.h"
 #include "constants/trainer_classes.h"
+#include "unk_02024E64.h"
 
 #pragma thumb on
 
-extern void * FUN_02024EC0(struct SaveBlock2 *);
-extern u16 * FUN_02024EE8(void *);
 
 // Loads all battle opponents, including multi-battle partner if exists.
 void EnemyTrainerSet_Init(struct BattleSetupStruct * enemies, struct SaveBlock2 * sav2, u32 heap_id)
@@ -23,7 +22,7 @@ void EnemyTrainerSet_Init(struct BattleSetupStruct * enemies, struct SaveBlock2
 
     // FIXME: String formatting in files/msgdata/msg/narc_0559.txt is abnormal.
     msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 559, heap_id);
-    rivalName = FUN_02024EE8(FUN_02024EC0(sav2));
+    rivalName = GetRivalNamePtr(FUN_02024EC0(sav2));
     for (i = 0; i < 4; i++)
     {
         if (enemies->trainer_idxs[i] != 0)
diff --git a/arm9/src/unk_02024E64.c b/arm9/src/unk_02024E64.c
new file mode 100644
index 00000000..d8682531
--- /dev/null
+++ b/arm9/src/unk_02024E64.c
@@ -0,0 +1,62 @@
+#include "unk_02024E64.h"
+
+extern void FUN_020250A4(void *param0);
+extern void FUN_02025484(void *param0);
+
+THUMB_FUNC u32 FUN_02024E64()
+{
+    return sizeof(struct UnkStruct_02024E64);
+}
+
+THUMB_FUNC void FUN_02024E6C(struct UnkStruct_02024E64 *param0)
+{
+    MIi_CpuClearFast(0, param0, sizeof(struct UnkStruct_02024E64));
+
+    FUN_020250A4(param0->unk0);
+
+    FUN_02025484(param0->unk700);
+
+    MIi_CpuClear16(0xFFFF, param0->rival_name_buf, sizeof(param0->rival_name_buf) / sizeof(u16));
+    MIi_CpuClear16(0xFFFF, param0->unk734, sizeof(param0->unk734) / sizeof(u16));
+}
+
+THUMB_FUNC struct UnkStruct_02024E64 *FUN_02024EB4(struct SaveBlock2 *sav2)
+{
+    return SavArray_get(sav2, 0xa);
+}
+
+THUMB_FUNC void *FUN_02024EC0(struct SaveBlock2 *sav2)
+{
+    return FUN_02022634(sav2, 0xa);
+}
+
+THUMB_FUNC struct UnkStruct_02024E64 *FUN_02024ECC(struct SaveBlock2 *sav2)
+{
+    return SavArray_get(sav2, 0xa);
+}
+
+THUMB_FUNC void *FUN_02024ED8(struct SaveBlock2 *sav2)
+{
+    struct UnkStruct_02024E64 *res = SavArray_get(sav2, 0xa);
+    return res->unk700;
+}
+
+THUMB_FUNC u16 *GetRivalNamePtr(struct UnkStruct_02024E64 *unk)
+{
+    return unk->rival_name_buf;
+}
+
+THUMB_FUNC void RivalsNameToU16Array(struct UnkStruct_02024E64 *unk, struct String *str)
+{
+    CopyStringToU16Array(str, unk->rival_name_buf, sizeof(unk->rival_name_buf) / sizeof(u16));
+}
+
+THUMB_FUNC u16 *FUN_02024F0C(struct UnkStruct_02024E64 *unk)
+{
+    return unk->unk734;
+}
+
+THUMB_FUNC void FUN_02024F18(struct UnkStruct_02024E64 *unk, struct String *str)
+{
+    CopyStringToU16Array(str, unk->unk734, sizeof(unk->unk734) / sizeof(u16));
+}
diff --git a/arm9/src/unk_0204AEA8.c b/arm9/src/unk_0204AEA8.c
new file mode 100644
index 00000000..9c572a8e
--- /dev/null
+++ b/arm9/src/unk_0204AEA8.c
@@ -0,0 +1,43 @@
+#include "global.h"
+#include "heap.h"
+#include "unk_0204639C.h"
+#include "unk_0204AEA8.h"
+
+extern void MOD05_021E3444(u32, struct UnkStruct_0204639C *, u32);
+extern void FUN_0200433C(u32, u16, u32);
+
+THUMB_FUNC BOOL FUN_0204AEA8(struct UnkStruct_0204639C *a0)
+{
+    struct UnkStruct_0204639C *v0 = FUN_02046528(a0);
+    u32 *v1 = FUN_0204652C(a0);
+
+    switch (v1[0])
+    {
+        case 0:
+            MOD05_021E3444(v1[2], v0, (u32)v1 + 4);
+            FUN_0200433C(5, (u16)v1[3], 1);
+            v1[0]++;
+            break;
+        case 1:
+            if (v1[1] == 1)
+            {
+                FreeToHeap(v1);
+                return TRUE;
+            }
+            break;
+    }
+    
+    return FALSE;
+}
+
+THUMB_FUNC void FUN_0204AEF8(struct UnkStruct_0204639C *a0, u32 a1, u32 a2)
+{
+    u32 *v0 = AllocFromHeapAtEnd(11, 4 * sizeof(u32));
+    
+    v0[0] = 0;
+    v0[1] = 0;
+    v0[2] = a1;
+    v0[3] = a2;
+    
+    FUN_0204640C(a0, FUN_0204AEA8, v0);
+}
diff --git a/arm9/temp.c b/arm9/temp.c
deleted file mode 100644
index e69de29b..00000000
--- a/arm9/temp.c
+++ /dev/null
diff --git a/include/event_data.h b/include/event_data.h
index e1d46348..1f0f090a 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_SCRIPT_STATE_H
 #define GUARD_SCRIPT_STATE_H
 
+#include "save_block_2.h"
+
 struct ScriptState
 {
     u16 vars[288];
diff --git a/include/unk_02024E64.h b/include/unk_02024E64.h
new file mode 100644
index 00000000..ed1bd447
--- /dev/null
+++ b/include/unk_02024E64.h
@@ -0,0 +1,28 @@
+#ifndef POKEDIAMOND_UNK_02024E64_H
+#define POKEDIAMOND_UNK_02024E64_H
+
+#include "global.h"
+#include "MI_memory.h"
+#include "save_block_2.h"
+#include "string16.h"
+
+struct UnkStruct_02024E64 {
+    u8 unk0[0xE][0x80];
+    u8 unk700[0x24];
+    u16 rival_name_buf[0x8];
+    u16 unk734[0xB];
+    u8 unk74A[2]; // might be padding
+};
+
+THUMB_FUNC u32 FUN_02024E64();
+THUMB_FUNC void FUN_02024E6C(struct UnkStruct_02024E64 *param0);
+THUMB_FUNC struct UnkStruct_02024E64 *FUN_02024EB4(struct SaveBlock2 *sav2);
+THUMB_FUNC void *FUN_02024EC0(struct SaveBlock2 *sav2);
+THUMB_FUNC struct UnkStruct_02024E64 *FUN_02024ECC(struct SaveBlock2 *sav2);
+THUMB_FUNC void *FUN_02024ED8(struct SaveBlock2 *sav2);
+THUMB_FUNC u16 *GetRivalNamePtr(struct UnkStruct_02024E64 *unk);
+THUMB_FUNC void RivalsNameToU16Array(struct UnkStruct_02024E64 *unk, struct String *str);
+THUMB_FUNC u16 *FUN_02024F0C(struct UnkStruct_02024E64 *unk);
+THUMB_FUNC void FUN_02024F18(struct UnkStruct_02024E64 *unk, struct String *str);
+
+#endif
diff --git a/include/unk_0204AEA8.h b/include/unk_0204AEA8.h
new file mode 100644
index 00000000..90e13cc2
--- /dev/null
+++ b/include/unk_0204AEA8.h
@@ -0,0 +1,7 @@
+#ifndef POKEDIAMOND_UNK_0204AEA8_H
+#define POKEDIAMOND_UNK_0204AEA8_H
+
+BOOL FUN_0204AEA8(struct UnkStruct_0204639C *a0);
+void FUN_0204AEF8(struct UnkStruct_0204639C *a0, u32 a1, u32 a2);
+
+#endif
diff --git a/tools/asm_processor/asm_processor.py b/tools/asm_processor/asm_processor.py
index e3226cb2..e1540c0c 100644
--- a/tools/asm_processor/asm_processor.py
+++ b/tools/asm_processor/asm_processor.py
@@ -575,7 +575,7 @@ class GlobalAsmBlock:
             self.add_sized(int(line.split()[1], 0), real_line)

         elif line.startswith('.balign') or line.startswith('.align'):

             align = int(line.split()[1])

-            if align != 2:

+            if align != 4: 

                 self.fail("only .balign 4 is supported", real_line)

             self.align4()

         elif line.startswith('.asci'):

@@ -586,9 +586,6 @@ class GlobalAsmBlock:
         # Branches are 4 bytes long

         elif line.startswith('bl'):

             self.add_sized(4, real_line)

-        elif line.startswith('.'):

-            # .macro, ...

-            self.fail("asm directive not supported", real_line)

         else:

             # Unfortunately, macros are hard to support for .rodata --

             # we don't know how how space they will expand to before

@@ -1027,8 +1024,11 @@ def fixup_objfile(objfile_name, functions, asm_prelude, assembler, output_enc):
                 loc1 = asm_objfile.symtab.find_symbol_in_section(temp_name + '_asm_start', source)

                 loc2 = asm_objfile.symtab.find_symbol_in_section(temp_name + '_asm_end', source)

                 assert loc1 == pos, "assembly and C files don't line up for section " + sectype + ", " + fn_desc

-                if loc2 - loc1 != count:

-                    raise Failure("incorrectly computed size for section " + sectype + ", " + fn_desc + ". If using .double, make sure to provide explicit alignment padding.")

+                # Since we are nonmatching whole functions, we don't need to insert the correct

+                # amount of padding into the src file. We don't actually need to insert padding  

+                # at all. We can just plop the asm's text section into the objfile.   

+                # if loc2 - loc1 != count:

+                #     raise Failure("incorrectly computed size for section " + sectype + ", " + fn_desc + ". If using .double, make sure to provide explicit alignment padding.")

             if sectype == '.bss' or sectype == '.sbss2':

                 continue

             target = objfile.find_section(sectype, n_text if sectype == '.text' else 0)

diff --git a/tools/asm_processor/compile.sh b/tools/asm_processor/compile.sh
index 786da404..8c367b3e 100644
--- a/tools/asm_processor/compile.sh
+++ b/tools/asm_processor/compile.sh
@@ -1,19 +1,27 @@
 #!/bin/bash
 
 CC="$1"
-shift
-AS="$1"
-shift
+AS="$2"
+OBJ="$3"
+SRC="$4"
 
-temp="$(mktemp)"
-../tools/asm_processor/asm_processor.py "$2" --assembler "$AS" > "$temp.c" &&
-$CC -c "$temp.c" -o "$1"
+PADDED_SRC="$(mktemp --suffix=.c padded-XXXXXX)"
+PADDED_OBJ="$(mktemp --suffix=.o padded-XXXXXX)"
 
-prelude=$(mktemp prelude.XXXXXX)
-cat ../include/macros.inc >> "$prelude"
-cat global.inc >> "$prelude"
+# Create a .c file replacing the nonmatching function with volatile int writes, 
+# and compile. 
+../tools/asm_processor/asm_processor.py "$SRC" --assembler "$AS" > "$PADDED_SRC"
+$CC -c "$PADDED_SRC" -o "$PADDED_OBJ"
 
-../tools/asm_processor/asm_processor.py "$2" --post-process "$1" --assembler "$AS" --asm-prelude "$prelude"
-arm-none-eabi-objcopy --remove-section .comment "$1" "$1"
-rm "$prelude"
-rm "$temp"
+PRELUDE=$(mktemp)
+cat ../include/macros.inc >> "$PRELUDE"
+cat global.inc >> "$PRELUDE"
+
+# Inject the matching assembly into the padded obj file.
+../tools/asm_processor/asm_processor.py "$SRC" --post-process "$PADDED_OBJ" --assembler "$AS" --asm-prelude "$PRELUDE"
+
+$DEVKITARM/bin/arm-none-eabi-objcopy --remove-section .comment "$PADDED_OBJ" "$OBJ"
+
+rm "$PADDED_SRC"
+rm "$PADDED_OBJ"
+rm "$PRELUDE"