From 1499e9f8be9458bbf94cbc4dc6d1034f53606cd0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Aug 2021 08:31:30 -0400
Subject: Move UNK_021C46B4 to C

---
 arm9/asm/unk_0200E1D0.s   | 961 ----------------------------------------------
 arm9/asm/unk_0200E1D0_s.s | 929 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 929 insertions(+), 961 deletions(-)
 delete mode 100644 arm9/asm/unk_0200E1D0.s
 create mode 100644 arm9/asm/unk_0200E1D0_s.s

(limited to 'arm9/asm')

diff --git a/arm9/asm/unk_0200E1D0.s b/arm9/asm/unk_0200E1D0.s
deleted file mode 100644
index b93e5e74..00000000
--- a/arm9/asm/unk_0200E1D0.s
+++ /dev/null
@@ -1,961 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.section .rodata
-
-	.global UNK_020ECEF4
-UNK_020ECEF4: ; 0x020ECEF4
-	.word FUN_0200E850
-	.word FUN_0200E86C
-	.word FUN_0200E88C
-	.word FUN_0200E8C8
-	.word FUN_0200E900
-	.word FUN_0200E93C
-	.word FUN_0200E974
-	.word FUN_0200E9A0
-	.word FUN_0200E9CC
-	.word FUN_0200EA08
-	.word FUN_0200EA40
-	.word FUN_0200EA7C
-	.word FUN_0200EAB4
-	.word FUN_0200EAE0
-	.word FUN_0200EB0C
-	.word FUN_0200EB40
-	.word FUN_0200EB70
-	.word FUN_0200EB9C
-	.word FUN_0200EBC8
-	.word FUN_0200EBF4
-	.word FUN_0200EC20
-	.word FUN_0200EC4C
-	.word FUN_0200EC78
-	.word FUN_0200ECA4
-	.word FUN_0200ECD0
-	.word FUN_0200ECFC
-	.word FUN_0200ED28
-	.word FUN_0200ED54
-	.word FUN_0200ED80
-	.word FUN_0200EDD4
-	.word FUN_0200EE24
-	.word FUN_0200EE60
-	.word FUN_0200EE98
-	.word FUN_0200EED8
-	.word FUN_0200EF14
-	.word FUN_0200EF54
-	.word FUN_0200EF90
-	.word FUN_0200EFBC
-	.word FUN_0200EFE8
-	.word FUN_0200F014
-	.word FUN_0200F040
-	.word FUN_0200F07C
-
-	.section .bss
-
-	.global UNK_021C46B4
-UNK_021C46B4: ; 0x021C46B4
-	.space 0x4
-
-	.global UNK_021C46B8
-UNK_021C46B8: ; 0x021C46B8
-	.space 0x4
-
-	.global UNK_021C46BC
-UNK_021C46BC: ; 0x021C46BC
-	.space 0xc
-
-	.global UNK_021C46C8
-UNK_021C46C8: ; 0x021C46C8
-	.space 0x30
-
-	.global UNK_021C46F8
-UNK_021C46F8: ; 0x021C46F8
-	.space 0x30
-
-	.global UNK_021C4728
-UNK_021C4728: ; 0x021C4728
-	.space 0x18
-
-	.global UNK_021C4740
-UNK_021C4740: ; 0x021C4740
-	.space 0xb4
-
-	.global UNK_021C47F4
-UNK_021C47F4: ; 0x021C47F4
-	.space 0x14
-
-	.text
-
-	thumb_func_start FUN_0200E1D0
-FUN_0200E1D0: ; 0x0200E1D0
-	push {r4-r7, lr}
-	sub sp, #0x1c
-	add r5, r0, #0x0
-	ldr r0, [sp, #0x30]
-	add r4, r1, #0x0
-	add r7, r2, #0x0
-	add r6, r3, #0x0
-	cmp r0, #0x0
-	bne _0200E1E6
-	bl GF_AssertFail
-_0200E1E6:
-	ldr r0, [sp, #0x34]
-	cmp r0, #0x0
-	bne _0200E1F0
-	bl GF_AssertFail
-_0200E1F0:
-	ldr r0, _0200E2AC ; =UNK_021C47F4
-	ldrh r0, [r0, #0xc]
-	cmp r0, #0x0
-	beq _0200E1FC
-	bl GF_AssertFail
-_0200E1FC:
-	ldr r0, _0200E2B0 ; =UNK_021C46B4
-	bl FUN_0200E808
-	ldr r1, _0200E2B0 ; =UNK_021C46B4
-	add r0, r5, #0x0
-	bl FUN_0200E558
-	ldr r0, _0200E2B4 ; =UNK_021C4728
-	bl FUN_0200E5F4
-	ldr r0, _0200E2B0 ; =UNK_021C46B4
-	add r1, r6, #0x0
-	bl FUN_0200E75C
-	add r5, r0, #0x0
-	mov r0, #0x0
-	str r0, [sp, #0x0]
-	str r0, [sp, #0x4]
-	str r0, [sp, #0x8]
-	ldr r0, _0200E2B8 ; =UNK_021C4740
-	ldr r2, [sp, #0x30]
-	str r0, [sp, #0xc]
-	ldr r0, _0200E2B4 ; =UNK_021C4728
-	ldr r3, [sp, #0x34]
-	str r0, [sp, #0x10]
-	ldr r0, [sp, #0x38]
-	add r1, r4, #0x0
-	str r0, [sp, #0x14]
-	ldr r0, _0200E2BC ; =UNK_021C46C8
-	str r5, [sp, #0x18]
-	bl FUN_0200E5C8
-	mov r0, #0x0
-	str r0, [sp, #0x0]
-	str r0, [sp, #0x4]
-	mov r0, #0x1
-	str r0, [sp, #0x8]
-	ldr r0, _0200E2B8 ; =UNK_021C4740
-	ldr r2, [sp, #0x30]
-	str r0, [sp, #0xc]
-	ldr r0, _0200E2B4 ; =UNK_021C4728
-	ldr r3, [sp, #0x34]
-	str r0, [sp, #0x10]
-	ldr r0, [sp, #0x38]
-	add r1, r7, #0x0
-	str r0, [sp, #0x14]
-	ldr r0, _0200E2C0 ; =UNK_021C46F8
-	str r5, [sp, #0x18]
-	bl FUN_0200E5C8
-	ldr r0, _0200E2AC ; =UNK_021C47F4
-	mov r1, #0x1
-	strh r1, [r0, #0xc]
-	ldr r0, _0200E2C4 ; =UNK_021C46B8
-	ldr r1, _0200E2BC ; =UNK_021C46C8
-	bl FUN_0200E528
-	ldr r0, _0200E2C8 ; =UNK_021C46BC
-	ldr r1, _0200E2C0 ; =UNK_021C46F8
-	bl FUN_0200E528
-	ldr r0, _0200E2CC ; =UNK_021C46B4
-	ldr r0, [r0, #0xc]
-	cmp r0, #0x0
-	beq _0200E28E
-	ldr r0, _0200E2B0 ; =UNK_021C46B4
-	add r0, #0x14
-	bl FUN_0200E7A8
-	ldr r1, _0200E2D0 ; =0x0000014E
-	ldr r0, _0200E2B0 ; =UNK_021C46B4
-	mov r2, #0x1
-	strb r2, [r0, r1]
-_0200E28E:
-	ldr r0, _0200E2B0 ; =UNK_021C46B4
-	ldr r0, [r0, #0x10]
-	cmp r0, #0x0
-	beq _0200E2A6
-	ldr r0, _0200E2B0 ; =UNK_021C46B4
-	add r0, #0x44
-	bl FUN_0200E7A8
-	ldr r1, _0200E2D4 ; =0x0000014F
-	ldr r0, _0200E2B0 ; =UNK_021C46B4
-	mov r2, #0x1
-	strb r2, [r0, r1]
-_0200E2A6:
-	add sp, #0x1c
-	pop {r4-r7, pc}
-	nop
-_0200E2AC: .word UNK_021C47F4
-_0200E2B0: .word UNK_021C46B4
-_0200E2B4: .word UNK_021C4728
-_0200E2B8: .word UNK_021C4740
-_0200E2BC: .word UNK_021C46C8
-_0200E2C0: .word UNK_021C46F8
-_0200E2C4: .word UNK_021C46B8
-_0200E2C8: .word UNK_021C46BC
-_0200E2CC: .word UNK_021C46B4
-_0200E2D0: .word 0x0000014E
-_0200E2D4: .word 0x0000014F
-
-	thumb_func_start FUN_0200E2D8
-FUN_0200E2D8: ; 0x0200E2D8
-	push {r4, lr}
-	ldr r0, _0200E300 ; =UNK_021C47F4
-	ldr r4, _0200E304 ; =UNK_021C46B4
-	ldrh r0, [r0, #0xc]
-	cmp r0, #0x0
-	beq _0200E2FC
-	add r1, r4, #0x0
-	add r2, r4, #0x0
-	add r0, r4, #0x0
-	add r1, #0x14
-	add r2, #0x44
-	bl FUN_0200E4B8
-	cmp r0, #0x1
-	bne _0200E2FC
-	add r0, r4, #0x0
-	bl FUN_0200E460
-_0200E2FC:
-	pop {r4, pc}
-	nop
-_0200E300: .word UNK_021C47F4
-_0200E304: .word UNK_021C46B4
-
-	thumb_func_start FUN_0200E308
-FUN_0200E308: ; 0x0200E308
-	ldr r0, _0200E318 ; =UNK_021C47F4
-	ldrh r0, [r0, #0xc]
-	cmp r0, #0x0
-	bne _0200E314
-	mov r0, #0x1
-	bx lr
-_0200E314:
-	mov r0, #0x0
-	bx lr
-	.balign 4
-_0200E318: .word UNK_021C47F4
-
-	thumb_func_start FUN_0200E31C
-FUN_0200E31C: ; 0x0200E31C
-	push {r3, lr}
-	ldr r0, _0200E368 ; =UNK_021C4728
-	mov r1, #0x0
-	bl FUN_0200E6A0
-	ldr r0, _0200E368 ; =UNK_021C4728
-	mov r1, #0x1
-	bl FUN_0200E6A0
-	ldr r0, _0200E36C ; =UNK_021C46B4
-	ldr r1, [r0, #0x4]
-	cmp r1, #0x0
-	beq _0200E33A
-	mov r1, #0x2
-	str r1, [r0, #0x20]
-_0200E33A:
-	ldr r0, _0200E36C ; =UNK_021C46B4
-	ldr r1, [r0, #0x8]
-	cmp r1, #0x0
-	beq _0200E346
-	mov r1, #0x2
-	str r1, [r0, #0x50]
-_0200E346:
-	ldr r0, _0200E370 ; =UNK_021C46B8
-	ldr r1, _0200E374 ; =UNK_021C46C8
-	bl FUN_0200E528
-	ldr r0, _0200E378 ; =UNK_021C46BC
-	ldr r1, _0200E37C ; =UNK_021C46F8
-	bl FUN_0200E528
-	ldr r0, _0200E380 ; =UNK_021C47F4
-	mov r1, #0x0
-	strh r1, [r0, #0xc]
-	strb r1, [r0, #0xe]
-	strb r1, [r0, #0xf]
-	ldr r0, _0200E384 ; =UNK_021C46B4
-	bl FUN_0200E808
-	pop {r3, pc}
-	.balign 4
-_0200E368: .word UNK_021C4728
-_0200E36C: .word UNK_021C46B4
-_0200E370: .word UNK_021C46B8
-_0200E374: .word UNK_021C46C8
-_0200E378: .word UNK_021C46BC
-_0200E37C: .word UNK_021C46F8
-_0200E380: .word UNK_021C47F4
-_0200E384: .word UNK_021C46B4
-
-	thumb_func_start FUN_0200E388
-FUN_0200E388: ; 0x0200E388
-	ldr r3, _0200E390 ; =FUN_02011480
-	add r1, r0, #0x0
-	mov r0, #0x0
-	bx r3
-	.balign 4
-_0200E390: .word FUN_02011480
-
-	thumb_func_start FUN_0200E394
-FUN_0200E394: ; 0x0200E394
-	ldr r3, _0200E39C ; =FUN_0200E440
-	mov r1, #0x0
-	bx r3
-	nop
-_0200E39C: .word FUN_0200E440
-
-	thumb_func_start FUN_0200E3A0
-FUN_0200E3A0: ; 0x0200E3A0
-	ldr r2, _0200E3B4 ; =0x00007FFF
-	cmp r1, r2
-	bne _0200E3AA
-	mov r1, #0x10
-	b _0200E3AE
-_0200E3AA:
-	mov r1, #0xf
-	mvn r1, r1
-_0200E3AE:
-	ldr r3, _0200E3B8 ; =FUN_0200E440
-	bx r3
-	nop
-_0200E3B4: .word 0x00007FFF
-_0200E3B8: .word FUN_0200E440
-
-	thumb_func_start FUN_0200E3BC
-FUN_0200E3BC: ; 0x0200E3BC
-	push {r0-r3}
-	push {r3-r4, lr}
-	sub sp, #0xc
-	add r4, r0, #0x0
-	add r0, sp, #0x1c
-	bne _0200E3D2
-	mov r1, #0x0
-	mov r2, #0x2
-	bl GX_LoadBGPltt
-	b _0200E3DA
-_0200E3D2:
-	mov r1, #0x0
-	mov r2, #0x2
-	bl GXS_LoadBGPltt
-_0200E3DA:
-	ldr r0, _0200E41C ; =UNK_021C4740
-	mov r1, #0x1
-	add r2, r4, #0x0
-	bl FUN_02011634
-	mov r2, #0x0
-	ldr r0, _0200E41C ; =UNK_021C4740
-	mov r1, #0x3f
-	add r3, r2, #0x0
-	str r4, [sp, #0x0]
-	bl FUN_02011650
-	mov r1, #0x0
-	str r1, [sp, #0x0]
-	str r1, [sp, #0x4]
-	ldr r0, _0200E41C ; =UNK_021C4740
-	add r2, r1, #0x0
-	add r3, r1, #0x0
-	str r4, [sp, #0x8]
-	bl FUN_02011698
-	ldr r0, _0200E41C ; =UNK_021C4740
-	mov r1, #0x20
-	mov r2, #0x0
-	add r3, r4, #0x0
-	bl FUN_02011678
-	add sp, #0xc
-	pop {r3-r4}
-	pop {r3}
-	add sp, #0x10
-	bx r3
-	nop
-_0200E41C: .word UNK_021C4740
-
-	thumb_func_start FUN_0200E420
-FUN_0200E420: ; 0x0200E420
-	push {r0-r3}
-	push {r3, lr}
-	add r0, sp, #0x8
-	mov r1, #0x0
-	mov r2, #0x2
-	bl GX_LoadBGPltt
-	add r0, sp, #0x8
-	mov r1, #0x0
-	mov r2, #0x2
-	bl GXS_LoadBGPltt
-	pop {r3}
-	pop {r3}
-	add sp, #0x10
-	bx r3
-
-	thumb_func_start FUN_0200E440
-FUN_0200E440: ; 0x0200E440
-	push {r3, lr}
-	cmp r0, #0x0
-	bne _0200E44E
-	ldr r0, _0200E458 ; =0x0400006C
-	bl GXx_SetMasterBrightness_
-	pop {r3, pc}
-_0200E44E:
-	ldr r0, _0200E45C ; =0x0400106C
-	bl GXx_SetMasterBrightness_
-	pop {r3, pc}
-	nop
-_0200E458: .word 0x0400006C
-_0200E45C: .word 0x0400106C
-
-	thumb_func_start FUN_0200E460
-FUN_0200E460: ; 0x0200E460
-	push {r4, lr}
-	mov r1, #0x53
-	add r4, r0, #0x0
-	mov r2, #0x0
-	lsl r1, r1, #0x2
-	strh r2, [r4, r1]
-	bl FUN_0200E770
-	mov r1, #0x15
-	lsl r1, r1, #0x4
-	strh r0, [r4, r1]
-	ldr r0, [r4, #0xc]
-	cmp r0, #0x0
-	beq _0200E490
-	add r0, r4, #0x0
-	add r0, #0x14
-	bl FUN_0200E7D8
-	ldr r0, [r4, #0x3c]
-	cmp r0, #0x0
-	bne _0200E490
-	ldr r0, _0200E4B4 ; =UNK_021C47F4
-	mov r1, #0x0
-	strb r1, [r0, #0xe]
-_0200E490:
-	ldr r0, [r4, #0x10]
-	cmp r0, #0x0
-	beq _0200E4AA
-	add r0, r4, #0x0
-	add r0, #0x44
-	bl FUN_0200E7D8
-	ldr r0, [r4, #0x3c]
-	cmp r0, #0x0
-	bne _0200E4AA
-	ldr r0, _0200E4B4 ; =UNK_021C47F4
-	mov r1, #0x0
-	strb r1, [r0, #0xf]
-_0200E4AA:
-	add r0, r4, #0x0
-	bl FUN_0200E808
-	pop {r4, pc}
-	nop
-_0200E4B4: .word UNK_021C47F4
-
-	thumb_func_start FUN_0200E4B8
-FUN_0200E4B8: ; 0x0200E4B8
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	ldr r0, [r5, #0x0]
-	add r4, r2, #0x0
-	cmp r0, #0x0
-	beq _0200E4CE
-	cmp r0, #0x1
-	beq _0200E4E0
-	cmp r0, #0x2
-	beq _0200E4FA
-	b _0200E512
-_0200E4CE:
-	add r0, r5, #0x4
-	bl FUN_0200E528
-	add r0, r5, #0x0
-	add r0, #0x8
-	add r1, r4, #0x0
-	bl FUN_0200E528
-	b _0200E512
-_0200E4E0:
-	ldr r0, [r5, #0x4]
-	cmp r0, #0x0
-	beq _0200E4EE
-	add r0, r5, #0x4
-	bl FUN_0200E528
-	b _0200E512
-_0200E4EE:
-	add r0, r5, #0x0
-	add r0, #0x8
-	add r1, r4, #0x0
-	bl FUN_0200E528
-	b _0200E512
-_0200E4FA:
-	ldr r0, [r5, #0x8]
-	cmp r0, #0x0
-	beq _0200E50C
-	add r0, r5, #0x0
-	add r0, #0x8
-	add r1, r4, #0x0
-	bl FUN_0200E528
-	b _0200E512
-_0200E50C:
-	add r0, r5, #0x4
-	bl FUN_0200E528
-_0200E512:
-	ldr r0, [r5, #0x4]
-	cmp r0, #0x0
-	bne _0200E522
-	ldr r0, [r5, #0x8]
-	cmp r0, #0x0
-	bne _0200E522
-	mov r0, #0x1
-	pop {r3-r5, pc}
-_0200E522:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_0200E528
-FUN_0200E528: ; 0x0200E528
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r0, [r4, #0x0]
-	cmp r0, #0x0
-	beq _0200E540
-	add r0, r1, #0x0
-	bl FUN_0200E544
-	cmp r0, #0x1
-	bne _0200E540
-	mov r0, #0x0
-	str r0, [r4, #0x0]
-_0200E540:
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_0200E544
-FUN_0200E544: ; 0x0200E544
-	push {r3, lr}
-	ldr r1, [r0, #0x0]
-	lsl r2, r1, #0x2
-	ldr r1, _0200E554 ; =UNK_020ECEF4
-	ldr r1, [r1, r2]
-	blx r1
-	pop {r3, pc}
-	nop
-_0200E554: .word UNK_020ECEF4
-
-	thumb_func_start FUN_0200E558
-FUN_0200E558: ; 0x0200E558
-	push {r3, lr}
-	cmp r0, #0x4
-	bhi _0200E5B8
-	add r0, r0, r0
-	add r0, pc
-	ldrh r0, [r0, #0x6]
-	lsl r0, r0, #0x10
-	asr r0, r0, #0x10
-	add pc, r0
-_0200E56A: ; jump table (using 16-bit offset)
-	.short _0200E574 - _0200E56A - 2; case 0
-	.short _0200E582 - _0200E56A - 2; case 1
-	.short _0200E590 - _0200E56A - 2; case 2
-	.short _0200E59E - _0200E56A - 2; case 3
-	.short _0200E5AC - _0200E56A - 2; case 4
-_0200E574:
-	mov r2, #0x1
-	add r0, r1, #0x0
-	mov r1, #0x0
-	add r3, r2, #0x0
-	bl FUN_0200E5BC
-	pop {r3, pc}
-_0200E582:
-	add r0, r1, #0x0
-	mov r1, #0x1
-	add r2, r1, #0x0
-	add r3, r1, #0x0
-	bl FUN_0200E5BC
-	pop {r3, pc}
-_0200E590:
-	mov r2, #0x1
-	add r0, r1, #0x0
-	mov r1, #0x2
-	add r3, r2, #0x0
-	bl FUN_0200E5BC
-	pop {r3, pc}
-_0200E59E:
-	add r0, r1, #0x0
-	mov r1, #0x1
-	add r2, r1, #0x0
-	mov r3, #0x0
-	bl FUN_0200E5BC
-	pop {r3, pc}
-_0200E5AC:
-	add r0, r1, #0x0
-	mov r1, #0x2
-	mov r2, #0x0
-	mov r3, #0x1
-	bl FUN_0200E5BC
-_0200E5B8:
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_0200E5BC
-FUN_0200E5BC: ; 0x0200E5BC
-	str r1, [r0, #0x0]
-	str r2, [r0, #0x4]
-	str r3, [r0, #0x8]
-	str r2, [r0, #0xc]
-	str r3, [r0, #0x10]
-	bx lr
-
-	thumb_func_start FUN_0200E5C8
-FUN_0200E5C8: ; 0x0200E5C8
-	str r1, [r0, #0x0]
-	str r2, [r0, #0x4]
-	ldr r1, [sp, #0x0]
-	str r3, [r0, #0x8]
-	str r1, [r0, #0xc]
-	ldr r1, [sp, #0x4]
-	str r1, [r0, #0x14]
-	ldr r1, [sp, #0x8]
-	str r1, [r0, #0x10]
-	ldr r1, [sp, #0xc]
-	str r1, [r0, #0x18]
-	ldr r1, [sp, #0x10]
-	str r1, [r0, #0x1c]
-	ldr r1, [sp, #0x14]
-	str r1, [r0, #0x20]
-	ldr r1, _0200E5F0 ; =0xFFFFFFF0
-	add r1, sp
-	ldrh r1, [r1, #0x28]
-	strh r1, [r0, #0x24]
-	bx lr
-	.balign 4
-_0200E5F0: .word 0xFFFFFFF0
-
-	thumb_func_start FUN_0200E5F4
-FUN_0200E5F4: ; 0x0200E5F4
-	mov r3, #0x0
-	ldr r1, _0200E60C ; =FUN_0200E758
-	add r2, r3, #0x0
-_0200E5FA:
-	str r2, [r0, #0x0]
-	str r1, [r0, #0x8]
-	str r2, [r0, #0x10]
-	add r3, r3, #0x1
-	add r0, r0, #0x4
-	cmp r3, #0x2
-	blt _0200E5FA
-	bx lr
-	nop
-_0200E60C: .word FUN_0200E758
-
-	thumb_func_start FUN_0200E610
-FUN_0200E610: ; 0x0200E610
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	mov r4, #0x0
-_0200E616:
-	ldr r0, [r5, #0x0]
-	ldr r1, [r5, #0x8]
-	blx r1
-	add r4, r4, #0x1
-	add r5, r5, #0x4
-	cmp r4, #0x2
-	blt _0200E616
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_0200E628
-FUN_0200E628: ; 0x0200E628
-	push {r4-r7, lr}
-	sub sp, #0xc
-	add r5, r0, #0x0
-	mov r0, #0x1
-	str r0, [sp, #0x4]
-	add r0, r5, #0x0
-	str r0, [sp, #0x8]
-	add r0, #0x10
-	lsl r4, r3, #0x2
-	str r0, [sp, #0x8]
-	ldr r0, [r0, r4]
-	add r7, r2, #0x0
-	str r1, [sp, #0x0]
-	cmp r0, #0x0
-	beq _0200E64A
-	bl GF_AssertFail
-_0200E64A:
-	add r6, r5, #0x0
-	add r6, #0x8
-	ldr r0, [r6, r4]
-	cmp r0, #0x0
-	bne _0200E658
-	bl GF_AssertFail
-_0200E658:
-	ldr r0, [r5, #0x10]
-	cmp r0, #0x0
-	bne _0200E672
-	ldr r0, [r5, #0x14]
-	cmp r0, #0x0
-	bne _0200E672
-	ldr r0, _0200E698 ; =FUN_0200E610
-	add r1, r5, #0x0
-	bl FUN_02015F34
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	str r0, [sp, #0x4]
-_0200E672:
-	ldr r0, [sp, #0x4]
-	cmp r0, #0x1
-	beq _0200E67C
-	bl GF_AssertFail
-_0200E67C:
-	ldr r0, [sp, #0x0]
-	cmp r7, #0x0
-	str r0, [r5, r4]
-	beq _0200E688
-	str r7, [r6, r4]
-	b _0200E68C
-_0200E688:
-	ldr r0, _0200E69C ; =FUN_0200E758
-	str r0, [r6, r4]
-_0200E68C:
-	ldr r0, [sp, #0x8]
-	mov r1, #0x1
-	str r1, [r0, r4]
-	add sp, #0xc
-	pop {r4-r7, pc}
-	nop
-_0200E698: .word FUN_0200E610
-_0200E69C: .word FUN_0200E758
-
-	thumb_func_start FUN_0200E6A0
-FUN_0200E6A0: ; 0x0200E6A0
-	push {r3-r5, lr}
-	lsl r4, r1, #0x2
-	add r5, r0, #0x0
-	mov r1, #0x0
-	add r0, r5, r4
-	str r1, [r0, #0x10]
-	ldr r0, [r5, #0x10]
-	cmp r0, #0x0
-	bne _0200E6BC
-	ldr r0, [r5, #0x14]
-	cmp r0, #0x0
-	bne _0200E6BC
-	bl FUN_02015F1C
-_0200E6BC:
-	ldr r1, _0200E6C8 ; =FUN_0200E758
-	add r0, r5, r4
-	str r1, [r0, #0x8]
-	mov r0, #0x0
-	str r0, [r5, r4]
-	pop {r3-r5, pc}
-	.balign 4
-_0200E6C8: .word FUN_0200E758
-
-	thumb_func_start FUN_0200E6CC
-FUN_0200E6CC: ; 0x0200E6CC
-	push {r3-r7, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	ldr r0, [sp, #0x18]
-	mov r1, #0x10
-	add r6, r2, #0x0
-	add r7, r3, #0x0
-	bl AllocFromHeapAtEnd
-	add r1, r0, #0x0
-	str r5, [r1, #0x0]
-	str r4, [r1, #0x4]
-	mov r2, #0x1
-	str r6, [r1, #0x8]
-	ldr r0, _0200E6F4 ; =FUN_0200E71C
-	lsl r2, r2, #0xa
-	str r7, [r1, #0xc]
-	bl FUN_0200CA98
-	pop {r3-r7, pc}
-	.balign 4
-_0200E6F4: .word FUN_0200E71C
-
-	thumb_func_start FUN_0200E6F8
-FUN_0200E6F8: ; 0x0200E6F8
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	add r0, r2, #0x0
-	mov r1, #0x8
-	bl AllocFromHeapAtEnd
-	add r1, r0, #0x0
-	mov r2, #0x1
-	str r5, [r1, #0x0]
-	ldr r0, _0200E718 ; =FUN_0200E73C
-	lsl r2, r2, #0xa
-	str r4, [r1, #0x4]
-	bl FUN_0200CA98
-	pop {r3-r5, pc}
-	.balign 4
-_0200E718: .word FUN_0200E73C
-
-	thumb_func_start FUN_0200E71C
-FUN_0200E71C: ; 0x0200E71C
-	push {r3-r5, lr}
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	ldr r0, [r4, #0x0]
-	ldr r1, [r4, #0x4]
-	ldr r2, [r4, #0x8]
-	ldr r3, [r4, #0xc]
-	bl FUN_0200E628
-	add r0, r5, #0x0
-	bl FUN_0200CAB4
-	add r0, r4, #0x0
-	bl FreeToHeap
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_0200E73C
-FUN_0200E73C: ; 0x0200E73C
-	push {r3-r5, lr}
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	ldr r0, [r4, #0x0]
-	ldr r1, [r4, #0x4]
-	bl FUN_0200E6A0
-	add r0, r5, #0x0
-	bl FUN_0200CAB4
-	add r0, r4, #0x0
-	bl FreeToHeap
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_0200E758
-FUN_0200E758: ; 0x0200E758
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_0200E75C
-FUN_0200E75C: ; 0x0200E75C
-	ldr r2, _0200E76C ; =0x0000FFFF
-	cmp r1, r2
-	bne _0200E768
-	mov r1, #0x15
-	lsl r1, r1, #0x4
-	ldrh r1, [r0, r1]
-_0200E768:
-	add r0, r1, #0x0
-	bx lr
-	.balign 4
-_0200E76C: .word 0x0000FFFF
-
-	thumb_func_start FUN_0200E770
-FUN_0200E770: ; 0x0200E770
-	ldr r1, [r0, #0xc]
-	cmp r1, #0x1
-	bne _0200E77C
-	add r2, r0, #0x0
-	add r2, #0x14
-	b _0200E780
-_0200E77C:
-	add r2, r0, #0x0
-	add r2, #0x44
-_0200E780:
-	ldr r1, [r2, #0x28]
-	cmp r1, #0x1
-	bne _0200E78A
-	ldrh r0, [r2, #0x24]
-	bx lr
-_0200E78A:
-	mov r1, #0x15
-	lsl r1, r1, #0x4
-	ldrh r0, [r0, r1]
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_0200E794
-FUN_0200E794: ; 0x0200E794
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r0, [r1, #0x10]
-	mov r1, #0x0
-	bl FUN_0200E440
-	add r0, r4, #0x0
-	bl FUN_0200CAB4
-	pop {r4, pc}
-
-	thumb_func_start FUN_0200E7A8
-FUN_0200E7A8: ; 0x0200E7A8
-	push {r3, lr}
-	add r1, r0, #0x0
-	ldr r0, [r1, #0x28]
-	cmp r0, #0x0
-	bne _0200E7CE
-	ldrh r2, [r1, #0x24]
-	ldr r0, _0200E7D0 ; =0x00007FFF
-	cmp r2, r0
-	beq _0200E7BE
-	cmp r2, #0x0
-	bne _0200E7CE
-_0200E7BE:
-	ldr r0, [r1, #0x2c]
-	cmp r0, #0x0
-	bne _0200E7CE
-	mov r2, #0x1
-	ldr r0, _0200E7D4 ; =FUN_0200E794
-	lsl r2, r2, #0xa
-	bl FUN_0200CA98
-_0200E7CE:
-	pop {r3, pc}
-	.balign 4
-_0200E7D0: .word 0x00007FFF
-_0200E7D4: .word FUN_0200E794
-
-	thumb_func_start FUN_0200E7D8
-FUN_0200E7D8: ; 0x0200E7D8
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r0, [r4, #0x28]
-	cmp r0, #0x1
-	bne _0200E800
-	ldrh r1, [r4, #0x24]
-	ldr r0, _0200E804 ; =0x00007FFF
-	cmp r1, r0
-	beq _0200E7EE
-	cmp r1, #0x0
-	bne _0200E800
-_0200E7EE:
-	ldr r0, [r4, #0x2c]
-	cmp r0, #0x0
-	bne _0200E800
-	ldr r0, [r4, #0x10]
-	bl FUN_0200E3A0
-	ldr r0, [r4, #0x10]
-	bl FUN_0200E388
-_0200E800:
-	pop {r4, pc}
-	nop
-_0200E804: .word 0x00007FFF
-
-	thumb_func_start FUN_0200E808
-FUN_0200E808: ; 0x0200E808
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r2, r4, #0x0
-	mov r1, #0x14
-	mov r0, #0x0
-_0200E812:
-	strb r0, [r2, #0x0]
-	add r2, r2, #0x1
-	sub r1, r1, #0x1
-	bne _0200E812
-	add r0, r4, #0x0
-	add r0, #0x14
-	mov r1, #0x0
-	mov r2, #0x30
-	bl memset
-	add r0, r4, #0x0
-	add r0, #0x44
-	mov r1, #0x0
-	mov r2, #0x30
-	bl memset
-	add r2, r4, #0x0
-	add r2, #0x74
-	mov r1, #0x18
-	mov r0, #0x0
-_0200E83A:
-	strb r0, [r2, #0x0]
-	add r2, r2, #0x1
-	sub r1, r1, #0x1
-	bne _0200E83A
-	add r4, #0x8c
-	add r0, r4, #0x0
-	mov r1, #0x0
-	mov r2, #0xc0
-	bl memset
-	pop {r4, pc}
diff --git a/arm9/asm/unk_0200E1D0_s.s b/arm9/asm/unk_0200E1D0_s.s
new file mode 100644
index 00000000..a84df611
--- /dev/null
+++ b/arm9/asm/unk_0200E1D0_s.s
@@ -0,0 +1,929 @@
+	.include "asm/macros.inc"
+	.include "global.inc"
+
+	.public UNK_021C46B4
+
+	.section .rodata
+
+	.global UNK_020ECEF4
+UNK_020ECEF4: ; 0x020ECEF4
+	.word FUN_0200E850
+	.word FUN_0200E86C
+	.word FUN_0200E88C
+	.word FUN_0200E8C8
+	.word FUN_0200E900
+	.word FUN_0200E93C
+	.word FUN_0200E974
+	.word FUN_0200E9A0
+	.word FUN_0200E9CC
+	.word FUN_0200EA08
+	.word FUN_0200EA40
+	.word FUN_0200EA7C
+	.word FUN_0200EAB4
+	.word FUN_0200EAE0
+	.word FUN_0200EB0C
+	.word FUN_0200EB40
+	.word FUN_0200EB70
+	.word FUN_0200EB9C
+	.word FUN_0200EBC8
+	.word FUN_0200EBF4
+	.word FUN_0200EC20
+	.word FUN_0200EC4C
+	.word FUN_0200EC78
+	.word FUN_0200ECA4
+	.word FUN_0200ECD0
+	.word FUN_0200ECFC
+	.word FUN_0200ED28
+	.word FUN_0200ED54
+	.word FUN_0200ED80
+	.word FUN_0200EDD4
+	.word FUN_0200EE24
+	.word FUN_0200EE60
+	.word FUN_0200EE98
+	.word FUN_0200EED8
+	.word FUN_0200EF14
+	.word FUN_0200EF54
+	.word FUN_0200EF90
+	.word FUN_0200EFBC
+	.word FUN_0200EFE8
+	.word FUN_0200F014
+	.word FUN_0200F040
+	.word FUN_0200F07C
+
+	.text
+
+	thumb_func_start FUN_0200E1D0
+FUN_0200E1D0: ; 0x0200E1D0
+	push {r4-r7, lr}
+	sub sp, #0x1c
+	add r5, r0, #0x0
+	ldr r0, [sp, #0x30]
+	add r4, r1, #0x0
+	add r7, r2, #0x0
+	add r6, r3, #0x0
+	cmp r0, #0x0
+	bne _0200E1E6
+	bl GF_AssertFail
+_0200E1E6:
+	ldr r0, [sp, #0x34]
+	cmp r0, #0x0
+	bne _0200E1F0
+	bl GF_AssertFail
+_0200E1F0:
+	ldr r0, _0200E2AC ; =UNK_021C46B4 + 0x140
+	ldrh r0, [r0, #0xc]
+	cmp r0, #0x0
+	beq _0200E1FC
+	bl GF_AssertFail
+_0200E1FC:
+	ldr r0, _0200E2B0 ; =UNK_021C46B4
+	bl FUN_0200E808
+	ldr r1, _0200E2B0 ; =UNK_021C46B4
+	add r0, r5, #0x0
+	bl FUN_0200E558
+	ldr r0, _0200E2B4 ; =UNK_021C46B4 + 0x74
+	bl FUN_0200E5F4
+	ldr r0, _0200E2B0 ; =UNK_021C46B4
+	add r1, r6, #0x0
+	bl FUN_0200E75C
+	add r5, r0, #0x0
+	mov r0, #0x0
+	str r0, [sp, #0x0]
+	str r0, [sp, #0x4]
+	str r0, [sp, #0x8]
+	ldr r0, _0200E2B8 ; =UNK_021C46B4 + 0x8C
+	ldr r2, [sp, #0x30]
+	str r0, [sp, #0xc]
+	ldr r0, _0200E2B4 ; =UNK_021C46B4 + 0x74
+	ldr r3, [sp, #0x34]
+	str r0, [sp, #0x10]
+	ldr r0, [sp, #0x38]
+	add r1, r4, #0x0
+	str r0, [sp, #0x14]
+	ldr r0, _0200E2BC ; =UNK_021C46B4 + 0x14
+	str r5, [sp, #0x18]
+	bl FUN_0200E5C8
+	mov r0, #0x0
+	str r0, [sp, #0x0]
+	str r0, [sp, #0x4]
+	mov r0, #0x1
+	str r0, [sp, #0x8]
+	ldr r0, _0200E2B8 ; =UNK_021C46B4 + 0x8C
+	ldr r2, [sp, #0x30]
+	str r0, [sp, #0xc]
+	ldr r0, _0200E2B4 ; =UNK_021C46B4 + 0x74
+	ldr r3, [sp, #0x34]
+	str r0, [sp, #0x10]
+	ldr r0, [sp, #0x38]
+	add r1, r7, #0x0
+	str r0, [sp, #0x14]
+	ldr r0, _0200E2C0 ; =UNK_021C46B4 + 0x44
+	str r5, [sp, #0x18]
+	bl FUN_0200E5C8
+	ldr r0, _0200E2AC ; =UNK_021C46B4 + 0x140
+	mov r1, #0x1
+	strh r1, [r0, #0xc]
+	ldr r0, _0200E2C4 ; =UNK_021C46B4 + 0x4
+	ldr r1, _0200E2BC ; =UNK_021C46B4 + 0x14
+	bl FUN_0200E528
+	ldr r0, _0200E2C8 ; =UNK_021C46B4 + 0x8
+	ldr r1, _0200E2C0 ; =UNK_021C46B4 + 0x44
+	bl FUN_0200E528
+	ldr r0, _0200E2CC ; =UNK_021C46B4
+	ldr r0, [r0, #0xc]
+	cmp r0, #0x0
+	beq _0200E28E
+	ldr r0, _0200E2B0 ; =UNK_021C46B4
+	add r0, #0x14
+	bl FUN_0200E7A8
+	ldr r1, _0200E2D0 ; =0x0000014E
+	ldr r0, _0200E2B0 ; =UNK_021C46B4
+	mov r2, #0x1
+	strb r2, [r0, r1]
+_0200E28E:
+	ldr r0, _0200E2B0 ; =UNK_021C46B4
+	ldr r0, [r0, #0x10]
+	cmp r0, #0x0
+	beq _0200E2A6
+	ldr r0, _0200E2B0 ; =UNK_021C46B4
+	add r0, #0x44
+	bl FUN_0200E7A8
+	ldr r1, _0200E2D4 ; =0x0000014F
+	ldr r0, _0200E2B0 ; =UNK_021C46B4
+	mov r2, #0x1
+	strb r2, [r0, r1]
+_0200E2A6:
+	add sp, #0x1c
+	pop {r4-r7, pc}
+	nop
+_0200E2AC: .word UNK_021C46B4 + 0x140
+_0200E2B0: .word UNK_021C46B4
+_0200E2B4: .word UNK_021C46B4 + 0x74
+_0200E2B8: .word UNK_021C46B4 + 0x8C
+_0200E2BC: .word UNK_021C46B4 + 0x14
+_0200E2C0: .word UNK_021C46B4 + 0x44
+_0200E2C4: .word UNK_021C46B4 + 0x4
+_0200E2C8: .word UNK_021C46B4 + 0x8
+_0200E2CC: .word UNK_021C46B4
+_0200E2D0: .word 0x0000014E
+_0200E2D4: .word 0x0000014F
+
+	thumb_func_start FUN_0200E2D8
+FUN_0200E2D8: ; 0x0200E2D8
+	push {r4, lr}
+	ldr r0, _0200E300 ; =UNK_021C46B4 + 0x140
+	ldr r4, _0200E304 ; =UNK_021C46B4
+	ldrh r0, [r0, #0xc]
+	cmp r0, #0x0
+	beq _0200E2FC
+	add r1, r4, #0x0
+	add r2, r4, #0x0
+	add r0, r4, #0x0
+	add r1, #0x14
+	add r2, #0x44
+	bl FUN_0200E4B8
+	cmp r0, #0x1
+	bne _0200E2FC
+	add r0, r4, #0x0
+	bl FUN_0200E460
+_0200E2FC:
+	pop {r4, pc}
+	nop
+_0200E300: .word UNK_021C46B4 + 0x140
+_0200E304: .word UNK_021C46B4
+
+	thumb_func_start FUN_0200E308
+FUN_0200E308: ; 0x0200E308
+	ldr r0, _0200E318 ; =UNK_021C46B4 + 0x140
+	ldrh r0, [r0, #0xc]
+	cmp r0, #0x0
+	bne _0200E314
+	mov r0, #0x1
+	bx lr
+_0200E314:
+	mov r0, #0x0
+	bx lr
+	.balign 4
+_0200E318: .word UNK_021C46B4 + 0x140
+
+	thumb_func_start FUN_0200E31C
+FUN_0200E31C: ; 0x0200E31C
+	push {r3, lr}
+	ldr r0, _0200E368 ; =UNK_021C46B4 + 0x74
+	mov r1, #0x0
+	bl FUN_0200E6A0
+	ldr r0, _0200E368 ; =UNK_021C46B4 + 0x74
+	mov r1, #0x1
+	bl FUN_0200E6A0
+	ldr r0, _0200E36C ; =UNK_021C46B4
+	ldr r1, [r0, #0x4]
+	cmp r1, #0x0
+	beq _0200E33A
+	mov r1, #0x2
+	str r1, [r0, #0x20]
+_0200E33A:
+	ldr r0, _0200E36C ; =UNK_021C46B4
+	ldr r1, [r0, #0x8]
+	cmp r1, #0x0
+	beq _0200E346
+	mov r1, #0x2
+	str r1, [r0, #0x50]
+_0200E346:
+	ldr r0, _0200E370 ; =UNK_021C46B4 + 0x4
+	ldr r1, _0200E374 ; =UNK_021C46B4 + 0x14
+	bl FUN_0200E528
+	ldr r0, _0200E378 ; =UNK_021C46B4 + 0x8
+	ldr r1, _0200E37C ; =UNK_021C46B4 + 0x44
+	bl FUN_0200E528
+	ldr r0, _0200E380 ; =UNK_021C46B4 + 0x140
+	mov r1, #0x0
+	strh r1, [r0, #0xc]
+	strb r1, [r0, #0xe]
+	strb r1, [r0, #0xf]
+	ldr r0, _0200E384 ; =UNK_021C46B4
+	bl FUN_0200E808
+	pop {r3, pc}
+	.balign 4
+_0200E368: .word UNK_021C46B4 + 0x74
+_0200E36C: .word UNK_021C46B4
+_0200E370: .word UNK_021C46B4 + 0x4
+_0200E374: .word UNK_021C46B4 + 0x14
+_0200E378: .word UNK_021C46B4 + 0x8
+_0200E37C: .word UNK_021C46B4 + 0x44
+_0200E380: .word UNK_021C46B4 + 0x140
+_0200E384: .word UNK_021C46B4
+
+	thumb_func_start FUN_0200E388
+FUN_0200E388: ; 0x0200E388
+	ldr r3, _0200E390 ; =FUN_02011480
+	add r1, r0, #0x0
+	mov r0, #0x0
+	bx r3
+	.balign 4
+_0200E390: .word FUN_02011480
+
+	thumb_func_start FUN_0200E394
+FUN_0200E394: ; 0x0200E394
+	ldr r3, _0200E39C ; =FUN_0200E440
+	mov r1, #0x0
+	bx r3
+	nop
+_0200E39C: .word FUN_0200E440
+
+	thumb_func_start FUN_0200E3A0
+FUN_0200E3A0: ; 0x0200E3A0
+	ldr r2, _0200E3B4 ; =0x00007FFF
+	cmp r1, r2
+	bne _0200E3AA
+	mov r1, #0x10
+	b _0200E3AE
+_0200E3AA:
+	mov r1, #0xf
+	mvn r1, r1
+_0200E3AE:
+	ldr r3, _0200E3B8 ; =FUN_0200E440
+	bx r3
+	nop
+_0200E3B4: .word 0x00007FFF
+_0200E3B8: .word FUN_0200E440
+
+	thumb_func_start FUN_0200E3BC
+FUN_0200E3BC: ; 0x0200E3BC
+	push {r0-r3}
+	push {r3-r4, lr}
+	sub sp, #0xc
+	add r4, r0, #0x0
+	add r0, sp, #0x1c
+	bne _0200E3D2
+	mov r1, #0x0
+	mov r2, #0x2
+	bl GX_LoadBGPltt
+	b _0200E3DA
+_0200E3D2:
+	mov r1, #0x0
+	mov r2, #0x2
+	bl GXS_LoadBGPltt
+_0200E3DA:
+	ldr r0, _0200E41C ; =UNK_021C46B4 + 0x8C
+	mov r1, #0x1
+	add r2, r4, #0x0
+	bl FUN_02011634
+	mov r2, #0x0
+	ldr r0, _0200E41C ; =UNK_021C46B4 + 0x8C
+	mov r1, #0x3f
+	add r3, r2, #0x0
+	str r4, [sp, #0x0]
+	bl FUN_02011650
+	mov r1, #0x0
+	str r1, [sp, #0x0]
+	str r1, [sp, #0x4]
+	ldr r0, _0200E41C ; =UNK_021C46B4 + 0x8C
+	add r2, r1, #0x0
+	add r3, r1, #0x0
+	str r4, [sp, #0x8]
+	bl FUN_02011698
+	ldr r0, _0200E41C ; =UNK_021C46B4 + 0x8C
+	mov r1, #0x20
+	mov r2, #0x0
+	add r3, r4, #0x0
+	bl FUN_02011678
+	add sp, #0xc
+	pop {r3-r4}
+	pop {r3}
+	add sp, #0x10
+	bx r3
+	nop
+_0200E41C: .word UNK_021C46B4 + 0x8C
+
+	thumb_func_start FUN_0200E420
+FUN_0200E420: ; 0x0200E420
+	push {r0-r3}
+	push {r3, lr}
+	add r0, sp, #0x8
+	mov r1, #0x0
+	mov r2, #0x2
+	bl GX_LoadBGPltt
+	add r0, sp, #0x8
+	mov r1, #0x0
+	mov r2, #0x2
+	bl GXS_LoadBGPltt
+	pop {r3}
+	pop {r3}
+	add sp, #0x10
+	bx r3
+
+	thumb_func_start FUN_0200E440
+FUN_0200E440: ; 0x0200E440
+	push {r3, lr}
+	cmp r0, #0x0
+	bne _0200E44E
+	ldr r0, _0200E458 ; =0x0400006C
+	bl GXx_SetMasterBrightness_
+	pop {r3, pc}
+_0200E44E:
+	ldr r0, _0200E45C ; =0x0400106C
+	bl GXx_SetMasterBrightness_
+	pop {r3, pc}
+	nop
+_0200E458: .word 0x0400006C
+_0200E45C: .word 0x0400106C
+
+	thumb_func_start FUN_0200E460
+FUN_0200E460: ; 0x0200E460
+	push {r4, lr}
+	mov r1, #0x53
+	add r4, r0, #0x0
+	mov r2, #0x0
+	lsl r1, r1, #0x2
+	strh r2, [r4, r1]
+	bl FUN_0200E770
+	mov r1, #0x15
+	lsl r1, r1, #0x4
+	strh r0, [r4, r1]
+	ldr r0, [r4, #0xc]
+	cmp r0, #0x0
+	beq _0200E490
+	add r0, r4, #0x0
+	add r0, #0x14
+	bl FUN_0200E7D8
+	ldr r0, [r4, #0x3c]
+	cmp r0, #0x0
+	bne _0200E490
+	ldr r0, _0200E4B4 ; =UNK_021C46B4 + 0x140
+	mov r1, #0x0
+	strb r1, [r0, #0xe]
+_0200E490:
+	ldr r0, [r4, #0x10]
+	cmp r0, #0x0
+	beq _0200E4AA
+	add r0, r4, #0x0
+	add r0, #0x44
+	bl FUN_0200E7D8
+	ldr r0, [r4, #0x3c]
+	cmp r0, #0x0
+	bne _0200E4AA
+	ldr r0, _0200E4B4 ; =UNK_021C46B4 + 0x140
+	mov r1, #0x0
+	strb r1, [r0, #0xf]
+_0200E4AA:
+	add r0, r4, #0x0
+	bl FUN_0200E808
+	pop {r4, pc}
+	nop
+_0200E4B4: .word UNK_021C46B4 + 0x140
+
+	thumb_func_start FUN_0200E4B8
+FUN_0200E4B8: ; 0x0200E4B8
+	push {r3-r5, lr}
+	add r5, r0, #0x0
+	ldr r0, [r5, #0x0]
+	add r4, r2, #0x0
+	cmp r0, #0x0
+	beq _0200E4CE
+	cmp r0, #0x1
+	beq _0200E4E0
+	cmp r0, #0x2
+	beq _0200E4FA
+	b _0200E512
+_0200E4CE:
+	add r0, r5, #0x4
+	bl FUN_0200E528
+	add r0, r5, #0x0
+	add r0, #0x8
+	add r1, r4, #0x0
+	bl FUN_0200E528
+	b _0200E512
+_0200E4E0:
+	ldr r0, [r5, #0x4]
+	cmp r0, #0x0
+	beq _0200E4EE
+	add r0, r5, #0x4
+	bl FUN_0200E528
+	b _0200E512
+_0200E4EE:
+	add r0, r5, #0x0
+	add r0, #0x8
+	add r1, r4, #0x0
+	bl FUN_0200E528
+	b _0200E512
+_0200E4FA:
+	ldr r0, [r5, #0x8]
+	cmp r0, #0x0
+	beq _0200E50C
+	add r0, r5, #0x0
+	add r0, #0x8
+	add r1, r4, #0x0
+	bl FUN_0200E528
+	b _0200E512
+_0200E50C:
+	add r0, r5, #0x4
+	bl FUN_0200E528
+_0200E512:
+	ldr r0, [r5, #0x4]
+	cmp r0, #0x0
+	bne _0200E522
+	ldr r0, [r5, #0x8]
+	cmp r0, #0x0
+	bne _0200E522
+	mov r0, #0x1
+	pop {r3-r5, pc}
+_0200E522:
+	mov r0, #0x0
+	pop {r3-r5, pc}
+	.balign 4
+
+	thumb_func_start FUN_0200E528
+FUN_0200E528: ; 0x0200E528
+	push {r4, lr}
+	add r4, r0, #0x0
+	ldr r0, [r4, #0x0]
+	cmp r0, #0x0
+	beq _0200E540
+	add r0, r1, #0x0
+	bl FUN_0200E544
+	cmp r0, #0x1
+	bne _0200E540
+	mov r0, #0x0
+	str r0, [r4, #0x0]
+_0200E540:
+	pop {r4, pc}
+	.balign 4
+
+	thumb_func_start FUN_0200E544
+FUN_0200E544: ; 0x0200E544
+	push {r3, lr}
+	ldr r1, [r0, #0x0]
+	lsl r2, r1, #0x2
+	ldr r1, _0200E554 ; =UNK_020ECEF4
+	ldr r1, [r1, r2]
+	blx r1
+	pop {r3, pc}
+	nop
+_0200E554: .word UNK_020ECEF4
+
+	thumb_func_start FUN_0200E558
+FUN_0200E558: ; 0x0200E558
+	push {r3, lr}
+	cmp r0, #0x4
+	bhi _0200E5B8
+	add r0, r0, r0
+	add r0, pc
+	ldrh r0, [r0, #0x6]
+	lsl r0, r0, #0x10
+	asr r0, r0, #0x10
+	add pc, r0
+_0200E56A: ; jump table (using 16-bit offset)
+	.short _0200E574 - _0200E56A - 2; case 0
+	.short _0200E582 - _0200E56A - 2; case 1
+	.short _0200E590 - _0200E56A - 2; case 2
+	.short _0200E59E - _0200E56A - 2; case 3
+	.short _0200E5AC - _0200E56A - 2; case 4
+_0200E574:
+	mov r2, #0x1
+	add r0, r1, #0x0
+	mov r1, #0x0
+	add r3, r2, #0x0
+	bl FUN_0200E5BC
+	pop {r3, pc}
+_0200E582:
+	add r0, r1, #0x0
+	mov r1, #0x1
+	add r2, r1, #0x0
+	add r3, r1, #0x0
+	bl FUN_0200E5BC
+	pop {r3, pc}
+_0200E590:
+	mov r2, #0x1
+	add r0, r1, #0x0
+	mov r1, #0x2
+	add r3, r2, #0x0
+	bl FUN_0200E5BC
+	pop {r3, pc}
+_0200E59E:
+	add r0, r1, #0x0
+	mov r1, #0x1
+	add r2, r1, #0x0
+	mov r3, #0x0
+	bl FUN_0200E5BC
+	pop {r3, pc}
+_0200E5AC:
+	add r0, r1, #0x0
+	mov r1, #0x2
+	mov r2, #0x0
+	mov r3, #0x1
+	bl FUN_0200E5BC
+_0200E5B8:
+	pop {r3, pc}
+	.balign 4
+
+	thumb_func_start FUN_0200E5BC
+FUN_0200E5BC: ; 0x0200E5BC
+	str r1, [r0, #0x0]
+	str r2, [r0, #0x4]
+	str r3, [r0, #0x8]
+	str r2, [r0, #0xc]
+	str r3, [r0, #0x10]
+	bx lr
+
+	thumb_func_start FUN_0200E5C8
+FUN_0200E5C8: ; 0x0200E5C8
+	str r1, [r0, #0x0]
+	str r2, [r0, #0x4]
+	ldr r1, [sp, #0x0]
+	str r3, [r0, #0x8]
+	str r1, [r0, #0xc]
+	ldr r1, [sp, #0x4]
+	str r1, [r0, #0x14]
+	ldr r1, [sp, #0x8]
+	str r1, [r0, #0x10]
+	ldr r1, [sp, #0xc]
+	str r1, [r0, #0x18]
+	ldr r1, [sp, #0x10]
+	str r1, [r0, #0x1c]
+	ldr r1, [sp, #0x14]
+	str r1, [r0, #0x20]
+	ldr r1, _0200E5F0 ; =0xFFFFFFF0
+	add r1, sp
+	ldrh r1, [r1, #0x28]
+	strh r1, [r0, #0x24]
+	bx lr
+	.balign 4
+_0200E5F0: .word 0xFFFFFFF0
+
+	thumb_func_start FUN_0200E5F4
+FUN_0200E5F4: ; 0x0200E5F4
+	mov r3, #0x0
+	ldr r1, _0200E60C ; =FUN_0200E758
+	add r2, r3, #0x0
+_0200E5FA:
+	str r2, [r0, #0x0]
+	str r1, [r0, #0x8]
+	str r2, [r0, #0x10]
+	add r3, r3, #0x1
+	add r0, r0, #0x4
+	cmp r3, #0x2
+	blt _0200E5FA
+	bx lr
+	nop
+_0200E60C: .word FUN_0200E758
+
+	thumb_func_start FUN_0200E610
+FUN_0200E610: ; 0x0200E610
+	push {r3-r5, lr}
+	add r5, r0, #0x0
+	mov r4, #0x0
+_0200E616:
+	ldr r0, [r5, #0x0]
+	ldr r1, [r5, #0x8]
+	blx r1
+	add r4, r4, #0x1
+	add r5, r5, #0x4
+	cmp r4, #0x2
+	blt _0200E616
+	pop {r3-r5, pc}
+	.balign 4
+
+	thumb_func_start FUN_0200E628
+FUN_0200E628: ; 0x0200E628
+	push {r4-r7, lr}
+	sub sp, #0xc
+	add r5, r0, #0x0
+	mov r0, #0x1
+	str r0, [sp, #0x4]
+	add r0, r5, #0x0
+	str r0, [sp, #0x8]
+	add r0, #0x10
+	lsl r4, r3, #0x2
+	str r0, [sp, #0x8]
+	ldr r0, [r0, r4]
+	add r7, r2, #0x0
+	str r1, [sp, #0x0]
+	cmp r0, #0x0
+	beq _0200E64A
+	bl GF_AssertFail
+_0200E64A:
+	add r6, r5, #0x0
+	add r6, #0x8
+	ldr r0, [r6, r4]
+	cmp r0, #0x0
+	bne _0200E658
+	bl GF_AssertFail
+_0200E658:
+	ldr r0, [r5, #0x10]
+	cmp r0, #0x0
+	bne _0200E672
+	ldr r0, [r5, #0x14]
+	cmp r0, #0x0
+	bne _0200E672
+	ldr r0, _0200E698 ; =FUN_0200E610
+	add r1, r5, #0x0
+	bl FUN_02015F34
+	lsl r0, r0, #0x18
+	lsr r0, r0, #0x18
+	str r0, [sp, #0x4]
+_0200E672:
+	ldr r0, [sp, #0x4]
+	cmp r0, #0x1
+	beq _0200E67C
+	bl GF_AssertFail
+_0200E67C:
+	ldr r0, [sp, #0x0]
+	cmp r7, #0x0
+	str r0, [r5, r4]
+	beq _0200E688
+	str r7, [r6, r4]
+	b _0200E68C
+_0200E688:
+	ldr r0, _0200E69C ; =FUN_0200E758
+	str r0, [r6, r4]
+_0200E68C:
+	ldr r0, [sp, #0x8]
+	mov r1, #0x1
+	str r1, [r0, r4]
+	add sp, #0xc
+	pop {r4-r7, pc}
+	nop
+_0200E698: .word FUN_0200E610
+_0200E69C: .word FUN_0200E758
+
+	thumb_func_start FUN_0200E6A0
+FUN_0200E6A0: ; 0x0200E6A0
+	push {r3-r5, lr}
+	lsl r4, r1, #0x2
+	add r5, r0, #0x0
+	mov r1, #0x0
+	add r0, r5, r4
+	str r1, [r0, #0x10]
+	ldr r0, [r5, #0x10]
+	cmp r0, #0x0
+	bne _0200E6BC
+	ldr r0, [r5, #0x14]
+	cmp r0, #0x0
+	bne _0200E6BC
+	bl FUN_02015F1C
+_0200E6BC:
+	ldr r1, _0200E6C8 ; =FUN_0200E758
+	add r0, r5, r4
+	str r1, [r0, #0x8]
+	mov r0, #0x0
+	str r0, [r5, r4]
+	pop {r3-r5, pc}
+	.balign 4
+_0200E6C8: .word FUN_0200E758
+
+	thumb_func_start FUN_0200E6CC
+FUN_0200E6CC: ; 0x0200E6CC
+	push {r3-r7, lr}
+	add r5, r0, #0x0
+	add r4, r1, #0x0
+	ldr r0, [sp, #0x18]
+	mov r1, #0x10
+	add r6, r2, #0x0
+	add r7, r3, #0x0
+	bl AllocFromHeapAtEnd
+	add r1, r0, #0x0
+	str r5, [r1, #0x0]
+	str r4, [r1, #0x4]
+	mov r2, #0x1
+	str r6, [r1, #0x8]
+	ldr r0, _0200E6F4 ; =FUN_0200E71C
+	lsl r2, r2, #0xa
+	str r7, [r1, #0xc]
+	bl FUN_0200CA98
+	pop {r3-r7, pc}
+	.balign 4
+_0200E6F4: .word FUN_0200E71C
+
+	thumb_func_start FUN_0200E6F8
+FUN_0200E6F8: ; 0x0200E6F8
+	push {r3-r5, lr}
+	add r5, r0, #0x0
+	add r4, r1, #0x0
+	add r0, r2, #0x0
+	mov r1, #0x8
+	bl AllocFromHeapAtEnd
+	add r1, r0, #0x0
+	mov r2, #0x1
+	str r5, [r1, #0x0]
+	ldr r0, _0200E718 ; =FUN_0200E73C
+	lsl r2, r2, #0xa
+	str r4, [r1, #0x4]
+	bl FUN_0200CA98
+	pop {r3-r5, pc}
+	.balign 4
+_0200E718: .word FUN_0200E73C
+
+	thumb_func_start FUN_0200E71C
+FUN_0200E71C: ; 0x0200E71C
+	push {r3-r5, lr}
+	add r4, r1, #0x0
+	add r5, r0, #0x0
+	ldr r0, [r4, #0x0]
+	ldr r1, [r4, #0x4]
+	ldr r2, [r4, #0x8]
+	ldr r3, [r4, #0xc]
+	bl FUN_0200E628
+	add r0, r5, #0x0
+	bl FUN_0200CAB4
+	add r0, r4, #0x0
+	bl FreeToHeap
+	pop {r3-r5, pc}
+
+	thumb_func_start FUN_0200E73C
+FUN_0200E73C: ; 0x0200E73C
+	push {r3-r5, lr}
+	add r4, r1, #0x0
+	add r5, r0, #0x0
+	ldr r0, [r4, #0x0]
+	ldr r1, [r4, #0x4]
+	bl FUN_0200E6A0
+	add r0, r5, #0x0
+	bl FUN_0200CAB4
+	add r0, r4, #0x0
+	bl FreeToHeap
+	pop {r3-r5, pc}
+
+	thumb_func_start FUN_0200E758
+FUN_0200E758: ; 0x0200E758
+	bx lr
+	.balign 4
+
+	thumb_func_start FUN_0200E75C
+FUN_0200E75C: ; 0x0200E75C
+	ldr r2, _0200E76C ; =0x0000FFFF
+	cmp r1, r2
+	bne _0200E768
+	mov r1, #0x15
+	lsl r1, r1, #0x4
+	ldrh r1, [r0, r1]
+_0200E768:
+	add r0, r1, #0x0
+	bx lr
+	.balign 4
+_0200E76C: .word 0x0000FFFF
+
+	thumb_func_start FUN_0200E770
+FUN_0200E770: ; 0x0200E770
+	ldr r1, [r0, #0xc]
+	cmp r1, #0x1
+	bne _0200E77C
+	add r2, r0, #0x0
+	add r2, #0x14
+	b _0200E780
+_0200E77C:
+	add r2, r0, #0x0
+	add r2, #0x44
+_0200E780:
+	ldr r1, [r2, #0x28]
+	cmp r1, #0x1
+	bne _0200E78A
+	ldrh r0, [r2, #0x24]
+	bx lr
+_0200E78A:
+	mov r1, #0x15
+	lsl r1, r1, #0x4
+	ldrh r0, [r0, r1]
+	bx lr
+	.balign 4
+
+	thumb_func_start FUN_0200E794
+FUN_0200E794: ; 0x0200E794
+	push {r4, lr}
+	add r4, r0, #0x0
+	ldr r0, [r1, #0x10]
+	mov r1, #0x0
+	bl FUN_0200E440
+	add r0, r4, #0x0
+	bl FUN_0200CAB4
+	pop {r4, pc}
+
+	thumb_func_start FUN_0200E7A8
+FUN_0200E7A8: ; 0x0200E7A8
+	push {r3, lr}
+	add r1, r0, #0x0
+	ldr r0, [r1, #0x28]
+	cmp r0, #0x0
+	bne _0200E7CE
+	ldrh r2, [r1, #0x24]
+	ldr r0, _0200E7D0 ; =0x00007FFF
+	cmp r2, r0
+	beq _0200E7BE
+	cmp r2, #0x0
+	bne _0200E7CE
+_0200E7BE:
+	ldr r0, [r1, #0x2c]
+	cmp r0, #0x0
+	bne _0200E7CE
+	mov r2, #0x1
+	ldr r0, _0200E7D4 ; =FUN_0200E794
+	lsl r2, r2, #0xa
+	bl FUN_0200CA98
+_0200E7CE:
+	pop {r3, pc}
+	.balign 4
+_0200E7D0: .word 0x00007FFF
+_0200E7D4: .word FUN_0200E794
+
+	thumb_func_start FUN_0200E7D8
+FUN_0200E7D8: ; 0x0200E7D8
+	push {r4, lr}
+	add r4, r0, #0x0
+	ldr r0, [r4, #0x28]
+	cmp r0, #0x1
+	bne _0200E800
+	ldrh r1, [r4, #0x24]
+	ldr r0, _0200E804 ; =0x00007FFF
+	cmp r1, r0
+	beq _0200E7EE
+	cmp r1, #0x0
+	bne _0200E800
+_0200E7EE:
+	ldr r0, [r4, #0x2c]
+	cmp r0, #0x0
+	bne _0200E800
+	ldr r0, [r4, #0x10]
+	bl FUN_0200E3A0
+	ldr r0, [r4, #0x10]
+	bl FUN_0200E388
+_0200E800:
+	pop {r4, pc}
+	nop
+_0200E804: .word 0x00007FFF
+
+	thumb_func_start FUN_0200E808
+FUN_0200E808: ; 0x0200E808
+	push {r4, lr}
+	add r4, r0, #0x0
+	add r2, r4, #0x0
+	mov r1, #0x14
+	mov r0, #0x0
+_0200E812:
+	strb r0, [r2, #0x0]
+	add r2, r2, #0x1
+	sub r1, r1, #0x1
+	bne _0200E812
+	add r0, r4, #0x0
+	add r0, #0x14
+	mov r1, #0x0
+	mov r2, #0x30
+	bl memset
+	add r0, r4, #0x0
+	add r0, #0x44
+	mov r1, #0x0
+	mov r2, #0x30
+	bl memset
+	add r2, r4, #0x0
+	add r2, #0x74
+	mov r1, #0x18
+	mov r0, #0x0
+_0200E83A:
+	strb r0, [r2, #0x0]
+	add r2, r2, #0x1
+	sub r1, r1, #0x1
+	bne _0200E83A
+	add r4, #0x8c
+	add r0, r4, #0x0
+	mov r1, #0x0
+	mov r2, #0xc0
+	bl memset
+	pop {r4, pc}
-- 
cgit v1.2.3


From 43e94ce5920e4dc00ce78624104874cf9f1ac4a5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Sep 2021 12:38:14 -0400
Subject: Refactor .exceptix, 1

---
 arm9/asm/MSL_ARM_abort_exit.s                | 14 ++-------
 arm9/asm/MSL_ARM_math.s                      |  6 +---
 arm9/asm/MSL_Common_ansi_files.s             | 10 ++----
 arm9/asm/MSL_Common_assert.s                 |  6 +---
 arm9/asm/MSL_Common_buffer_io.s              | 10 ++----
 arm9/asm/MSL_Common_direct_io.s              | 14 ++-------
 arm9/asm/MSL_Common_file_io.s                | 10 ++----
 arm9/asm/MSL_Common_file_pos.s               | 18 +++--------
 arm9/asm/MSL_Common_mbstring.s               | 18 +++--------
 arm9/asm/MSL_Common_mem.s                    |  6 +---
 arm9/asm/MSL_Common_printf.s                 | 46 +++++++---------------------
 arm9/asm/MSL_Common_qsort.s                  |  6 +---
 arm9/asm/MSL_Common_scanf.s                  | 14 ++-------
 arm9/asm/MSL_Common_signal.s                 |  6 +---
 arm9/asm/MSL_Common_strtold.s                | 14 ++-------
 arm9/asm/MSL_Common_strtoul.s                | 22 +++----------
 arm9/asm/MSL_Common_wmem.s                   |  6 +---
 arm9/asm/MSL_Common_wprintf.s                | 34 +++++---------------
 arm9/asm/MSL_DPMath_e_pow.s                  |  5 +--
 arm9/asm/MSL_DPMath_s_frexp.s                |  6 +---
 arm9/asm/MSL_DPMath_s_ldexp.s                |  6 +---
 arm9/asm/MSL_DPMath_w_pow.s                  |  6 +---
 arm9/asm/MSL_fp_ansi.s                       | 34 +++++---------------
 arm9/asm/MSL_math.s                          |  5 +--
 arm9/asm/RUNTIME_ARM_semihosted_console_io.s | 10 ++----
 arm9/asm/RUNTIME_CPLUS_StaticInitializers.s  | 10 ++----
 arm9/asm/RUNTIME_NITRO_eabi_init.s           |  6 +---
 arm9/asm/macros.inc                          |  1 +
 arm9/asm/macros/cw.inc                       | 12 ++++++++
 arm9/asm/macros/function.inc                 |  4 +++
 30 files changed, 91 insertions(+), 274 deletions(-)
 create mode 100644 arm9/asm/macros/cw.inc

(limited to 'arm9/asm')

diff --git a/arm9/asm/MSL_ARM_abort_exit.s b/arm9/asm/MSL_ARM_abort_exit.s
index 2fb7796f..1128f4e8 100644
--- a/arm9/asm/MSL_ARM_abort_exit.s
+++ b/arm9/asm/MSL_ARM_abort_exit.s
@@ -155,14 +155,6 @@ _020DE2DC: .word __console_exit
 _020DE2E0: .word __atexit_funcs
 	arm_func_end __exit
 
-	.section .exceptix,4
-
-	.word abort
-	.short 37
-	.word 0x00100000
-	.word exit
-	.short 77
-	.word 0x00100100
-	.word __exit
-	.short 297
-	.word 0x00200300
+	exception abort, 37, 0x00100000
+	exception exit, 77, 0x00100100
+	exception __exit, 297, 0x00200300
diff --git a/arm9/asm/MSL_ARM_math.s b/arm9/asm/MSL_ARM_math.s
index cb9bb034..6fad26bb 100644
--- a/arm9/asm/MSL_ARM_math.s
+++ b/arm9/asm/MSL_ARM_math.s
@@ -14,8 +14,4 @@ _020DE2F4: .word __float_nan
 _020DE2F8: .word _f2d
 	arm_func_end nan
 
-	.section .exceptix,4
-
-	.word nan
-	.short 25
-	.word 0x00000000
+	exception nan, 25, 0x00000000
diff --git a/arm9/asm/MSL_Common_ansi_files.s b/arm9/asm/MSL_Common_ansi_files.s
index 70fdc293..a2e75c22 100644
--- a/arm9/asm/MSL_Common_ansi_files.s
+++ b/arm9/asm/MSL_Common_ansi_files.s
@@ -141,11 +141,5 @@ _020DE3DC:
 _020DE3EC: .word __files
 	arm_func_end __flush_all
 
-	.section .exceptix,4
-
-	.word __flush_line_buffered_output_files
-	.short 141
-	.word 0x00403F00
-	.word __flush_all
-	.short 105
-	.word 0x00403F00
+	exception __flush_line_buffered_output_files, 141, 0x00403F00
+	exception __flush_all, 105, 0x00403F00
diff --git a/arm9/asm/MSL_Common_assert.s b/arm9/asm/MSL_Common_assert.s
index ded4056d..db655417 100644
--- a/arm9/asm/MSL_Common_assert.s
+++ b/arm9/asm/MSL_Common_assert.s
@@ -30,8 +30,4 @@ __msl_assertion_failed: ; 0x020DE3FC
 _020DE434: .word __local_str__msl_assertion_failed
 	arm_func_end __msl_assertion_failed
 
-	.section .exceptix,4
-
-	.word __msl_assertion_failed
-	.short 61
-	.word 0x00200100
+	exception __msl_assertion_failed, 61, 0x00200100
diff --git a/arm9/asm/MSL_Common_buffer_io.s b/arm9/asm/MSL_Common_buffer_io.s
index 7dbbcc45..a3791f4d 100644
--- a/arm9/asm/MSL_Common_buffer_io.s
+++ b/arm9/asm/MSL_Common_buffer_io.s
@@ -109,11 +109,5 @@ _020DE574:
 	ldmia sp!, {r3-r5,pc}
 	arm_func_end __flush_buffer
 
-	.section .exceptix,4
-
-	.word __load_buffer
-	.short 141
-	.word 0x00200700
-	.word __flush_buffer
-	.short 137
-	.word 0x00200300
+	exception __load_buffer, 141, 0x00200700
+	exception __flush_buffer, 137, 0x00200300
diff --git a/arm9/asm/MSL_Common_direct_io.s b/arm9/asm/MSL_Common_direct_io.s
index d71f0bc4..bc803a3f 100644
--- a/arm9/asm/MSL_Common_direct_io.s
+++ b/arm9/asm/MSL_Common_direct_io.s
@@ -500,14 +500,6 @@ _020DEC5C:
 	ldmia sp!, {r3-r11,pc}
 	arm_func_end __fwrite
 
-	.section .exceptix,4
-
-	.word fread
-	.short 269
-	.word 0x00407F00
-	.word __fread
-	.short 841
-	.word 0x00507F00
-	.word __fwrite
-	.short 689
-	.word 0x0060FF00
\ No newline at end of file
+	exception fread, 269, 0x00407F00
+	exception __fread, 841, 0x00507F00
+	exception __fwrite, 689, 0x0060FF00
\ No newline at end of file
diff --git a/arm9/asm/MSL_Common_file_io.s b/arm9/asm/MSL_Common_file_io.s
index f8a76bba..dfc9db53 100644
--- a/arm9/asm/MSL_Common_file_io.s
+++ b/arm9/asm/MSL_Common_file_io.s
@@ -103,11 +103,5 @@ _020DEDCC:
 	ldmia sp!, {r4,pc}
 	arm_func_end fflush
 
-	.section .exceptix,4
-
-	.word fclose
-	.short 117
-	.word 0x00200300
-	.word fflush
-	.short 233
-	.word 0x00100100
+	exception fclose, 117, 0x00200300
+	exception fflush, 233, 0x00100100
diff --git a/arm9/asm/MSL_Common_file_pos.s b/arm9/asm/MSL_Common_file_pos.s
index f5a122aa..d416f9ad 100644
--- a/arm9/asm/MSL_Common_file_pos.s
+++ b/arm9/asm/MSL_Common_file_pos.s
@@ -356,17 +356,7 @@ rewind: ; 0x020DF290
 	ldmia sp!, {r4,pc}
 	arm_func_end rewind
 
-	.section .exceptix,4
-
-	.word ftell
-	.short 285
-	.word 0x00300F00
-	.word _fseek
-	.short 489
-	.word 0x00400320
-	.word fseek
-	.short 301
-	.word 0x00403F00
-	.word rewind
-	.short 37
-	.word 0x00100100
+	exception ftell, 285, 0x00300F00
+	exception _fseek, 489, 0x00400320
+	exception fseek, 301, 0x00403F00
+	exception rewind, 37, 0x00100100
diff --git a/arm9/asm/MSL_Common_mbstring.s b/arm9/asm/MSL_Common_mbstring.s
index e7bf6947..b22396f5 100644
--- a/arm9/asm/MSL_Common_mbstring.s
+++ b/arm9/asm/MSL_Common_mbstring.s
@@ -231,17 +231,7 @@ _020DF430:
 	ldmia sp!, {r3-r9,pc}
 	arm_func_end wcstombs
 
-	.section .exceptix,4
-
-	.word mbtowc
-	.short 29
-	.word 0x00100000
-	.word wctomb
-	.short 29
-	.word 0x00100000
-	.word mbstowcs
-	.short 137
-	.word 0x00301F00
-	.word wcstombs
-	.short 121
-	.word 0x00403F00
+	exception mbtowc, 29, 0x00100000
+	exception wctomb, 29, 0x00100000
+	exception mbstowcs, 137, 0x00301F00
+	exception wcstombs, 121, 0x00403F00
diff --git a/arm9/asm/MSL_Common_mem.s b/arm9/asm/MSL_Common_mem.s
index d6449dde..dfb7fd07 100644
--- a/arm9/asm/MSL_Common_mem.s
+++ b/arm9/asm/MSL_Common_mem.s
@@ -108,8 +108,4 @@ _020DF548:
 	bx lr
 	arm_func_end memcmp
 
-	.section .exceptix,4
-
-	.word memset
-	.short 21
-	.word 0x00100100
+	exception memset, 21, 0x00100100
diff --git a/arm9/asm/MSL_Common_printf.s b/arm9/asm/MSL_Common_printf.s
index b9879afe..1dfef8fd 100644
--- a/arm9/asm/MSL_Common_printf.s
+++ b/arm9/asm/MSL_Common_printf.s
@@ -2564,41 +2564,17 @@ sprintf: ; 0x020E185C
 	bx lr
 	arm_func_end sprintf
 
-	.section .exceptix,4
-
-	.word long2str
-	.short 589
-	.word 0x0090FF20
-	.word longlong2str
-	.short 737
-	.word 0x00A0FF20
-	.word double2hex
-	.short 1245
-	.word 0x00F07F20
-	.word float2str
-	.short 1893
-	.word 0x00C0FF20
-	.word __pformatter
-	.short 2084
-	.word UNK_020EC710
-	.word __FileWrite
-	.short 45
-	.word 0x00200300
-	.word __StringWrite
-	.short 69
-	.word 0x00200300
-	.word printf
-	.short 281
-	.word 0x00300120
-	.word vsnprintf
-	.short 105
-	.word 0x00300300
-	.word snprintf
-	.short 41
-	.word 0x00300020
-	.word sprintf
-	.short 45
-	.word 0x00300020
+	exception long2str, 589, 0x0090FF20
+	exception longlong2str, 737, 0x00A0FF20
+	exception double2hex, 1245, 0x00F07F20
+	exception float2str, 1893, 0x00C0FF20
+	exception __pformatter, 2084, UNK_020EC710
+	exception __FileWrite, 45, 0x00200300
+	exception __StringWrite, 69, 0x00200300
+	exception printf, 281, 0x00300120
+	exception vsnprintf, 105, 0x00300300
+	exception snprintf, 41, 0x00300020
+	exception sprintf, 45, 0x00300020
 
 	.section .exception,8
 
diff --git a/arm9/asm/MSL_Common_qsort.s b/arm9/asm/MSL_Common_qsort.s
index edfc142b..1e07aab6 100644
--- a/arm9/asm/MSL_Common_qsort.s
+++ b/arm9/asm/MSL_Common_qsort.s
@@ -105,8 +105,4 @@ _020E19D8:
 	ldmia sp!, {r3-r11,pc}
 	arm_func_end qsort
 
-	.section .exceptix,4
-
-	.word qsort
-	.short 357
-	.word 0x0070FF00
+	exception qsort, 357, 0x0070FF00
diff --git a/arm9/asm/MSL_Common_scanf.s b/arm9/asm/MSL_Common_scanf.s
index 8d9a8fe3..eb3fbb9a 100644
--- a/arm9/asm/MSL_Common_scanf.s
+++ b/arm9/asm/MSL_Common_scanf.s
@@ -1447,17 +1447,9 @@ sscanf: ; 0x020E2D54
 	bx lr
 	arm_func_end sscanf
 
-	.section .exceptix,4
-
-	.word __sformatter
-	.short 3412
-	.word UNK_020EC718
-	.word vsscanf
-	.short 85
-	.word 0x00200000
-	.word sscanf
-	.short 41
-	.word 0x00300020
+	exception __sformatter, 3412, UNK_020EC718
+	exception vsscanf, 85, 0x00200000
+	exception sscanf, 41, 0x00300020
 
 	.section .exception,8
 
diff --git a/arm9/asm/MSL_Common_signal.s b/arm9/asm/MSL_Common_signal.s
index 8fd03917..3a68bbac 100644
--- a/arm9/asm/MSL_Common_signal.s
+++ b/arm9/asm/MSL_Common_signal.s
@@ -100,8 +100,4 @@ _020E2EA4: .word __cs_ref
 _020E2EA8: .word signal_funcs
 	arm_func_end raise
 
-	.section .exceptix,4
-
-	.word raise
-	.short 305
-	.word 0x00200300
+	exception raise, 305, 0x00200300
diff --git a/arm9/asm/MSL_Common_strtold.s b/arm9/asm/MSL_Common_strtold.s
index 424c3a19..2cb0918b 100644
--- a/arm9/asm/MSL_Common_strtold.s
+++ b/arm9/asm/MSL_Common_strtold.s
@@ -1417,17 +1417,9 @@ atod: ; 0x020E463C
 _020E4648: .word strtold
 	arm_func_end atod
 
-	.section .exceptix,4
-
-	.word __strtold
-	.short 4684
-	.word UNK_020EC720
-	.word strtold
-	.short 225
-	.word 0x00500F00
-	.word atod
-	.short 17
-	.word 0x00000000
+	exception __strtold, 4684, UNK_020EC720
+	exception strtold, 225, 0x00500F00
+	exception atod, 17, 0x00000000
 
 	.section .exception,8
 
diff --git a/arm9/asm/MSL_Common_strtoul.s b/arm9/asm/MSL_Common_strtoul.s
index ab4a1bbf..c49a7468 100644
--- a/arm9/asm/MSL_Common_strtoul.s
+++ b/arm9/asm/MSL_Common_strtoul.s
@@ -724,20 +724,8 @@ atol: ; 0x020E4FE0
 _020E4FF0: .word strtol
 	arm_func_end atol
 
-	.section .exceptix,4
-
-	.word __strtoul
-	.short 1001
-	.word 0x0060FF00
-	.word __strtoull
-	.short 1101
-	.word 0x0080FF00
-	.word strtoul
-	.short 153
-	.word 0x00600300
-	.word strtol
-	.short 201
-	.word 0x00600300
-	.word atol
-	.short 21
-	.word 0x00000000
+	exception __strtoul, 1001, 0x0060FF00
+	exception __strtoull, 1101, 0x0080FF00
+	exception strtoul, 153, 0x00600300
+	exception strtol, 201, 0x00600300
+	exception atol, 21, 0x00000000
diff --git a/arm9/asm/MSL_Common_wmem.s b/arm9/asm/MSL_Common_wmem.s
index 7c02c344..b09b5b66 100644
--- a/arm9/asm/MSL_Common_wmem.s
+++ b/arm9/asm/MSL_Common_wmem.s
@@ -28,8 +28,4 @@ _020E5098:
 	bx lr
 	arm_func_end wmemchr
 
-	.section .exceptix,4
-
-	.word wmemcpy
-	.short 17
-	.word 0x00000000
+	exception wmemcpy, 17, 0x00000000
diff --git a/arm9/asm/MSL_Common_wprintf.s b/arm9/asm/MSL_Common_wprintf.s
index 95d115e6..3c99e921 100644
--- a/arm9/asm/MSL_Common_wprintf.s
+++ b/arm9/asm/MSL_Common_wprintf.s
@@ -2327,32 +2327,14 @@ _020E7000:
 _020E7018: .word __wStringWrite
 	arm_func_end vswprintf
 
-	.section .exceptix,4
-
-	.word long2str__wide
-	.short 593
-	.word 0x0090FF20
-	.word longlong2str__wide
-	.short 741
-	.word 0x00A0FF20
-	.word double2hex__wide
-	.short 921
-	.word 0x00F07F20
-	.word float2str__wide
-	.short 1612
-	.word UNK_020EC728
-	.word __wpformatter
-	.short 2288
-	.word UNK_020EC730
-	.word __wStringWrite
-	.short 65
-	.word 0x00200300
-	.word swprintf
-	.short 41
-	.word 0x00300020
-	.word vswprintf
-	.short 113
-	.word 0x00300300
+	exception long2str__wide, 593, 0x0090FF20
+	exception longlong2str__wide, 741, 0x00A0FF20
+	exception double2hex__wide, 921, 0x00F07F20
+	exception float2str__wide, 1612, UNK_020EC728
+	exception __wpformatter, 2288, UNK_020EC730
+	exception __wStringWrite, 65, 0x00200300
+	exception swprintf, 41, 0x00300020
+	exception vswprintf, 113, 0x00300300
 
 	.section .exception,8
 
diff --git a/arm9/asm/MSL_DPMath_e_pow.s b/arm9/asm/MSL_DPMath_e_pow.s
index fedcbb10..132716e6 100644
--- a/arm9/asm/MSL_DPMath_e_pow.s
+++ b/arm9/asm/MSL_DPMath_e_pow.s
@@ -1180,10 +1180,7 @@ _020E81F0:
 	bx lr
 	arm_func_end __ieee754_pow
 
-	.section .exceptix,4
-	.word __ieee754_pow
-	.short 4488
-	.word UNK_020EC738
+	exception __ieee754_pow, 4488, UNK_020EC738
 
 	.section .exception,8
 
diff --git a/arm9/asm/MSL_DPMath_s_frexp.s b/arm9/asm/MSL_DPMath_s_frexp.s
index b0c22aac..b07ce1d6 100644
--- a/arm9/asm/MSL_DPMath_s_frexp.s
+++ b/arm9/asm/MSL_DPMath_s_frexp.s
@@ -58,8 +58,4 @@ _020E8310: .word 0x800FFFFF
 _020E8314: .word 0xFFFFFC02
 	arm_func_end frexp
 
-	.section .exceptix,4
-
-	.word frexp
-	.short 189
-	.word 0x00300120
+	exception frexp, 189, 0x00300120
diff --git a/arm9/asm/MSL_DPMath_s_ldexp.s b/arm9/asm/MSL_DPMath_s_ldexp.s
index fc3a4713..131fe52f 100644
--- a/arm9/asm/MSL_DPMath_s_ldexp.s
+++ b/arm9/asm/MSL_DPMath_s_ldexp.s
@@ -163,8 +163,4 @@ _020E855C: .word 0x0000C350
 _020E8560: .word 0x3C900000
 	arm_func_end ldexp
 
-	.section .exceptix,4
-
-	.word ldexp
-	.short 589
-	.word 0x00300120
+	exception ldexp, 589, 0x00300120
diff --git a/arm9/asm/MSL_DPMath_w_pow.s b/arm9/asm/MSL_DPMath_w_pow.s
index 8a6625ad..c0f6346b 100644
--- a/arm9/asm/MSL_DPMath_w_pow.s
+++ b/arm9/asm/MSL_DPMath_w_pow.s
@@ -11,8 +11,4 @@ pow: ; 0x020E8564
 _020E856C: .word __ieee754_pow
 	arm_func_end pow
 
-	.section .exceptix,4
-
-	.word pow
-	.short 13
-	.word 0x00000000
+	exception pow, 13, 0x00000000
diff --git a/arm9/asm/MSL_fp_ansi.s b/arm9/asm/MSL_fp_ansi.s
index b10a364e..734e3090 100644
--- a/arm9/asm/MSL_fp_ansi.s
+++ b/arm9/asm/MSL_fp_ansi.s
@@ -1599,29 +1599,11 @@ UNK_020EC740: ; 0x020EC740
 	.byte 0x00, 0xFF, 0x05, 0x20
 	.balign 8
 
-	.section .exceptix,4
-
-	.word __rounddec
-	.short 65
-	.word 0x00200300
-	.word __ull2dec
-	.short 205
-	.word 0x0050FF00
-	.word __timesdec
-	.short 389
-	.word 0x00D0FF00
-	.word __str2dec
-	.short 157
-	.word 0x00100000
-	.word __two_exp
-	.short 901
-	.word 0x00B00300
-	.word __num2dec_internal
-	.short 385
-	.word 0x00E01F00
-	.word __num2dec_internal2
-	.short 169
-	.word 0x00200300
-	.word __dec2num
-	.short 1572
-	.word UNK_020EC740
+	exception __rounddec, 65, 0x00200300
+	exception __ull2dec, 205, 0x0050FF00
+	exception __timesdec, 389, 0x00D0FF00
+	exception __str2dec, 157, 0x00100000
+	exception __two_exp, 901, 0x00B00300
+	exception __num2dec_internal, 385, 0x00E01F00
+	exception __num2dec_internal2, 169, 0x00200300
+	exception __dec2num, 1572, UNK_020EC740
diff --git a/arm9/asm/MSL_math.s b/arm9/asm/MSL_math.s
index 260034e5..1278b024 100644
--- a/arm9/asm/MSL_math.s
+++ b/arm9/asm/MSL_math.s
@@ -104,7 +104,4 @@ scalbn: ; 0x020E9AA4
 	ldmia sp!, {r3-r4,pc}
 	arm_func_end scalbn
 
-	.section .exceptix,4
-	.word scalbn
-	.short 45
-	.word 0x00200100
+	exception scalbn, 45, 0x00200100
diff --git a/arm9/asm/RUNTIME_ARM_semihosted_console_io.s b/arm9/asm/RUNTIME_ARM_semihosted_console_io.s
index 7bd44bdb..6e7ddf0b 100644
--- a/arm9/asm/RUNTIME_ARM_semihosted_console_io.s
+++ b/arm9/asm/RUNTIME_ARM_semihosted_console_io.s
@@ -74,11 +74,5 @@ __close_console: ; 0x020EC68C
 	mov r0, #0x0
 	bx lr
 
-	.section .exceptix,4
-
-	.word __read_console
-	.short 81
-	.word 0x00300F00
-	.word __write_console
-	.short 53
-	.word 0x00200700
\ No newline at end of file
+	exception __read_console, 81, 0x00300F00
+	exception __write_console, 53, 0x00200700
\ No newline at end of file
diff --git a/arm9/asm/RUNTIME_CPLUS_StaticInitializers.s b/arm9/asm/RUNTIME_CPLUS_StaticInitializers.s
index c1446521..1c0caeb8 100644
--- a/arm9/asm/RUNTIME_CPLUS_StaticInitializers.s
+++ b/arm9/asm/RUNTIME_CPLUS_StaticInitializers.s
@@ -50,11 +50,5 @@ _020EC6D8:
 	.balign 4
 _020EC700: .word __global_destructor_chain
 
-	.section .exceptix,4
-
-	.word __call_static_initializers
-	.short 45
-	.word 0x00100100
-	.word __destroy_global_chain
-	.short 69
-	.word 0x00200300
+	exception __call_static_initializers, 45, 0x00100100
+	exception __destroy_global_chain, 69, 0x00200300
diff --git a/arm9/asm/RUNTIME_NITRO_eabi_init.s b/arm9/asm/RUNTIME_NITRO_eabi_init.s
index 1bd26818..716c8bb1 100644
--- a/arm9/asm/RUNTIME_NITRO_eabi_init.s
+++ b/arm9/asm/RUNTIME_NITRO_eabi_init.s
@@ -10,8 +10,4 @@ _ExitProcess: ; 0x020EC704
 	.balign 4
 _020EC70C: .word sys_exit
 
-	.section .exceptix,4
-
-	.word _ExitProcess
-	.short 13
-	.word 0x00000000
+	exception _ExitProcess, 13, 0x00000000
diff --git a/arm9/asm/macros.inc b/arm9/asm/macros.inc
index 156b2b09..f8cf61e4 100644
--- a/arm9/asm/macros.inc
+++ b/arm9/asm/macros.inc
@@ -1 +1,2 @@
 	.include "asm/macros/function.inc"
+	.include "asm/macros/cw.inc"
diff --git a/arm9/asm/macros/cw.inc b/arm9/asm/macros/cw.inc
new file mode 100644
index 00000000..14841f11
--- /dev/null
+++ b/arm9/asm/macros/cw.inc
@@ -0,0 +1,12 @@
+	.macro exception what, size, data
+	.section .exceptix,4,1,2
+	.balign 4, 0
+	.type ?exc$\what, @object
+	.global ?exc$\what
+	.size ?exc$\what, 12
+?exc$\what:
+	.word \what
+	.short \size
+	.word \data
+	.previous
+	.endm
diff --git a/arm9/asm/macros/function.inc b/arm9/asm/macros/function.inc
index 3323f53e..9c3e5eb5 100644
--- a/arm9/asm/macros/function.inc
+++ b/arm9/asm/macros/function.inc
@@ -1,10 +1,12 @@
 	.macro arm_func_start name
+	.type \name,@function
 	.balign 4, 0
 	.global \name
 	.arm
 	.endm
 
 	.macro local_arm_func_start name
+	.type \name,@function
 	.balign 4, 0
 	.arm
 	.endm
@@ -14,12 +16,14 @@
 	.endm
 
 	.macro thumb_func_start name
+	.type \name,@function
 	.balign 4, 0
 	.global \name
 	.thumb
 	.endm
 
 	.macro non_word_aligned_thumb_func_start name
+	.type \name,@function
 	.global \name
 	.thumb
 	.endm
-- 
cgit v1.2.3


From 2f4f4272b562692b33275f83b0133ee7785fe0cf Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 4 Sep 2021 13:02:30 -0400
Subject: Remove -nodead from ld flags

---
 arm9/asm/unk_0206F1F0.s | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'arm9/asm')

diff --git a/arm9/asm/unk_0206F1F0.s b/arm9/asm/unk_0206F1F0.s
index 64da364f..3b10238b 100644
--- a/arm9/asm/unk_0206F1F0.s
+++ b/arm9/asm/unk_0206F1F0.s
@@ -204,9 +204,9 @@ _0206F34A:
 	mov r0, #0x3
 	mov r1, #0x36
 	bl CreateHeap
-	bl FUN_02088878
+	bl FUN_02088878 ; Loads overlay 13
 	mov r0, #0x36
-	bl MOD07_02211E60
+	bl MOD13_02211E60
 	mov r0, #0x0
 	bl OS_ResetSystem
 	b _0206F380
-- 
cgit v1.2.3


From 438c14c5686c45c661c4fd09137fb8f4fae559ca Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 8 Sep 2021 12:36:55 -0400
Subject: unk_02029FB0, 1

---
 arm9/asm/unk_02029FB0.s   | 334 ----------------------------------------------
 arm9/asm/unk_02029FB0_s.s | 171 ++++++++++++++++++++++++
 2 files changed, 171 insertions(+), 334 deletions(-)
 delete mode 100644 arm9/asm/unk_02029FB0.s
 create mode 100644 arm9/asm/unk_02029FB0_s.s

(limited to 'arm9/asm')

diff --git a/arm9/asm/unk_02029FB0.s b/arm9/asm/unk_02029FB0.s
deleted file mode 100644
index 2c66522a..00000000
--- a/arm9/asm/unk_02029FB0.s
+++ /dev/null
@@ -1,334 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.section .rodata
-
-	.global UNK_020EEA7C
-UNK_020EEA7C: ; 0x020EEA7C
-	.short 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0002
-	.short 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0007, 0x0007, 0x0007
-	.short 0x000A, 0x000A, 0x000B, 0x000B, 0x000B, 0x000B, 0x0014, 0x001E
-	.short 0x0023, 0x0028, 0x01F4, 0x2710, 0x001E, 0x001E, 0x0002, 0x0005
-	.short 0x0001, 0x0001, 0x0005, 0x0003, 0x0001, 0x0001
-
-	.section .data
-
-	.global UNK_02105CD8
-UNK_02105CD8: ; 0x02105CD8
-	.byte 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01
-	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 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, 0x00, 0x00, 0x00, 0x00
-
-	.text
-
-	thumb_func_start FUN_02029FB0
-FUN_02029FB0: ; 0x02029FB0
-	mov r0, #0x53
-	lsl r0, r0, #0x2
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_02029FB8
-FUN_02029FB8: ; 0x02029FB8
-	ldr r3, _02029FC4 ; =MIi_CpuClear32
-	mov r2, #0x53
-	add r1, r0, #0x0
-	mov r0, #0x0
-	lsl r2, r2, #0x2
-	bx r3
-	.balign 4
-_02029FC4: .word MIi_CpuClear32
-
-	thumb_func_start FUN_02029FC8
-FUN_02029FC8: ; 0x02029FC8
-	ldr r3, _02029FD0 ; =SavArray_get
-	mov r1, #0x14
-	bx r3
-	nop
-_02029FD0: .word SavArray_get
-
-	thumb_func_start FUN_02029FD4
-FUN_02029FD4: ; 0x02029FD4
-	push {r3, lr}
-	cmp r1, #0x2c
-	bge _02029FE0
-	lsl r1, r1, #0x2
-	ldr r0, [r0, r1]
-	pop {r3, pc}
-_02029FE0:
-	cmp r1, #0x79
-	bge _02029FF0
-	sub r1, #0x2c
-	lsl r1, r1, #0x1
-	add r0, r0, r1
-	add r0, #0xb0
-	ldrh r0, [r0, #0x0]
-	pop {r3, pc}
-_02029FF0:
-	bl GF_AssertFail
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02029FF8
-FUN_02029FF8: ; 0x02029FF8
-	push {r3-r5, lr}
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	cmp r4, #0x2c
-	bge _0202A008
-	lsl r0, r4, #0x2
-	str r2, [r5, r0]
-	b _0202A01E
-_0202A008:
-	cmp r4, #0x79
-	bge _0202A01A
-	add r0, r4, #0x0
-	sub r0, #0x2c
-	lsl r0, r0, #0x1
-	add r0, r5, r0
-	add r0, #0xb0
-	strh r2, [r0, #0x0]
-	b _0202A01E
-_0202A01A:
-	bl GF_AssertFail
-_0202A01E:
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02029FD4
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_0202A028
-FUN_0202A028: ; 0x0202A028
-	push {r3, lr}
-	cmp r0, #0x2c
-	bge _0202A03E
-	ldr r1, _0202A05C ; =UNK_02105CD8
-	ldrb r0, [r1, r0]
-	cmp r0, #0x0
-	beq _0202A03A
-	ldr r0, _0202A060 ; =0x3B9AC9FF
-	pop {r3, pc}
-_0202A03A:
-	ldr r0, _0202A064 ; =0x000F423F
-	pop {r3, pc}
-_0202A03E:
-	cmp r0, #0x79
-	bge _0202A052
-	ldr r1, _0202A05C ; =UNK_02105CD8
-	ldrb r0, [r1, r0]
-	cmp r0, #0x0
-	beq _0202A04E
-	ldr r0, _0202A068 ; =0x0000FFFF
-	pop {r3, pc}
-_0202A04E:
-	ldr r0, _0202A06C ; =0x0000270F
-	pop {r3, pc}
-_0202A052:
-	bl GF_AssertFail
-	mov r0, #0x0
-	pop {r3, pc}
-	nop
-_0202A05C: .word UNK_02105CD8
-_0202A060: .word 0x3B9AC9FF
-_0202A064: .word 0x000F423F
-_0202A068: .word 0x0000FFFF
-_0202A06C: .word 0x0000270F
-
-	thumb_func_start FUN_0202A070
-FUN_0202A070: ; 0x0202A070
-	lsl r1, r0, #0x1
-	ldr r0, _0202A078 ; =UNK_020EEA7C
-	ldrh r0, [r0, r1]
-	bx lr
-	.balign 4
-_0202A078: .word UNK_020EEA7C
-
-	thumb_func_start FUN_0202A07C
-FUN_0202A07C: ; 0x0202A07C
-	push {r4-r6, lr}
-	add r5, r1, #0x0
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	add r4, r2, #0x0
-	bl FUN_0202A028
-	add r2, r0, #0x0
-	cmp r4, r2
-	bhs _0202A09C
-	add r0, r6, #0x0
-	add r1, r5, #0x0
-	add r2, r4, #0x0
-	bl FUN_02029FF8
-	pop {r4-r6, pc}
-_0202A09C:
-	add r0, r6, #0x0
-	add r1, r5, #0x0
-	bl FUN_02029FF8
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_0202A0A8
-FUN_0202A0A8: ; 0x0202A0A8
-	push {r3-r7, lr}
-	add r6, r1, #0x0
-	add r7, r0, #0x0
-	add r0, r6, #0x0
-	add r5, r2, #0x0
-	bl FUN_0202A028
-	add r4, r0, #0x0
-	add r0, r7, #0x0
-	add r1, r6, #0x0
-	bl FUN_02029FD4
-	cmp r5, r4
-	bls _0202A0C6
-	add r5, r4, #0x0
-_0202A0C6:
-	cmp r0, r5
-	bhs _0202A0D6
-	add r0, r7, #0x0
-	add r1, r6, #0x0
-	add r2, r5, #0x0
-	bl FUN_02029FF8
-	pop {r3-r7, pc}
-_0202A0D6:
-	cmp r0, r4
-	bls _0202A0E4
-	add r0, r7, #0x0
-	add r1, r6, #0x0
-	add r2, r4, #0x0
-	bl FUN_02029FF8
-_0202A0E4:
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0202A0E8
-FUN_0202A0E8: ; 0x0202A0E8
-	push {r4-r6, lr}
-	add r6, r1, #0x0
-	add r5, r0, #0x0
-	add r0, r6, #0x0
-	bl FUN_0202A028
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	bl FUN_02029FD4
-	add r2, r0, #0x1
-	cmp r2, r4
-	bhs _0202A10E
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	bl FUN_02029FF8
-	pop {r4-r6, pc}
-_0202A10E:
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	add r2, r4, #0x0
-	bl FUN_02029FF8
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_0202A11C
-FUN_0202A11C: ; 0x0202A11C
-	push {r3-r7, lr}
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	add r7, r2, #0x0
-	bl FUN_0202A028
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02029FD4
-	add r2, r0, r7
-	cmp r2, r6
-	bhs _0202A144
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02029FF8
-	pop {r3-r7, pc}
-_0202A144:
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	add r2, r6, #0x0
-	bl FUN_02029FF8
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_0202A150
-FUN_0202A150: ; 0x0202A150
-	push {r4-r6, lr}
-	add r6, r1, #0x0
-	add r5, r0, #0x0
-	add r0, r6, #0x0
-	bl FUN_0202A028
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	bl FUN_02029FD4
-	cmp r0, r4
-	bhi _0202A16C
-	add r4, r0, #0x0
-_0202A16C:
-	add r0, r4, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_0202A170
-FUN_0202A170: ; 0x0202A170
-	push {r4-r6, lr}
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	cmp r4, #0x26
-	blt _0202A17E
-	bl GF_AssertFail
-_0202A17E:
-	add r0, r5, #0x0
-	mov r1, #0x0
-	bl FUN_0202A150
-	add r6, r0, #0x0
-	add r0, r4, #0x0
-	bl FUN_0202A070
-	ldr r2, _0202A1B4 ; =0x05F5E0FF
-	add r0, r6, r0
-	cmp r0, r2
-	bls _0202A1A0
-	add r0, r5, #0x0
-	mov r1, #0x0
-	bl FUN_0202A07C
-	pop {r4-r6, pc}
-_0202A1A0:
-	add r0, r4, #0x0
-	bl FUN_0202A070
-	add r2, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x0
-	bl FUN_0202A11C
-	pop {r4-r6, pc}
-	nop
-_0202A1B4: .word 0x05F5E0FF
-
-	thumb_func_start FUN_0202A1B8
-FUN_0202A1B8: ; 0x0202A1B8
-	ldr r3, _0202A1C0 ; =FUN_0202A150
-	mov r1, #0x0
-	bx r3
-	nop
-_0202A1C0: .word FUN_0202A150
-
-	thumb_func_start FUN_0202A1C4
-FUN_0202A1C4: ; 0x0202A1C4
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r0, r1, #0x0
-	add r1, r2, #0x0
-	bl Pokedex_CheckMonCaughtFlag
-	cmp r0, #0x0
-	bne _0202A1DC
-	add r0, r4, #0x0
-	mov r1, #0x16
-	bl FUN_0202A170
-_0202A1DC:
-	pop {r4, pc}
-	.balign 4
diff --git a/arm9/asm/unk_02029FB0_s.s b/arm9/asm/unk_02029FB0_s.s
new file mode 100644
index 00000000..36bff703
--- /dev/null
+++ b/arm9/asm/unk_02029FB0_s.s
@@ -0,0 +1,171 @@
+	.include "asm/macros.inc"
+	.include "global.inc"
+
+	.extern FUN_02029FD4
+	.extern FUN_02029FF8
+	.extern FUN_0202A028
+	.extern FUN_0202A070
+
+	.text
+
+	thumb_func_start FUN_0202A0A8
+FUN_0202A0A8: ; 0x0202A0A8
+	push {r3-r7, lr}
+	add r6, r1, #0x0
+	add r7, r0, #0x0
+	add r0, r6, #0x0
+	add r5, r2, #0x0
+	bl FUN_0202A028
+	add r4, r0, #0x0
+	add r0, r7, #0x0
+	add r1, r6, #0x0
+	bl FUN_02029FD4
+	cmp r5, r4
+	bls _0202A0C6
+	add r5, r4, #0x0
+_0202A0C6:
+	cmp r0, r5
+	bhs _0202A0D6
+	add r0, r7, #0x0
+	add r1, r6, #0x0
+	add r2, r5, #0x0
+	bl FUN_02029FF8
+	pop {r3-r7, pc}
+_0202A0D6:
+	cmp r0, r4
+	bls _0202A0E4
+	add r0, r7, #0x0
+	add r1, r6, #0x0
+	add r2, r4, #0x0
+	bl FUN_02029FF8
+_0202A0E4:
+	pop {r3-r7, pc}
+	.balign 4
+
+	thumb_func_start FUN_0202A0E8
+FUN_0202A0E8: ; 0x0202A0E8
+	push {r4-r6, lr}
+	add r6, r1, #0x0
+	add r5, r0, #0x0
+	add r0, r6, #0x0
+	bl FUN_0202A028
+	add r4, r0, #0x0
+	add r0, r5, #0x0
+	add r1, r6, #0x0
+	bl FUN_02029FD4
+	add r2, r0, #0x1
+	cmp r2, r4
+	bhs _0202A10E
+	add r0, r5, #0x0
+	add r1, r6, #0x0
+	bl FUN_02029FF8
+	pop {r4-r6, pc}
+_0202A10E:
+	add r0, r5, #0x0
+	add r1, r6, #0x0
+	add r2, r4, #0x0
+	bl FUN_02029FF8
+	pop {r4-r6, pc}
+	.balign 4
+
+	thumb_func_start FUN_0202A11C
+FUN_0202A11C: ; 0x0202A11C
+	push {r3-r7, lr}
+	add r4, r1, #0x0
+	add r5, r0, #0x0
+	add r0, r4, #0x0
+	add r7, r2, #0x0
+	bl FUN_0202A028
+	add r6, r0, #0x0
+	add r0, r5, #0x0
+	add r1, r4, #0x0
+	bl FUN_02029FD4
+	add r2, r0, r7
+	cmp r2, r6
+	bhs _0202A144
+	add r0, r5, #0x0
+	add r1, r4, #0x0
+	bl FUN_02029FF8
+	pop {r3-r7, pc}
+_0202A144:
+	add r0, r5, #0x0
+	add r1, r4, #0x0
+	add r2, r6, #0x0
+	bl FUN_02029FF8
+	pop {r3-r7, pc}
+
+	thumb_func_start FUN_0202A150
+FUN_0202A150: ; 0x0202A150
+	push {r4-r6, lr}
+	add r6, r1, #0x0
+	add r5, r0, #0x0
+	add r0, r6, #0x0
+	bl FUN_0202A028
+	add r4, r0, #0x0
+	add r0, r5, #0x0
+	add r1, r6, #0x0
+	bl FUN_02029FD4
+	cmp r0, r4
+	bhi _0202A16C
+	add r4, r0, #0x0
+_0202A16C:
+	add r0, r4, #0x0
+	pop {r4-r6, pc}
+
+	thumb_func_start FUN_0202A170
+FUN_0202A170: ; 0x0202A170
+	push {r4-r6, lr}
+	add r4, r1, #0x0
+	add r5, r0, #0x0
+	cmp r4, #0x26
+	blt _0202A17E
+	bl GF_AssertFail
+_0202A17E:
+	add r0, r5, #0x0
+	mov r1, #0x0
+	bl FUN_0202A150
+	add r6, r0, #0x0
+	add r0, r4, #0x0
+	bl FUN_0202A070
+	ldr r2, _0202A1B4 ; =0x05F5E0FF
+	add r0, r6, r0
+	cmp r0, r2
+	bls _0202A1A0
+	add r0, r5, #0x0
+	mov r1, #0x0
+	bl FUN_0202A07C
+	pop {r4-r6, pc}
+_0202A1A0:
+	add r0, r4, #0x0
+	bl FUN_0202A070
+	add r2, r0, #0x0
+	add r0, r5, #0x0
+	mov r1, #0x0
+	bl FUN_0202A11C
+	pop {r4-r6, pc}
+	nop
+_0202A1B4: .word 0x05F5E0FF
+
+	thumb_func_start FUN_0202A1B8
+FUN_0202A1B8: ; 0x0202A1B8
+	ldr r3, _0202A1C0 ; =FUN_0202A150
+	mov r1, #0x0
+	bx r3
+	nop
+_0202A1C0: .word FUN_0202A150
+
+	thumb_func_start FUN_0202A1C4
+FUN_0202A1C4: ; 0x0202A1C4
+	push {r4, lr}
+	add r4, r0, #0x0
+	add r0, r1, #0x0
+	add r1, r2, #0x0
+	bl Pokedex_CheckMonCaughtFlag
+	cmp r0, #0x0
+	bne _0202A1DC
+	add r0, r4, #0x0
+	mov r1, #0x16
+	bl FUN_0202A170
+_0202A1DC:
+	pop {r4, pc}
+	.balign 4
-- 
cgit v1.2.3


From a9ce5e44987cea38aaa0a2336d8582fc7a1edec4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 8 Sep 2021 13:04:56 -0400
Subject: unk_02029FB0.c, 2

---
 arm9/asm/unk_02029FB0_s.s | 171 ----------------------------------------------
 1 file changed, 171 deletions(-)
 delete mode 100644 arm9/asm/unk_02029FB0_s.s

(limited to 'arm9/asm')

diff --git a/arm9/asm/unk_02029FB0_s.s b/arm9/asm/unk_02029FB0_s.s
deleted file mode 100644
index 36bff703..00000000
--- a/arm9/asm/unk_02029FB0_s.s
+++ /dev/null
@@ -1,171 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.extern FUN_02029FD4
-	.extern FUN_02029FF8
-	.extern FUN_0202A028
-	.extern FUN_0202A070
-
-	.text
-
-	thumb_func_start FUN_0202A0A8
-FUN_0202A0A8: ; 0x0202A0A8
-	push {r3-r7, lr}
-	add r6, r1, #0x0
-	add r7, r0, #0x0
-	add r0, r6, #0x0
-	add r5, r2, #0x0
-	bl FUN_0202A028
-	add r4, r0, #0x0
-	add r0, r7, #0x0
-	add r1, r6, #0x0
-	bl FUN_02029FD4
-	cmp r5, r4
-	bls _0202A0C6
-	add r5, r4, #0x0
-_0202A0C6:
-	cmp r0, r5
-	bhs _0202A0D6
-	add r0, r7, #0x0
-	add r1, r6, #0x0
-	add r2, r5, #0x0
-	bl FUN_02029FF8
-	pop {r3-r7, pc}
-_0202A0D6:
-	cmp r0, r4
-	bls _0202A0E4
-	add r0, r7, #0x0
-	add r1, r6, #0x0
-	add r2, r4, #0x0
-	bl FUN_02029FF8
-_0202A0E4:
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0202A0E8
-FUN_0202A0E8: ; 0x0202A0E8
-	push {r4-r6, lr}
-	add r6, r1, #0x0
-	add r5, r0, #0x0
-	add r0, r6, #0x0
-	bl FUN_0202A028
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	bl FUN_02029FD4
-	add r2, r0, #0x1
-	cmp r2, r4
-	bhs _0202A10E
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	bl FUN_02029FF8
-	pop {r4-r6, pc}
-_0202A10E:
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	add r2, r4, #0x0
-	bl FUN_02029FF8
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_0202A11C
-FUN_0202A11C: ; 0x0202A11C
-	push {r3-r7, lr}
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	add r7, r2, #0x0
-	bl FUN_0202A028
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02029FD4
-	add r2, r0, r7
-	cmp r2, r6
-	bhs _0202A144
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02029FF8
-	pop {r3-r7, pc}
-_0202A144:
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	add r2, r6, #0x0
-	bl FUN_02029FF8
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_0202A150
-FUN_0202A150: ; 0x0202A150
-	push {r4-r6, lr}
-	add r6, r1, #0x0
-	add r5, r0, #0x0
-	add r0, r6, #0x0
-	bl FUN_0202A028
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	bl FUN_02029FD4
-	cmp r0, r4
-	bhi _0202A16C
-	add r4, r0, #0x0
-_0202A16C:
-	add r0, r4, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_0202A170
-FUN_0202A170: ; 0x0202A170
-	push {r4-r6, lr}
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	cmp r4, #0x26
-	blt _0202A17E
-	bl GF_AssertFail
-_0202A17E:
-	add r0, r5, #0x0
-	mov r1, #0x0
-	bl FUN_0202A150
-	add r6, r0, #0x0
-	add r0, r4, #0x0
-	bl FUN_0202A070
-	ldr r2, _0202A1B4 ; =0x05F5E0FF
-	add r0, r6, r0
-	cmp r0, r2
-	bls _0202A1A0
-	add r0, r5, #0x0
-	mov r1, #0x0
-	bl FUN_0202A07C
-	pop {r4-r6, pc}
-_0202A1A0:
-	add r0, r4, #0x0
-	bl FUN_0202A070
-	add r2, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x0
-	bl FUN_0202A11C
-	pop {r4-r6, pc}
-	nop
-_0202A1B4: .word 0x05F5E0FF
-
-	thumb_func_start FUN_0202A1B8
-FUN_0202A1B8: ; 0x0202A1B8
-	ldr r3, _0202A1C0 ; =FUN_0202A150
-	mov r1, #0x0
-	bx r3
-	nop
-_0202A1C0: .word FUN_0202A150
-
-	thumb_func_start FUN_0202A1C4
-FUN_0202A1C4: ; 0x0202A1C4
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r0, r1, #0x0
-	add r1, r2, #0x0
-	bl Pokedex_CheckMonCaughtFlag
-	cmp r0, #0x0
-	bne _0202A1DC
-	add r0, r4, #0x0
-	mov r1, #0x16
-	bl FUN_0202A170
-_0202A1DC:
-	pop {r4, pc}
-	.balign 4
-- 
cgit v1.2.3


From 84dce8ea46ff8e27b171169a1fa266f1a1115b27 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 8 Sep 2021 13:18:19 -0400
Subject: Name game stats methods

---
 arm9/asm/scrcmd_9.s     |  4 ++--
 arm9/asm/scrcmd_asm.s   | 24 ++++++++++----------
 arm9/asm/unk_0202B870.s | 16 ++++++-------
 arm9/asm/unk_02035068.s |  4 ++--
 arm9/asm/unk_020377F0.s | 20 ++++++++---------
 arm9/asm/unk_0204653C.s | 60 ++++++++++++++++++++++++-------------------------
 arm9/asm/unk_020476CC.s |  8 +++----
 arm9/asm/unk_020484A8.s |  4 ++--
 arm9/asm/unk_0204B9EC.s |  4 ++--
 arm9/asm/unk_0204CB20.s |  8 +++----
 arm9/asm/unk_0204FBA8.s |  4 ++--
 arm9/asm/unk_020557F4.s |  4 ++--
 arm9/asm/unk_02064E90.s | 40 ++++++++++++++++-----------------
 arm9/asm/unk_0206C700.s |  8 +++----
 arm9/asm/unk_02080C38.s | 18 +++++++--------
 arm9/asm/unk_020854E0.s |  4 ++--
 16 files changed, 115 insertions(+), 115 deletions(-)

(limited to 'arm9/asm')

diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s
index c3d8c4ba..211f5afc 100644
--- a/arm9/asm/scrcmd_9.s
+++ b/arm9/asm/scrcmd_9.s
@@ -316,7 +316,7 @@ _020420A8:
 	add r0, #0x80
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r4, r0, #0x0
 	add r0, r5, #0x0
 	bl ScriptReadHalfword
@@ -349,7 +349,7 @@ _020420A8:
 	bl FUN_020421D8
 	add r0, r4, #0x0
 	mov r1, #0x3
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _02042106:
 	mov r0, #0x0
 	pop {r3-r7, pc}
diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s
index 29106585..231a064d 100644
--- a/arm9/asm/scrcmd_asm.s
+++ b/arm9/asm/scrcmd_asm.s
@@ -6368,9 +6368,9 @@ ScrCmd_Unk01E5: ; 0x0203E4F0
 	add r4, r0, #0x0
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r4, #0x0
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	mov r0, #0x0
 	pop {r3-r5, pc}
 	.balign 4
@@ -6402,9 +6402,9 @@ ScrCmd_Unk01E6: ; 0x0203E510
 	add r6, r0, #0x0
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r7, #0x0
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	ldr r1, _0203E564 ; =0xFFFF0000
 	and r1, r0
 	lsr r1, r1, #0x10
@@ -6444,28 +6444,28 @@ _0203E59C:
 	add r5, #0x80
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r6, #0x0
 	add r2, r4, #0x0
-	bl FUN_0202A11C
+	bl GameStats_Add
 	b _0203E5D6
 _0203E5B0:
 	add r5, #0x80
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r6, #0x0
 	add r2, r4, #0x0
-	bl FUN_0202A07C
+	bl GameStats_SetCapped
 	b _0203E5D6
 _0203E5C4:
 	add r5, #0x80
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r6, #0x0
 	add r2, r4, #0x0
-	bl FUN_0202A0A8
+	bl GameStats_UpdateBounded
 _0203E5D6:
 	mov r0, #0x0
 	pop {r4-r6, pc}
@@ -7563,9 +7563,9 @@ ScrCmd_Unk0260: ; 0x0203EE78
 	add r4, r0, #0x0
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r4, #0x0
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	mov r0, #0x0
 	pop {r3-r5, pc}
 	.balign 4
diff --git a/arm9/asm/unk_0202B870.s b/arm9/asm/unk_0202B870.s
index c4dc6cc4..33f15eb4 100644
--- a/arm9/asm/unk_0202B870.s
+++ b/arm9/asm/unk_0202B870.s
@@ -154,7 +154,7 @@ FUN_0202B93C: ; 0x0202B93C
 	push {r3-r7, lr}
 	sub sp, #0x8
 	add r5, r1, #0x0
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r4, r0, #0x0
 	add r0, r5, #0x0
 	mov r1, #0x34
@@ -175,12 +175,12 @@ _0202B95A:
 _0202B968:
 	add r0, r4, #0x0
 	mov r1, #0xf
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r7, r0, #0x0
 	beq _0202B984
 	add r0, r4, #0x0
 	mov r1, #0x1d
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r1, r7, #0x0
 	bl _u32_div_f
 	add r7, r0, #0x0
@@ -190,22 +190,22 @@ _0202B984:
 _0202B988:
 	add r0, r4, #0x0
 	mov r1, #0x41
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r7, r0, #0x0
 	add r0, r4, #0x0
 	mov r1, #0x42
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r0, r7, r0
 	str r0, [r5, #0x0]
 	b _0202B9D4
 _0202B9A0:
 	add r0, r4, #0x0
 	mov r1, #0x3f
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r7, r0, #0x0
 	add r0, r4, #0x0
 	mov r1, #0x40
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r1, r7, r0
 	beq _0202B9C4
 	ldr r0, [sp, #0x4]
@@ -221,7 +221,7 @@ _0202B9C8:
 	ldr r1, [sp, #0x0]
 	add r0, r4, #0x0
 	ldr r1, [r1, #0x0]
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [r5, #0x0]
 _0202B9D4:
 	ldr r0, [sp, #0x0]
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index d0bddd04..ceed181f 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -3672,7 +3672,7 @@ FUN_02036E08: ; 0x02036E08
 	bl Sav2_Bag_get
 	str r0, [sp, #0x30]
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [sp, #0x34]
 	ldr r0, [r4, #0xc]
 	bl Sav2_Poketch_get
@@ -3709,7 +3709,7 @@ _02036E9E:
 	bl Sav2_Bag_get
 	str r0, [sp, #0x40]
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [sp, #0x44]
 	ldr r0, [r4, #0xc]
 	bl Sav2_Poketch_get
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 5ac3b4c2..a5047e10 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -1279,7 +1279,7 @@ FUN_0203800C: ; 0x0203800C
 	bl Sav2_PlayerData_GetOptionsAddr
 	str r0, [r4, #0xc]
 	add r0, r5, #0x0
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r4, #0x10]
 	add r0, r5, #0x0
 	bl Sav2_PlayerData_GetProfileAddr
@@ -1435,7 +1435,7 @@ FUN_02038144: ; 0x02038144
 	ldr r0, [r0, #0x0]
 	str r0, [r5, #0x1c]
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r5, #0x20]
 	bl PlayerProfile_sizeof
 	add r1, r0, #0x0
@@ -1647,7 +1647,7 @@ _020382F6:
 	bl Sav2_Bag_get
 	str r0, [sp, #0x28]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [sp, #0x2c]
 	ldr r0, [r5, #0xc]
 	bl Sav2_Poketch_get
@@ -1702,9 +1702,9 @@ _020383B2:
 	mov r0, #0x2
 	str r0, [r4, #0x0]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x10
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _020383C8:
 	mov r0, #0x0
 	add sp, #0x34
@@ -1771,7 +1771,7 @@ FUN_0203842C: ; 0x0203842C
 	bl Sav2_PlayerData_GetOptionsAddr
 	str r0, [r4, #0x8]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r4, #0xc]
 	add r0, r5, #0x0
 	add r0, #0x98
@@ -2145,7 +2145,7 @@ FUN_020386E0: ; 0x020386E0
 	bl Sav2_PlayerData_GetOptionsAddr
 	str r0, [r4, #0x24]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r4, #0x28]
 	add r0, r5, #0x0
 	add r0, #0x98
@@ -2473,7 +2473,7 @@ FUN_020389CC: ; 0x020389CC
 	str r0, [r4, #0x4]
 	str r1, [r4, #0x8]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r4, #0x14]
 	mov r0, #0x0
 	str r0, [r4, #0x18]
@@ -2486,9 +2486,9 @@ FUN_020389CC: ; 0x020389CC
 	bl FUN_02038A3C
 	str r0, [r4, #0x10]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x5
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r1, _02038A38 ; =FUN_02038914
 	add r0, r7, #0x0
 	add r2, r4, #0x0
diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s
index f3d45372..212047b4 100644
--- a/arm9/asm/unk_0204653C.s
+++ b/arm9/asm/unk_0204653C.s
@@ -348,9 +348,9 @@ _020467C0:
 	add r1, r7, #0x0
 	bl FUN_02047FA4
 	ldr r0, [r7, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x15
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	add r0, r6, #0x0
 	bl FUN_0204AF84
 	ldr r0, [r4, #0x0]
@@ -410,9 +410,9 @@ _02046844:
 	add r1, r6, #0x0
 	bl FUN_02047FA4
 	ldr r0, [r6, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x15
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r0, [r4, #0x0]
 	add r0, r0, #0x1
 	str r0, [r4, #0x0]
@@ -710,9 +710,9 @@ _02046ABC:
 	ldr r0, [r5, #0x34]
 	bl FUN_02058780
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r1, [r4, #0x4]
 	ldr r2, [r4, #0x8]
 	add r0, r6, #0x0
@@ -905,9 +905,9 @@ _02046C68:
 	ldr r0, [r6, #0x34]
 	bl FUN_02058780
 	ldr r0, [r6, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r1, [r5, #0x4]
 	ldr r2, [r5, #0x8]
 	add r0, r7, #0x0
@@ -1079,9 +1079,9 @@ FUN_02046DB4: ; 0x02046DB4
 	add r1, r4, #0x0
 	bl MOD06_0223CCDC
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_020475A0
 	add r5, r0, #0x0
@@ -1131,9 +1131,9 @@ FUN_02046E18: ; 0x02046E18
 	str r0, [r4, r1]
 _02046E60:
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_020475A0
 	add r5, r0, #0x0
@@ -1181,9 +1181,9 @@ _02046EC6:
 	ldr r0, [r6, #0x34]
 	bl FUN_02058780
 	ldr r0, [r6, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r1, [r5, #0x4]
 	ldr r2, [r5, #0x8]
 	add r0, r7, #0x0
@@ -1305,9 +1305,9 @@ FUN_02046FA0: ; 0x02046FA0
 	lsl r0, r0, #0x2
 	str r1, [r4, r0]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_020475A0
 	add r5, r0, #0x0
@@ -1484,9 +1484,9 @@ _0204711A:
 	add r0, r4, #0x0
 	bl EnemyTrainerSet_Init
 	ldr r0, [r7, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x8
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_020475A0
 	add r5, r0, #0x0
@@ -1702,9 +1702,9 @@ _02047318:
 	cmp r2, #0x1
 	bne _0204732A
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x8
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 _0204732A:
 	cmp r2, #0x4
@@ -1721,14 +1721,14 @@ _0204732A:
 	cmp r0, #0x0
 	ldr r0, [r4, #0xc]
 	beq _02047358
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x9
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 _02047358:
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0xa
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 _02047364:
 	mov r3, #0x1
@@ -1741,9 +1741,9 @@ _02047370:
 	cmp r2, #0x1
 	bne _020473C8
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0xb
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 _02047382:
 	mov r3, #0x20
@@ -1768,14 +1768,14 @@ _02047390:
 	cmp r0, #0x0
 	ldr r0, [r4, #0xc]
 	beq _020473BE
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x9
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 _020473BE:
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0xa
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _020473C8:
 	pop {r3-r5, pc}
 	.balign 4
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index cfbae230..5c61e632 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -295,7 +295,7 @@ FUN_02047814: ; 0x02047814
 	sub r1, #0x8
 	str r0, [r4, r1]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x51
 	lsl r1, r1, #0x2
 	str r0, [r4, r1]
@@ -572,7 +572,7 @@ FUN_02047A78: ; 0x02047A78
 	lsl r1, r1, #0x2
 	str r0, [r5, r1]
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x51
 	lsl r1, r1, #0x2
 	str r0, [r5, r1]
@@ -747,7 +747,7 @@ _02047C98:
 	str r0, [r6, r1]
 	ldr r0, [sp, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x51
 	lsl r1, r1, #0x2
 	str r0, [r6, r1]
@@ -925,7 +925,7 @@ _02047E2C:
 	str r0, [r5, r1]
 	ldr r0, [sp, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x51
 	lsl r1, r1, #0x2
 	str r0, [r5, r1]
diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s
index 97e67111..cbf66c82 100644
--- a/arm9/asm/unk_020484A8.s
+++ b/arm9/asm/unk_020484A8.s
@@ -321,9 +321,9 @@ _0204871E:
 	ldr r0, [sp, #0x0]
 	bl PlayerProfile_SetGameClearFlag
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x2e
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r1, _02048760 ; =FUN_020484F8
 	add r0, r7, #0x0
 	add r2, r5, #0x0
diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s
index fbf817bd..440b55ae 100644
--- a/arm9/asm/unk_0204B9EC.s
+++ b/arm9/asm/unk_0204B9EC.s
@@ -36,7 +36,7 @@ FUN_0204BA1C: ; 0x0204BA1C
 	push {r3-r5, lr}
 	ldr r0, [r0, #0xc]
 	ldr r4, _0204BA60 ; =UNK_021C5A1C
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r5, r0, #0x0
 	bl GF_RTC_DateTimeToSec
 	add r3, r1, #0x0
@@ -62,7 +62,7 @@ _0204BA52:
 	str r0, [r4, #0x48]
 	add r0, r5, #0x0
 	mov r1, #0x11
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 	nop
 _0204BA60: .word UNK_021C5A1C
diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s
index 87fb50fc..ad7e088e 100644
--- a/arm9/asm/unk_0204CB20.s
+++ b/arm9/asm/unk_0204CB20.s
@@ -2342,9 +2342,9 @@ FUN_0204DCB4: ; 0x0204DCB4
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0x54]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x25
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _0204DD0C:
 	pop {r3-r5, pc}
 	nop
@@ -4606,9 +4606,9 @@ FUN_0204EDEC: ; 0x0204EDEC
 	beq _0204EE96
 	ldr r0, [r2, #0x54]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x1c
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r0, _0204EE98 ; =UNK_021C5A68
 	ldr r1, [r0, #0x0]
 	mov r0, #0xa3
diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s
index 16e26d1a..e2fcf579 100644
--- a/arm9/asm/unk_0204FBA8.s
+++ b/arm9/asm/unk_0204FBA8.s
@@ -180,9 +180,9 @@ FUN_0204FCA0: ; 0x0204FCA0
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0x18]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x24
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r0, _0204FCD0 ; =UNK_021C5A6C
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0x18]
diff --git a/arm9/asm/unk_020557F4.s b/arm9/asm/unk_020557F4.s
index b3bd5347..e7b734a0 100644
--- a/arm9/asm/unk_020557F4.s
+++ b/arm9/asm/unk_020557F4.s
@@ -3408,9 +3408,9 @@ FUN_020572D4: ; 0x020572D4
 	bl FUN_020553A0
 	bl FUN_02058738
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x5
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	pop {r3, pc}
 
 	thumb_func_start FUN_020572EC
diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s
index ac7baa5d..2b45a359 100644
--- a/arm9/asm/unk_02064E90.s
+++ b/arm9/asm/unk_02064E90.s
@@ -19,7 +19,7 @@ FUN_02064E90: ; 0x02064E90
 	bl Sav2_PlayerData_GetProfileAddr
 	add r7, r0, #0x0
 	ldr r0, [sp, #0x20]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r4, r0, #0x0
 	ldr r0, [sp, #0x1c]
 	strb r0, [r5, #0x5]
@@ -56,7 +56,7 @@ FUN_02064E90: ; 0x02064E90
 	bl Pokedex_GetSinnohDexFlag
 	str r0, [sp, #0x3c]
 	add r0, r4, #0x0
-	bl FUN_0202A1B8
+	bl GameStats_GetStat0
 	ldr r1, [sp, #0x38]
 	ldr r2, [sp, #0x30]
 	str r1, [sp, #0x0]
@@ -100,27 +100,27 @@ FUN_02064E90: ; 0x02064E90
 	str r0, [sp, #0x44]
 	add r0, r4, #0x0
 	mov r1, #0x20
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x48]
 	add r0, r4, #0x0
 	mov r1, #0x19
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x4c]
 	add r0, r4, #0x0
 	mov r1, #0x14
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x50]
 	add r0, r4, #0x0
 	mov r1, #0x18
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x54]
 	add r0, r4, #0x0
 	mov r1, #0x40
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x58]
 	add r0, r4, #0x0
 	mov r1, #0x13
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	ldr r1, [sp, #0x58]
 	add r1, r1, r0
 	ldr r0, [sp, #0x54]
@@ -132,27 +132,27 @@ FUN_02064E90: ; 0x02064E90
 	str r0, [sp, #0x5c]
 	add r0, r4, #0x0
 	mov r1, #0x15
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x60]
 	add r0, r4, #0x0
 	mov r1, #0x1a
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x64]
 	add r0, r4, #0x0
 	mov r1, #0x16
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x68]
 	add r0, r4, #0x0
 	mov r1, #0x1b
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x6c]
 	add r0, r4, #0x0
 	mov r1, #0x13
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x70]
 	add r0, r4, #0x0
 	mov r1, #0x18
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r4, r0, #0x0
 	ldr r0, [sp, #0x44]
 	bl FUN_02029AC8
@@ -220,7 +220,7 @@ FUN_02065078: ; 0x02065078
 	push {r3-r7, lr}
 	bl ScriptEnvironment_GetSav2Ptr
 	add r7, r0, #0x0
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r6, r0, #0x0
 	add r0, r7, #0x0
 	bl SavArray_Flags_get
@@ -248,27 +248,27 @@ _020650A8:
 _020650BC:
 	add r0, r6, #0x0
 	mov r1, #0x35
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	cmp r0, #0x64
 	bhs _020650F8
 	add r0, r6, #0x0
 	mov r1, #0x37
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	cmp r0, #0x64
 	bhs _020650F8
 	add r0, r6, #0x0
 	mov r1, #0x39
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	cmp r0, #0x64
 	bhs _020650F8
 	add r0, r6, #0x0
 	mov r1, #0x3b
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	cmp r0, #0x64
 	bhs _020650F8
 	add r0, r6, #0x0
 	mov r1, #0x3d
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	cmp r0, #0x64
 	blo _020650FE
 _020650F8:
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 345ecae1..ec33e447 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -1099,10 +1099,10 @@ _0206CFFA:
 	bl Pokedex_SetMonCaughtFlag
 	ldr r0, [r4, #0x50]
 	mov r1, #0xc
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r0, [r4, #0x50]
 	mov r1, #0x16
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r0, [r4, #0x28]
 	bl FUN_020690E4
 	add r1, r0, #0x0
@@ -2201,10 +2201,10 @@ _0206D8EA:
 	bl Pokedex_SetMonCaughtFlag
 	ldr r0, [r4, #0x50]
 	mov r1, #0xc
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r0, [r4, #0x50]
 	mov r1, #0x16
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	add r0, r5, #0x0
 	bl FUN_020690E4
 	add r1, r0, #0x0
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index e8299712..c3747143 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -3623,26 +3623,26 @@ _020826EA:
 	bl FUN_02060F10
 	ldr r0, _02082848 ; =0x0000198C
 	ldr r0, [r4, r0]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x3f
 	add r6, r0, #0x0
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_0208217C
 	cmp r0, #0x0
 	bne _02082740
 	add r0, r6, #0x0
 	mov r1, #0x41
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r6, #0x0
 	mov r1, #0xd
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _02082740:
 	cmp r5, #0x1
 	bne _0208274C
 	add r0, r6, #0x0
 	mov r1, #0x43
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 _0208274C:
 	ldr r0, _02082848 ; =0x0000198C
 	ldr r0, [r4, r0]
@@ -3679,20 +3679,20 @@ _02082774:
 	bl FUN_0202C108
 	ldr r0, _02082848 ; =0x0000198C
 	ldr r0, [r4, r0]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x40
 	add r5, r0, #0x0
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_0208217C
 	cmp r0, #0x0
 	bne _020827BA
 	add r0, r5, #0x0
 	mov r1, #0x42
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r5, #0x0
 	mov r1, #0x13
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _020827BA:
 	ldr r1, _02082854 ; =0x00000123
 	mov r0, #0xc
diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s
index 4c77e4ac..cf9d8236 100644
--- a/arm9/asm/unk_020854E0.s
+++ b/arm9/asm/unk_020854E0.s
@@ -531,9 +531,9 @@ _020858D2:
 	ldr r0, [r6, #0x14]
 	bl FUN_020857A4
 	ldr r0, [r6, #0x10]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x2
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	mov r0, #0x1
 	str r0, [r6, #0x4]
 	b _020858FC
-- 
cgit v1.2.3


From 60780539f9f599924eb2c5dc12cb09d2b9831ed1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 14 Sep 2021 08:30:01 -0400
Subject: Name remaining map_header.c routines

---
 arm9/asm/unk_02028980.s | 12 ++++++------
 arm9/asm/unk_0204C1B4.s | 22 +++++++++++-----------
 arm9/asm/unk_0205CE48.s |  2 +-
 arm9/asm/unk_0206367C.s |  2 +-
 arm9/asm/unk_02063948.s |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'arm9/asm')

diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s
index 8299ea95..ca48ecc9 100644
--- a/arm9/asm/unk_02028980.s
+++ b/arm9/asm/unk_02028980.s
@@ -2207,11 +2207,11 @@ FUN_02029880: ; 0x02029880
 	str r1, [sp, #0x0]
 	add r5, r2, #0x0
 	ldr r6, [sp, #0x20]
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x1
 	bne _020298BA
 	add r0, r5, #0x0
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x1
 	bne _02029942
 	add r0, r4, #0x0
@@ -2224,11 +2224,11 @@ FUN_02029880: ; 0x02029880
 	b _02029942
 _020298BA:
 	add r0, r4, #0x0
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x1
 	bne _0202991A
 	add r0, r5, #0x0
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x1
 	bne _02029942
 	ldr r0, _02029958 ; =0x0000019E
@@ -2271,11 +2271,11 @@ _02029910:
 	b _02029942
 _0202991A:
 	add r0, r4, #0x0
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x1
 	bne _02029942
 	add r0, r5, #0x0
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x1
 	bne _02029942
 	add r0, r7, #0x0
diff --git a/arm9/asm/unk_0204C1B4.s b/arm9/asm/unk_0204C1B4.s
index 7ca0881c..ea61b039 100644
--- a/arm9/asm/unk_0204C1B4.s
+++ b/arm9/asm/unk_0204C1B4.s
@@ -162,25 +162,25 @@ FUN_0204C29C: ; 0x0204C29C
 	ldr r0, [r7, #0x1c]
 	ldr r0, [r0, #0x0]
 	str r0, [sp, #0x8]
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x0
 	beq _0204C308
 	add r0, r5, #0x0
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x0
 	beq _0204C2E6
 	mov r4, #0x6
 	b _0204C36A
 _0204C2E6:
 	add r0, r5, #0x0
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x0
 	beq _0204C2F4
 	mov r4, #0x5
 	b _0204C36A
 _0204C2F4:
 	add r0, r5, #0x0
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x0
 	beq _0204C302
 	mov r4, #0x6
@@ -190,18 +190,18 @@ _0204C302:
 	b _0204C36A
 _0204C308:
 	ldr r0, [sp, #0x8]
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x0
 	beq _0204C334
 	add r0, r5, #0x0
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x0
 	beq _0204C320
 	mov r4, #0x4
 	b _0204C36A
 _0204C320:
 	add r0, r5, #0x0
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x0
 	beq _0204C32E
 	mov r4, #0x6
@@ -211,22 +211,22 @@ _0204C32E:
 	b _0204C36A
 _0204C334:
 	ldr r0, [sp, #0x8]
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x0
 	beq _0204C366
 	add r0, r5, #0x0
-	bl FUN_02034964
+	bl MapHeader_IsOutdoor
 	cmp r0, #0x0
 	bne _0204C36A
 	add r0, r5, #0x0
-	bl FUN_02034944
+	bl MapHeader_IsBuilding
 	cmp r0, #0x0
 	beq _0204C356
 	mov r4, #0x6
 	b _0204C36A
 _0204C356:
 	add r0, r5, #0x0
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x0
 	bne _0204C36A
 	bl GF_AssertFail
diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s
index 43f1137e..14dfd9ef 100644
--- a/arm9/asm/unk_0205CE48.s
+++ b/arm9/asm/unk_0205CE48.s
@@ -1591,7 +1591,7 @@ FUN_0205DA80: ; 0x0205DA80
 	pop {r4, pc}
 _0205DA8E:
 	ldr r0, [r4, #0x0]
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x1
 	bne _0205DAA6
 	ldr r0, [r4, #0x0]
diff --git a/arm9/asm/unk_0206367C.s b/arm9/asm/unk_0206367C.s
index 3a92648f..0cb2156c 100644
--- a/arm9/asm/unk_0206367C.s
+++ b/arm9/asm/unk_0206367C.s
@@ -88,7 +88,7 @@ _020636F8:
 	bl FUN_02060478
 	ldr r0, [r5, #0x1c]
 	ldr r0, [r0, #0x0]
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x0
 	bne _02063758
 	ldr r0, [r5, #0xc]
diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s
index 632e129d..7b29aaba 100644
--- a/arm9/asm/unk_02063948.s
+++ b/arm9/asm/unk_02063948.s
@@ -1015,7 +1015,7 @@ FUN_020640CC: ; 0x020640CC
 	pop {r4, pc}
 _020640DE:
 	ldr r0, [r4, #0x0]
-	bl FUN_020348E4
+	bl MapHeader_IsOutdoorNotTown
 	cmp r0, #0x0
 	bne _020640EC
 	mov r0, #0x1
@@ -1125,7 +1125,7 @@ FUN_020641AC: ; 0x020641AC
 	pop {r4, pc}
 _020641BE:
 	ldr r0, [r4, #0x0]
-	bl FUN_02034930
+	bl MapHeader_IsCave
 	cmp r0, #0x1
 	bne _020641D2
 	ldr r0, [r4, #0x0]
-- 
cgit v1.2.3


From 3fd325f0aa9d7ad402c77c596ef7d0b38d50803f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 17 Dec 2021 19:28:07 -0500
Subject: Fix calcrom invoke back to diamond; other fixes

---
 arm9/asm/MSL_Common_direct_io.s              | 2 +-
 arm9/asm/RUNTIME_ARM_semihosted_console_io.s | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'arm9/asm')

diff --git a/arm9/asm/MSL_Common_direct_io.s b/arm9/asm/MSL_Common_direct_io.s
index bc803a3f..8a493303 100644
--- a/arm9/asm/MSL_Common_direct_io.s
+++ b/arm9/asm/MSL_Common_direct_io.s
@@ -502,4 +502,4 @@ _020DEC5C:
 
 	exception fread, 269, 0x00407F00
 	exception __fread, 841, 0x00507F00
-	exception __fwrite, 689, 0x0060FF00
\ No newline at end of file
+	exception __fwrite, 689, 0x0060FF00
diff --git a/arm9/asm/RUNTIME_ARM_semihosted_console_io.s b/arm9/asm/RUNTIME_ARM_semihosted_console_io.s
index 6e7ddf0b..b36cee70 100644
--- a/arm9/asm/RUNTIME_ARM_semihosted_console_io.s
+++ b/arm9/asm/RUNTIME_ARM_semihosted_console_io.s
@@ -75,4 +75,4 @@ __close_console: ; 0x020EC68C
 	bx lr
 
 	exception __read_console, 81, 0x00300F00
-	exception __write_console, 53, 0x00200700
\ No newline at end of file
+	exception __write_console, 53, 0x00200700
-- 
cgit v1.2.3