Merge branch 'master' into unkk_020851B8

2 files changed, 74 insertions, 74 deletions

diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s
index 4f086525..d5ce1348 100644
--- a/arm9/modules/63/asm/mod63_021D74E0.s
+++ b/arm9/modules/63/asm/mod63_021D74E0.s
@@ -404,7 +404,7 @@ MOD63_021D782C: ; 0x021D782C
 	ldr r0, [r0, #4]
 	bx r3
 	nop
-_021D7834: .word FUN_0201AB60
+_021D7834: .word DoScheduledBgGpuUpdates
 	thumb_func_end MOD63_021D782C
 
 	thumb_func_start MOD63_021D7838
@@ -692,7 +692,7 @@ MOD63_021D7A48: ; 0x021D7A48
 	sub sp, #0xb8
 	add r4, r0, #0
 	ldr r0, [r4]
-	bl FUN_02016B94
+	bl BgConfig_Alloc
 	add r3, sp, #0xa8
 	ldr r5, _021D7B80 ; =MOD63_021DB9B4
 	str r0, [r4, #4]
@@ -702,7 +702,7 @@ MOD63_021D7A48: ; 0x021D7A48
 	ldmia r5!, {r0, r1}
 	stmia r3!, {r0, r1}
 	add r0, r2, #0
-	bl FUN_02016BBC
+	bl SetBothScreensModesAndDisable
 	ldr r5, _021D7B84 ; =MOD63_021DB9E0
 	add r3, sp, #0x8c
 	ldmia r5!, {r0, r1}
@@ -717,7 +717,7 @@ MOD63_021D7A48: ; 0x021D7A48
 	str r0, [r3]
 	ldr r0, [r4, #4]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D7B88 ; =MOD63_021DB9C4
 	add r3, sp, #0x70
 	ldmia r5!, {r0, r1}
@@ -732,7 +732,7 @@ MOD63_021D7A48: ; 0x021D7A48
 	str r0, [r3]
 	ldr r0, [r4, #4]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D7B8C ; =MOD63_021DBA50
 	add r3, sp, #0x54
 	ldmia r5!, {r0, r1}
@@ -747,7 +747,7 @@ MOD63_021D7A48: ; 0x021D7A48
 	str r0, [r3]
 	ldr r0, [r4, #4]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D7B90 ; =MOD63_021DBA34
 	add r3, sp, #0x38
 	ldmia r5!, {r0, r1}
@@ -762,7 +762,7 @@ MOD63_021D7A48: ; 0x021D7A48
 	str r0, [r3]
 	ldr r0, [r4, #4]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D7B94 ; =MOD63_021DB9FC
 	add r3, sp, #0x1c
 	ldmia r5!, {r0, r1}
@@ -777,7 +777,7 @@ MOD63_021D7A48: ; 0x021D7A48
 	ldr r0, [r4, #4]
 	mov r1, #3
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D7B98 ; =MOD63_021DBA18
 	add r3, sp, #0
 	ldmia r5!, {r0, r1}
@@ -792,7 +792,7 @@ MOD63_021D7A48: ; 0x021D7A48
 	str r0, [r3]
 	ldr r0, [r4, #4]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	mov r0, #1
 	mov r1, #0
 	bl GX_EngineAToggleLayers
@@ -819,10 +819,10 @@ MOD63_021D7A48: ; 0x021D7A48
 	bl GX_EngineBToggleLayers
 	mov r0, #0
 	add r1, r0, #0
-	bl FUN_02017FE4
+	bl BG_SetMaskColor
 	mov r0, #4
 	mov r1, #0
-	bl FUN_02017FE4
+	bl BG_SetMaskColor
 	add sp, #0xb8
 	pop {r3, r4, r5, pc}
 	nop
@@ -865,22 +865,22 @@ MOD63_021D7B9C: ; 0x021D7B9C
 	bl GX_EngineBToggleLayers
 	ldr r0, [r4, #4]
 	mov r1, #4
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #4]
 	mov r1, #5
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #4]
 	mov r1, #6
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #4]
 	mov r1, #1
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #4]
 	mov r1, #3
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #4]
 	mov r1, #7
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #4]
 	bl FreeToHeap
 	pop {r4, pc}
@@ -2031,15 +2031,15 @@ _021D844C:
 	bl GfGfxLoader_GXLoadPal
 	mov r0, #0
 	add r1, r0, #0
-	bl FUN_02017FE4
+	bl BG_SetMaskColor
 	mov r0, #4
 	mov r1, #0
-	bl FUN_02017FE4
+	bl BG_SetMaskColor
 	mov r0, #4
 	mov r1, #0x20
 	mov r2, #0
 	add r3, r4, #0
-	bl FUN_02017F18
+	bl BG_ClearCharDataRange
 	ldr r2, _021D85CC ; =0x00000227
 	mov r0, #1
 	mov r1, #0x1a
@@ -2054,7 +2054,7 @@ _021D844C:
 	ldr r2, _021D85D0 ; =MOD63_021DB9A0
 	add r0, r5, #0
 	add r1, #0xac
-	bl FUN_02019150
+	bl AddWindow
 	mov r1, #0
 	mov r0, #0xe0
 	str r0, [sp]
@@ -2104,12 +2104,12 @@ _021D844C:
 	add r1, #2
 	mov r2, #2
 	mov r3, #0x42
-	bl FUN_02017FB4
+	bl BG_LoadPlttData
 	mov r0, #4
 	add r1, sp, #0x1c
 	mov r2, #2
 	mov r3, #0x44
-	bl FUN_02017FB4
+	bl BG_LoadPlttData
 	add sp, #0x20
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
@@ -2183,7 +2183,7 @@ MOD63_021D8644: ; 0x021D8644
 	add r0, r2, #0
 	bx r3
 	.align 2, 0
-_021D864C: .word FUN_02019178
+_021D864C: .word RemoveWindow
 	thumb_func_end MOD63_021D8644
 
 	thumb_func_start MOD63_021D8650
diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s
index 24804568..34d50a11 100644
--- a/arm9/modules/63/asm/mod63_021D8890.s
+++ b/arm9/modules/63/asm/mod63_021D8890.s
@@ -69,7 +69,7 @@ MOD63_021D88F0: ; 0x021D88F0
 	sub sp, #0xb8
 	add r4, r0, #0
 	ldr r0, [r4]
-	bl FUN_02016B94
+	bl BgConfig_Alloc
 	add r3, sp, #0xa8
 	ldr r5, _021D89E8 ; =MOD63_021DBB4C
 	str r0, [r4, #0xc]
@@ -79,7 +79,7 @@ MOD63_021D88F0: ; 0x021D88F0
 	ldmia r5!, {r0, r1}
 	stmia r3!, {r0, r1}
 	add r0, r2, #0
-	bl FUN_02016BBC
+	bl SetBothScreensModesAndDisable
 	ldr r5, _021D89EC ; =MOD63_021DBC88
 	add r3, sp, #0x8c
 	ldmia r5!, {r0, r1}
@@ -94,7 +94,7 @@ MOD63_021D88F0: ; 0x021D88F0
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D89F0 ; =MOD63_021DBC6C
 	add r3, sp, #0x70
 	ldmia r5!, {r0, r1}
@@ -109,7 +109,7 @@ MOD63_021D88F0: ; 0x021D88F0
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D89F4 ; =MOD63_021DBBC4
 	add r3, sp, #0x54
 	ldmia r5!, {r0, r1}
@@ -124,7 +124,7 @@ MOD63_021D88F0: ; 0x021D88F0
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D89F8 ; =MOD63_021DBBFC
 	add r3, sp, #0x38
 	ldmia r5!, {r0, r1}
@@ -139,7 +139,7 @@ MOD63_021D88F0: ; 0x021D88F0
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D89FC ; =MOD63_021DBC18
 	add r3, sp, #0x1c
 	ldmia r5!, {r0, r1}
@@ -154,7 +154,7 @@ MOD63_021D88F0: ; 0x021D88F0
 	ldr r0, [r4, #0xc]
 	mov r1, #6
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D8A00 ; =MOD63_021DBC34
 	add r3, sp, #0
 	ldmia r5!, {r0, r1}
@@ -169,13 +169,13 @@ MOD63_021D88F0: ; 0x021D88F0
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	mov r0, #0
 	add r1, r0, #0
-	bl FUN_02017FE4
+	bl BG_SetMaskColor
 	mov r0, #4
 	mov r1, #0
-	bl FUN_02017FE4
+	bl BG_SetMaskColor
 	add sp, #0xb8
 	pop {r3, r4, r5, pc}
 	nop
@@ -194,7 +194,7 @@ MOD63_021D8A04: ; 0x021D8A04
 	sub sp, #0x80
 	add r4, r0, #0
 	ldr r0, [r4]
-	bl FUN_02016B94
+	bl BgConfig_Alloc
 	add r3, sp, #0x70
 	ldr r5, _021D8AC4 ; =MOD63_021DBB3C
 	str r0, [r4, #0xc]
@@ -204,7 +204,7 @@ MOD63_021D8A04: ; 0x021D8A04
 	ldmia r5!, {r0, r1}
 	stmia r3!, {r0, r1}
 	add r0, r2, #0
-	bl FUN_02016BBC
+	bl SetBothScreensModesAndDisable
 	mov r2, #1
 	lsl r2, r2, #0x1a
 	ldr r1, [r2]
@@ -227,7 +227,7 @@ MOD63_021D8A04: ; 0x021D8A04
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D8AD0 ; =MOD63_021DBCA4
 	add r3, sp, #0x38
 	ldmia r5!, {r0, r1}
@@ -242,7 +242,7 @@ MOD63_021D8A04: ; 0x021D8A04
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D8AD4 ; =MOD63_021DBCC0
 	add r3, sp, #0x1c
 	ldmia r5!, {r0, r1}
@@ -257,7 +257,7 @@ MOD63_021D8A04: ; 0x021D8A04
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D8AD8 ; =MOD63_021DBCDC
 	add r3, sp, #0
 	ldmia r5!, {r0, r1}
@@ -272,10 +272,10 @@ MOD63_021D8A04: ; 0x021D8A04
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	mov r0, #4
 	mov r1, #0
-	bl FUN_02017FE4
+	bl BG_SetMaskColor
 	add sp, #0x80
 	pop {r3, r4, r5, pc}
 	nop
@@ -293,7 +293,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
 	sub sp, #0x9c
 	add r4, r0, #0
 	ldr r0, [r4]
-	bl FUN_02016B94
+	bl BgConfig_Alloc
 	add r3, sp, #0x8c
 	ldr r5, _021D8BBC ; =MOD63_021DBB6C
 	str r0, [r4, #0xc]
@@ -303,7 +303,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
 	ldmia r5!, {r0, r1}
 	stmia r3!, {r0, r1}
 	add r0, r2, #0
-	bl FUN_02016BBC
+	bl SetBothScreensModesAndDisable
 	mov r2, #1
 	lsl r2, r2, #0x1a
 	ldr r1, [r2]
@@ -326,7 +326,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D8BC8 ; =MOD63_021DBD14
 	add r3, sp, #0x54
 	ldmia r5!, {r0, r1}
@@ -341,7 +341,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #1
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D8BCC ; =MOD63_021DBD30
 	add r3, sp, #0x38
 	ldmia r5!, {r0, r1}
@@ -356,7 +356,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #1
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D8BD0 ; =MOD63_021DBBA8
 	add r3, sp, #0x1c
 	ldmia r5!, {r0, r1}
@@ -371,7 +371,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	add r3, r1, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	ldr r5, _021D8BD4 ; =MOD63_021DBBE0
 	add r3, sp, #0
 	ldmia r5!, {r0, r1}
@@ -386,10 +386,10 @@ MOD63_021D8ADC: ; 0x021D8ADC
 	str r0, [r3]
 	ldr r0, [r4, #0xc]
 	mov r3, #0
-	bl FUN_02016C18
+	bl InitBgFromTemplate
 	mov r0, #4
 	mov r1, #0
-	bl FUN_02017FE4
+	bl BG_SetMaskColor
 	add sp, #0x9c
 	pop {r4, r5, pc}
 	nop
@@ -1200,22 +1200,22 @@ MOD63_021D9234: ; 0x021D9234
 	bl MOD63_021DAF9C
 	ldr r0, [r4, #0xc]
 	mov r1, #1
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	mov r1, #2
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	mov r1, #6
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	mov r1, #3
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	mov r1, #7
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	mov r1, #5
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	bl FreeToHeap
 	mov r0, #0
@@ -1708,16 +1708,16 @@ _021D964A:
 _021D965E:
 	ldr r0, [r5, #0xc]
 	mov r1, #3
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r5, #0xc]
 	mov r1, #1
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r5, #0xc]
 	mov r1, #2
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r5, #0xc]
 	mov r1, #4
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r5, #0xc]
 	bl FreeToHeap
 	ldr r0, [r5, #0x10]
@@ -2716,7 +2716,7 @@ MOD63_021D9EE0: ; 0x021D9EE0
 	ldr r0, [r4, #0xc]
 	mov r1, #1
 	sub r3, r2, #5
-	bl FUN_020179E0
+	bl BgSetPosTextAndCommit
 	mov r0, #0
 	str r0, [r4, #8]
 _021D9EFE:
@@ -2736,7 +2736,7 @@ MOD63_021D9F00: ; 0x021D9F00
 	ldr r0, [r4, #0xc]
 	mov r1, #2
 	add r3, r2, #0
-	bl FUN_020179E0
+	bl BgSetPosTextAndCommit
 	mov r0, #0
 	str r0, [r4, #8]
 _021D9F1E:
@@ -2752,7 +2752,7 @@ MOD63_021D9F20: ; 0x021D9F20
 	ldr r0, [r4, #0xc]
 	mov r1, #3
 	sub r3, #0x11
-	bl FUN_020179E0
+	bl BgSetPosTextAndCommit
 	mov r0, #0
 	str r0, [r4, #8]
 	pop {r4, pc}
@@ -3183,7 +3183,7 @@ _021DA192:
 	mov r1, #3
 	mov r2, #1
 	mov r3, #0x40
-	bl FUN_020179E0
+	bl BgSetPosTextAndCommit
 	mov r0, #1
 	lsl r0, r0, #0xc
 	bl FX_Inv
@@ -3203,14 +3203,14 @@ _021DA192:
 	mov r1, #2
 	add r2, sp, #0x10
 	mov r3, #0x80
-	bl FUN_02017BD0
+	bl SetBgAffine
 	mov r0, #0x60
 	str r0, [sp]
 	ldr r0, [r4, #0xc]
 	mov r1, #3
 	add r2, sp, #0x10
 	mov r3, #0xc0
-	bl FUN_02017BD0
+	bl SetBgAffine
 	mov r0, #1
 	strb r0, [r4, #3]
 	add sp, #0x20
@@ -3357,19 +3357,19 @@ MOD63_021DA418: ; 0x021DA418
 	beq _021DA458
 	ldr r0, [r4, #0xc]
 	mov r1, #1
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	mov r1, #2
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	mov r1, #3
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	mov r1, #0
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	mov r1, #5
-	bl FUN_020178A0
+	bl FreeBgTilemapBuffer
 	ldr r0, [r4, #0xc]
 	bl FreeToHeap
 	ldr r0, _021DA470 ; =0x0000028E
@@ -3438,7 +3438,7 @@ MOD63_021DA478: ; 0x021DA478
 	mov r1, #2
 	mov r2, #4
 	mov r3, #1
-	bl FUN_02017B60
+	bl Bg_SetTextDimAndAffineParams
 	mov r0, #1
 	ldr r1, [r4, #8]
 	lsl r0, r0, #0xa
@@ -3454,7 +3454,7 @@ MOD63_021DA478: ; 0x021DA478
 	mov r1, #3
 	mov r2, #4
 	mov r3, #1
-	bl FUN_02017B60
+	bl Bg_SetTextDimAndAffineParams
 _021DA4FE:
 	add sp, #0x2c
 	pop {r4, r5, pc}
@@ -3502,7 +3502,7 @@ MOD63_021DA504: ; 0x021DA504
 	mov r1, #2
 	mov r2, #4
 	mov r3, #1
-	bl FUN_02017B60
+	bl Bg_SetTextDimAndAffineParams
 	mov r0, #2
 	ldr r1, [r4, #8]
 	lsl r0, r0, #0xa
@@ -3518,7 +3518,7 @@ MOD63_021DA504: ; 0x021DA504
 	mov r1, #3
 	mov r2, #4
 	mov r3, #1
-	bl FUN_02017B60
+	bl Bg_SetTextDimAndAffineParams
 	add sp, #0x2c
 	pop {r4, r5, pc}
 	.align 2, 0