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/29 | |
| parent | 6bede5a9393e2796c110e6304f455293a240cd7b (diff) | |
| parent | e8d0b49a6864d6077a5d7b1c123c49481fe14bfe (diff) | |
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'arm9/modules/29')
| -rw-r--r-- | arm9/modules/29/asm/module_29.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s index 9fb45a65..061b078c 100644 --- a/arm9/modules/29/asm/module_29.s +++ b/arm9/modules/29/asm/module_29.s @@ -672,7 +672,7 @@ MOD29_02254D10: ; 0x02254D10 ldr r2, _02254DE8 ; =MOD29_022550E0 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -737,7 +737,7 @@ MOD29_02254D10: ; 0x02254D10 bl GXS_LoadOBJPltt ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254DEC ; =0x04001000 ldr r0, _02254DF0 ; =0xFFFFE0FF ldr r3, [r1] @@ -771,7 +771,7 @@ MOD29_02254DF4: ; 0x02254DF4 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD29_02254CFC pop {r4, pc} |