summaryrefslogtreecommitdiff
path: root/arm9/modules/05/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/05/asm')
-rw-r--r--arm9/modules/05/asm/mod05_021D74E0.s34
-rw-r--r--arm9/modules/05/asm/mod05_021D80E8.s8
-rw-r--r--arm9/modules/05/asm/mod05_021D9320.s4
-rw-r--r--arm9/modules/05/asm/mod05_021D9A48.s4
-rw-r--r--arm9/modules/05/asm/mod05_021DA5B8.s4
-rw-r--r--arm9/modules/05/asm/mod05_021DB44C.s2
-rw-r--r--arm9/modules/05/asm/mod05_021DBEF4.s4
-rw-r--r--arm9/modules/05/asm/mod05_021DC0B8.s18
-rw-r--r--arm9/modules/05/asm/mod05_021E1374.s2
-rw-r--r--arm9/modules/05/asm/mod05_021E1AD8.s42
-rw-r--r--arm9/modules/05/asm/mod05_021E2E88.s20
-rw-r--r--arm9/modules/05/asm/mod05_021E3444.s28
-rw-r--r--arm9/modules/05/asm/mod05_021E4AE4.s2
-rw-r--r--arm9/modules/05/asm/mod05_021E5AB4.s2
-rw-r--r--arm9/modules/05/asm/mod05_021E5FD8.s16
-rw-r--r--arm9/modules/05/asm/mod05_021E7504.s4
-rw-r--r--arm9/modules/05/asm/mod05_021E779C.s4
-rw-r--r--arm9/modules/05/asm/mod05_021E80F8.s30
-rw-r--r--arm9/modules/05/asm/mod05_021E8310.s4
-rw-r--r--arm9/modules/05/asm/module_05.s120
20 files changed, 176 insertions, 176 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s
index 730bfc00..9cea7a32 100644
--- a/arm9/modules/05/asm/mod05_021D74E0.s
+++ b/arm9/modules/05/asm/mod05_021D74E0.s
@@ -8,7 +8,7 @@ MOD05_021D74E0: ; 0x021D74E0
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #8]
- bl FUN_0201AB60
+ bl DoScheduledBgGpuUpdates
bl FUN_0201C30C
bl FUN_02009F80
ldr r0, [r4, #0x34]
@@ -69,7 +69,7 @@ _021D7564:
mov r0, #3
ldr r2, [r2, #4]
mov r1, #4
- bl FUN_0201681C
+ bl CreateHeap
ldr r0, [r4, #4]
cmp r0, #0
beq _021D757A
@@ -101,7 +101,7 @@ _021D757A:
bl MOD05_021D7B38
bl GX_SwapDisplay
mov r0, #4
- bl FUN_02016B94
+ bl BgConfig_Alloc
str r0, [r4, #8]
bl MOD05_021D7A30
mov r0, #0
@@ -361,7 +361,7 @@ _021D7806:
mov r0, #0
str r0, [r4, #4]
mov r0, #4
- bl FUN_020168D0
+ bl DestroyHeap
ldr r0, [r4, #0x70]
ldr r0, [r0]
lsl r0, r0, #8
@@ -617,7 +617,7 @@ MOD05_021D7A30: ; 0x021D7A30
ldmia r5!, {r0, r1}
stmia r3!, {r0, r1}
add r0, r2, #0
- bl FUN_02016BBC
+ bl SetBothScreensModesAndDisable
ldr r5, _021D7B04 ; =UNK05_021F6468
add r3, sp, #0x3c
ldmia r5!, {r0, r1}
@@ -632,15 +632,15 @@ MOD05_021D7A30: ; 0x021D7A30
str r0, [r3]
add r0, r4, #0
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
mov r0, #1
mov r1, #0x20
mov r2, #0
mov r3, #4
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
add r0, r4, #0
mov r1, #1
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
ldr r5, _021D7B08 ; =UNK05_021F644C
add r3, sp, #0x20
ldmia r5!, {r0, r1}
@@ -655,15 +655,15 @@ MOD05_021D7A30: ; 0x021D7A30
str r0, [r3]
add r0, r4, #0
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
mov r0, #2
mov r1, #0x20
mov r2, #0
mov r3, #4
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
add r0, r4, #0
mov r1, #2
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
ldr r5, _021D7B0C ; =UNK05_021F6484
add r3, sp, #4
ldmia r5!, {r0, r1}
@@ -678,15 +678,15 @@ MOD05_021D7A30: ; 0x021D7A30
str r0, [r3]
add r0, r4, #0
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
mov r0, #3
mov r1, #0x20
mov r2, #0
mov r3, #4
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
add r0, r4, #0
mov r1, #3
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0
add r1, sp, #0
strh r0, [r1]
@@ -713,13 +713,13 @@ MOD05_021D7B10: ; 0x021D7B10
bl GX_EngineAToggleLayers
add r0, r4, #0
mov r1, #1
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
add r0, r4, #0
mov r1, #2
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
add r0, r4, #0
mov r1, #3
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
pop {r4, pc}
.balign 4, 0
diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s
index e228ee0a..bda94277 100644
--- a/arm9/modules/05/asm/mod05_021D80E8.s
+++ b/arm9/modules/05/asm/mod05_021D80E8.s
@@ -575,7 +575,7 @@ _021D856A:
cmp r0, #1
bne _021D858E
ldr r0, _021D8598 ; =0x000005FD
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0
bl FUN_02035080
add sp, #8
@@ -770,7 +770,7 @@ _021D8710:
lsr r0, r0, #0x1f
beq _021D8726
ldr r0, _021D8730 ; =0x000005FD
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0
bl FUN_0203515C
mov r0, #1
@@ -881,7 +881,7 @@ _021D87F4:
lsr r0, r0, #0x1f
beq _021D8816
ldr r0, _021D881C ; =0x000005FD
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0
bl FUN_02035118
mov r0, #4
@@ -1027,7 +1027,7 @@ _021D892C:
lsr r0, r0, #0x1f
beq _021D8946
ldr r0, _021D8950 ; =0x000005FD
- bl FUN_020054C8
+ bl PlaySE
add r0, r4, #0
bl FUN_02035080
add sp, #4
diff --git a/arm9/modules/05/asm/mod05_021D9320.s b/arm9/modules/05/asm/mod05_021D9320.s
index ec304548..419b92fd 100644
--- a/arm9/modules/05/asm/mod05_021D9320.s
+++ b/arm9/modules/05/asm/mod05_021D9320.s
@@ -53,7 +53,7 @@ _021D9374:
str r0, [sp, #0x20]
ldr r1, [r6]
add r0, r4, #0
- bl FUN_020161A4
+ bl AllocAndReadFile
ldr r1, [sp, #0x20]
str r0, [sp, #0x24]
add r2, r4, #0
@@ -161,7 +161,7 @@ _021D944A:
ldr r1, [sp, #0x10]
add r0, r4, #0
ldr r1, [r1, #0x18]
- bl FUN_020161A4
+ bl AllocAndReadFile
mov r3, #0x4e
lsl r3, r3, #2
ldr r1, [r5, r3]
diff --git a/arm9/modules/05/asm/mod05_021D9A48.s b/arm9/modules/05/asm/mod05_021D9A48.s
index ee169f98..442bfb26 100644
--- a/arm9/modules/05/asm/mod05_021D9A48.s
+++ b/arm9/modules/05/asm/mod05_021D9A48.s
@@ -199,7 +199,7 @@ _021D9B98:
mov r1, #4
add r0, r7, #0
add r2, r1, #0
- bl FUN_02016B20
+ bl GF_ExpHeap_FndInitAllocator
mov r0, #0x6e
mov r1, #4
bl NARC_ctor
@@ -1564,7 +1564,7 @@ _021DA526:
beq _021DA542
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- bl FUN_020054C8
+ bl PlaySE
_021DA542:
add r0, r5, #0
mov r1, #0
diff --git a/arm9/modules/05/asm/mod05_021DA5B8.s b/arm9/modules/05/asm/mod05_021DA5B8.s
index b4648ab3..eb8560b0 100644
--- a/arm9/modules/05/asm/mod05_021DA5B8.s
+++ b/arm9/modules/05/asm/mod05_021DA5B8.s
@@ -1489,7 +1489,7 @@ _021DB164:
str r0, [r5, #8]
strb r0, [r5, #4]
ldr r0, _021DB1C8 ; =0x00000603
- bl FUN_020054C8
+ bl PlaySE
mov r0, #6
str r0, [sp]
mov r0, #1
@@ -1552,7 +1552,7 @@ _021DB1F0:
str r0, [r4, #8]
strb r0, [r4, #4]
ldr r0, _021DB24C ; =0x00000603
- bl FUN_020054C8
+ bl PlaySE
mov r1, #0
str r1, [sp]
mov r0, #6
diff --git a/arm9/modules/05/asm/mod05_021DB44C.s b/arm9/modules/05/asm/mod05_021DB44C.s
index eaee32f8..bba92897 100644
--- a/arm9/modules/05/asm/mod05_021DB44C.s
+++ b/arm9/modules/05/asm/mod05_021DB44C.s
@@ -255,7 +255,7 @@ MOD05_021DB61C: ; 0x021DB61C
str r1, [sp]
mov r0, #4
add r1, r2, #0
- bl FUN_020161A4
+ bl AllocAndReadFile
mov r1, #0
str r0, [sp, #0x14]
str r1, [sp, #8]
diff --git a/arm9/modules/05/asm/mod05_021DBEF4.s b/arm9/modules/05/asm/mod05_021DBEF4.s
index f65de9d8..ae93e2a3 100644
--- a/arm9/modules/05/asm/mod05_021DBEF4.s
+++ b/arm9/modules/05/asm/mod05_021DBEF4.s
@@ -120,7 +120,7 @@ _021DBFA8:
add r7, #0x10
mov r0, #4
add r1, sp, #0xc
- bl FUN_020161A4
+ bl AllocAndReadFile
str r0, [r7, r5]
add r0, r6, #0
str r0, [sp, #8]
@@ -128,7 +128,7 @@ _021DBFA8:
str r0, [sp, #8]
ldr r0, [r7, r5]
mov r1, #4
- bl FUN_02016324
+ bl OpenFileCached
ldr r1, [sp, #8]
str r0, [r1, r5]
add r0, r1, #0
diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s
index 7b1e767f..0e77cb4b 100644
--- a/arm9/modules/05/asm/mod05_021DC0B8.s
+++ b/arm9/modules/05/asm/mod05_021DC0B8.s
@@ -1903,7 +1903,7 @@ MOD05_021DCECC: ; 0x021DCECC
ldr r1, [r1, #0xc]
mov r2, #0x20
mov r3, #0xc0
- bl FUN_02017FB4
+ bl BG_LoadPlttData
ldr r0, [sp]
bl FreeToHeap
mov r0, #0
@@ -1945,7 +1945,7 @@ MOD05_021DCF14: ; 0x021DCF14
ldr r0, [r0, #8]
ldr r3, [r3, #0x10]
mov r1, #2
- bl FUN_02017E14
+ bl BG_LoadCharTilesData
ldr r0, [sp, #8]
bl FreeToHeap
mov r0, #0
@@ -1997,7 +1997,7 @@ _021DCFA0:
ldr r0, [r0, #8]
mov r1, #2
add r2, #0xc
- bl FUN_02017CE8
+ bl BgCopyOrUncompressTilemapBufferRangeToVram
mov r0, #0x41
lsl r0, r0, #2
ldr r3, [sp, #0x18]
@@ -2007,7 +2007,7 @@ _021DCFA0:
ldr r3, [r3, #8]
mov r1, #2
add r2, #0xc
- bl FUN_02017DFC
+ bl BG_LoadScreenTilemapData
mov r0, #0x20
str r0, [sp]
str r0, [sp, #4]
@@ -2019,13 +2019,13 @@ _021DCFA0:
ldr r0, [r0, #8]
mov r1, #2
add r3, r2, #0
- bl FUN_020186B4
+ bl BgTilemapRectChangePalette
mov r0, #0x41
lsl r0, r0, #2
ldr r0, [r4, r0]
mov r1, #2
ldr r0, [r0, #8]
- bl FUN_02017CD0
+ bl BgCommitTilemapBufferToVram
ldr r0, [sp, #0x14]
bl FreeToHeap
mov r0, #0
@@ -8960,13 +8960,13 @@ _021E060E:
mov r0, #0x24
str r0, [r4, #8]
ldr r0, _021E06F4 ; =0x0000063D
- bl FUN_020054C8
+ bl PlaySE
b _021E06CC
_021E0644:
mov r0, #0xc8
str r0, [r4, #8]
ldr r0, _021E06F8 ; =0x0000063C
- bl FUN_020054C8
+ bl PlaySE
b _021E06CC
_021E0650:
ldr r0, [r4, #0x14]
@@ -10156,7 +10156,7 @@ _021E0FB6:
lsr r0, r0, #0x10
add r1, r1, #4
strh r0, [r5, r1]
- bl FUN_020054C8
+ bl PlaySE
pop {r3, r4, r5, pc}
nop
_021E0FCC: .word 0x00000F5C
diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s
index 0e1a6b44..f3c8709a 100644
--- a/arm9/modules/05/asm/mod05_021E1374.s
+++ b/arm9/modules/05/asm/mod05_021E1374.s
@@ -118,7 +118,7 @@ _021E1442:
_021E1456:
mov r0, #0x62
lsl r0, r0, #4
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #8]
mov r1, #0
bl FUN_0205F42C
diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s
index 22b26c5d..20fc2752 100644
--- a/arm9/modules/05/asm/mod05_021E1AD8.s
+++ b/arm9/modules/05/asm/mod05_021E1AD8.s
@@ -274,7 +274,7 @@ _021E1CA8:
ldr r0, [r0, #8]
add r1, #8
mov r2, #3
- bl FUN_02019064
+ bl AddWindowParameterized
mov r0, #0
str r0, [sp]
mov r0, #4
@@ -531,7 +531,7 @@ MOD05_021E1ECC: ; 0x021E1ECC
push {r4, r5, r6, lr}
add r6, r0, #0
ldr r0, _021E1F30 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r6, #0
add r0, #0xb0
ldr r0, [r0]
@@ -545,7 +545,7 @@ MOD05_021E1ECC: ; 0x021E1ECC
add r0, r6, #0
add r0, #0xa8
ldr r0, [r0]
- bl FUN_02019178
+ bl RemoveWindow
mov r4, #0
add r5, r6, #0
_021E1EFC:
@@ -685,7 +685,7 @@ _021E1FC8:
ldr r0, [r0, #8]
add r1, #8
mov r2, #3
- bl FUN_02019064
+ bl AddWindowParameterized
b _021E2032
_021E2002:
add r1, r4, #0
@@ -710,7 +710,7 @@ _021E2002:
ldr r0, [r0, #8]
add r1, #8
mov r2, #3
- bl FUN_02019064
+ bl AddWindowParameterized
_021E2032:
mov r0, #0
str r0, [sp]
@@ -1061,7 +1061,7 @@ _021E22B8:
cmp r6, r0
beq _021E22EE
ldr r0, _021E235C ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
_021E22EE:
ldr r0, _021E2360 ; =gMain
mov r1, #0x40
@@ -1098,7 +1098,7 @@ _021E2320:
cmp r0, #1
bne _021E235A
ldr r0, _021E235C ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0
add r0, #0xa0
ldr r1, _021E2364 ; =0x0000FFFE
@@ -1109,7 +1109,7 @@ _021E2320:
pop {r4, r5, r6, pc}
_021E2346:
ldr r0, _021E235C ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0
add r0, #0xa0
ldr r0, [r0]
@@ -1128,7 +1128,7 @@ MOD05_021E2368: ; 0x021E2368
push {r4, r5, r6, lr}
add r6, r0, #0
ldr r0, _021E23CC ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0x6d
lsl r0, r0, #2
mov r1, #0
@@ -1142,7 +1142,7 @@ MOD05_021E2368: ; 0x021E2368
bl FUN_0200CCF8
add r0, r6, #0
add r0, #8
- bl FUN_02019178
+ bl RemoveWindow
mov r4, #0
add r5, r6, #0
_021E2398:
@@ -1291,7 +1291,7 @@ _021E2496:
ldr r0, [r0, #8]
add r1, #8
mov r2, #3
- bl FUN_02019064
+ bl AddWindowParameterized
mov r0, #0
str r0, [sp]
mov r0, #4
@@ -1411,7 +1411,7 @@ MOD05_021E25A4: ; 0x021E25A4
add r0, r6, #0
add r0, #0xa8
ldr r0, [r0]
- bl FUN_02019178
+ bl RemoveWindow
mov r4, #0
add r5, r6, #0
_021E25D0:
@@ -1626,7 +1626,7 @@ _021E270A:
ldr r0, [r0, #8]
add r1, #8
mov r2, #3
- bl FUN_02019064
+ bl AddWindowParameterized
mov r0, #0
str r0, [sp]
mov r0, #4
@@ -1733,7 +1733,7 @@ MOD05_021E27E8: ; 0x021E27E8
add r1, r4, #0
mov r2, #3
add r3, r7, #0
- bl FUN_02019064
+ bl AddWindowParameterized
mov r0, #0
str r0, [sp]
mov r0, #4
@@ -1791,7 +1791,7 @@ MOD05_021E288C: ; 0x021E288C
bl FUN_0200CCF8
add r0, r4, #0
mov r1, #1
- bl FUN_020191A4
+ bl WindowArray_dtor
pop {r4, pc}
thumb_func_start MOD05_021E28A0
@@ -1865,7 +1865,7 @@ MOD05_021E28A0: ; 0x021E28A0
ldr r0, [sp, #0xc]
bl DestroyMsgData
add r0, r5, #0
- bl FUN_02019220
+ bl ScheduleWindowCopyToVram
add sp, #0x14
pop {r4, r5, r6, r7, pc}
@@ -1893,7 +1893,7 @@ MOD05_021E2950: ; 0x021E2950
add r1, r4, #0
mov r2, #3
add r3, r7, #0
- bl FUN_02019064
+ bl AddWindowParameterized
mov r0, #0
str r0, [sp]
mov r0, #4
@@ -1925,7 +1925,7 @@ MOD05_021E29B4: ; 0x021E29B4
bl FUN_0200CCF8
add r0, r4, #0
mov r1, #1
- bl FUN_020191A4
+ bl WindowArray_dtor
pop {r4, pc}
thumb_func_start MOD05_021E29C8
@@ -1992,7 +1992,7 @@ MOD05_021E29C8: ; 0x021E29C8
add r0, r7, #0
bl DestroyMsgData
ldr r0, [sp, #0xc]
- bl FUN_02019220
+ bl ScheduleWindowCopyToVram
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@@ -2022,7 +2022,7 @@ MOD05_021E2A70: ; 0x021E2A70
add r1, r4, #0
mov r2, #3
add r3, r7, #0
- bl FUN_02019064
+ bl AddWindowParameterized
mov r0, #0
str r0, [sp]
mov r0, #4
@@ -2112,7 +2112,7 @@ MOD05_021E2AD4: ; 0x021E2AD4
add r0, r7, #0
bl DestroyMsgData
ldr r0, [sp, #0xc]
- bl FUN_02019220
+ bl ScheduleWindowCopyToVram
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s
index a81ba2f1..9a7c0b1f 100644
--- a/arm9/modules/05/asm/mod05_021E2E88.s
+++ b/arm9/modules/05/asm/mod05_021E2E88.s
@@ -36,7 +36,7 @@ MOD05_021E2EA4: ; 0x021E2EA4
add r1, #0x20
str r0, [sp, #0x10]
ldr r0, [r4, #0x1c]
- bl FUN_02019064
+ bl AddWindowParameterized
mov r0, #0
str r0, [sp]
ldr r2, _021E2EE0 ; =0x000003CF
@@ -61,7 +61,7 @@ MOD05_021E2EE4: ; 0x021E2EE4
add r0, #0x38
mov r1, #4
add r7, r3, #0
- bl FUN_0201AB28
+ bl LoadCharacterDataFromFile
str r0, [r5, #0x34]
add r3, r0, #0
str r4, [sp]
@@ -69,11 +69,11 @@ MOD05_021E2EE4: ; 0x021E2EE4
ldr r0, [r5, #0x1c]
ldr r3, [r3, #0x10]
add r1, r6, #0
- bl FUN_02017E14
+ bl BG_LoadCharTilesData
ldr r2, _021E2F30 ; =UNK05_021FD62C
add r0, sp, #4
mov r1, #4
- bl FUN_0201AB44
+ bl LoadPaletteDataFromFile
ldr r0, [r0, #0xc]
mov r1, #1
add r2, r7, #0
@@ -367,7 +367,7 @@ _021E314E:
ldr r0, [r4, #0x1c]
ldr r3, [r4, #0xc]
add r2, r1, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
ldr r0, [r4, #0xc]
cmp r0, #0
bne _021E31D0
@@ -401,7 +401,7 @@ _021E318E:
ldr r0, [r4, #0x1c]
ldr r3, [r4, #0xc]
add r2, r1, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
ldr r0, [r4, #0xc]
cmp r0, #0x26
bne _021E31D0
@@ -498,7 +498,7 @@ MOD05_021E3248: ; 0x021E3248
bl DestroyMsgData
add r0, r4, #0
add r0, #0x20
- bl FUN_02019178
+ bl RemoveWindow
ldr r0, [r4, #0x40]
bl String_dtor
ldr r0, [r4, #0x38]
@@ -522,7 +522,7 @@ MOD05_021E3270: ; 0x021E3270
ldr r0, [r4, #0x1c]
add r2, r1, #0
mov r3, #0x26
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
mov r0, #0x26
str r0, [r4, #0xc]
ldr r0, _021E32EC ; =MOD05_021E3124
@@ -584,12 +584,12 @@ MOD05_021E32F0: ; 0x021E32F0
_021E32FE:
add r0, r4, #0
add r0, #0x20
- bl FUN_02019570
+ bl ClearWindowTilemapAndCopyToVram
mov r1, #3
ldr r0, [r4, #0x1c]
add r2, r1, #0
mov r3, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
ldr r1, [r4, #0x1c]
add r0, r4, #0
bl MOD05_021E3114
diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s
index 42f9037e..9bd14da2 100644
--- a/arm9/modules/05/asm/mod05_021E3444.s
+++ b/arm9/modules/05/asm/mod05_021E3444.s
@@ -1055,7 +1055,7 @@ MOD05_021E3C14: ; 0x021E3C14
ldmia r6!, {r0, r1}
stmia r3!, {r0, r1}
add r0, r2, #0
- bl FUN_02016BBC
+ bl SetBothScreensModesAndDisable
mov r0, #1
add r1, r0, #0
bl GX_EngineAToggleLayers
@@ -1071,20 +1071,20 @@ MOD05_021E3C14: ; 0x021E3C14
mov r1, #1
str r0, [r2]
add r0, r4, #0
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
add r0, r4, #0
mov r1, #1
add r2, sp, #0x38
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
mov r0, #1
mov r1, #0x20
mov r2, #0
mov r3, #4
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
add r0, r4, #0
mov r1, #1
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #2
mov r1, #0
bl GX_EngineAToggleLayers
@@ -1100,20 +1100,20 @@ MOD05_021E3C14: ; 0x021E3C14
mov r1, #2
str r0, [r2]
add r0, r4, #0
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
add r0, r4, #0
mov r1, #2
add r2, sp, #0x1c
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
mov r0, #2
mov r1, #0x20
mov r2, #0
mov r3, #4
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
add r0, r4, #0
mov r1, #2
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #4
mov r1, #1
bl GX_EngineAToggleLayers
@@ -1129,20 +1129,20 @@ MOD05_021E3C14: ; 0x021E3C14
str r0, [r2]
add r0, r4, #0
mov r1, #3
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
add r0, r4, #0
mov r1, #3
add r2, sp, #0
mov r3, #1
- bl FUN_02016C18
+ bl InitBgFromTemplate
mov r0, #3
mov r1, #0x20
mov r2, #0
mov r3, #4
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
add r0, r4, #0
mov r1, #3
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #8
mov r1, #0
bl GX_EngineAToggleLayers
@@ -1214,7 +1214,7 @@ MOD05_021E3D70: ; 0x021E3D70
lsl r1, r1, #0x18
ldr r3, [r3, #0x20]
lsr r1, r1, #0x18
- bl FUN_02017B60
+ bl Bg_SetTextDimAndAffineParams
add r0, r4, #0
bl FUN_0200CAB4
add sp, #0xc
diff --git a/arm9/modules/05/asm/mod05_021E4AE4.s b/arm9/modules/05/asm/mod05_021E4AE4.s
index 98146a9c..09f66fe5 100644
--- a/arm9/modules/05/asm/mod05_021E4AE4.s
+++ b/arm9/modules/05/asm/mod05_021E4AE4.s
@@ -1093,7 +1093,7 @@ MOD05_021E5294: ; 0x021E5294
add r1, r0, #0
add r0, r4, #0
mov r2, #0x20
- bl FUN_02016B20
+ bl GF_ExpHeap_FndInitAllocator
pop {r4, pc}
.section .rodata
diff --git a/arm9/modules/05/asm/mod05_021E5AB4.s b/arm9/modules/05/asm/mod05_021E5AB4.s
index 3b0d6a5f..eebf0d96 100644
--- a/arm9/modules/05/asm/mod05_021E5AB4.s
+++ b/arm9/modules/05/asm/mod05_021E5AB4.s
@@ -99,7 +99,7 @@ MOD05_021E5B30: ; 0x021E5B30
mov r3, #0
bl MOD05_021E4DC4
ldr r0, _021E5B7C ; =0x00000609
- bl FUN_020054C8
+ bl PlaySE
add sp, #0x1c
pop {r4, r5, pc}
nop
diff --git a/arm9/modules/05/asm/mod05_021E5FD8.s b/arm9/modules/05/asm/mod05_021E5FD8.s
index f341dfd8..6064c13b 100644
--- a/arm9/modules/05/asm/mod05_021E5FD8.s
+++ b/arm9/modules/05/asm/mod05_021E5FD8.s
@@ -92,7 +92,7 @@ _021E6088:
mov r1, #0
bl FUN_02055450
ldr r0, _021E6098 ; =0x00000618
- bl FUN_020054C8
+ bl PlaySE
pop {r4, pc}
.balign 4, 0
_021E6098: .word 0x00000618
@@ -474,7 +474,7 @@ _021E636C:
add r0, r6, #0
bl FUN_0205ADDC
ldr r0, _021E63D0 ; =0x00000627
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]
@@ -1011,7 +1011,7 @@ MOD05_021E67C0: ; 0x021E67C0
b _021E68C6
_021E67E4:
ldr r0, _021E68CC ; =0x00000651
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]
@@ -1029,7 +1029,7 @@ _021E6804:
cmp r0, #5
blt _021E6824
ldr r0, _021E68D0 ; =0x00000652
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4, #0xc]
mov r1, #1
bl FUN_0205574C
@@ -1177,7 +1177,7 @@ _021E6938:
add r0, r4, #0
bl FUN_02057654
ldr r0, _021E6950 ; =0x0000065B
- bl FUN_020054C8
+ bl PlaySE
mov r0, #0
pop {r4, pc}
nop
@@ -1352,7 +1352,7 @@ MOD05_021E6A58: ; 0x021E6A58
bl MOD06_0224F0BC
str r0, [r5, #0x2c]
ldr r0, _021E6AA8 ; =0x00000627
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r5]
add r0, r0, #1
str r0, [r5]
@@ -1631,7 +1631,7 @@ MOD05_021E6CA0: ; 0x021E6CA0
cmp r0, #1
bne _021E6CBA
ldr r0, _021E6CC0 ; =0x0000064D
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]
@@ -1862,7 +1862,7 @@ MOD05_021E6E6C: ; 0x021E6E6C
cmp r0, #1
bne _021E6E86
ldr r0, _021E6E8C ; =0x0000064D
- bl FUN_020054C8
+ bl PlaySE
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]
diff --git a/arm9/modules/05/asm/mod05_021E7504.s b/arm9/modules/05/asm/mod05_021E7504.s
index d7f960b2..dc029b32 100644
--- a/arm9/modules/05/asm/mod05_021E7504.s
+++ b/arm9/modules/05/asm/mod05_021E7504.s
@@ -65,7 +65,7 @@ _021E7564:
mov r0, #1
str r0, [r5, #8]
ldr r0, _021E760C ; =0x0000064F
- bl FUN_020054C8
+ bl PlaySE
_021E756E:
ldr r0, [r5, #0xc]
lsr r2, r0, #0x1f
@@ -192,7 +192,7 @@ _021E763C:
add r0, r4, #0
bl MOD05_021F1D8C
ldr r0, _021E774C ; =0x0000064F
- bl FUN_020054C8
+ bl PlaySE
mov r0, #1
str r0, [r5, #8]
_021E7694:
diff --git a/arm9/modules/05/asm/mod05_021E779C.s b/arm9/modules/05/asm/mod05_021E779C.s
index 7c09387c..012dbb1d 100644
--- a/arm9/modules/05/asm/mod05_021E779C.s
+++ b/arm9/modules/05/asm/mod05_021E779C.s
@@ -340,7 +340,7 @@ MOD05_021E79A8: ; 0x021E79A8
cmp r0, #1
bne _021E79FC
ldr r0, _021E7A04 ; =0x000005DD
- bl FUN_020054C8
+ bl PlaySE
_021E79FC:
mov r0, #1
add sp, #0xc
@@ -523,7 +523,7 @@ MOD05_021E7B08: ; 0x021E7B08
cmp r0, #1
bne _021E7B6C
ldr r0, _021E7B74 ; =0x000005DD
- bl FUN_020054C8
+ bl PlaySE
_021E7B6C:
mov r0, #1
add sp, #0xc
diff --git a/arm9/modules/05/asm/mod05_021E80F8.s b/arm9/modules/05/asm/mod05_021E80F8.s
index 82fd7a02..3d6303b2 100644
--- a/arm9/modules/05/asm/mod05_021E80F8.s
+++ b/arm9/modules/05/asm/mod05_021E80F8.s
@@ -26,7 +26,7 @@ MOD05_021E8110: ; 0x021E8110
lsl r1, r1, #0x18
lsr r1, r1, #0x1f
beq _021E8120
- bl FUN_02019178
+ bl RemoveWindow
_021E8120:
add r0, r4, #0
bl FreeToHeap
@@ -147,7 +147,7 @@ MOD05_021E81D0: ; 0x021E81D0
ldr r0, [r4, #8]
add r2, r1, #0
sub r3, #0x33
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
ldr r1, [r4, #0x60]
ldrb r0, [r1, #0x13]
lsl r0, r0, #0x18
@@ -179,7 +179,7 @@ MOD05_021E820C: ; 0x021E820C
lsl r1, r1, #0x18
lsr r1, r1, #0x1f
beq _021E825A
- bl FUN_02019178
+ bl RemoveWindow
mov r0, #0x12
str r0, [sp]
mov r0, #0x20
@@ -192,15 +192,15 @@ MOD05_021E820C: ; 0x021E820C
ldr r0, [r4, #8]
mov r1, #3
add r3, r2, #0
- bl FUN_02018540
+ bl FillBgTilemapRect
ldr r0, [r4, #8]
mov r1, #3
- bl FUN_02017CD0
+ bl BgCommitTilemapBufferToVram
mov r1, #3
ldr r0, [r4, #8]
add r2, r1, #0
mov r3, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
ldr r2, [r4, #0x60]
mov r0, #0x80
ldrb r1, [r2, #0x13]
@@ -217,7 +217,7 @@ MOD05_021E8260: ; 0x021E8260
add r4, r0, #0
ldr r0, [r4, #8]
mov r1, #3
- bl FUN_02017B54
+ bl Bg_GetYpos
cmp r0, #0
bne _021E8274
mov r0, #1
@@ -235,13 +235,13 @@ _021E8280:
ldr r0, [r4, #8]
add r2, r1, #0
sub r3, #0x33
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
_021E828E:
ldr r0, [r4, #8]
mov r1, #3
mov r2, #4
mov r3, #0x10
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
mov r0, #0
pop {r4, pc}
.balign 4, 0
@@ -253,7 +253,7 @@ MOD05_021E82A0: ; 0x021E82A0
add r4, r0, #0
ldr r0, [r4, #8]
mov r1, #3
- bl FUN_02017B54
+ bl Bg_GetYpos
mov r1, #0x2f
mvn r1, r1
cmp r0, r1
@@ -270,15 +270,15 @@ MOD05_021E82A0: ; 0x021E82A0
ldr r0, [r4, #8]
mov r1, #3
add r3, r2, #0
- bl FUN_02018540
+ bl FillBgTilemapRect
ldr r0, [r4, #8]
mov r1, #3
- bl FUN_02017CD0
+ bl BgCommitTilemapBufferToVram
mov r1, #3
ldr r0, [r4, #8]
add r2, r1, #0
mov r3, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
add sp, #0x10
mov r0, #1
pop {r4, pc}
@@ -291,13 +291,13 @@ _021E82F2:
ldr r0, [r4, #8]
add r2, r1, #0
mov r3, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
_021E82FE:
ldr r0, [r4, #8]
mov r1, #3
mov r2, #5
mov r3, #0x10
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
mov r0, #0
add sp, #0x10
pop {r4, pc}
diff --git a/arm9/modules/05/asm/mod05_021E8310.s b/arm9/modules/05/asm/mod05_021E8310.s
index 5bf27853..6c9c422b 100644
--- a/arm9/modules/05/asm/mod05_021E8310.s
+++ b/arm9/modules/05/asm/mod05_021E8310.s
@@ -264,7 +264,7 @@ MOD05_021E84F4: ; 0x021E84F4
ldrb r2, [r4, #8]
ldr r0, [r4, #0xc]
ldr r1, [r4, #0x10]
- bl FUN_02019064
+ bl AddWindowParameterized
mov r0, #0
str r0, [sp]
ldr r0, [r4, #4]
@@ -301,7 +301,7 @@ MOD05_021E856C: ; 0x021E856C
mov r1, #0
bl FUN_0200CCF8
ldr r0, [r4, #0x10]
- bl FUN_02019178
+ bl RemoveWindow
ldr r0, [r4, #0x10]
bl FreeToHeap
pop {r4, pc}
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 006e8bb1..0157aedb 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -2753,7 +2753,7 @@ _021E9C02:
ldr r0, [r0, #0x10]
mov r2, #3
ldr r0, [r0, #8]
- bl FUN_02019064
+ bl AddWindowParameterized
mov r1, #0
add r0, sp, #0x28
strh r1, [r0]
@@ -2761,7 +2761,7 @@ _021E9C02:
add r1, sp, #0x28
mov r2, #2
mov r3, #0x1e
- bl FUN_02017FB4
+ bl BG_LoadPlttData
mov r0, #0x83
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -2770,7 +2770,7 @@ _021E9C02:
mov r0, #0x83
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_02019220
+ bl ScheduleWindowCopyToVram
ldr r0, [sp, #0x1c]
ldr r0, [r0]
add r1, r0, #1
@@ -3160,26 +3160,26 @@ _021E9FA4:
mov r0, #0x83
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_02019570
+ bl ClearWindowTilemapAndCopyToVram
mov r0, #0x83
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_02019178
+ bl RemoveWindow
mov r0, #0x83
lsl r0, r0, #2
ldr r0, [r4, r0]
mov r1, #1
- bl FUN_020191A4
+ bl WindowArray_dtor
mov r0, #3
mov r1, #0x20
mov r2, #0
mov r3, #4
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
ldr r0, [sp, #0x1c]
mov r1, #3
ldr r0, [r0, #0x10]
ldr r0, [r0, #8]
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
ldr r1, [sp, #0x1c]
mov r0, #4
ldr r1, [r1, #0xc]
@@ -3275,7 +3275,7 @@ _021EA0B0:
mov r0, #0x83
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_02019220
+ bl ScheduleWindowCopyToVram
ldr r0, [sp, #0x1c]
ldr r0, [r0]
cmp r0, #7
@@ -3725,7 +3725,7 @@ _021EA430:
ldr r0, [r0, #0x10]
mov r2, #3
ldr r0, [r0, #8]
- bl FUN_02019064
+ bl AddWindowParameterized
mov r1, #0
add r0, sp, #0x28
strh r1, [r0]
@@ -3733,7 +3733,7 @@ _021EA430:
add r1, sp, #0x28
mov r2, #2
mov r3, #0x1e
- bl FUN_02017FB4
+ bl BG_LoadPlttData
mov r0, #2
lsl r0, r0, #8
ldr r0, [r4, r0]
@@ -3742,7 +3742,7 @@ _021EA430:
mov r0, #2
lsl r0, r0, #8
ldr r0, [r4, r0]
- bl FUN_02019220
+ bl ScheduleWindowCopyToVram
mov r0, #4
bl MOD05_021E4394
mov r1, #0x81
@@ -4030,7 +4030,7 @@ _021EA6FA:
mov r0, #2
lsl r0, r0, #8
ldr r0, [r4, r0]
- bl FUN_02019220
+ bl ScheduleWindowCopyToVram
mov r0, #0x83
lsl r0, r0, #2
add r0, r4, r0
@@ -4093,26 +4093,26 @@ _021EA76C:
mov r0, #2
lsl r0, r0, #8
ldr r0, [r4, r0]
- bl FUN_02019570
+ bl ClearWindowTilemapAndCopyToVram
mov r0, #2
lsl r0, r0, #8
ldr r0, [r4, r0]
- bl FUN_02019178
+ bl RemoveWindow
mov r0, #2
lsl r0, r0, #8
ldr r0, [r4, r0]
mov r1, #1
- bl FUN_020191A4
+ bl WindowArray_dtor
mov r0, #3
mov r1, #0x20
mov r2, #0
mov r3, #4
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
ldr r0, [sp, #0x18]
mov r1, #3
ldr r0, [r0, #0x10]
ldr r0, [r0, #8]
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
ldr r1, [sp, #0x18]
mov r0, #4
ldr r1, [r1, #0xc]
@@ -5393,7 +5393,7 @@ _021EB18E:
ldr r1, [r4]
ldr r0, [r0, #8]
mov r2, #3
- bl FUN_02019064
+ bl AddWindowParameterized
mov r1, #0
add r0, sp, #0x14
strh r1, [r0]
@@ -5401,12 +5401,12 @@ _021EB18E:
add r1, sp, #0x14
mov r2, #2
mov r3, #0x1e
- bl FUN_02017FB4
+ bl BG_LoadPlttData
ldr r0, [r4]
mov r1, #0
bl FillWindowPixelBuffer
ldr r0, [r4]
- bl FUN_02019220
+ bl ScheduleWindowCopyToVram
ldr r0, [r5]
add r0, r0, #1
str r0, [r5]
@@ -5535,7 +5535,7 @@ _021EB344:
str r0, [r5]
_021EB36C:
ldr r0, [r4]
- bl FUN_02019220
+ bl ScheduleWindowCopyToVram
b _021EB3F2
_021EB374:
mov r0, #0
@@ -5566,21 +5566,21 @@ _021EB394:
add r0, #8
bl MOD05_021E3E44
ldr r0, [r4]
- bl FUN_02019570
+ bl ClearWindowTilemapAndCopyToVram
ldr r0, [r4]
- bl FUN_02019178
+ bl RemoveWindow
ldr r0, [r4]
mov r1, #1
- bl FUN_020191A4
+ bl WindowArray_dtor
mov r0, #3
mov r1, #0x20
mov r2, #0
mov r3, #4
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
ldr r0, [r5, #0x10]
mov r1, #3
ldr r0, [r0, #8]
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
ldr r0, _021EB410 ; =0x0400004D
mov r1, #0
strb r1, [r0]
@@ -13882,7 +13882,7 @@ MOD05_021EF4F8: ; 0x021EF4F8
MOD05_021EF514: ; 0x021EF514
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
- bl FUN_020162FC
+ bl ClearFileCache
bl NNS_GfdResetLnkTexVramState
bl NNS_GfdResetLnkPlttVramState
mov r4, #0
@@ -15215,7 +15215,7 @@ MOD05_021EFEDC: ; 0x021EFEDC
ldr r0, [r0, #8]
mov r2, #3
mov r3, #0x13
- bl FUN_02019064
+ bl AddWindowParameterized
add r0, r5, #0
ldr r2, _021EFFBC ; =0x000003D9
add r0, #0x20
@@ -15311,7 +15311,7 @@ MOD05_021EFFC8: ; 0x021EFFC8
pop {r3, r4, r5, r6, r7, pc}
_021EFFE6:
ldr r0, _021F007C ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0
add r0, #0x8c
ldr r0, [r0]
@@ -15328,7 +15328,7 @@ _021EFFE6:
b _021F0056
_021F000E:
ldr r0, _021F007C ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
add r0, r5, #0
add r0, #0x90
str r4, [r0]
@@ -15362,7 +15362,7 @@ _021F0056:
bl FUN_0200CCF8
add r0, r5, #0
add r0, #0x20
- bl FUN_02019178
+ bl RemoveWindow
mov r1, #0
ldr r0, [r5, #4]
add r2, r1, #0
@@ -15565,12 +15565,12 @@ MOD05_021F01EC: ; 0x021F01EC
add r4, r0, #0
add r0, #0x10
add r5, r1, #0
- bl FUN_02019048
+ bl WindowIsInUse
cmp r0, #0
beq _021F0204
add r0, r4, #0
add r0, #0x10
- bl FUN_02019178
+ bl RemoveWindow
_021F0204:
ldr r0, [r4, #0x3c]
ldr r2, [r4, #8]
@@ -15648,12 +15648,12 @@ MOD05_021F0290: ; 0x021F0290
bl String_dtor
add r0, r4, #0
add r0, #0x10
- bl FUN_02019048
+ bl WindowIsInUse
cmp r0, #0
beq _021F02C0
add r4, #0x10
add r0, r4, #0
- bl FUN_02019178
+ bl RemoveWindow
_021F02C0:
pop {r4, pc}
.balign 4, 0
@@ -15695,7 +15695,7 @@ MOD05_021F0304: ; 0x021F0304
cmp r2, #0
bne _021F0310
ldr r0, _021F0314 ; =0x000005DC
- bl FUN_020054C8
+ bl PlaySE
_021F0310:
pop {r3, pc}
nop
@@ -24673,7 +24673,7 @@ _021F4732:
str r0, [r4, #8]
mov r0, #0x61
lsl r0, r0, #4
- bl FUN_020054C8
+ bl PlaySE
pop {r4, pc}
.balign 4, 0
_021F47A4: .word MOD05_021F48CC
@@ -24929,7 +24929,7 @@ MOD05_021F4968: ; 0x021F4968
sub r1, r1, r0
bx r3
nop
-_021F4974: .word FUN_02016B44
+_021F4974: .word ReallocFromHeap
thumb_func_start MOD05_021F4978
MOD05_021F4978: ; 0x021F4978
@@ -26506,12 +26506,12 @@ MOD05_021F5518: ; 0x021F5518
bl G2x_SetBlendAlpha_
mov r0, #2
mov r1, #0
- bl FUN_020178BC
+ bl SetBgPriority
mov r0, #4
mov r1, #1
bl GX_EngineAToggleLayers
ldr r0, _021F5560 ; =0x00000648
- bl FUN_020054C8
+ bl PlaySE
add sp, #4
pop {r3, r4, pc}
.balign 4, 0
@@ -26629,7 +26629,7 @@ MOD05_021F5608: ; 0x021F5608
add r1, sp, #4
add r2, r0, #0
mov r3, #0xc2
- bl FUN_02017FB4
+ bl BG_LoadPlttData
mov r0, #4
mov r1, #0x20
bl AllocFromHeap
@@ -26643,13 +26643,13 @@ MOD05_021F5608: ; 0x021F5608
mov r1, #2
add r2, r4, #0
mov r3, #0x20
- bl FUN_02017E14
+ bl BG_LoadCharTilesData
add r0, r4, #0
bl FreeToHeap
ldr r2, _021F565C ; =0x00006001
add r0, r5, #0
mov r1, #2
- bl FUN_02018768
+ bl BgFillTilemapBufferAndCommit
add sp, #8
pop {r3, r4, r5, pc}
nop
@@ -26694,21 +26694,21 @@ _021F5696:
thumb_func_start MOD05_021F569C
MOD05_021F569C: ; 0x021F569C
- ldr r3, _021F56A4 ; =FUN_02017FE4
+ ldr r3, _021F56A4 ; =BG_SetMaskColor
mov r0, #2
mov r1, #0
bx r3
.balign 4, 0
-_021F56A4: .word FUN_02017FE4
+_021F56A4: .word BG_SetMaskColor
thumb_func_start MOD05_021F56A8
MOD05_021F56A8: ; 0x021F56A8
- ldr r3, _021F56B0 ; =FUN_02017FE4
+ ldr r3, _021F56B0 ; =BG_SetMaskColor
mov r0, #2
ldr r1, _021F56B4 ; =0x00007FFF
bx r3
.balign 4, 0
-_021F56B0: .word FUN_02017FE4
+_021F56B0: .word BG_SetMaskColor
_021F56B4: .word 0x00007FFF
thumb_func_start MOD05_021F56B8
@@ -26733,17 +26733,17 @@ MOD05_021F56B8: ; 0x021F56B8
mov r0, #2
add r1, sp, #4
add r2, r0, #0
- bl FUN_02017FB4
+ bl BG_LoadPlttData
mov r1, #2
str r1, [sp]
ldr r0, [r4, #8]
add r2, r1, #0
mov r3, #1
- bl FUN_02017F48
+ bl BG_FillCharDataRange
ldr r0, [r4, #8]
ldr r2, _021F5718 ; =0x00006002
mov r1, #2
- bl FUN_02018768
+ bl BgFillTilemapBufferAndCommit
mov r0, #4
mov r1, #1
bl GX_EngineAToggleLayers
@@ -26777,17 +26777,17 @@ MOD05_021F571C: ; 0x021F571C
strh r2, [r1]
add r1, sp, #4
mov r2, #2
- bl FUN_02017FB4
+ bl BG_LoadPlttData
mov r2, #2
str r2, [sp]
ldr r0, [r4, #8]
mov r1, #3
mov r3, #1
- bl FUN_02017F48
+ bl BG_FillCharDataRange
ldr r0, [r4, #8]
ldr r2, _021F577C ; =0x00006002
mov r1, #3
- bl FUN_02018768
+ bl BgFillTilemapBufferAndCommit
mov r0, #8
mov r1, #1
bl GX_EngineAToggleLayers
@@ -26928,7 +26928,7 @@ _021F5856:
mov r0, #2
mov r1, #0
strh r0, [r4, #8]
- bl FUN_020178BC
+ bl SetBgPriority
mov r0, #4
mov r1, #1
bl GX_EngineAToggleLayers
@@ -27007,7 +27007,7 @@ _021F58EE:
strh r1, [r0]
mov r0, #2
mov r1, #3
- bl FUN_020178BC
+ bl SetBgPriority
mov r0, #8
strh r0, [r4, #8]
b _021F5980
@@ -27084,7 +27084,7 @@ MOD05_021F5990: ; 0x021F5990
str r0, [sp]
add r7, r1, #0
str r3, [sp, #4]
- bl FUN_0201681C
+ bl CreateHeap
cmp r0, #1
beq _021F59B2
bl GF_AssertFail
@@ -27142,7 +27142,7 @@ _021F5A0E:
add r0, r6, #0
bl FreeToHeap
add r0, r4, #0
- bl FUN_020168D0
+ bl DestroyHeap
pop {r4, r5, r6, pc}
.balign 4, 0
@@ -27686,7 +27686,7 @@ MOD05_021F5DF8: ; 0x021F5DF8
bne _021F5E0E
mov r0, #0x65
lsl r0, r0, #4
- bl FUN_020054C8
+ bl PlaySE
_021F5E0E:
ldr r0, [r4, #0x10]
cmp r0, #0x22
@@ -28181,7 +28181,7 @@ MOD05_021F617C: ; 0x021F617C
bl FUN_0200D0E0
add r4, #0x38
add r0, r4, #0
- bl FUN_02019178
+ bl RemoveWindow
mov r0, #1
pop {r4, pc}
_021F61AA: