diff options
Diffstat (limited to 'arm9/modules/24')
| -rw-r--r-- | arm9/modules/24/asm/module_24.s | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index cdf4b770..65182148 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -621,7 +621,7 @@ MOD24_02254CA0: ; 0x02254CA0 add r4, r0, #0 beq _02254CFA mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254CC0 bl GF_AssertFail @@ -631,7 +631,7 @@ _02254CC0: mov r1, #0x10 bl MOD20_022536F4 mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254CD8 bl GF_AssertFail @@ -642,7 +642,7 @@ _02254CD8: bl MOD20_02252D24 str r0, [r4, #0x50] mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254CF4 bl GF_AssertFail @@ -668,7 +668,7 @@ MOD24_02254D00: ; 0x02254D00 beq _02254D3C ldr r0, [r4, #4] ldr r2, _02254D40 ; =MOD24_0225510C - bl FUN_02019150 + bl AddWindow mov r2, #0xbe ldr r1, [r4] ldr r0, _02254D44 ; =0x000016E8 @@ -699,7 +699,7 @@ MOD24_02254D48: ; 0x02254D48 add r4, r0, #0 beq _02254D84 mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254D5C bl GF_AssertFail @@ -715,7 +715,7 @@ _02254D5C: lsl r2, r2, #6 bl FUN_02089444 ldr r0, [r4, #0x70] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x70] bl FreeToHeap _02254D7E: @@ -783,7 +783,7 @@ MOD24_02254DDC: ; 0x02254DDC sub sp, #0x14 mov r0, #8 add r4, r1, #0 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254DF0 bl GF_AssertFail @@ -795,14 +795,14 @@ _02254DF0: ldr r2, _02254ED0 ; =MOD24_02255114 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _02254ED4 ; =MOD24_02255130 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E1E bl GF_AssertFail @@ -835,7 +835,7 @@ _02254E1E: add r1, r0, #0 bl MOD20_02252D7C mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E68 bl GF_AssertFail @@ -845,7 +845,7 @@ _02254E68: ldr r0, [r5, #0x70] bl CopyWindowToVram mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E82 bl GF_AssertFail @@ -853,14 +853,14 @@ _02254E82: add r0, r5, #0 bl MOD24_02255078 mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E96 bl GF_AssertFail _02254E96: ldr r0, [r5, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254ED8 ; =0x04001000 ldr r0, _02254EDC ; =0xFFFFE0FF ldr r3, [r1] @@ -877,7 +877,7 @@ _02254E96: add r0, r4, #0 bl MOD24_02254DC8 mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254ECC bl GF_AssertFail @@ -932,7 +932,7 @@ MOD24_02254F28: ; 0x02254F28 add r0, r4, #0 bl MOD20_022538A0 ldr r0, [r0, #0x70] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD24_02254DC8 pop {r4, pc} @@ -1072,7 +1072,7 @@ MOD24_02255038: ; 0x02255038 add r0, r4, #0 bl MOD20_022538A0 ldr r0, [r0, #0x70] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD24_02254DC8 pop {r4, pc} @@ -1088,10 +1088,10 @@ MOD24_02255050: ; 0x02255050 bl MOD24_022550D4 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 MOD24_02254DC8 pop {r3, r4, r5, pc} |