diff options
Diffstat (limited to 'arm9/modules/23')
| -rw-r--r-- | arm9/modules/23/asm/module_23.s | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s index 9f052087..15af3d3a 100644 --- a/arm9/modules/23/asm/module_23.s +++ b/arm9/modules/23/asm/module_23.s @@ -1153,7 +1153,7 @@ MOD23_02255088: ; 0x02255088 ldr r2, _02255118 ; =MOD23_02255D1C mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1185,7 +1185,7 @@ MOD23_02255088: ; 0x02255088 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _0225511C ; =0x04001000 ldr r0, _02255120 ; =0xFFFFE0FF ldr r3, [r1] @@ -1216,7 +1216,7 @@ MOD23_02255124: ; 0x02255124 add r6, r0, #0 ldr r0, [r6, #4] mov r1, #6 - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 mov r0, #0 ldr r3, _022551A0 ; =MOD23_02255FB8 @@ -1310,10 +1310,10 @@ MOD23_022551A4: ; 0x022551A4 ldrb r3, [r5, r3] str r0, [sp, #8] ldr r0, [r4, #4] - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 add sp, #0xc @@ -1356,10 +1356,10 @@ MOD23_02255210: ; 0x02255210 ldrb r3, [r5, r3] str r0, [sp, #8] ldr r0, [r4, #4] - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 add sp, #0xc @@ -1391,7 +1391,7 @@ MOD23_02255270: ; 0x02255270 bl MOD23_0225548C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1419,7 +1419,7 @@ MOD23_022552A8: ; 0x022552A8 bl MOD23_0225544C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1446,7 +1446,7 @@ MOD23_022552E8: ; 0x022552E8 bl MOD23_0225548C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1474,7 +1474,7 @@ MOD23_02255320: ; 0x02255320 bl MOD23_0225544C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1504,7 +1504,7 @@ MOD23_02255360: ; 0x02255360 bl MOD23_02255410 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1538,7 +1538,7 @@ _022553B2: bl MOD23_0225544C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD23_02255074 pop {r3, r4, r5, pc} @@ -1558,7 +1558,7 @@ MOD23_022553E4: ; 0x022553E4 bl MOD23_02255410 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD23_02255074 pop {r3, r4, r5, pc} @@ -1572,7 +1572,7 @@ MOD23_02255410: ; 0x02255410 add r5, r1, #0 mov r1, #6 add r4, r0, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer ldrh r1, [r5, #2] cmp r1, #0x11 bne _0225542E @@ -1602,7 +1602,7 @@ MOD23_0225544C: ; 0x0225544C push {lr} sub sp, #0xc mov r1, #6 - bl FUN_0201886C + bl GetBgTilemapBuffer mov r1, #0x29 str r1, [sp] mov r1, #0x28 @@ -1625,7 +1625,7 @@ MOD23_02255470: ; 0x02255470 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD23_02255074 pop {r4, pc} @@ -1638,7 +1638,7 @@ MOD23_0225548C: ; 0x0225548C sub sp, #0x14 add r6, r1, #0 mov r1, #6 - bl FUN_0201886C + bl GetBgTilemapBuffer add r7, r0, #0 ldrh r0, [r6] mov r1, #0 |