summaryrefslogtreecommitdiff
path: root/arm9/modules/59
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/59')
-rw-r--r--arm9/modules/59/asm/mod59_021D74E0_asm.s278
-rw-r--r--arm9/modules/59/asm/mod59_021D9868.s58
-rw-r--r--arm9/modules/59/include/mod59_021D74E0.h2
-rw-r--r--arm9/modules/59/src/mod59_021D74E0_src.c4
4 files changed, 171 insertions, 171 deletions
diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s
index 7d1c22b6..4de36b62 100644
--- a/arm9/modules/59/asm/mod59_021D74E0_asm.s
+++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s
@@ -21,7 +21,7 @@ _021D7798:
add r0, sp, #0x50
bl GX_SetBanks
ldr r0, [r4]
- bl FUN_02016B94
+ bl BgConfig_Alloc
add r3, sp, #0x40
ldr r5, _021D7958 ; =0x021D9DCC
str r0, [r4, #0x18]
@@ -31,7 +31,7 @@ _021D7798:
ldmia r5!, {r0, r1}
stmia r3!, {r0, r1}
add r0, r2, #0
- bl FUN_02016BBC
+ bl SetBothScreensModesAndDisable
ldr r5, _021D795C ; =0x021D9EA0
add r3, sp, #0x24
ldmia r5!, {r0, r1}
@@ -50,10 +50,10 @@ _021D7798:
strb r0, [r2, #0x13]
ldr r0, [r4, #0x18]
add r3, r1, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
ldr r0, [r4, #0x18]
mov r1, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0xe
add r2, sp, #0x24
strb r0, [r2, #0x12]
@@ -62,10 +62,10 @@ _021D7798:
ldr r0, [r4, #0x18]
mov r1, #1
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
ldr r0, [r4, #0x18]
mov r1, #1
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0xd
add r2, sp, #0x24
strb r0, [r2, #0x12]
@@ -74,10 +74,10 @@ _021D7798:
ldr r0, [r4, #0x18]
mov r1, #2
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
ldr r0, [r4, #0x18]
mov r1, #2
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0xc
add r2, sp, #0x24
strb r0, [r2, #0x12]
@@ -85,10 +85,10 @@ _021D7798:
strb r1, [r2, #0x13]
ldr r0, [r4, #0x18]
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
ldr r0, [r4, #0x18]
mov r1, #3
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r1, #0
str r1, [sp]
ldr r0, [r4]
@@ -132,10 +132,10 @@ _021D7798:
ldr r0, [r4, #0x18]
mov r1, #4
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
ldr r0, [r4, #0x18]
mov r1, #4
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r1, #0xe
add r0, sp, #8
strb r1, [r0, #0x12]
@@ -144,10 +144,10 @@ _021D7798:
ldr r0, [r4, #0x18]
add r2, sp, #8
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
ldr r0, [r4, #0x18]
mov r1, #5
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r1, #0xd
add r0, sp, #8
strb r1, [r0, #0x12]
@@ -157,10 +157,10 @@ _021D7798:
mov r1, #6
add r2, sp, #8
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
ldr r0, [r4, #0x18]
mov r1, #6
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r1, #0xc
add r0, sp, #8
strb r1, [r0, #0x12]
@@ -170,34 +170,34 @@ _021D7798:
mov r1, #7
add r2, sp, #8
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
ldr r0, [r4, #0x18]
mov r1, #7
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0
add r1, r0, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #1
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #2
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #3
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #4
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #5
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #6
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #7
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
add r0, r4, #0
bl MOD59_021D8058
mov r0, #0
@@ -219,52 +219,52 @@ MOD59_021D796C: ; 0x021D796C
add r4, r0, #0
mov r0, #0
add r1, r0, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #1
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #2
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #3
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #4
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #5
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #6
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #7
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
ldr r0, [r4, #0x18]
mov r1, #0
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #0x18]
mov r1, #1
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #0x18]
mov r1, #2
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #0x18]
mov r1, #3
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #0x18]
mov r1, #4
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #0x18]
mov r1, #5
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #0x18]
mov r1, #6
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #0x18]
mov r1, #7
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #0x18]
bl FreeToHeap
pop {r4, pc}
@@ -431,7 +431,7 @@ _021D7B0E:
lsl r0, r4, #0x18
lsr r0, r0, #0x18
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
b _021D7BDE
_021D7B1A:
mov r0, #0x10
@@ -524,7 +524,7 @@ _021D7BC0:
lsl r0, r4, #0x18
lsr r0, r0, #0x18
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
b _021D7BDE
_021D7BD0:
ldr r0, _021D7BE4 ; =0x04000050
@@ -584,11 +584,11 @@ MOD59_021D7C10: ; 0x021D7C10
ldr r0, [r5, #0x18]
lsr r1, r1, #0x18
add r3, r2, #0
- bl FUN_020186B4
+ bl BgTilemapRectChangePalette
lsl r1, r4, #0x18
ldr r0, [r5, #0x18]
lsr r1, r1, #0x18
- bl FUN_02017CD0
+ bl BgCommitTilemapBufferToVram
add sp, #0xc
pop {r4, r5, pc}
.align 2, 0
@@ -614,7 +614,7 @@ _021D7C5E:
ldr r0, [r5, #0x18]
ldr r2, _021D7D5C ; =0x021D9DB8
add r1, #0x1c
- bl FUN_02019150
+ bl AddWindow
mov r0, #0xd8
str r0, [sp]
mov r0, #0x20
@@ -715,7 +715,7 @@ _021D7D36:
_021D7D46:
add r0, r5, #0
add r0, #0x1c
- bl FUN_02019178
+ bl RemoveWindow
mov r0, #0
str r0, [r5, #0x50]
mov r4, #1
@@ -789,7 +789,7 @@ _021D7DC4:
add r1, r5, #0
ldr r0, [r5, #0x18]
add r1, #0x30
- bl FUN_02019150
+ bl AddWindow
ldr r1, [r5]
add r0, r6, #0
bl ListMenuItems_ctor
@@ -870,7 +870,7 @@ _021D7E66:
bl FUN_0200CCF8
add r0, r5, #0
add r0, #0x30
- bl FUN_02019178
+ bl RemoveWindow
mov r1, #0
ldr r0, [r5, #0x40]
add r2, r1, #0
@@ -932,7 +932,7 @@ _021D7EEE: ; jump table
_021D7EFA:
add r0, r5, #0
add r1, r5, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #1
ldr r1, [r4]
lsl r0, r0, #0xa
@@ -966,7 +966,7 @@ _021D7EFA:
ldr r0, [r4, #0x18]
add r1, #0x1c
add r2, sp, #0x14
- bl FUN_02019150
+ bl AddWindow
add r1, r5, #0
mov r0, #0xc0
str r0, [sp]
@@ -1005,7 +1005,7 @@ _021D7F7C:
add r1, r4, #0
ldr r0, [r4, #0x18]
add r1, #0x1c
- bl FUN_02019150
+ bl AddWindow
add r1, r5, #0
mov r0, #0xc0
str r0, [sp]
@@ -1075,10 +1075,10 @@ _021D8016:
b _021D803C
_021D8028:
add r0, #0x1c
- bl FUN_02019178
+ bl RemoveWindow
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
add r0, r5, #0
str r0, [r4, #0x54]
mov r5, #1
@@ -1113,7 +1113,7 @@ MOD59_021D8058: ; 0x021D8058
ldr r3, [r5]
mov r1, #0x20
add r2, r0, #0
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1161,10 +1161,10 @@ _021D80AA:
bl MOD59_021D8234
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, #0x10
pop {r3, r4, r5, pc}
nop
@@ -1437,7 +1437,7 @@ _021D82C8:
ldr r0, [r5, #0x18]
mov r1, #2
add r3, r2, #0
- bl FUN_02018540
+ bl FillBgTilemapRect
mov r3, #0xb
str r3, [sp]
mov r0, #0xa
@@ -1446,7 +1446,7 @@ _021D82C8:
ldr r0, [r5, #0x18]
mov r1, #2
add r2, r7, #0
- bl FUN_02018148
+ bl LoadRectToBgTilemapRect
add r0, r5, #0
mov r1, #2
mov r2, #9
@@ -1455,7 +1455,7 @@ _021D82C8:
mov r0, #2
mov r1, #0x20
mov r2, #0
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
mov r0, #1
str r0, [sp]
mov r3, #0x32
@@ -1463,19 +1463,19 @@ _021D82C8:
mov r1, #2
add r2, r4, #0
lsl r3, r3, #6
- bl FUN_02017E14
+ bl BG_LoadCharTilesData
mov r3, #0x20
add r2, r3, #0
mov r0, #2
add r1, r6, #0
add r3, #0xe0
- bl FUN_02017FB4
+ bl BG_LoadPlttData
mov r3, #0x12
ldr r1, _021D83F4 ; =0x021D9ED8
mov r0, #2
mov r2, #0x20
lsl r3, r3, #4
- bl FUN_02017FB4
+ bl BG_LoadPlttData
mov r2, #0
str r2, [sp]
mov r0, #0x20
@@ -1487,7 +1487,7 @@ _021D82C8:
ldr r0, [r5, #0x18]
mov r1, #5
add r3, r2, #0
- bl FUN_02018540
+ bl FillBgTilemapRect
mov r0, #7
str r0, [sp]
mov r0, #0xa
@@ -1497,7 +1497,7 @@ _021D82C8:
mov r1, #5
add r2, r7, #0
mov r3, #0xb
- bl FUN_02018148
+ bl LoadRectToBgTilemapRect
add r0, r5, #0
mov r1, #5
mov r2, #0xa
@@ -1506,7 +1506,7 @@ _021D82C8:
mov r0, #5
mov r1, #0x20
mov r2, #0
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
mov r0, #1
str r0, [sp]
mov r3, #0x32
@@ -1514,17 +1514,17 @@ _021D82C8:
mov r1, #5
add r2, r4, #0
lsl r3, r3, #6
- bl FUN_02017E14
+ bl BG_LoadCharTilesData
mov r0, #5
add r1, r6, #0
mov r2, #0x20
lsl r3, r0, #6
- bl FUN_02017FB4
+ bl BG_LoadPlttData
mov r0, #5
ldr r1, _021D83F4 ; =0x021D9ED8
mov r2, #0x20
lsl r3, r0, #6
- bl FUN_02017FB4
+ bl BG_LoadPlttData
add r0, r6, #0
bl FreeToHeap
add r0, r4, #0
@@ -1572,7 +1572,7 @@ MOD59_021D83F8: ; 0x021D83F8
mov r0, #6
mov r1, #0x20
mov r2, #0
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
mov r0, #0x20
str r0, [sp]
mov r0, #0
@@ -1599,7 +1599,7 @@ MOD59_021D8460: ; 0x021D8460
cmp r2, #0
bne _021D849C
ldr r0, [r5, #0x18]
- bl FUN_02017B48
+ bl Bg_GetXpos
cmp r0, #0
beq _021D8498
cmp r0, #0
@@ -1609,14 +1609,14 @@ MOD59_021D8460: ; 0x021D8460
lsr r1, r1, #0x18
mov r2, #2
mov r3, #4
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
b _021D84E2
_021D848A:
lsl r1, r4, #0x18
lsr r1, r1, #0x18
mov r2, #1
mov r3, #4
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
b _021D84E2
_021D8498:
mov r6, #1
@@ -1625,7 +1625,7 @@ _021D849C:
cmp r2, #1
bne _021D84C2
ldr r0, [r5, #0x18]
- bl FUN_02017B48
+ bl Bg_GetXpos
add r1, r6, #0
sub r1, #0x30
cmp r0, r1
@@ -1635,7 +1635,7 @@ _021D849C:
lsr r1, r1, #0x18
mov r2, #2
mov r3, #4
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
b _021D84E2
_021D84BE:
mov r6, #1
@@ -1644,7 +1644,7 @@ _021D84C2:
cmp r2, #2
bne _021D84E2
ldr r0, [r5, #0x18]
- bl FUN_02017B48
+ bl Bg_GetXpos
cmp r0, #0
beq _021D84E0
lsl r1, r4, #0x18
@@ -1652,7 +1652,7 @@ _021D84C2:
lsr r1, r1, #0x18
mov r2, #1
mov r3, #4
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
b _021D84E2
_021D84E0:
mov r6, #1
@@ -1947,19 +1947,19 @@ _021D86E4:
mov r1, #2
add r2, r7, #0
add r3, r7, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
mov r2, #3
add r3, r2, #0
ldr r0, [r4, #0x18]
mov r1, #2
sub r3, #0x6b
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
mov r0, #2
add r1, r7, #0
- bl FUN_020178BC
+ bl SetBgPriority
mov r0, #5
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
add r0, r4, #0
add r2, r7, #0
add r0, #0xa8
@@ -1976,10 +1976,10 @@ _021D86E4:
_021D8728:
ldr r0, [r4, #0x18]
mov r1, #2
- bl FUN_02017B48
+ bl Bg_GetXpos
ldr r0, [r4, #0x18]
mov r1, #5
- bl FUN_02017B54
+ bl Bg_GetYpos
add r1, r4, #0
add r1, #0xb0
ldr r3, [r1]
@@ -2010,22 +2010,22 @@ _021D8728:
mov r1, #2
ldr r0, [r4, #0x18]
add r3, r1, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
ldr r0, [r4, #0x18]
mov r1, #5
mov r2, #1
mov r3, #2
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
ldr r0, [r4, #0x18]
mov r1, #5
mov r2, #3
add r3, r5, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
b _021D890A
_021D8792:
mov r0, #5
add r1, r7, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #0x1e
add r4, #0xb0
str r0, [r4]
@@ -2048,7 +2048,7 @@ _021D87A6:
_021D87BE:
mov r0, #2
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
add r0, r4, #0
add r2, r7, #0
add r0, #0xa8
@@ -2065,10 +2065,10 @@ _021D87BE:
_021D87E0:
ldr r0, [r4, #0x18]
mov r1, #2
- bl FUN_02017B48
+ bl Bg_GetXpos
ldr r0, [r4, #0x18]
mov r1, #2
- bl FUN_02017B54
+ bl Bg_GetYpos
add r0, r4, #0
add r0, #0xb0
ldr r1, [r0]
@@ -2097,7 +2097,7 @@ _021D87E0:
mov r1, #2
mov r2, #3
add r3, r7, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
add r0, r4, #0
add r2, r7, #0
add r0, #0xa8
@@ -2126,7 +2126,7 @@ _021D8846:
ldr r0, [r4, #0x18]
mov r1, #2
add r3, r2, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
asr r5, r5, #1
cmp r5, #0x90
ble _021D886E
@@ -2136,15 +2136,15 @@ _021D886E:
mov r1, #2
mov r2, #3
add r3, r5, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
b _021D890A
_021D887C:
ldr r0, [r4, #0x18]
mov r1, #2
- bl FUN_02017B48
+ bl Bg_GetXpos
ldr r0, [r4, #0x18]
mov r1, #2
- bl FUN_02017B54
+ bl Bg_GetYpos
add r0, r4, #0
add r0, #0xb0
ldr r1, [r0]
@@ -2172,7 +2172,7 @@ _021D887C:
mov r1, #2
mov r2, #3
add r3, r7, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
mov r0, #5
str r0, [r6]
b _021D890A
@@ -2188,12 +2188,12 @@ _021D88CC:
mov r1, #2
ldr r0, [r4, #0x18]
add r3, r1, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
ldr r0, [r4, #0x18]
mov r1, #2
mov r2, #3
add r3, r5, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
add r4, #0xa8
str r5, [r4]
b _021D890A
@@ -2219,7 +2219,7 @@ MOD59_021D8914: ; 0x021D8914
mov r1, #1
bx r3
.align 2, 0
-_021D891C: .word FUN_020178BC
+_021D891C: .word SetBgPriority
thumb_func_end MOD59_021D8914
thumb_func_start MOD59_021D8920
@@ -2360,10 +2360,10 @@ _021D8A1A:
bl FUN_02005350
add r0, r5, #0
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #7
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #6
mov r1, #1
str r0, [sp]
@@ -2399,7 +2399,7 @@ _021D8A76:
str r0, [r4, #0xc]
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
bl _021D985C
_021D8A92:
ldr r0, _021D8D70 ; =0x00000405
@@ -2416,10 +2416,10 @@ _021D8A92:
bl MOD59_021D8140
mov r0, #3
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #1
add r1, r0, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #0x10
str r0, [sp]
mov r0, #4
@@ -2489,7 +2489,7 @@ _021D8B44:
str r0, [r4, #0xc]
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
bl _021D985C
_021D8B58:
mov r0, #0x29
@@ -2516,10 +2516,10 @@ _021D8B80:
bne _021D8C84
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #1
add r1, r5, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
ldr r0, [r4, #0x10]
str r0, [r4, #0xc]
bl _021D985C
@@ -2634,12 +2634,12 @@ _021D8C88:
str r0, [r4, #0xc]
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
bl _021D985C
_021D8C98:
add r0, r5, #0
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #0x14
str r0, [r4, #0xc]
bl _021D985C
@@ -2669,7 +2669,7 @@ _021D8CBC:
bl FUN_020145C8
mov r0, #6
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
add r0, r4, #0
mov r1, #3
add r0, #0x8b
@@ -2744,7 +2744,7 @@ _021D8D7C:
bne _021D8DA0
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0x1c
str r0, [r4, #0xc]
bl _021D985C
@@ -2759,7 +2759,7 @@ _021D8DA0:
_021D8DA4:
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
ldr r0, [r4, #0x68]
bl FUN_020146C4
add r0, r4, #0
@@ -2799,12 +2799,12 @@ _021D8DEA:
bl MOD59_021D8234
mov r0, #1
add r1, r0, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
add r2, r5, #0
ldr r0, [r4, #0x18]
mov r1, #1
add r3, r2, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
mov r0, #6
mov r1, #1
str r0, [sp]
@@ -2961,10 +2961,10 @@ _021D8F5E:
bne _021D8FCE
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
add r0, r5, #0
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #0x1c
str r0, [r4, #0xc]
bl _021D985C
@@ -3018,7 +3018,7 @@ _021D8FD2:
bl MOD59_021D8234
mov r0, #6
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #6
mov r1, #1
str r0, [sp]
@@ -3060,7 +3060,7 @@ _021D9030:
add r0, #0x98
str r1, [r0]
ldr r0, [r4, #0x18]
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0x30
str r0, [r4, #0xc]
bl _021D985C
@@ -3223,7 +3223,7 @@ _021D9192:
bl MOD59_021D82A0
mov r0, #6
add r1, r5, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
add r0, r4, #0
add r1, r5, #0
add r0, #0x94
@@ -3298,7 +3298,7 @@ _021D922A:
bne _021D92FA
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0x3b
str r0, [r4, #0xc]
b _021D985C
@@ -3356,12 +3356,12 @@ _021D9290:
ldr r0, [r4, #0x18]
mov r1, #1
sub r3, #0x30
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
ldr r0, [r4, #0x18]
mov r1, #2
add r2, r5, #0
mov r3, #0x30
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
mov r0, #0x40
str r0, [r4, #0xc]
b _021D985C
@@ -3542,7 +3542,7 @@ _021D9416:
_021D941C:
ldr r0, [r4, #0x18]
mov r1, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0x4a
str r0, [r4, #0xc]
b _021D985C
@@ -3589,13 +3589,13 @@ _021D945C:
_021D9476:
add r0, r5, #0
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #3
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #7
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
add r0, r4, #0
add r0, #0x84
ldr r0, [r0]
@@ -3603,22 +3603,22 @@ _021D9476:
bne _021D94AE
mov r0, #1
add r1, r0, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
add r2, r5, #0
ldr r0, [r4, #0x18]
mov r1, #1
add r3, r2, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
b _021D94C2
_021D94AE:
mov r0, #2
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
add r2, r5, #0
ldr r0, [r4, #0x18]
mov r1, #2
add r3, r2, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
_021D94C2:
mov r0, #6
mov r1, #1
@@ -3666,7 +3666,7 @@ _021D950C:
bne _021D9530
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
ldr r1, [r4, #0x48]
sub r0, r5, #2
cmp r1, r0
@@ -3865,21 +3865,21 @@ _021D9684:
_021D9696:
add r0, r5, #0
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #3
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #7
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #1
add r1, r0, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
add r2, r5, #0
ldr r0, [r4, #0x18]
mov r1, #1
add r3, r2, #0
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
mov r0, #6
mov r1, #1
str r0, [sp]
@@ -3928,7 +3928,7 @@ _021D971A:
_021D971C:
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0x61
str r0, [r4, #0xc]
b _021D985C
@@ -4004,7 +4004,7 @@ _021D97B2:
bne _021D985C
ldr r0, [r4, #0x18]
add r1, r5, #0
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
mov r0, #0x67
str r0, [r4, #0xc]
b _021D985C
diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s
index e4325d83..147b3a99 100644
--- a/arm9/modules/59/asm/mod59_021D9868.s
+++ b/arm9/modules/59/asm/mod59_021D9868.s
@@ -212,7 +212,7 @@ MOD59_021D9A14: ; 0x021D9A14
ldr r0, [r0, #4]
bx r3
nop
-_021D9A1C: .word FUN_0201AB60
+_021D9A1C: .word DoScheduledBgGpuUpdates
thumb_func_end MOD59_021D9A14
thumb_func_start MOD59_021D9A20
@@ -231,7 +231,7 @@ _021D9A2C:
add r0, sp, #0x90
bl GX_SetBanks
ldr r0, [r4]
- bl FUN_02016B94
+ bl BgConfig_Alloc
add r3, sp, #0x80
ldr r5, _021D9BB8 ; =0x021DA054
str r0, [r4, #4]
@@ -241,7 +241,7 @@ _021D9A2C:
ldmia r5!, {r0, r1}
stmia r3!, {r0, r1}
add r0, r2, #0
- bl FUN_02016BBC
+ bl SetBothScreensModesAndDisable
ldr r5, _021D9BBC ; =0x021DA080
add r3, sp, #0x64
ldmia r5!, {r0, r1}
@@ -256,15 +256,15 @@ _021D9A2C:
str r0, [r3]
ldr r0, [r4, #4]
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
ldr r3, [r4]
mov r0, #2
mov r1, #0x20
mov r2, #0
- bl FUN_02017F18
+ bl BG_ClearCharDataRange
ldr r0, [r4, #4]
mov r1, #2
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
ldr r5, _021D9BC0 ; =0x021DA09C
add r3, sp, #0x48
ldmia r5!, {r0, r1}
@@ -279,7 +279,7 @@ _021D9A2C:
str r0, [r3]
ldr r0, [r4, #4]
add r3, r1, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
mov r3, #0
str r3, [sp]
str r3, [sp, #4]
@@ -314,7 +314,7 @@ _021D9A2C:
str r0, [r3]
ldr r0, [r4, #4]
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -351,7 +351,7 @@ _021D9A2C:
str r0, [r3]
ldr r0, [r4, #4]
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
mov r1, #0
str r1, [sp]
str r1, [sp, #4]
@@ -387,10 +387,10 @@ _021D9A2C:
bl FUN_02002ED0
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 r2, #0xc
ldr r0, _021D9BCC ; =0x04000050
mov r1, #2
@@ -415,43 +415,43 @@ MOD59_021D9BD0: ; 0x021D9BD0
add r4, r0, #0
mov r0, #0
add r1, r0, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #1
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #2
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #3
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #4
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #5
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #6
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #7
mov r1, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
ldr r0, _021D9C44 ; =0x04000050
mov r1, #0
strh r1, [r0]
ldr r0, [r4, #4]
mov r1, #3
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #4]
mov r1, #1
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #4]
mov r1, #0
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #4]
mov r1, #2
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
ldr r0, [r4, #4]
bl FreeToHeap
pop {r4, pc}
@@ -511,7 +511,7 @@ _021D9C92: ; jump table
_021D9C9A:
mov r0, #2
add r1, r5, #0
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #1
ldr r1, [r4]
lsl r0, r0, #0xa
@@ -525,7 +525,7 @@ _021D9C9A:
ldr r0, [r4, #4]
ldr r2, _021D9D6C ; =0x021DA04C
add r1, #0x10
- bl FUN_02019150
+ bl AddWindow
add r1, r5, #0
mov r0, #1
lsl r0, r0, #8
@@ -562,7 +562,7 @@ _021D9C9A:
bl CopyWindowToVram
mov r0, #2
mov r1, #1
- bl FUN_0201797C
+ bl ToggleBgLayer
mov r0, #0xf0
str r0, [r4, #0x24]
mov r0, #1
@@ -597,10 +597,10 @@ _021D9D4A:
_021D9D50:
add r0, r4, #0
add r0, #0x10
- bl FUN_02019178
+ bl RemoveWindow
ldr r0, [r4, #4]
mov r1, #2
- bl FUN_02018744
+ bl BgClearTilemapBufferAndCommit
add r0, r5, #0
str r0, [r4, #0xc]
mov r5, #1
@@ -624,7 +624,7 @@ MOD59_021D9D78: ; 0x021D9D78
ldr r0, [r0, #4]
mov r1, #1
asr r3, r3, #4
- bl FUN_020179E0
+ bl BgSetPosTextAndCommit
pop {r3, pc}
.align 2, 0
thumb_func_end MOD59_021D9D78
diff --git a/arm9/modules/59/include/mod59_021D74E0.h b/arm9/modules/59/include/mod59_021D74E0.h
index 2dd05826..d6f52bba 100644
--- a/arm9/modules/59/include/mod59_021D74E0.h
+++ b/arm9/modules/59/include/mod59_021D74E0.h
@@ -23,7 +23,7 @@ typedef struct MOD59_OverlayData
u32 Unk0C;
u32 Unk10;
struct UnkStruct_02006234 *Unk14;
- struct UnkStruct_02016B94_2 *Unk18;
+ struct BgConfig *Unk18;
u8 padding[0x54];
struct MOD59_UnkPlayerStruct *playerStruct;
struct MOD59_UnkPlayerStruct *rivalStruct;
diff --git a/arm9/modules/59/src/mod59_021D74E0_src.c b/arm9/modules/59/src/mod59_021D74E0_src.c
index 9be9eff3..e104cf4f 100644
--- a/arm9/modules/59/src/mod59_021D74E0_src.c
+++ b/arm9/modules/59/src/mod59_021D74E0_src.c
@@ -6,7 +6,7 @@
#include "game_init.h"
#include "GX_layers.h"
#include "unk_02024E64.h"
-#include "unk_02016B94.h"
+#include "bg_window.h"
#include "module_52.h"
extern void *FUN_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct Options *options);
@@ -177,7 +177,7 @@ THUMB_FUNC BOOL MOD59_021D76C0(struct UnkStruct_02006234 *param0)
THUMB_FUNC void MOD59_021D7724(MOD59_OverlayData *data)
{
- FUN_0201AB60(data->Unk18);
+ DoScheduledBgGpuUpdates(data->Unk18);
}
THUMB_FUNC BOOL MOD59_021D7730(void)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 14:29:14 +0000