summaryrefslogtreecommitdiff
path: root/arm9/modules/40
diff options
context:
space:
mode:
authorAkira Akashi <rubenru09@aol.com>2021-06-10 22:42:43 +0100
committerGitHub <noreply@github.com>2021-06-10 22:42:43 +0100
commitaa185f6be5696ae4bd6c9f8093eb13a06cb2cc79 (patch)
tree8f56e977e7e4f69c1c48249118074f500857f195 /arm9/modules/40
parent6bede5a9393e2796c110e6304f455293a240cd7b (diff)
parente8d0b49a6864d6077a5d7b1c123c49481fe14bfe (diff)
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'arm9/modules/40')
-rw-r--r--arm9/modules/40/asm/module_40.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s
index 13c9a94f..62231a53 100644
--- a/arm9/modules/40/asm/module_40.s
+++ b/arm9/modules/40/asm/module_40.s
@@ -1038,7 +1038,7 @@ MOD40_02254FE8: ; 0x02254FE8
ldr r2, _0225506C ; =MOD40_02255340
mov r1, #6
mov r3, #0
- bl FUN_02016C18
+ bl InitBgFromTemplate
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1068,7 +1068,7 @@ MOD40_02254FE8: ; 0x02254FE8
bl MOD20_02252D7C
ldr r0, [r5, #4]
mov r1, #6
- bl FUN_02017CD0
+ bl BgCommitTilemapBufferToVram
ldr r1, _02255070 ; =0x04001000
ldr r0, _02255074 ; =0xFFFFE0FF
ldr r3, [r1]
@@ -1120,7 +1120,7 @@ _022550A2:
beq _022550BC
ldr r0, [r4, #4]
mov r1, #6
- bl FUN_020178A0
+ bl FreeBgTilemapBuffer
add r0, r5, #0
bl MOD40_02254FD4
_022550BC: