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/43 | |
| parent | 6bede5a9393e2796c110e6304f455293a240cd7b (diff) | |
| parent | e8d0b49a6864d6077a5d7b1c123c49481fe14bfe (diff) | |
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'arm9/modules/43')
| -rw-r--r-- | arm9/modules/43/asm/module_43.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index ce3da4bb..59f7e81d 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -561,7 +561,7 @@ MOD43_02254C28: ; 0x02254C28 ldr r0, [r5, #4] ldr r2, _02254CC4 ; =MOD43_022551A0 mov r1, #6 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -595,7 +595,7 @@ MOD43_02254C28: ; 0x02254C28 bl MOD43_02254CD0 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254CC8 ; =0x04001000 ldr r0, _02254CCC ; =0xFFFFE0FF ldr r3, [r1] @@ -651,7 +651,7 @@ MOD43_02254CD0: ; 0x02254CD0 add r1, sp, #0x14 mov r2, #6 mov r3, #0x12 - bl FUN_02019064 + bl AddWindowParameterized add r0, sp, #0x14 mov r1, #4 bl FillWindowPixelBuffer @@ -667,11 +667,11 @@ MOD43_02254CD0: ; 0x02254CD0 str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, sp, #0x14 - bl FUN_02019270 + bl PutWindowTilemap add r0, sp, #0x14 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, sp, #0x14 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 bl String_dtor _02254D44: @@ -717,7 +717,7 @@ _02254D78: strb r1, [r0, #1] ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD43_02254C14 _02254DA0: |