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/49 | |
| parent | 6bede5a9393e2796c110e6304f455293a240cd7b (diff) | |
| parent | e8d0b49a6864d6077a5d7b1c123c49481fe14bfe (diff) | |
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'arm9/modules/49')
| -rw-r--r-- | arm9/modules/49/asm/module_49.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s index 1de7ea96..68c7625e 100644 --- a/arm9/modules/49/asm/module_49.s +++ b/arm9/modules/49/asm/module_49.s @@ -384,14 +384,14 @@ MOD49_02254AD4: ; 0x02254AD4 ldr r2, _02254BD0 ; =MOD49_02254D20 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] ldr r0, [r5, #4] mov r1, #6 mov r2, #4 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -402,7 +402,7 @@ MOD49_02254AD4: ; 0x02254AD4 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 @@ -418,12 +418,12 @@ MOD49_02254AD4: ; 0x02254AD4 ldr r0, [r5, #4] add r1, sp, #0x1c mov r2, #6 - bl FUN_02019064 + bl AddWindowParameterized add r0, sp, #0x1c mov r1, #4 bl FillWindowPixelBuffer add r0, sp, #0x1c - bl FUN_02019270 + bl PutWindowTilemap ldr r1, _02254BD4 ; =0x00000197 mov r0, #0x1a mov r2, #0 @@ -450,15 +450,15 @@ MOD49_02254AD4: ; 0x02254AD4 str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, sp, #0x1c - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl String_dtor _02254B94: add r0, sp, #0x1c - bl FUN_02019178 + bl RemoveWindow ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, [sp, #0x14] add r0, r5, #0 bl MOD49_02254C04 @@ -497,7 +497,7 @@ MOD49_02254BE4: ; 0x02254BE4 bl MOD49_02254CB8 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD49_02254AC0 pop {r3, r4, r5, pc} |