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

6 files changed, 0 insertions, 556 deletions

diff --git a/arm9/asm/WM_ks.s b/arm9/asm/WM_ks.s
deleted file mode 100644
index 3dd46c1b..00000000
--- a/arm9/asm/WM_ks.s
+++ /dev/null
@@ -1,26 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	arm_func_start WM_EndKeySharing
-WM_EndKeySharing: ; 0x020DAD3C
-	ldr ip, _020DAD44 ; =WM_EndDataSharing
-	bx r12
-	.balign 4
-_020DAD44: .word WM_EndDataSharing
-
-	arm_func_start WM_StartKeySharing
-WM_StartKeySharing: ; 0x020DAD48
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	ldr r2, _020DAD70 ; =0x0000FFFF
-	mov r12, #0x1
-	mov r3, #0x2
-	str r12, [sp, #0x0]
-	bl WM_StartDataSharing
-	add sp, sp, #0x4
-	ldmia sp!, {lr}
-	bx lr
-	.balign 4
-_020DAD70: .word 0x0000FFFF
diff --git a/arm9/asm/unk_020061E8.s b/arm9/asm/unk_020061E8.s
deleted file mode 100644
index 22f390c7..00000000
--- a/arm9/asm/unk_020061E8.s
+++ /dev/null
@@ -1,45 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-	.section .text
-
-	thumb_func_start FUN_020061E8
-FUN_020061E8: ; 0x020061E8
-	push {r3-r7, lr}
-	add r5, r1, #0x0
-	add r6, r0, #0x0
-	add r7, r2, #0x0
-	cmp r5, #0x0
-	beq _0200620C
-	add r0, r3, #0x0
-	bl AllocFromHeap
-	add r4, r0, #0x0
-	bne _02006202
-	mov r0, #0x0
-	pop {r3-r7, pc}
-_02006202:
-	mov r1, #0x0
-	add r2, r5, #0x0
-	bl memset
-	b _0200620E
-_0200620C:
-	mov r4, #0x0
-_0200620E:
-	add r0, r6, #0x0
-	add r1, r4, #0x0
-	add r2, r7, #0x0
-	bl FUN_0200CA44
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0200621C
-FUN_0200621C: ; 0x0200621C
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl FUN_0201B6C8
-	cmp r0, #0x0
-	beq _0200622C
-	bl FreeToHeap
-_0200622C:
-	add r0, r4, #0x0
-	bl FUN_0200CAB4
-	pop {r4, pc}
diff --git a/arm9/asm/unk_020222E8.s b/arm9/asm/unk_020222E8.s
deleted file mode 100644
index 047712a5..00000000
--- a/arm9/asm/unk_020222E8.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_020222E8
-FUN_020222E8: ; 0x020222E8
-	mov r0, #0x5
-	lsl r0, r0, #0x18
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_020222F0
-FUN_020222F0: ; 0x020222F0
-	mov r0, #0x2
-	lsl r0, r0, #0x8
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_020222F8
-FUN_020222F8: ; 0x020222F8
-	ldr r0, _020222FC ; =0x05000400
-	bx lr
-	.balign 4
-_020222FC: .word 0x05000400
-
-	thumb_func_start FUN_02022300
-FUN_02022300: ; 0x02022300
-	mov r0, #0x2
-	lsl r0, r0, #0x8
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_02022308
-FUN_02022308: ; 0x02022308
-	ldr r0, _0202230C ; =0x05000200
-	bx lr
-	.balign 4
-_0202230C: .word 0x05000200
-
-	thumb_func_start FUN_02022310
-FUN_02022310: ; 0x02022310
-	ldr r0, _02022314 ; =0x05000600
-	bx lr
-	.balign 4
-_02022314: .word 0x05000600
diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s
deleted file mode 100644
index 66bb542c..00000000
--- a/arm9/asm/unk_02034188.s
+++ /dev/null
@@ -1,242 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.extern gMain
-
-	.section .rodata
-
-	.global UNK_020EECF8
-UNK_020EECF8: ; 0x020EECF8
-	.byte 0x00, 0x03, 0x03, 0x1A, 0x12, 0x01, 0x23, 0x00
-
-	.global UNK_020EED00
-UNK_020EED00: ; 0x020EED00
-	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	.global UNK_020EED10
-UNK_020EED10: ; 0x020EED10
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x01, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	.global UNK_020EED2C
-UNK_020EED2C: ; 0x020EED2C
-	.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	.text
-
-	thumb_func_start FUN_02034188
-FUN_02034188: ; 0x02034188
-	push {r4-r7, lr}
-	sub sp, #0x24
-	add r4, r0, #0x0
-	mov r0, #0x0
-	add r1, r0, #0x0
-	bl FUN_0200E3A0
-	mov r0, #0x1
-	mov r1, #0x0
-	bl FUN_0200E3A0
-	bl FUN_02015EF4
-	mov r0, #0x0
-	add r1, r0, #0x0
-	bl Main_SetVBlankIntrCB
-	mov r0, #0x0
-	add r1, r0, #0x0
-	bl FUN_02015F34
-	bl GX_DisableEngineALayers
-	bl GX_DisableEngineBLayers
-	mov r2, #0x1
-	lsl r2, r2, #0x1a
-	ldr r1, [r2, #0x0]
-	ldr r0, _02034368 ; =0xFFFFE0FF
-	and r1, r0
-	str r1, [r2, #0x0]
-	ldr r2, _0203436C ; =0x04001000
-	ldr r1, [r2, #0x0]
-	and r0, r1
-	str r0, [r2, #0x0]
-	mov r0, #0x4
-	mov r1, #0x8
-	bl SetKeyRepeatTimers
-	ldr r0, _02034370 ; =gMain + 0x60
-	mov r1, #0x0
-	strb r1, [r0, #0x5]
-	bl GX_SwapDisplay
-	ldr r3, _02034374 ; =0x04000050
-	mov r0, #0x0
-	strh r0, [r3, #0x0]
-	ldr r2, _02034378 ; =0x04001050
-	sub r3, #0x50
-	strh r0, [r2, #0x0]
-	ldr r1, [r3, #0x0]
-	ldr r0, _0203437C ; =0xFFFF1FFF
-	sub r2, #0x50
-	and r1, r0
-	str r1, [r3, #0x0]
-	ldr r1, [r2, #0x0]
-	and r0, r1
-	str r0, [r2, #0x0]
-	ldr r0, _02034380 ; =UNK_020EED2C
-	bl GX_SetBanks
-	add r0, r4, #0x0
-	bl BgConfig_Alloc
-	str r0, [sp, #0x10]
-	ldr r0, _02034384 ; =UNK_020EED00
-	bl SetBothScreensModesAndDisable
-	mov r1, #0x0
-	ldr r0, [sp, #0x10]
-	ldr r2, _02034388 ; =UNK_020EED10
-	add r3, r1, #0x0
-	bl InitBgFromTemplate
-	ldr r0, [sp, #0x10]
-	mov r1, #0x0
-	bl BgClearTilemapBufferAndCommit
-	mov r1, #0x0
-	str r1, [sp, #0x0]
-	ldr r0, [sp, #0x10]
-	ldr r2, _0203438C ; =0x000001F7
-	mov r3, #0x2
-	str r4, [sp, #0x4]
-	bl FUN_0200CB00
-	mov r0, #0x0
-	mov r1, #0x20
-	add r2, r4, #0x0
-	bl FUN_02002ED0
-	mov r0, #0x0
-	mov r1, #0x20
-	add r2, r0, #0x0
-	add r3, r4, #0x0
-	bl BG_ClearCharDataRange
-	ldr r1, _02034390 ; =0x00006C21
-	mov r0, #0x0
-	bl BG_SetMaskColor
-	ldr r1, _02034390 ; =0x00006C21
-	mov r0, #0x4
-	bl BG_SetMaskColor
-	ldr r2, _02034394 ; =0x00000265
-	mov r0, #0x1
-	mov r1, #0x1a
-	add r3, r4, #0x0
-	bl NewMsgDataFromNarc
-	str r0, [sp, #0xc]
-	mov r0, #0x6
-	lsl r0, r0, #0x6
-	add r1, r4, #0x0
-	bl String_ctor
-	add r4, r0, #0x0
-	bl FUN_0201BD5C
-	ldr r0, [sp, #0x10]
-	ldr r2, _02034398 ; =UNK_020EECF8
-	add r1, sp, #0x14
-	bl AddWindow
-	mov r0, #0xd0
-	str r0, [sp, #0x0]
-	mov r0, #0x90
-	mov r2, #0x0
-	str r0, [sp, #0x4]
-	add r0, sp, #0x14
-	mov r1, #0xf
-	add r3, r2, #0x0
-	bl FillWindowPixelRect
-	ldr r2, _0203438C ; =0x000001F7
-	add r0, sp, #0x14
-	mov r1, #0x0
-	mov r3, #0x2
-	bl FUN_0200CCA4
-	ldr r0, [sp, #0xc]
-	mov r1, #0xf
-	add r2, r4, #0x0
-	bl ReadMsgDataIntoString
-	mov r1, #0x0
-	str r1, [sp, #0x0]
-	str r1, [sp, #0x4]
-	add r0, sp, #0x14
-	add r2, r4, #0x0
-	add r3, r1, #0x0
-	str r1, [sp, #0x8]
-	bl AddTextPrinterParameterized
-	add r0, r4, #0x0
-	bl String_dtor
-	bl GX_BothDispOn
-	mov r0, #0x0
-	bl FUN_0200E394
-	mov r0, #0x1
-	bl FUN_0200E394
-	mov r0, #0x0
-	mov r1, #0x3f
-	mov r2, #0x3
-	bl FUN_0200A274
-	ldr r4, _0203439C ; =0x04000130
-	ldr r6, _020343A0 ; =0x027FFFA8
-	mov r7, #0x1
-_020342E4:
-	ldrh r1, [r4, #0x0]
-	ldrh r0, [r6, #0x0]
-	orr r1, r0
-	ldr r0, _020343A4 ; =0x00002FFF
-	eor r1, r0
-	and r0, r1
-	lsl r0, r0, #0x10
-	lsr r5, r0, #0x10
-	bl HandleDSLidAction
-	add r0, r5, #0x0
-	tst r0, r7
-	bne _02034308
-	mov r0, #0x1
-	add r1, r0, #0x0
-	bl OS_WaitIrq
-	b _020342E4
-_02034308:
-	add r0, sp, #0x14
-	bl RemoveWindow
-	ldr r0, [sp, #0xc]
-	bl DestroyMsgData
-	mov r0, #0x0
-	add r1, r0, #0x0
-	bl ToggleBgLayer
-	mov r0, #0x1
-	mov r1, #0x0
-	bl ToggleBgLayer
-	mov r0, #0x2
-	mov r1, #0x0
-	bl ToggleBgLayer
-	mov r0, #0x3
-	mov r1, #0x0
-	bl ToggleBgLayer
-	mov r0, #0x4
-	mov r1, #0x0
-	bl ToggleBgLayer
-	mov r0, #0x5
-	mov r1, #0x0
-	bl ToggleBgLayer
-	mov r0, #0x6
-	mov r1, #0x0
-	bl ToggleBgLayer
-	mov r0, #0x7
-	mov r1, #0x0
-	bl ToggleBgLayer
-	ldr r0, [sp, #0x10]
-	mov r1, #0x0
-	bl FreeBgTilemapBuffer
-	ldr r0, [sp, #0x10]
-	bl FreeToHeap
-	add sp, #0x24
-	pop {r4-r7, pc}
-	nop
-_02034368: .word 0xFFFFE0FF
-_0203436C: .word 0x04001000
-_02034370: .word gMain + 0x60
-_02034374: .word 0x04000050
-_02034378: .word 0x04001050
-_0203437C: .word 0xFFFF1FFF
-_02034380: .word UNK_020EED2C
-_02034384: .word UNK_020EED00
-_02034388: .word UNK_020EED10
-_0203438C: .word 0x000001F7
-_02034390: .word 0x00006C21
-_02034394: .word 0x00000265
-_02034398: .word UNK_020EECF8
-_0203439C: .word 0x04000130
-_020343A0: .word 0x027FFFA8
-_020343A4: .word 0x00002FFF
diff --git a/arm9/asm/unk_02064E20.s b/arm9/asm/unk_02064E20.s
deleted file mode 100644
index 19ada5a3..00000000
--- a/arm9/asm/unk_02064E20.s
+++ /dev/null
@@ -1,25 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02064E20
-FUN_02064E20: ; 0x02064E20
-	push {r4, lr}
-	bl ScriptEnvironment_GetSav2Ptr
-	bl FUN_02024ED8
-	add r4, r0, #0x0
-	bl FUN_020254B4
-	cmp r0, #0x6
-	beq _02064E48
-	add r0, r4, #0x0
-	mov r1, #0x6
-	bl FUN_02025490
-	add r0, r4, #0x0
-	mov r1, #0x6
-	bl FUN_020254A0
-	mov r1, #0x2
-	strh r1, [r0, #0x0]
-_02064E48:
-	pop {r4, pc}
-	.balign 4
diff --git a/arm9/asm/unk_02088DD8.s b/arm9/asm/unk_02088DD8.s
deleted file mode 100644
index 3df58ffe..00000000
--- a/arm9/asm/unk_02088DD8.s
+++ /dev/null
@@ -1,172 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02088DD8
-FUN_02088DD8: ; 0x02088DD8
-	push {r3, lr}
-	mov r1, #0x18
-	bl AllocFromHeap
-	add r3, r0, #0x0
-	mov r2, #0x18
-	mov r1, #0x0
-_02088DE6:
-	strb r1, [r3, #0x0]
-	add r3, r3, #0x1
-	sub r2, r2, #0x1
-	bne _02088DE6
-	pop {r3, pc}
-
-	thumb_func_start FUN_02088DF0
-FUN_02088DF0: ; 0x02088DF0
-	ldr r3, _02088DF4 ; =FreeToHeap
-	bx r3
-	.balign 4
-_02088DF4: .word FreeToHeap
-
-	thumb_func_start FUN_02088DF8
-FUN_02088DF8: ; 0x02088DF8
-	push {r3-r7, lr}
-	sub sp, #0x18
-	str r1, [sp, #0x0]
-	mov r1, #0x5
-	mov r2, #0x0
-	add r5, r0, #0x0
-	bl GetMonData
-	lsl r0, r0, #0x10
-	lsr r0, r0, #0x10
-	str r0, [sp, #0xc]
-	add r0, r5, #0x0
-	mov r1, #0x70
-	mov r2, #0x0
-	bl GetMonData
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	str r0, [sp, #0x8]
-	add r0, r5, #0x0
-	mov r1, #0xa0
-	mov r2, #0x0
-	bl GetMonData
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	mov r4, #0x0
-	str r0, [sp, #0x4]
-	add r7, r4, #0x0
-	add r6, sp, #0x10
-_02088E34:
-	add r1, r4, #0x0
-	add r0, r5, #0x0
-	add r1, #0x36
-	add r2, r7, #0x0
-	bl GetMonData
-	lsl r1, r4, #0x1
-	strh r0, [r6, r1]
-	add r0, r4, #0x1
-	lsl r0, r0, #0x18
-	lsr r4, r0, #0x18
-	cmp r4, #0x4
-	blo _02088E34
-	ldr r0, [sp, #0x0]
-	mov r1, #0x2c
-	bl AllocFromHeap
-	add r7, r0, #0x0
-	ldr r0, [sp, #0x0]
-	mov r1, #0x2c
-	bl AllocFromHeap
-	add r4, r0, #0x0
-	ldr r0, [sp, #0xc]
-	ldr r1, [sp, #0x8]
-	add r2, r7, #0x0
-	bl LoadWotbl_HandleAlternateForme
-	mov r2, #0x0
-	mov r12, r2
-_02088E70:
-	mov r0, r12
-	lsl r0, r0, #0x1
-	ldrh r5, [r7, r0]
-	ldr r6, _02088EF4 ; =0x0000FFFF
-	cmp r5, r6
-	bne _02088E82
-	lsl r0, r2, #0x1
-	strh r6, [r4, r0]
-	b _02088EE8
-_02088E82:
-	mov r1, #0xfe
-	lsl r1, r1, #0x8
-	and r1, r5
-	asr r3, r1, #0x9
-	ldr r1, [sp, #0x4]
-	cmp r3, r1
-	bgt _02088EDA
-	lsr r1, r6, #0x7
-	and r1, r5
-	strh r1, [r7, r0]
-	ldrh r3, [r7, r0]
-	mov r1, #0x0
-	add r6, sp, #0x10
-_02088E9C:
-	lsl r5, r1, #0x1
-	ldrh r5, [r6, r5]
-	cmp r3, r5
-	beq _02088EAE
-	add r1, r1, #0x1
-	lsl r1, r1, #0x18
-	lsr r1, r1, #0x18
-	cmp r1, #0x4
-	blo _02088E9C
-_02088EAE:
-	cmp r1, #0x4
-	bne _02088EDA
-	mov r1, #0x0
-	cmp r2, #0x0
-	bls _02088ECA
-_02088EB8:
-	lsl r5, r1, #0x1
-	ldrh r5, [r4, r5]
-	cmp r5, r3
-	beq _02088ECA
-	add r1, r1, #0x1
-	lsl r1, r1, #0x18
-	lsr r1, r1, #0x18
-	cmp r1, r2
-	blo _02088EB8
-_02088ECA:
-	cmp r1, r2
-	bne _02088EDA
-	ldrh r1, [r7, r0]
-	lsl r0, r2, #0x1
-	strh r1, [r4, r0]
-	add r0, r2, #0x1
-	lsl r0, r0, #0x18
-	lsr r2, r0, #0x18
-_02088EDA:
-	mov r0, r12
-	add r0, r0, #0x1
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	mov r12, r0
-	cmp r0, #0x16
-	blo _02088E70
-_02088EE8:
-	add r0, r7, #0x0
-	bl FreeToHeap
-	add r0, r4, #0x0
-	add sp, #0x18
-	pop {r3-r7, pc}
-	.balign 4
-_02088EF4: .word 0x0000FFFF
-
-	thumb_func_start FUN_02088EF8
-FUN_02088EF8: ; 0x02088EF8
-	ldrh r1, [r0, #0x0]
-	ldr r0, _02088F08 ; =0x0000FFFF
-	cmp r1, r0
-	beq _02088F04
-	mov r0, #0x1
-	bx lr
-_02088F04:
-	mov r0, #0x0
-	bx lr
-	.balign 4
-_02088F08: .word 0x0000FFFF