diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-06-10 22:42:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-10 22:42:43 +0100 |
| commit | aa185f6be5696ae4bd6c9f8093eb13a06cb2cc79 (patch) | |
| tree | 8f56e977e7e4f69c1c48249118074f500857f195 /arm9/modules/37 | |
| parent | 6bede5a9393e2796c110e6304f455293a240cd7b (diff) | |
| parent | e8d0b49a6864d6077a5d7b1c123c49481fe14bfe (diff) | |
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'arm9/modules/37')
| -rw-r--r-- | arm9/modules/37/asm/module_37.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s index c2f1439a..313343b5 100644 --- a/arm9/modules/37/asm/module_37.s +++ b/arm9/modules/37/asm/module_37.s @@ -459,7 +459,7 @@ MOD37_02254B70: ; 0x02254B70 ldr r2, _02254BF4 ; =MOD37_02254D44 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -489,7 +489,7 @@ MOD37_02254B70: ; 0x02254B70 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254BF8 ; =0x04001000 ldr r0, _02254BFC ; =0xFFFFE0FF ldr r3, [r1] @@ -540,7 +540,7 @@ _02254C26: beq _02254C40 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD37_02254B5C _02254C40: |