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/45 | |
| parent | 6bede5a9393e2796c110e6304f455293a240cd7b (diff) | |
| parent | e8d0b49a6864d6077a5d7b1c123c49481fe14bfe (diff) | |
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'arm9/modules/45')
| -rw-r--r-- | arm9/modules/45/asm/module_45.s | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s index 95cf3fbc..4f710dc6 100644 --- a/arm9/modules/45/asm/module_45.s +++ b/arm9/modules/45/asm/module_45.s @@ -637,12 +637,12 @@ MOD45_02254CCC: ; 0x02254CCC ldr r2, _02254D60 ; =MOD45_022550FC mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _02254D64 ; =MOD45_022550E0 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 add r1, r4, #0 bl MOD45_02254DDC @@ -666,10 +666,10 @@ MOD45_02254CCC: ; 0x02254CCC bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r5, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254D68 ; =0x04001000 ldr r0, _02254D6C ; =0xFFFFE0FF ldr r3, [r1] @@ -703,10 +703,10 @@ MOD45_02254D70: ; 0x02254D70 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD45_02254CB8 pop {r3, r4, r5, pc} @@ -742,7 +742,7 @@ _02254DBC: bl MOD45_02254E28 ldr r0, [r5, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD45_02254CB8 pop {r3, r4, r5, pc} @@ -825,7 +825,7 @@ MOD45_02254E28: ; 0x02254E28 mov r1, #7 add r2, r6, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -846,7 +846,7 @@ MOD45_02254E74: ; 0x02254E74 ldr r0, [r7, #4] mov r1, #6 mov r2, #0x82 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r7, #4] ldr r1, [r6] bl MOD45_02254EBC @@ -902,7 +902,7 @@ _02254ED6: mov r1, #6 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r5, r5, #1 cmp r5, #4 blt _02254ED6 @@ -975,7 +975,7 @@ _02254F46: mov r1, #6 add r2, r7, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r5, #1 lsl r0, r0, #0x18 lsr r0, r0, #0x18 @@ -992,7 +992,7 @@ _02254F46: mov r1, #6 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect _02254FAE: mov r0, #0x14 add r3, r6, #0 @@ -1016,7 +1016,7 @@ _02254FAE: mov r1, #6 add r2, r6, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r5, #1 lsl r0, r0, #0x18 lsr r0, r0, #0x18 @@ -1034,7 +1034,7 @@ _02254FAE: mov r1, #6 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 |