diff options
Diffstat (limited to 'arm9/modules/06/asm/module_06.s')
-rw-r--r-- | arm9/modules/06/asm/module_06.s | 198 |
1 files changed, 99 insertions, 99 deletions
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 6fbee88b..6f2604e6 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -90,11 +90,11 @@ MOD06_02239728: ; 0x02239728 MOD06_0223972C: ; 0x0223972C push {r4, lr} add r4, r0, #0 - bl GX_GetBankForBGExtPltt_2 + bl GX_GetBankForBG str r0, [r4] bl GX_GetBankForBGExtPltt str r0, [r4, #4] - bl GX_GetBankForSubBGExtPltt_2 + bl GX_GetBankForSubBG str r0, [r4, #8] bl GX_GetBankForSubBGExtPltt str r0, [r4, #0xc] @@ -106,7 +106,7 @@ MOD06_0223972C: ; 0x0223972C str r0, [r4, #0x18] bl GX_GetBankForSubOBJExtPltt str r0, [r4, #0x1c] - bl FUN_020C5D8C + bl GX_GetBankForTex str r0, [r4, #0x20] bl GX_GetBankForTexPltt str r0, [r4, #0x24] @@ -145,7 +145,7 @@ MOD06_02239790: ; 0x02239790 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -163,15 +163,15 @@ MOD06_02239790: ; 0x02239790 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x2c pop {r4, r5, pc} nop @@ -8472,7 +8472,7 @@ MOD06_0223D63C: ; 0x0223D63C ldr r0, [r5] add r1, #8 add r2, r4, #0 - bl FUN_02019064 + bl AddWindowParameterized b _0223D710 _0223D6B8: mov r4, #2 @@ -8514,7 +8514,7 @@ _0223D6B8: ldr r0, [r5] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized _0223D710: add r0, r5, #0 add r0, #0x84 @@ -8609,7 +8609,7 @@ MOD06_0223D7B8: ; 0x0223D7B8 bl FUN_0200CCF8 add r0, r4, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x80 ldr r0, [r0] @@ -8621,7 +8621,7 @@ MOD06_0223D7B8: ; 0x0223D7B8 bl ListMenuItems_dtor add r4, #8 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} thumb_func_start MOD06_0223D7EC @@ -8649,7 +8649,7 @@ _0223D804: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x88 ldr r0, [r0] @@ -8780,7 +8780,7 @@ MOD06_0223D918: ; 0x0223D918 ldr r0, [r4] mov r1, #3 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0 bl MOD06_0223D7B8 add r0, r4, #0 @@ -8825,13 +8825,13 @@ _0223D984: ldr r0, [r5] ldr r2, _0223D9BC ; =0x0224F350 add r1, r4, #0 - bl FUN_02019150 + bl AddWindow b _0223D9A6 _0223D99C: ldr r0, [r5] add r1, r4, #0 add r2, r7, #0 - bl FUN_02019150 + bl AddWindow _0223D9A6: add r6, r6, #1 add r4, #0x10 @@ -8855,9 +8855,9 @@ MOD06_0223D9C0: ; 0x0223D9C0 add r5, #8 _0223D9D0: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #6 @@ -8955,37 +8955,37 @@ MOD06_0223DA8C: ; 0x0223DA8C str r0, [r4, r1] ldr r0, [r4] mov r1, #0 - bl FUN_02018884 + bl GetBgPriority mov r1, #0x8d lsl r1, r1, #2 strb r0, [r4, r1] ldr r0, [r4] mov r1, #1 - bl FUN_02018884 + bl GetBgPriority ldr r1, _0223DB10 ; =0x00000235 strb r0, [r4, r1] ldr r0, [r4] mov r1, #2 - bl FUN_02018884 + bl GetBgPriority ldr r1, _0223DB14 ; =0x00000236 strb r0, [r4, r1] ldr r0, [r4] mov r1, #3 - bl FUN_02018884 + bl GetBgPriority ldr r1, _0223DB18 ; =0x00000237 strb r0, [r4, r1] mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0 mov r1, #1 bl GX_EngineAToggleLayers @@ -9012,19 +9012,19 @@ MOD06_0223DB1C: ; 0x0223DB1C lsl r1, r1, #2 ldrb r1, [r4, r1] mov r0, #0 - bl FUN_020178BC + bl SetBgPriority ldr r1, _0223DB58 ; =0x00000235 mov r0, #1 ldrb r1, [r4, r1] - bl FUN_020178BC + bl SetBgPriority ldr r1, _0223DB5C ; =0x00000236 mov r0, #2 ldrb r1, [r4, r1] - bl FUN_020178BC + bl SetBgPriority ldr r1, _0223DB60 ; =0x00000237 mov r0, #3 ldrb r1, [r4, r1] - bl FUN_020178BC + bl SetBgPriority mov r0, #0x8e lsl r0, r0, #2 ldr r0, [r4, r0] @@ -9323,7 +9323,7 @@ _0223DDB2: _0223DDBA: add r0, r4, #0 add r0, #0x18 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r1, sp, #0x14 ldr r0, [sp, #0x10] add r1, #2 @@ -9546,7 +9546,7 @@ _0223DF30: bl String_dtor add r5, #0x28 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -9604,7 +9604,7 @@ _0223E006: bl MOD06_0223DB1C ldr r0, [r5] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _0223E188 ; =0x000005DC bl FUN_020054C8 mov r0, #0xc @@ -9640,7 +9640,7 @@ _0223E034: bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x18 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 add r0, #0x58 mov r1, #0 @@ -9881,7 +9881,7 @@ _0223E214: bl String_dtor add r5, #0x48 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -9975,7 +9975,7 @@ _0223E314: bl MOD06_0223ECC8 add r4, #0x18 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _0223E380 ; =0x000005DC bl FUN_020054C8 mov r0, #4 @@ -10268,7 +10268,7 @@ _0223E50A: bl String_dtor add r5, #0x38 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -10471,7 +10471,7 @@ _0223E74A: bl MOD06_0223ECC8 add r5, #0x18 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 pop {r3, r4, r5, pc} _0223E78C: @@ -10684,7 +10684,7 @@ _0223E902: bl MOD06_0223ECC8 add r5, #0x18 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 pop {r3, r4, r5, pc} _0223E944: @@ -10736,7 +10736,7 @@ _0223E966: bl MOD06_0223ECC8 add r4, #0x18 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 pop {r4, pc} _0223E9B2: @@ -10917,7 +10917,7 @@ MOD06_0223EB04: ; 0x0223EB04 _0223EB1A: add r0, r4, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl MOD06_0223D63C mov r0, #1 @@ -11285,7 +11285,7 @@ _0223EE16: ldr r0, _0223EE70 ; =0x02252420 ldr r0, [r0] add r0, #0x40 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223EE34 ldr r0, _0223EE70 ; =0x02252420 @@ -11333,7 +11333,7 @@ MOD06_0223EE74: ; 0x0223EE74 ldr r0, _0223EF10 ; =0x02252420 ldr r0, [r0] add r0, #0x20 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223EEB8 ldr r0, _0223EF10 ; =0x02252420 @@ -11358,7 +11358,7 @@ MOD06_0223EE74: ; 0x0223EE74 ldr r0, [r1, #0x68] add r1, #0x20 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized _0223EEB8: ldr r0, _0223EF10 ; =0x02252420 ldr r2, _0223EF14 ; =0x000003D9 @@ -11570,7 +11570,7 @@ _0223F060: cmp r1, #0 beq _0223F07A add r0, #0x40 - bl FUN_02019178 + bl RemoveWindow _0223F07A: ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] @@ -11820,7 +11820,7 @@ MOD06_0223F270: ; 0x0223F270 ldr r0, _0223F330 ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223F2AA ldr r0, _0223F330 ; =0x02252420 @@ -11840,7 +11840,7 @@ MOD06_0223F270: ; 0x0223F270 add r1, #0x30 ldr r0, [r0, #8] mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0223F2AA: ldr r0, _0223F330 ; =0x02252420 ldr r2, _0223F334 ; =0x000003D9 @@ -12578,7 +12578,7 @@ MOD06_0223F8C8: ; 0x0223F8C8 ldr r0, _0223F950 ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223F910 ldr r0, _0223F950 ; =0x02252420 @@ -12598,7 +12598,7 @@ MOD06_0223F8C8: ; 0x0223F8C8 add r1, #0x30 ldr r0, [r0, #8] mov r3, #0x16 - bl FUN_02019064 + bl AddWindowParameterized _0223F910: ldr r0, _0223F950 ; =0x02252420 ldr r2, _0223F954 ; =0x000003D9 @@ -13856,10 +13856,10 @@ MOD06_02240364: ; 0x02240364 bl DestroyListMenu add r0, r4, #0 add r0, #0x20 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x97 ldrb r0, [r0] @@ -13873,11 +13873,11 @@ MOD06_02240364: ; 0x02240364 ldr r0, _022403DC ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _022403DC ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019178 + bl RemoveWindow mov r0, #0 add r4, #0x97 strb r0, [r4] @@ -14468,7 +14468,7 @@ MOD06_02240864: ; 0x02240864 add r5, r0, #0 add r0, #0x54 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0224089E add r0, r5, #0 @@ -14524,11 +14524,11 @@ MOD06_022408D4: ; 0x022408D4 bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x54 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _022408EC: add r4, #0x54 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 @@ -14572,7 +14572,7 @@ MOD06_02240924: ; 0x02240924 add r6, r6, #1 _02240940: add r0, r4, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _022409D2 add r0, r6, #2 @@ -14594,7 +14594,7 @@ _02240940: add r1, r4, #0 ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02240A20 ; =0x000003D9 add r0, #0x34 @@ -14695,10 +14695,10 @@ MOD06_02240A28: ; 0x02240A28 add r1, #0x38 ldrb r1, [r1] ldr r0, [r4, #0x34] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0 add r0, #0x34 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #8] bl ListMenuItems_dtor mov r0, #0 @@ -14810,7 +14810,7 @@ MOD06_02240B04: ; 0x02240B04 ldr r0, [r0, #8] mov r2, #3 mov r3, #0x16 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02240BB0 ; =0x000003D9 add r0, #0x44 @@ -14930,10 +14930,10 @@ _02240C1A: add r1, #0x48 ldrb r1, [r1] ldr r0, [r5, #0x44] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0 add r0, #0x44 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r5, #0xc] bl ListMenuItems_dtor mov r0, #0 @@ -14984,7 +14984,7 @@ MOD06_02240C58: ; 0x02240C58 ldr r0, [r0, #0x10] mov r3, #4 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x24] ldr r2, _02240F00 ; =0x000003D9 mov r1, #1 @@ -15286,10 +15286,10 @@ MOD06_02240F1C: ; 0x02240F1C add r1, #0x28 ldrb r1, [r1] ldr r0, [r4, #0x24] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r4, #0x24 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 @@ -19005,7 +19005,7 @@ MOD06_02242CDC: ; 0x02242CDC add r1, r4, #4 mov r2, #3 add r3, r6, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -19433,7 +19433,7 @@ MOD06_02243024: ; 0x02243024 bl FUN_0200D0E0 add r0, r6, #0 add r0, #0x14 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 add r0, #0x88 mov r1, #0 @@ -19444,7 +19444,7 @@ MOD06_02243024: ; 0x02243024 mov r1, #0 bl FUN_0200CCF8 add r0, r6, #4 - bl FUN_02019178 + bl RemoveWindow mov r4, #0 add r5, r6, #0 _02243060: @@ -27719,12 +27719,12 @@ MOD06_02246F0C: ; 0x02246F0C ldr r0, [r5, #0x60] mov r1, #0 ldr r0, [r0, #8] - bl FUN_02018884 + bl GetBgPriority strh r0, [r5, #0x24] ldr r0, [r5, #0x60] mov r1, #3 ldr r0, [r0, #8] - bl FUN_02018884 + bl GetBgPriority strh r0, [r5, #0x26] ldr r2, _02246FB4 ; =0x0400000A mov r1, #3 @@ -28496,7 +28496,7 @@ MOD06_02247544: ; 0x02247544 ldr r1, [r1, #0xc] mov r2, #0x20 lsl r3, r0, #7 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r4, #0 bl FreeToHeap pop {r3, r4, r5, pc} @@ -28521,7 +28521,7 @@ MOD06_0224756C: ; 0x0224756C ldr r3, [r3, #0x10] add r0, r5, #0 mov r1, #3 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r6, #0 bl FreeToHeap add sp, #4 @@ -28539,12 +28539,12 @@ MOD06_022475A4: ; 0x022475A4 mov r1, #3 add r3, r2, #0 add r5, r0, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r5, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r6, #0 add r1, r7, #0 mov r2, #4 @@ -28558,7 +28558,7 @@ MOD06_022475A4: ; 0x022475A4 ldr r3, [r3, #8] mov r1, #3 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData mov r0, #0x20 str r0, [sp] str r0, [sp, #4] @@ -28568,10 +28568,10 @@ MOD06_022475A4: ; 0x022475A4 add r0, r5, #0 mov r1, #3 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r5, #0 mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl FreeToHeap add sp, #0xc @@ -28579,11 +28579,11 @@ MOD06_022475A4: ; 0x022475A4 thumb_func_start MOD06_02247610 MOD06_02247610: ; 0x02247610 - ldr r3, _02247618 ; =FUN_02018744 + ldr r3, _02247618 ; =BgClearTilemapBufferAndCommit mov r1, #3 bx r3 nop -_02247618: .word FUN_02018744 +_02247618: .word BgClearTilemapBufferAndCommit thumb_func_start MOD06_0224761C MOD06_0224761C: ; 0x0224761C @@ -40876,7 +40876,7 @@ MOD06_0224D46C: ; 0x0224D46C add r0, r5, #0 add r1, r4, #0 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r3, #0xb @@ -41093,9 +41093,9 @@ MOD06_0224D6A4: ; 0x0224D6A4 mov r1, #1 bl FUN_0200CCF8 add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x10] bl DestroyMsgData ldr r0, [r4, #0x14] @@ -41381,7 +41381,7 @@ _0224D8DC: ldr r0, [r4, #0x14] mov r1, #3 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x61 lsl r0, r0, #2 add r0, r4, r0 @@ -41746,7 +41746,7 @@ MOD06_0224DBCC: ; 0x0224DBCC bl FUN_02002ED0 ldr r0, [r4, #0x14] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #8 pop {r4, pc} .align 2, 0 @@ -41756,7 +41756,7 @@ MOD06_0224DC28: ; 0x0224DC28 push {r3, lr} ldr r0, [r0, #0x14] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #1 bl FUN_02054590 @@ -41810,7 +41810,7 @@ MOD06_0224DC5C: ; 0x0224DC5C add r0, r4, #0 mov r2, #3 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5, #4] mov r1, #0xf bl FillWindowPixelBuffer @@ -41834,12 +41834,12 @@ MOD06_0224DCB4: ; 0x0224DCB4 cmp r0, #0 beq _0224DCD6 ldr r0, [r4, #4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r4, #4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #0 str r0, [r4] _0224DCD6: @@ -42055,7 +42055,7 @@ MOD06_0224DE60: ; 0x0224DE60 add r0, r4, #0 mov r2, #3 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x14] bl ScrStrBufs_new str r0, [r6, #8] @@ -42106,12 +42106,12 @@ _0224DEE6: ldr r0, [r6, #8] bl ScrStrBufs_delete ldr r0, [r6, #4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r6, #4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r6, #4] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #0 str r0, [r6] _0224DF18: @@ -42230,7 +42230,7 @@ _0224DFC0: add r0, r4, #0 mov r2, #3 mov r3, #0x11 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x14] bl ScrStrBufs_new mov r1, #0x49 @@ -42447,12 +42447,12 @@ _0224E1C0: add r2, r1, #0 bl DestroyListMenu ldr r0, [r6, #4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r6, #4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r6, #4] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #1 str r0, [r6] _0224E1E2: @@ -42780,10 +42780,10 @@ _0224E448: ldr r0, [r5, #4] mov r1, #3 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #4] mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, pc} |