diff options
author | YamaArashi <shadow962@live.com> | 2015-10-10 03:12:48 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2015-10-10 03:15:57 -0700 |
commit | 41013b2febb92f429e2063500f9af4b8b0afe17f (patch) | |
tree | 1641932c60120ae8caf987ae00ca4d7ca7b7d95d /asm/window.s | |
parent | c21b61688e86223b61792da0883de091dd01ca14 (diff) |
update for modified assembler
Diffstat (limited to 'asm/window.s')
-rw-r--r-- | asm/window.s | 746 |
1 files changed, 373 insertions, 373 deletions
diff --git a/asm/window.s b/asm/window.s index 657c5389c..a74b8d2c1 100644 --- a/asm/window.s +++ b/asm/window.s @@ -1,11 +1,11 @@ thumb_func_start nullsub_8 -nullsub_8: @ 80031BC +nullsub_8: ; 80031BC bx lr thumb_func_end nullsub_8 thumb_func_start Window_InitFromTemplates -@ int Window_InitFromTemplates(struct rbox_template *template) -Window_InitFromTemplates: @ 80031C0 +; int Window_InitFromTemplates(struct rbox_template *template) +Window_InitFromTemplates: ; 80031C0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -16,22 +16,22 @@ Window_InitFromTemplates: @ 80031C0 movs r0, 0 mov r8, r0 ldr r4, =0x03002f70 -_080031D4: +@080031D4: mov r1, r8 lsls r0, r1, 24 lsrs r0, 24 bl bg_get_tilemap cmp r0, 0 - beq _080031E4 + beq @080031E4 ldr r0, =nullsub_8 + 1 -_080031E4: +@080031E4: str r0, [r4] adds r4, 0x4 movs r2, 0x1 add r8, r2 mov r0, r8 cmp r0, 0x3 - ble _080031D4 + ble @080031D4 ldr r0, =gDummyWindowTemplate ldr r2, [r0] ldr r3, [r0, 0x4] @@ -39,7 +39,7 @@ _080031E4: movs r0, 0 movs r4, 0x1F mov r8, r4 -_08003200: +@08003200: str r2, [r1] str r3, [r1, 0x4] str r0, [r1, 0x8] @@ -49,24 +49,24 @@ _08003200: add r8, r4 mov r4, r8 cmp r4, 0 - bge _08003200 + bge @08003200 movs r0, 0 mov r8, r0 movs r1, 0 str r1, [sp] ldrb r7, [r5] cmp r7, 0xFF - bne _08003224 - b _0800335C -_08003224: + bne @08003224 + b @0800335C +@08003224: adds r6, r5, 0 movs r2, 0 str r2, [sp, 0x4] -_0800322A: +@0800322A: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _08003268 + bne @08003268 ldrb r1, [r6, 0x3] ldrb r0, [r6, 0x4] adds r2, r1, 0 @@ -80,13 +80,13 @@ _0800322A: negs r0, r0 ldr r4, [sp] cmp r4, r0 - bne _08003268 -_08003250: + bne @08003268 +@08003250: movs r0, 0 - b _08003364 + b @08003364 .align 2, 0 .pool -_08003268: +@08003268: ldr r0, =0x03002f70 mov r9, r0 lsls r0, r7, 2 @@ -95,7 +95,7 @@ _08003268: ldr r1, [r1] mov r10, r0 cmp r1, 0 - bne _080032CA + bne @080032CA adds r0, r7, 0 movs r1, 0x8 bl bg_get_field @@ -103,36 +103,36 @@ _08003268: lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq _080032CA + beq @080032CA adds r0, r5, 0 bl malloc_and_clear adds r4, r0, 0 cmp r4, 0 - bne _080032A8 + bne @080032A8 bl Window_FreeMemory - b _08003250 + b @08003250 .align 2, 0 .pool -_080032A8: +@080032A8: movs r1, 0 mov r3, r9 cmp r1, r5 - bge _080032BC + bge @080032BC movs r2, 0 -_080032B2: +@080032B2: adds r0, r4, r1 strb r2, [r0] adds r1, 0x1 cmp r1, r5 - blt _080032B2 -_080032BC: + blt @080032B2 +@080032BC: mov r1, r10 adds r0, r1, r3 str r4, [r0] adds r0, r7, 0 adds r1, r4, 0 bl bg_set_tilemap -_080032CA: +@080032CA: ldrb r1, [r6, 0x3] ldrb r0, [r6, 0x4] muls r0, r1 @@ -141,26 +141,26 @@ _080032CA: bl malloc_and_clear adds r4, r0, 0 cmp r4, 0 - bne _0800330C + bne @0800330C adds r0, r7, 0 bl GetNumActiveWindowsOnBg lsls r0, 24 cmp r0, 0 - bne _08003250 + bne @08003250 ldr r0, =0x03002f70 mov r2, r10 adds r5, r2, r0 ldr r1, [r5] ldr r0, =nullsub_8 + 1 cmp r1, r0 - beq _08003250 + beq @08003250 adds r0, r1, 0 bl free str r4, [r5] - b _08003250 + b @08003250 .align 2, 0 .pool -_0800330C: +@0800330C: ldr r1, =0x02020004 adds r0, r1, 0 adds r0, 0x8 @@ -175,7 +175,7 @@ _0800330C: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _08003342 + bne @08003342 mov r4, sp ldrh r4, [r4] strh r4, [r2, 0x6] @@ -187,7 +187,7 @@ _0800330C: ldr r1, [sp] movs r3, 0x1 bl do_nothing -_08003342: +@08003342: adds r6, 0x8 ldr r0, [sp, 0x4] adds r0, 0xC @@ -196,17 +196,17 @@ _08003342: add r8, r1 ldrb r7, [r6] cmp r7, 0xFF - beq _0800335C + beq @0800335C mov r2, r8 cmp r2, 0x1F - bgt _0800335C - b _0800322A -_0800335C: + bgt @0800335C + b @0800322A +@0800335C: ldr r1, =0x03002f60 movs r0, 0 strb r0, [r1] movs r0, 0x1 -_08003364: +@08003364: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -220,8 +220,8 @@ _08003364: thumb_func_end Window_InitFromTemplates thumb_func_start Window_AddFromTemplate -@ int Window_AddFromTemplate(struct rbox_template *template) -Window_AddFromTemplate: @ 8003380 +; int Window_AddFromTemplate(struct rbox_template *template) +Window_AddFromTemplate: ; 8003380 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -233,23 +233,23 @@ Window_AddFromTemplate: @ 8003380 ldr r1, =0x02020004 ldrb r0, [r1] cmp r0, 0xFF - beq _080033B0 -_08003398: + beq @080033B0 +@08003398: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x1F - bhi _080033B0 + bhi @080033B0 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _08003398 -_080033B0: + bne @08003398 +@080033B0: cmp r6, 0x20 - beq _0800346A + beq @0800346A mov r0, r8 ldrb r7, [r0] movs r1, 0 @@ -257,7 +257,7 @@ _080033B0: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _080033E2 + bne @080033E2 mov r2, r8 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -271,8 +271,8 @@ _080033B0: movs r0, 0x1 negs r0, r0 cmp r9, r0 - beq _0800346A -_080033E2: + beq @0800346A +@080033E2: ldr r3, =0x03002f70 mov r10, r3 lsls r0, r7, 2 @@ -280,7 +280,7 @@ _080033E2: ldr r1, [r1] str r0, [sp] cmp r1, 0 - bne _08003432 + bne @08003432 adds r0, r7, 0 movs r1, 0x8 bl bg_get_field @@ -288,31 +288,31 @@ _080033E2: lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq _08003432 + beq @08003432 adds r0, r5, 0 bl malloc_and_clear adds r4, r0, 0 cmp r4, 0 - beq _0800346A + beq @0800346A movs r1, 0 mov r3, r10 cmp r1, r5 - bge _08003424 + bge @08003424 movs r2, 0 -_0800341A: +@0800341A: adds r0, r4, r1 strb r2, [r0] adds r1, 0x1 cmp r1, r5 - blt _0800341A -_08003424: + blt @0800341A +@08003424: ldr r1, [sp] adds r0, r1, r3 str r4, [r0] adds r0, r7, 0 adds r1, r4, 0 bl bg_set_tilemap -_08003432: +@08003432: mov r2, r8 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -322,28 +322,28 @@ _08003432: bl malloc_and_clear adds r4, r0, 0 cmp r4, 0 - bne _08003484 + bne @08003484 adds r0, r7, 0 bl GetNumActiveWindowsOnBg lsls r0, 24 cmp r0, 0 - bne _0800346A + bne @0800346A ldr r0, =0x03002f70 ldr r3, [sp] adds r5, r3, r0 ldr r1, [r5] ldr r0, =nullsub_8 + 1 cmp r1, r0 - beq _0800346A + beq @0800346A adds r0, r1, 0 bl free str r4, [r5] -_0800346A: +@0800346A: movs r0, 0xFF - b _080034C0 + b @080034C0 .align 2, 0 .pool -_08003484: +@08003484: ldr r2, =0x02020004 lsls r1, r6, 1 adds r1, r6 @@ -361,7 +361,7 @@ _08003484: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _080034BE + bne @080034BE mov r0, r9 strh r0, [r2, 0x6] ldrb r0, [r2, 0x3] @@ -372,9 +372,9 @@ _08003484: mov r1, r9 movs r3, 0x1 bl do_nothing -_080034BE: +@080034BE: adds r0, r6, 0 -_080034C0: +@080034C0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -388,37 +388,37 @@ _080034C0: thumb_func_end Window_AddFromTemplate thumb_func_start Window_AddFromTemplateWithoutAllocatingMemory -@ int Window_AddFromTemplateWithoutAllocatingMemory(struct rbox_template *template) -Window_AddFromTemplateWithoutAllocatingMemory: @ 80034D8 +; int Window_AddFromTemplateWithoutAllocatingMemory(struct rbox_template *template) +Window_AddFromTemplateWithoutAllocatingMemory: ; 80034D8 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 ldr r1, =0x02020004 ldrb r0, [r1] cmp r0, 0xFF - beq _080034FE -_080034E6: + beq @080034FE +@080034E6: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1F - bhi _080034FE + bhi @080034FE lsls r0, r4, 1 adds r0, r4 lsls r0, 2 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _080034E6 -_080034FE: + bne @080034E6 +@080034FE: cmp r4, 0x20 - beq _08003528 + beq @08003528 ldrb r6, [r5] movs r3, 0 ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _08003534 + bne @08003534 ldrb r1, [r5, 0x3] ldrb r0, [r5, 0x4] adds r2, r1, 0 @@ -430,13 +430,13 @@ _080034FE: movs r0, 0x1 negs r0, r0 cmp r3, r0 - bne _08003534 -_08003528: + bne @08003534 +@08003528: movs r0, 0xFF - b _08003564 + b @08003564 .align 2, 0 .pool -_08003534: +@08003534: ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 @@ -449,7 +449,7 @@ _08003534: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _08003562 + bne @08003562 strh r3, [r2, 0x6] ldrb r0, [r2, 0x3] ldrb r1, [r2, 0x4] @@ -459,9 +459,9 @@ _08003534: adds r1, r3, 0 movs r3, 0x1 bl do_nothing -_08003562: +@08003562: adds r0, r4, 0 -_08003564: +@08003564: pop {r4-r6} pop {r1} bx r1 @@ -470,8 +470,8 @@ _08003564: thumb_func_end Window_AddFromTemplateWithoutAllocatingMemory thumb_func_start Window_Remove -@ int Window_Remove(int rbox_id) -Window_Remove: @ 8003574 +; int Window_Remove(int rbox_id) +Window_Remove: ; 8003574 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -485,7 +485,7 @@ Window_Remove: @ 8003574 ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _080035A0 + bne @080035A0 ldrh r1, [r4, 0x6] ldrb r2, [r4, 0x3] ldrb r0, [r4, 0x4] @@ -493,7 +493,7 @@ Window_Remove: @ 8003574 adds r0, r3, 0 movs r3, 0x2 bl do_nothing -_080035A0: +@080035A0: ldr r0, =gDummyWindowTemplate ldr r1, [r0, 0x4] ldr r0, [r0] @@ -504,18 +504,18 @@ _080035A0: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _080035CE + bne @080035CE ldr r0, =0x03002f70 lsls r1, r7, 2 adds r4, r1, r0 ldr r1, [r4] ldr r0, =nullsub_8 + 1 cmp r1, r0 - beq _080035CE + beq @080035CE adds r0, r1, 0 bl free str r5, [r4] -_080035CE: +@080035CE: ldr r1, =0x02020004 lsls r0, r6, 1 adds r0, r6 @@ -524,11 +524,11 @@ _080035CE: adds r4, r0, r1 ldr r0, [r4] cmp r0, 0 - beq _080035E8 + beq @080035E8 bl free movs r0, 0 str r0, [r4] -_080035E8: +@080035E8: pop {r4-r7} pop {r0} bx r0 @@ -537,43 +537,43 @@ _080035E8: thumb_func_end Window_Remove thumb_func_start Window_FreeMemory -@ void Window_FreeMemory() -Window_FreeMemory: @ 8003604 +; void Window_FreeMemory() +Window_FreeMemory: ; 8003604 push {r4-r6,lr} ldr r4, =0x03002f70 movs r5, 0x3 -_0800360A: +@0800360A: ldr r1, [r4] cmp r1, 0 - beq _08003620 + beq @08003620 ldr r0, =nullsub_8 + 1 cmp r1, r0 - beq _08003620 + beq @08003620 adds r0, r1, 0 bl free movs r0, 0 str r0, [r4] -_08003620: +@08003620: adds r4, 0x4 subs r5, 0x1 cmp r5, 0 - bge _0800360A + bge @0800360A ldr r0, =0x02020004 adds r4, r0, 0 adds r4, 0x8 movs r6, 0 movs r5, 0x1F -_08003632: +@08003632: ldr r0, [r4] cmp r0, 0 - beq _0800363E + beq @0800363E bl free str r6, [r4] -_0800363E: +@0800363E: adds r4, 0xC subs r5, 0x1 cmp r5, 0 - bge _08003632 + bge @08003632 pop {r4-r6} pop {r0} bx r0 @@ -582,8 +582,8 @@ _0800363E: thumb_func_end Window_FreeMemory thumb_func_start Window_CopyToVram -@ void Window_CopyToVram(u8 rbox_id, u8 mode) -Window_CopyToVram: @ 8003658 +; void Window_CopyToVram(u8 rbox_id, u8 mode) +Window_CopyToVram: ; 8003658 push {r4-r6,lr} sub sp, 0xC lsls r0, 24 @@ -606,24 +606,24 @@ Window_CopyToVram: @ 8003658 lsls r0, 21 lsrs r4, r0, 16 cmp r3, 0x2 - beq _080036A4 + beq @080036A4 cmp r3, 0x2 - bgt _08003694 + bgt @08003694 cmp r3, 0x1 - beq _0800369A - b _080036CE + beq @0800369A + b @080036CE .align 2, 0 .pool -_08003694: +@08003694: cmp r5, 0x3 - beq _080036B6 - b _080036CE -_0800369A: + beq @080036B6 + b @080036CE +@0800369A: mov r0, sp ldrb r0, [r0] bl gpu_copy_wram_bg_tilemap_to_vram - b _080036CE -_080036A4: + b @080036CE +@080036A4: mov r0, sp ldrb r0, [r0] ldr r1, [sp, 0x8] @@ -631,8 +631,8 @@ _080036A4: ldrh r3, [r2, 0x6] adds r2, r4, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - b _080036CE -_080036B6: + b @080036CE +@080036B6: mov r0, sp ldrb r0, [r0] ldr r1, [sp, 0x8] @@ -643,7 +643,7 @@ _080036B6: mov r0, sp ldrb r0, [r0] bl gpu_copy_wram_bg_tilemap_to_vram -_080036CE: +@080036CE: add sp, 0xC pop {r4-r6} pop {r0} @@ -651,8 +651,8 @@ _080036CE: thumb_func_end Window_CopyToVram thumb_func_start Window_CopyRectToVram -@ void Window_CopyRectToVram(int rbox_id, int mode, int x, int y, int w, int h) -Window_CopyRectToVram: @ 80036D8 +; void Window_CopyRectToVram(int rbox_id, int mode, int x, int y, int w, int h) +Window_CopyRectToVram: ; 80036D8 push {r4-r7,lr} sub sp, 0xC adds r6, r0, 0 @@ -662,9 +662,9 @@ Window_CopyRectToVram: @ 80036D8 ldr r3, [sp, 0x24] ldr r0, [sp, 0x20] cmp r0, 0 - beq _08003782 + beq @08003782 cmp r3, 0 - beq _08003782 + beq @08003782 ldr r2, =0x02020004 lsls r0, r6, 1 adds r0, r6 @@ -689,24 +689,24 @@ Window_CopyRectToVram: @ 80036D8 muls r0, r1 adds r4, r0, r4 cmp r5, 0x2 - beq _08003740 + beq @08003740 cmp r5, 0x2 - bhi _08003730 + bhi @08003730 cmp r5, 0x1 - beq _08003736 - b _08003782 + beq @08003736 + b @08003782 .align 2, 0 .pool -_08003730: +@08003730: cmp r5, 0x3 - beq _0800375E - b _08003782 -_08003736: + beq @0800375E + b @08003782 +@08003736: mov r0, sp ldrb r0, [r0] bl gpu_copy_wram_bg_tilemap_to_vram - b _08003782 -_08003740: + b @08003782 +@08003740: mov r0, sp ldrb r0, [r0] lsls r2, r4, 5 @@ -720,8 +720,8 @@ _08003740: lsls r3, 16 lsrs r3, 16 bl gpu_copy_bg_tile_pattern_data_to_vram - b _08003782 -_0800375E: + b @08003782 +@0800375E: mov r0, sp ldrb r0, [r0] lsls r2, r4, 5 @@ -738,7 +738,7 @@ _0800375E: mov r0, sp ldrb r0, [r0] bl gpu_copy_wram_bg_tilemap_to_vram -_08003782: +@08003782: add sp, 0xC pop {r4-r7} pop {r0} @@ -746,8 +746,8 @@ _08003782: thumb_func_end Window_CopyRectToVram thumb_func_start Window_WriteStandardTileMap -@ void Window_WriteStandardTileMap(int rbox_id) -Window_WriteStandardTileMap: @ 800378C +; void Window_WriteStandardTileMap(int rbox_id) +Window_WriteStandardTileMap: ; 800378C push {r4,lr} sub sp, 0x1C lsls r0, 24 @@ -797,8 +797,8 @@ Window_WriteStandardTileMap: @ 800378C thumb_func_end Window_WriteStandardTileMap thumb_func_start Window_WriteStandardTileMapRectOverridePalette -@ void Window_WriteStandardTileMapRectOverridePalette(u8 rbox_id, u8 x, u8 y, u8 w, u8 h, u8 palette) -Window_WriteStandardTileMapRectOverridePalette: @ 80037EC +; void Window_WriteStandardTileMapRectOverridePalette(u8 rbox_id, u8 x, u8 y, u8 w, u8 h, u8 palette) +Window_WriteStandardTileMapRectOverridePalette: ; 80037EC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -850,10 +850,10 @@ Window_WriteStandardTileMapRectOverridePalette: @ 80037EC lsrs r6, r0, 16 movs r5, 0 cmp r5, r8 - bge _0800388E + bge @0800388E add r4, sp, 0x10 movs r7, 0x1 -_0800385A: +@0800385A: ldrb r0, [r4] ldrb r2, [r4, 0x1] add r2, r10 @@ -878,8 +878,8 @@ _0800385A: lsrs r6, r0, 16 adds r5, 0x1 cmp r5, r8 - blt _0800385A -_0800388E: + blt @0800385A +@0800388E: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -893,8 +893,8 @@ _0800388E: thumb_func_end Window_WriteStandardTileMapRectOverridePalette thumb_func_start Window_FillTileMap -@ void Window_FillTileMap(int rbox_id) -Window_FillTileMap: @ 80038A4 +; void Window_FillTileMap(int rbox_id) +Window_FillTileMap: ; 80038A4 push {r4,lr} sub sp, 0x18 lsls r0, 24 @@ -934,8 +934,8 @@ Window_FillTileMap: @ 80038A4 thumb_func_end Window_FillTileMap thumb_func_start Window_WriteStandardTileMapRect -@ void Window_WriteStandardTileMapRect(u8 rbox_id, u8 x, u8 y, u8 w, u8 h) -Window_WriteStandardTileMapRect: @ 80038F4 +; void Window_WriteStandardTileMapRect(u8 rbox_id, u8 x, u8 y, u8 w, u8 h) +Window_WriteStandardTileMapRect: ; 80038F4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -983,10 +983,10 @@ Window_WriteStandardTileMapRect: @ 80038F4 lsrs r6, r0, 16 movs r5, 0 cmp r5, r8 - bge _0800398E + bge @0800398E add r4, sp, 0x10 movs r7, 0x1 -_0800395A: +@0800395A: ldrb r0, [r4] ldrb r2, [r4, 0x1] add r2, r10 @@ -1011,8 +1011,8 @@ _0800395A: lsrs r6, r0, 16 adds r5, 0x1 cmp r5, r8 - blt _0800395A -_0800398E: + blt @0800395A +@0800398E: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -1026,8 +1026,8 @@ _0800398E: thumb_func_end Window_WriteStandardTileMapRect thumb_func_start Window_CopyWholePixelBlockToWindow -@ void Window_CopyWholePixelBlockToWindow(u8 rbox_id, int a2, u16 x, u16 y, u16 w, u16 h) -Window_CopyWholePixelBlockToWindow: @ 80039A4 +; void Window_CopyWholePixelBlockToWindow(u8 rbox_id, int a2, u16 x, u16 y, u16 w, u16 h) +Window_CopyWholePixelBlockToWindow: ; 80039A4 push {r4,r5,lr} sub sp, 0x18 ldr r4, [sp, 0x24] @@ -1058,8 +1058,8 @@ Window_CopyWholePixelBlockToWindow: @ 80039A4 thumb_func_end Window_CopyWholePixelBlockToWindow thumb_func_start Window_CopyPixelRectToWindow -@ void Window_CopyPixelRectToWindow(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h) -Window_CopyPixelRectToWindow: @ 80039DC +; void Window_CopyPixelRectToWindow(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h) +Window_CopyPixelRectToWindow: ; 80039DC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1153,8 +1153,8 @@ Window_CopyPixelRectToWindow: @ 80039DC thumb_func_end Window_CopyPixelRectToWindow thumb_func_start Window_copy_pixels_rect_3 -@ void Window_copy_pixels_rect_3(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11) -Window_copy_pixels_rect_3: @ 8003A9C +; void Window_copy_pixels_rect_3(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11) +Window_copy_pixels_rect_3: ; 8003A9C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1252,8 +1252,8 @@ Window_copy_pixels_rect_3: @ 8003A9C thumb_func_end Window_copy_pixels_rect_3 thumb_func_start Window_FillPixelRect -@ void Window_FillPixelRect(u8 rbox_id, char fill_value, u16 x, u16 y, u16 w, u16 h) -Window_FillPixelRect: @ 8003B64 +; void Window_FillPixelRect(u8 rbox_id, char fill_value, u16 x, u16 y, u16 w, u16 h) +Window_FillPixelRect: ; 8003B64 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -1321,7 +1321,7 @@ Window_FillPixelRect: @ 8003B64 thumb_func_end Window_FillPixelRect thumb_func_start Window_CopyToPixels -Window_CopyToPixels: @ 8003BF0 +Window_CopyToPixels: ; 8003BF0 push {r4-r6,lr} adds r6, r1, 0 lsls r0, 24 @@ -1330,7 +1330,7 @@ Window_CopyToPixels: @ 8003BF0 lsls r3, 16 lsrs r2, r3, 16 cmp r5, 0 - beq _08003C24 + beq @08003C24 ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 @@ -1343,10 +1343,10 @@ Window_CopyToPixels: @ 8003BF0 lsrs r2, r5, 17 adds r0, r6, 0 bl CpuSet - b _08003C3C + b @08003C3C .align 2, 0 .pool -_08003C24: +@08003C24: ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 @@ -1358,7 +1358,7 @@ _08003C24: adds r1, r2 adds r0, r6, 0 bl LZ77UnCompWram -_08003C3C: +@08003C3C: pop {r4-r6} pop {r0} bx r0 @@ -1367,8 +1367,8 @@ _08003C3C: thumb_func_end Window_CopyToPixels thumb_func_start Window_FastFillPixels -@ void Window_FastFillPixels(u8 rbox_id, int value) -Window_FastFillPixels: @ 8003C48 +; void Window_FastFillPixels(u8 rbox_id, int value) +Window_FastFillPixels: ; 8003C48 push {r4,r5,lr} sub sp, 0x4 lsls r0, 24 @@ -1408,8 +1408,8 @@ Window_FastFillPixels: @ 8003C48 thumb_func_end Window_FastFillPixels thumb_func_start Window_ScrollVertically -@ int Window_ScrollVertically(u8 a1, u8 mode, u8 a3, int a4) -Window_ScrollVertically: @ 8003C94 +; int Window_ScrollVertically(u8 a1, u8 mode, u8 a3, int a4) +Window_ScrollVertically: ; 8003C94 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1450,29 +1450,29 @@ Window_ScrollVertically: @ 8003C94 mov r12, r1 mov r0, r8 cmp r0, 0x1 - bne _08003CE8 - b _08003E9E -_08003CE8: + bne @08003CE8 + b @08003E9E +@08003CE8: cmp r0, 0x1 - ble _08003CEE - b _08004046 -_08003CEE: + ble @08003CEE + b @08004046 +@08003CEE: cmp r0, 0 - beq _08003CF4 - b _08004046 -_08003CF4: + beq @08003CF4 + b @08004046 +@08003CF4: movs r4, 0 cmp r4, r6 - blt _08003CFC - b _08004046 -_08003CFC: + blt @08003CFC + b @08004046 +@08003CFC: movs r1, 0x8 negs r1, r1 mov r9, r1 movs r2, 0x7 mov r8, r2 mov r10, r5 -_08003D08: +@08003D08: ldr r3, [sp] adds r0, r3, 0 mov r1, r9 @@ -1486,18 +1486,18 @@ _08003D08: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003D34 + bge @08003D34 adds r0, r5, r1 ldr r0, [r0] mov r1, r10 str r0, [r1] - b _08003D38 + b @08003D38 .align 2, 0 .pool -_08003D34: +@08003D34: mov r2, r10 str r7, [r2] -_08003D38: +@08003D38: adds r3, 0x1 adds r2, r4, 0x4 adds r0, r3, 0 @@ -1514,16 +1514,16 @@ _08003D38: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003D64 + bge @08003D64 adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003D68 -_08003D64: + b @08003D68 +@08003D64: adds r0, r5, r2 str r7, [r0] -_08003D68: +@08003D68: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x8 @@ -1541,16 +1541,16 @@ _08003D68: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003D96 + bge @08003D96 adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003D9A -_08003D96: + b @08003D9A +@08003D96: adds r0, r5, r2 str r7, [r0] -_08003D9A: +@08003D9A: adds r3, 0x1 adds r2, r4, 0 adds r2, 0xC @@ -1568,16 +1568,16 @@ _08003D9A: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003DC8 + bge @08003DC8 adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003DCC -_08003DC8: + b @08003DCC +@08003DC8: adds r0, r5, r2 str r7, [r0] -_08003DCC: +@08003DCC: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x10 @@ -1595,16 +1595,16 @@ _08003DCC: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003DFA + bge @08003DFA adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003DFE -_08003DFA: + b @08003DFE +@08003DFA: adds r0, r5, r2 str r7, [r0] -_08003DFE: +@08003DFE: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x14 @@ -1622,16 +1622,16 @@ _08003DFE: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003E2C + bge @08003E2C adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003E30 -_08003E2C: + b @08003E30 +@08003E2C: adds r0, r5, r2 str r7, [r0] -_08003E30: +@08003E30: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x18 @@ -1649,16 +1649,16 @@ _08003E30: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003E5E + bge @08003E5E adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003E62 -_08003E5E: + b @08003E62 +@08003E5E: adds r0, r5, r2 str r7, [r0] -_08003E62: +@08003E62: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x1C @@ -1674,39 +1674,39 @@ _08003E62: lsls r0, 2 adds r1, r4, r0 cmp r1, r6 - bge _08003E8C + bge @08003E8C adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003E90 -_08003E8C: + b @08003E90 +@08003E8C: adds r0, r5, r2 str r7, [r0] -_08003E90: +@08003E90: movs r2, 0x20 add r10, r2 adds r4, 0x20 cmp r4, r6 - bge _08003E9C - b _08003D08 -_08003E9C: - b _08004046 -_08003E9E: + bge @08003E9C + b @08003D08 +@08003E9C: + b @08004046 +@08003E9E: subs r0, r6, 0x4 adds r5, r0 movs r4, 0 cmp r4, r6 - blt _08003EAA - b _08004046 -_08003EAA: + blt @08003EAA + b @08004046 +@08003EAA: movs r0, 0x8 negs r0, r0 mov r9, r0 movs r1, 0x7 mov r8, r1 mov r10, r5 -_08003EB6: +@08003EB6: ldr r3, [sp] adds r0, r3, 0 mov r2, r9 @@ -1720,16 +1720,16 @@ _08003EB6: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003EDC + bge @08003EDC subs r0, r5, r1 ldr r0, [r0] mov r1, r10 str r0, [r1] - b _08003EE0 -_08003EDC: + b @08003EE0 +@08003EDC: mov r2, r10 str r7, [r2] -_08003EE0: +@08003EE0: adds r3, 0x1 adds r2, r4, 0x4 adds r0, r3, 0 @@ -1746,16 +1746,16 @@ _08003EE0: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003F0C + bge @08003F0C subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003F10 -_08003F0C: + b @08003F10 +@08003F0C: subs r0, r5, r2 str r7, [r0] -_08003F10: +@08003F10: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x8 @@ -1773,16 +1773,16 @@ _08003F10: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003F3E + bge @08003F3E subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003F42 -_08003F3E: + b @08003F42 +@08003F3E: subs r0, r5, r2 str r7, [r0] -_08003F42: +@08003F42: adds r3, 0x1 adds r2, r4, 0 adds r2, 0xC @@ -1800,16 +1800,16 @@ _08003F42: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003F70 + bge @08003F70 subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003F74 -_08003F70: + b @08003F74 +@08003F70: subs r0, r5, r2 str r7, [r0] -_08003F74: +@08003F74: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x10 @@ -1827,16 +1827,16 @@ _08003F74: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003FA2 + bge @08003FA2 subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003FA6 -_08003FA2: + b @08003FA6 +@08003FA2: subs r0, r5, r2 str r7, [r0] -_08003FA6: +@08003FA6: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x14 @@ -1854,16 +1854,16 @@ _08003FA6: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003FD4 + bge @08003FD4 subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003FD8 -_08003FD4: + b @08003FD8 +@08003FD4: subs r0, r5, r2 str r7, [r0] -_08003FD8: +@08003FD8: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x18 @@ -1881,16 +1881,16 @@ _08003FD8: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08004006 + bge @08004006 subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _0800400A -_08004006: + b @0800400A +@08004006: subs r0, r5, r2 str r7, [r0] -_0800400A: +@0800400A: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x1C @@ -1906,24 +1906,24 @@ _0800400A: lsls r0, 2 adds r1, r4, r0 cmp r1, r6 - bge _08004034 + bge @08004034 subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08004038 -_08004034: + b @08004038 +@08004034: subs r0, r5, r2 str r7, [r0] -_08004038: +@08004038: movs r2, 0x20 negs r2, r2 add r10, r2 adds r4, 0x20 cmp r4, r6 - bge _08004046 - b _08003EB6 -_08004046: + bge @08004046 + b @08003EB6 +@08004046: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -1935,8 +1935,8 @@ _08004046: thumb_func_end Window_ScrollVertically thumb_func_start CallWindowFunction -@ void CallWindowFunction(u8 windowId, void ( *functionPointer)(s8, s8, s8, s8)) -CallWindowFunction: @ 8004058 +; void CallWindowFunction(u8 windowId, void ( *functionPointer)(s8, s8, s8, s8)) +CallWindowFunction: ; 8004058 push {r4-r6,lr} mov r6, r8 push {r6} @@ -1978,32 +1978,32 @@ CallWindowFunction: @ 8004058 thumb_func_end CallWindowFunction thumb_func_start Window_SetField -Window_SetField: @ 80040A8 +Window_SetField: ; 80040A8 push {lr} lsls r0, 24 lsrs r3, r0, 24 lsls r1, 24 lsrs r0, r1, 24 cmp r0, 0x7 - bhi _08004142 + bhi @08004142 lsls r0, 2 - ldr r1, =_080040C4 + ldr r1, =@080040C4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080040C4: - .4byte _08004142 - .4byte _080040E4 - .4byte _080040F8 - .4byte _08004142 - .4byte _08004142 - .4byte _0800410C - .4byte _08004120 - .4byte _08004134 -_080040E4: +@080040C4: + .4byte @08004142 + .4byte @080040E4 + .4byte @080040F8 + .4byte @08004142 + .4byte @08004142 + .4byte @0800410C + .4byte @08004120 + .4byte @08004134 +@080040E4: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2011,10 +2011,10 @@ _080040E4: adds r0, r1 strb r2, [r0, 0x1] movs r0, 0 - b _08004144 + b @08004144 .align 2, 0 .pool -_080040F8: +@080040F8: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2022,10 +2022,10 @@ _080040F8: adds r0, r1 strb r2, [r0, 0x2] movs r0, 0 - b _08004144 + b @08004144 .align 2, 0 .pool -_0800410C: +@0800410C: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2033,10 +2033,10 @@ _0800410C: adds r0, r1 strb r2, [r0, 0x5] movs r0, 0 - b _08004144 + b @08004144 .align 2, 0 .pool -_08004120: +@08004120: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2044,10 +2044,10 @@ _08004120: adds r0, r1 strh r2, [r0, 0x6] movs r0, 0 - b _08004144 + b @08004144 .align 2, 0 .pool -_08004134: +@08004134: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2055,9 +2055,9 @@ _08004134: adds r1, 0x8 adds r0, r1 str r2, [r0] -_08004142: +@08004142: movs r0, 0x1 -_08004144: +@08004144: pop {r1} bx r1 .align 2, 0 @@ -2065,102 +2065,102 @@ _08004144: thumb_func_end Window_SetField thumb_func_start Window_GetField -Window_GetField: @ 800414C +Window_GetField: ; 800414C push {lr} lsls r0, 24 lsrs r2, r0, 24 lsls r1, 24 lsrs r0, r1, 24 cmp r0, 0x7 - bhi _08004228 + bhi @08004228 lsls r0, 2 - ldr r1, =_08004168 + ldr r1, =@08004168 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08004168: - .4byte _08004188 - .4byte _0800419C - .4byte _080041B0 - .4byte _080041C4 - .4byte _080041D8 - .4byte _080041EC - .4byte _08004200 - .4byte _08004214 -_08004188: +@08004168: + .4byte @08004188 + .4byte @0800419C + .4byte @080041B0 + .4byte @080041C4 + .4byte @080041D8 + .4byte @080041EC + .4byte @08004200 + .4byte @08004214 +@08004188: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1] - b _0800422A + b @0800422A .align 2, 0 .pool -_0800419C: +@0800419C: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x1] - b _0800422A + b @0800422A .align 2, 0 .pool -_080041B0: +@080041B0: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x2] - b _0800422A + b @0800422A .align 2, 0 .pool -_080041C4: +@080041C4: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x3] - b _0800422A + b @0800422A .align 2, 0 .pool -_080041D8: +@080041D8: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x4] - b _0800422A + b @0800422A .align 2, 0 .pool -_080041EC: +@080041EC: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x5] - b _0800422A + b @0800422A .align 2, 0 .pool -_08004200: +@08004200: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrh r0, [r1, 0x6] - b _0800422A + b @0800422A .align 2, 0 .pool -_08004214: +@08004214: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 @@ -2168,37 +2168,37 @@ _08004214: adds r0, 0x8 adds r1, r0 ldr r0, [r1] - b _0800422A + b @0800422A .align 2, 0 .pool -_08004228: +@08004228: movs r0, 0 -_0800422A: +@0800422A: pop {r1} bx r1 thumb_func_end Window_GetField thumb_func_start GetNumActiveWindowsOnBg -@ int GetNumActiveWindowsOnBg(int bg_id) -GetNumActiveWindowsOnBg: @ 8004230 +; int GetNumActiveWindowsOnBg(int bg_id) +GetNumActiveWindowsOnBg: ; 8004230 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 movs r3, 0 ldr r2, =0x02020004 movs r1, 0x1F -_0800423C: +@0800423C: ldrb r0, [r2] cmp r0, r4 - bne _08004248 + bne @08004248 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_08004248: +@08004248: adds r2, 0xC subs r1, 0x1 cmp r1, 0 - bge _0800423C + bge @0800423C adds r0, r3, 0 pop {r4} pop {r1} @@ -2208,13 +2208,13 @@ _08004248: thumb_func_end GetNumActiveWindowsOnBg thumb_func_start nullsub_9 -nullsub_9: @ 800425C +nullsub_9: ; 800425C bx lr thumb_func_end nullsub_9 thumb_func_start Window_AddFromTemplate8Bpp -@ int Window_AddFromTemplate8Bpp(struct rbox_template *template) -Window_AddFromTemplate8Bpp: @ 8004260 +; int Window_AddFromTemplate8Bpp(struct rbox_template *template) +Window_AddFromTemplate8Bpp: ; 8004260 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2225,23 +2225,23 @@ Window_AddFromTemplate8Bpp: @ 8004260 ldr r1, =0x02020004 ldrb r0, [r1] cmp r0, 0xFF - beq _0800428E -_08004276: + beq @0800428E +@08004276: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x1F - bhi _0800428E + bhi @0800428E lsls r0, r6, 1 adds r0, r6 lsls r0, 2 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _08004276 -_0800428E: + bne @08004276 +@0800428E: cmp r6, 0x20 - beq _08004322 + beq @08004322 mov r0, r9 ldrb r7, [r0] ldr r1, =0x03002f70 @@ -2252,7 +2252,7 @@ _0800428E: add r0, r10 ldr r0, [r0] cmp r0, 0 - bne _080042EA + bne @080042EA adds r0, r7, 0 movs r1, 0x8 bl bg_get_field @@ -2260,32 +2260,32 @@ _0800428E: lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq _080042EA + beq @080042EA adds r0, r5, 0 bl malloc adds r4, r0, 0 cmp r4, 0 - beq _08004322 + beq @08004322 movs r1, 0 mov r12, r10 mov r3, r8 cmp r1, r5 - bge _080042DC + bge @080042DC movs r2, 0 -_080042D2: +@080042D2: adds r0, r4, r1 strb r2, [r0] adds r1, 0x1 cmp r1, r5 - blt _080042D2 -_080042DC: + blt @080042D2 +@080042DC: mov r1, r12 adds r0, r3, r1 str r4, [r0] adds r0, r7, 0 adds r1, r4, 0 bl bg_set_tilemap -_080042EA: +@080042EA: mov r2, r9 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -2295,28 +2295,28 @@ _080042EA: bl malloc adds r4, r0, 0 cmp r4, 0 - bne _08004338 + bne @08004338 adds r0, r7, 0 bl GetNumActiveWindowsOnBgDuplicate lsls r0, 24 cmp r0, 0 - bne _08004322 + bne @08004322 ldr r0, =0x03002f70 lsls r1, r7, 2 adds r5, r1, r0 ldr r1, [r5] ldr r0, =nullsub_9 + 1 cmp r1, r0 - beq _08004322 + beq @08004322 adds r0, r1, 0 bl free str r4, [r5] -_08004322: +@08004322: movs r0, 0xFF - b _08004356 + b @08004356 .align 2, 0 .pool -_08004338: +@08004338: ldr r1, =0x02020004 lsls r2, r6, 1 adds r2, r6 @@ -2332,7 +2332,7 @@ _08004338: str r0, [r2] str r1, [r2, 0x4] adds r0, r6, 0 -_08004356: +@08004356: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -2345,8 +2345,8 @@ _08004356: thumb_func_end Window_AddFromTemplate8Bpp thumb_func_start Window_FillPixels8Bpp -@ void Window_FillPixels8Bpp(u8 rbox_id, char value) -Window_FillPixels8Bpp: @ 8004368 +; void Window_FillPixels8Bpp(u8 rbox_id, char value) +Window_FillPixels8Bpp: ; 8004368 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -2364,18 +2364,18 @@ Window_FillPixels8Bpp: @ 8004368 lsrs r3, r0, 16 movs r2, 0 cmp r2, r3 - bge _0800439E + bge @0800439E adds r0, r6, 0 adds r0, 0x8 adds r1, r4, r0 -_08004392: +@08004392: ldr r0, [r1] adds r0, r2 strb r5, [r0] adds r2, 0x1 cmp r2, r3 - blt _08004392 -_0800439E: + blt @08004392 +@0800439E: pop {r4-r6} pop {r0} bx r0 @@ -2384,8 +2384,8 @@ _0800439E: thumb_func_end Window_FillPixels8Bpp thumb_func_start Window_FillPixelRect8Bpp -@ void Window_FillPixelRect8Bpp(u8 a1, char fill_value, u16 x, u16 y, u16 w, u16 h) -Window_FillPixelRect8Bpp: @ 80043A8 +; void Window_FillPixelRect8Bpp(u8 a1, char fill_value, u16 x, u16 y, u16 w, u16 h) +Window_FillPixelRect8Bpp: ; 80043A8 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -2453,8 +2453,8 @@ Window_FillPixelRect8Bpp: @ 80043A8 thumb_func_end Window_FillPixelRect8Bpp thumb_func_start Window_CopyPixelRectToWindow4BppTo8Bpp -@ void Window_CopyPixelRectToWindow4BppTo8Bpp(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11) -Window_CopyPixelRectToWindow4BppTo8Bpp: @ 8004434 +; void Window_CopyPixelRectToWindow4BppTo8Bpp(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11) +Window_CopyPixelRectToWindow4BppTo8Bpp: ; 8004434 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2554,7 +2554,7 @@ Window_CopyPixelRectToWindow4BppTo8Bpp: @ 8004434 thumb_func_end Window_CopyPixelRectToWindow4BppTo8Bpp thumb_func_start Window_CopyToVram8Bpp -Window_CopyToVram8Bpp: @ 8004500 +Window_CopyToVram8Bpp: ; 8004500 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -2575,30 +2575,30 @@ Window_CopyToVram8Bpp: @ 8004500 lsls r0, 6 strh r0, [r4] cmp r2, 0x2 - beq _0800454E + beq @0800454E cmp r2, 0x2 - bgt _08004540 + bgt @08004540 cmp r2, 0x1 - beq _08004546 - b _08004570 + beq @08004546 + b @08004570 .align 2, 0 .pool -_08004540: +@08004540: cmp r5, 0x3 - beq _0800455C - b _08004570 -_08004546: + beq @0800455C + b @08004570 +@08004546: ldrb r0, [r3] bl gpu_copy_wram_bg_tilemap_to_vram - b _08004570 -_0800454E: + b @08004570 +@0800454E: ldrb r0, [r3] ldr r1, [r3, 0x8] ldrh r2, [r4] ldrh r3, [r3, 0x6] bl gpu_copy_bg_tile_pattern_data_to_vram - b _08004570 -_0800455C: + b @08004570 +@0800455C: ldrb r0, [r3] ldr r1, [r3, 0x8] ldrh r2, [r4] @@ -2607,33 +2607,33 @@ _0800455C: ldr r0, [r6] ldrb r0, [r0] bl gpu_copy_wram_bg_tilemap_to_vram -_08004570: +@08004570: pop {r4-r6} pop {r0} bx r0 thumb_func_end Window_CopyToVram8Bpp thumb_func_start GetNumActiveWindowsOnBgDuplicate -@ int GetNumActiveWindowsOnBgDuplicate(int bg_id) -GetNumActiveWindowsOnBgDuplicate: @ 8004578 +; int GetNumActiveWindowsOnBgDuplicate(int bg_id) +GetNumActiveWindowsOnBgDuplicate: ; 8004578 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 movs r3, 0 ldr r2, =0x02020004 movs r1, 0x1F -_08004584: +@08004584: ldrb r0, [r2] cmp r0, r4 - bne _08004590 + bne @08004590 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_08004590: +@08004590: adds r2, 0xC subs r1, 0x1 cmp r1, 0 - bge _08004584 + bge @08004584 adds r0, r3, 0 pop {r4} pop {r1} |