diff options
Diffstat (limited to 'arm9/modules/05/asm/module_05.s')
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index a67d2d02..95a0e6ca 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -2753,7 +2753,7 @@ _021E9C02: ldr r0, [r0, #0x10] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0 add r0, sp, #0x28 strh r1, [r0] @@ -2761,7 +2761,7 @@ _021E9C02: add r1, sp, #0x28 mov r2, #2 mov r3, #0x1e - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2770,7 +2770,7 @@ _021E9C02: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x1c] ldr r0, [r0] add r1, r0, #1 @@ -3160,26 +3160,26 @@ _021E9FA4: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [sp, #0x1c] mov r1, #3 ldr r0, [r0, #0x10] ldr r0, [r0, #8] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, [sp, #0x1c] mov r0, #4 ldr r1, [r1, #0xc] @@ -3275,7 +3275,7 @@ _021EA0B0: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x1c] ldr r0, [r0] cmp r0, #7 @@ -3725,7 +3725,7 @@ _021EA430: ldr r0, [r0, #0x10] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0 add r0, sp, #0x28 strh r1, [r0] @@ -3733,7 +3733,7 @@ _021EA430: add r1, sp, #0x28 mov r2, #2 mov r3, #0x1e - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -3742,7 +3742,7 @@ _021EA430: mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 bl MOD05_021E4394 mov r1, #0x81 @@ -4030,7 +4030,7 @@ _021EA6FA: mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x83 lsl r0, r0, #2 add r0, r4, r0 @@ -4093,26 +4093,26 @@ _021EA76C: mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [sp, #0x18] mov r1, #3 ldr r0, [r0, #0x10] ldr r0, [r0, #8] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, [sp, #0x18] mov r0, #4 ldr r1, [r1, #0xc] @@ -5393,7 +5393,7 @@ _021EB18E: ldr r1, [r4] ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0 add r0, sp, #0x14 strh r1, [r0] @@ -5401,12 +5401,12 @@ _021EB18E: add r1, sp, #0x14 mov r2, #2 mov r3, #0x1e - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r0, [r4] mov r1, #0 bl FillWindowPixelBuffer ldr r0, [r4] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -5535,7 +5535,7 @@ _021EB344: str r0, [r5] _021EB36C: ldr r0, [r4] - bl FUN_02019220 + bl ScheduleWindowCopyToVram b _021EB3F2 _021EB374: mov r0, #0 @@ -5566,21 +5566,21 @@ _021EB394: add r0, #8 bl MOD05_021E3E44 ldr r0, [r4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r5, #0x10] mov r1, #3 ldr r0, [r0, #8] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _021EB410 ; =0x0400004D mov r1, #0 strb r1, [r0] @@ -15215,7 +15215,7 @@ MOD05_021EFEDC: ; 0x021EFEDC ldr r0, [r0, #8] mov r2, #3 mov r3, #0x13 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _021EFFBC ; =0x000003D9 add r0, #0x20 @@ -15362,7 +15362,7 @@ _021F0056: bl FUN_0200CCF8 add r0, r5, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow mov r1, #0 ldr r0, [r5, #4] add r2, r1, #0 @@ -15565,12 +15565,12 @@ MOD05_021F01EC: ; 0x021F01EC add r4, r0, #0 add r0, #0x10 add r5, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021F0204 add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow _021F0204: ldr r0, [r4, #0x3c] ldr r2, [r4, #8] @@ -15648,12 +15648,12 @@ MOD05_021F0290: ; 0x021F0290 bl String_dtor add r0, r4, #0 add r0, #0x10 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021F02C0 add r4, #0x10 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021F02C0: pop {r4, pc} .balign 4, 0 @@ -26506,7 +26506,7 @@ MOD05_021F5518: ; 0x021F5518 bl G2x_SetBlendAlpha_ mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -26629,7 +26629,7 @@ MOD05_021F5608: ; 0x021F5608 add r1, sp, #4 add r2, r0, #0 mov r3, #0xc2 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #4 mov r1, #0x20 bl AllocFromHeap @@ -26643,13 +26643,13 @@ MOD05_021F5608: ; 0x021F5608 mov r1, #2 add r2, r4, #0 mov r3, #0x20 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r4, #0 bl FreeToHeap ldr r2, _021F565C ; =0x00006001 add r0, r5, #0 mov r1, #2 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add sp, #8 pop {r3, r4, r5, pc} nop @@ -26694,21 +26694,21 @@ _021F5696: thumb_func_start MOD05_021F569C MOD05_021F569C: ; 0x021F569C - ldr r3, _021F56A4 ; =FUN_02017FE4 + ldr r3, _021F56A4 ; =BG_SetMaskColor mov r0, #2 mov r1, #0 bx r3 .balign 4, 0 -_021F56A4: .word FUN_02017FE4 +_021F56A4: .word BG_SetMaskColor thumb_func_start MOD05_021F56A8 MOD05_021F56A8: ; 0x021F56A8 - ldr r3, _021F56B0 ; =FUN_02017FE4 + ldr r3, _021F56B0 ; =BG_SetMaskColor mov r0, #2 ldr r1, _021F56B4 ; =0x00007FFF bx r3 .balign 4, 0 -_021F56B0: .word FUN_02017FE4 +_021F56B0: .word BG_SetMaskColor _021F56B4: .word 0x00007FFF thumb_func_start MOD05_021F56B8 @@ -26733,17 +26733,17 @@ MOD05_021F56B8: ; 0x021F56B8 mov r0, #2 add r1, sp, #4 add r2, r0, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r1, #2 str r1, [sp] ldr r0, [r4, #8] add r2, r1, #0 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange ldr r0, [r4, #8] ldr r2, _021F5718 ; =0x00006002 mov r1, #2 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -26777,17 +26777,17 @@ MOD05_021F571C: ; 0x021F571C strh r2, [r1] add r1, sp, #4 mov r2, #2 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r2, #2 str r2, [sp] ldr r0, [r4, #8] mov r1, #3 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange ldr r0, [r4, #8] ldr r2, _021F577C ; =0x00006002 mov r1, #3 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit mov r0, #8 mov r1, #1 bl GX_EngineAToggleLayers @@ -26928,7 +26928,7 @@ _021F5856: mov r0, #2 mov r1, #0 strh r0, [r4, #8] - bl FUN_020178BC + bl SetBgPriority mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -27007,7 +27007,7 @@ _021F58EE: strh r1, [r0] mov r0, #2 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #8 strh r0, [r4, #8] b _021F5980 @@ -28181,7 +28181,7 @@ MOD05_021F617C: ; 0x021F617C bl FUN_0200D0E0 add r4, #0x38 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow mov r0, #1 pop {r4, pc} _021F61AA: |