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/28 | |
| parent | 6bede5a9393e2796c110e6304f455293a240cd7b (diff) | |
| parent | e8d0b49a6864d6077a5d7b1c123c49481fe14bfe (diff) | |
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'arm9/modules/28')
| -rw-r--r-- | arm9/modules/28/asm/module_28.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 04176ba5..ee242492 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -547,7 +547,7 @@ MOD28_02254C18: ; 0x02254C18 ldr r2, _02254CA8 ; =MOD28_02255ED8 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -570,13 +570,13 @@ MOD28_02254C18: ; 0x02254C18 ldr r0, [r5, #4] mov r1, #6 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, [r5] add r0, r5, #0 bl MOD28_02254CB4 @@ -915,7 +915,7 @@ MOD28_02254F18: ; 0x02254F18 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD28_02254C04 pop {r4, pc} |