diff options
Diffstat (limited to 'asm/window.s')
| -rw-r--r-- | asm/window.s | 638 |
1 files changed, 319 insertions, 319 deletions
diff --git a/asm/window.s b/asm/window.s index 08c4db43c..1819ab1ac 100644 --- a/asm/window.s +++ b/asm/window.s @@ -16,22 +16,22 @@ InitWindows: ; 80031C0 movs r0, 0 mov r8, r0 ldr r4, =0x03002f70 -@080031D4: +_080031D4: mov r1, r8 lsls r0, r1, 24 lsrs r0, 24 bl GetBgTilemap cmp r0, 0 - beq @080031E4 + beq _080031E4 ldr r0, =nullsub_8 -@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 @@ InitWindows: ; 80031C0 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 @@ InitWindows: ; 80031C0 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,12 +80,12 @@ InitWindows: ; 80031C0 negs r0, r0 ldr r4, [sp] cmp r4, r0 - bne @08003268 -@08003250: + bne _08003268 +_08003250: movs r0, 0 - b @08003364 + b _08003364 .pool -@08003268: +_08003268: ldr r0, =0x03002f70 mov r9, r0 lsls r0, r7, 2 @@ -94,7 +94,7 @@ InitWindows: ; 80031C0 ldr r1, [r1] mov r10, r0 cmp r1, 0 - bne @080032CA + bne _080032CA adds r0, r7, 0 movs r1, 0x8 bl GetBgAttribute @@ -102,35 +102,35 @@ InitWindows: ; 80031C0 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq @080032CA + beq _080032CA adds r0, r5, 0 bl AllocZeroed adds r4, r0, 0 cmp r4, 0 - bne @080032A8 + bne _080032A8 bl FreeAllWindowBuffers - b @08003250 + b _08003250 .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 SetBgTilemap -@080032CA: +_080032CA: ldrb r1, [r6, 0x3] ldrb r0, [r6, 0x4] muls r0, r1 @@ -139,25 +139,25 @@ InitWindows: ; 80031C0 bl AllocZeroed 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 cmp r1, r0 - beq @08003250 + beq _08003250 adds r0, r1, 0 bl Free str r4, [r5] - b @08003250 + b _08003250 .pool -@0800330C: +_0800330C: ldr r1, =0x02020004 adds r0, r1, 0 adds r0, 0x8 @@ -172,7 +172,7 @@ InitWindows: ; 80031C0 ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne @08003342 + bne _08003342 mov r4, sp ldrh r4, [r4] strh r4, [r2, 0x6] @@ -184,7 +184,7 @@ InitWindows: ; 80031C0 ldr r1, [sp] movs r3, 0x1 bl DummiedOutFireRedLeafGreenTileAllocFunc -@08003342: +_08003342: adds r6, 0x8 ldr r0, [sp, 0x4] adds r0, 0xC @@ -193,17 +193,17 @@ InitWindows: ; 80031C0 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 @@ -229,23 +229,23 @@ AddWindow: ; 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 @@ -253,7 +253,7 @@ AddWindow: ; 8003380 ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne @080033E2 + bne _080033E2 mov r2, r8 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -267,8 +267,8 @@ AddWindow: ; 8003380 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 @@ -276,7 +276,7 @@ AddWindow: ; 8003380 ldr r1, [r1] str r0, [sp] cmp r1, 0 - bne @08003432 + bne _08003432 adds r0, r7, 0 movs r1, 0x8 bl GetBgAttribute @@ -284,31 +284,31 @@ AddWindow: ; 8003380 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq @08003432 + beq _08003432 adds r0, r5, 0 bl AllocZeroed 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 SetBgTilemap -@08003432: +_08003432: mov r2, r8 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -318,27 +318,27 @@ AddWindow: ; 8003380 bl AllocZeroed 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 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 .pool -@08003484: +_08003484: ldr r2, =0x02020004 lsls r1, r6, 1 adds r1, r6 @@ -356,7 +356,7 @@ AddWindow: ; 8003380 ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne @080034BE + bne _080034BE mov r0, r9 strh r0, [r2, 0x6] ldrb r0, [r2, 0x3] @@ -367,9 +367,9 @@ AddWindow: ; 8003380 mov r1, r9 movs r3, 0x1 bl DummiedOutFireRedLeafGreenTileAllocFunc -@080034BE: +_080034BE: adds r0, r6, 0 -@080034C0: +_080034C0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -390,29 +390,29 @@ AddWindowWithoutTileMap: ; 80034D8 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 @@ -424,12 +424,12 @@ AddWindowWithoutTileMap: ; 80034D8 movs r0, 0x1 negs r0, r0 cmp r3, r0 - bne @08003534 -@08003528: + bne _08003534 +_08003528: movs r0, 0xFF - b @08003564 + b _08003564 .pool -@08003534: +_08003534: ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 @@ -442,7 +442,7 @@ AddWindowWithoutTileMap: ; 80034D8 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] @@ -452,9 +452,9 @@ AddWindowWithoutTileMap: ; 80034D8 adds r1, r3, 0 movs r3, 0x1 bl DummiedOutFireRedLeafGreenTileAllocFunc -@08003562: +_08003562: adds r0, r4, 0 -@08003564: +_08003564: pop {r4-r6} pop {r1} bx r1 @@ -477,7 +477,7 @@ RemoveWindow: ; 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] @@ -485,7 +485,7 @@ RemoveWindow: ; 8003574 adds r0, r3, 0 movs r3, 0x2 bl DummiedOutFireRedLeafGreenTileAllocFunc -@080035A0: +_080035A0: ldr r0, =gDummyWindowTemplate ldr r1, [r0, 0x4] ldr r0, [r0] @@ -496,18 +496,18 @@ RemoveWindow: ; 8003574 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 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 @@ -516,11 +516,11 @@ RemoveWindow: ; 8003574 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 @@ -533,38 +533,38 @@ FreeAllWindowBuffers: ; 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 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 @@ -596,23 +596,23 @@ CopyWindowToVram: ; 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 .pool -@08003694: +_08003694: cmp r5, 0x3 - beq @080036B6 - b @080036CE -@0800369A: + beq _080036B6 + b _080036CE +_0800369A: mov r0, sp ldrb r0, [r0] bl CopyBgTilemapBufferToVram - b @080036CE -@080036A4: + b _080036CE +_080036A4: mov r0, sp ldrb r0, [r0] ldr r1, [sp, 0x8] @@ -620,8 +620,8 @@ CopyWindowToVram: ; 8003658 ldrh r3, [r2, 0x6] adds r2, r4, 0 bl LoadBgTiles - b @080036CE -@080036B6: + b _080036CE +_080036B6: mov r0, sp ldrb r0, [r0] ldr r1, [sp, 0x8] @@ -632,7 +632,7 @@ CopyWindowToVram: ; 8003658 mov r0, sp ldrb r0, [r0] bl CopyBgTilemapBufferToVram -@080036CE: +_080036CE: add sp, 0xC pop {r4-r6} pop {r0} @@ -651,9 +651,9 @@ CopyWindowRectToVram: ; 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 @@ -678,23 +678,23 @@ CopyWindowRectToVram: ; 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 .pool -@08003730: +_08003730: cmp r5, 0x3 - beq @0800375E - b @08003782 -@08003736: + beq _0800375E + b _08003782 +_08003736: mov r0, sp ldrb r0, [r0] bl CopyBgTilemapBufferToVram - b @08003782 -@08003740: + b _08003782 +_08003740: mov r0, sp ldrb r0, [r0] lsls r2, r4, 5 @@ -708,8 +708,8 @@ CopyWindowRectToVram: ; 80036D8 lsls r3, 16 lsrs r3, 16 bl LoadBgTiles - b @08003782 -@0800375E: + b _08003782 +_0800375E: mov r0, sp ldrb r0, [r0] lsls r2, r4, 5 @@ -726,7 +726,7 @@ CopyWindowRectToVram: ; 80036D8 mov r0, sp ldrb r0, [r0] bl CopyBgTilemapBufferToVram -@08003782: +_08003782: add sp, 0xC pop {r4-r7} pop {r0} @@ -837,10 +837,10 @@ PutWindowRectTilemapOverridePalette: ; 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 @@ -865,8 +865,8 @@ PutWindowRectTilemapOverridePalette: ; 80037EC 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 @@ -968,10 +968,10 @@ PutWindowRectTilemap: ; 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 @@ -996,8 +996,8 @@ PutWindowRectTilemap: ; 80038F4 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 @@ -1312,7 +1312,7 @@ CopyToWindowPixelBuffer: ; 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 @@ -1325,9 +1325,9 @@ CopyToWindowPixelBuffer: ; 8003BF0 lsrs r2, r5, 17 adds r0, r6, 0 bl CpuSet - b @08003C3C + b _08003C3C .pool -@08003C24: +_08003C24: ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 @@ -1339,7 +1339,7 @@ CopyToWindowPixelBuffer: ; 8003BF0 adds r1, r2 adds r0, r6, 0 bl LZ77UnCompWram -@08003C3C: +_08003C3C: pop {r4-r6} pop {r0} bx r0 @@ -1429,29 +1429,29 @@ ScrollWindow: ; 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 @@ -1465,17 +1465,17 @@ ScrollWindow: ; 8003C94 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 .pool -@08003D34: +_08003D34: mov r2, r10 str r7, [r2] -@08003D38: +_08003D38: adds r3, 0x1 adds r2, r4, 0x4 adds r0, r3, 0 @@ -1492,16 +1492,16 @@ ScrollWindow: ; 8003C94 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 @@ -1519,16 +1519,16 @@ ScrollWindow: ; 8003C94 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 @@ -1546,16 +1546,16 @@ ScrollWindow: ; 8003C94 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 @@ -1573,16 +1573,16 @@ ScrollWindow: ; 8003C94 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 @@ -1600,16 +1600,16 @@ ScrollWindow: ; 8003C94 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 @@ -1627,16 +1627,16 @@ ScrollWindow: ; 8003C94 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 @@ -1652,39 +1652,39 @@ ScrollWindow: ; 8003C94 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 @@ -1698,16 +1698,16 @@ ScrollWindow: ; 8003C94 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 @@ -1724,16 +1724,16 @@ ScrollWindow: ; 8003C94 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 @@ -1751,16 +1751,16 @@ ScrollWindow: ; 8003C94 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 @@ -1778,16 +1778,16 @@ ScrollWindow: ; 8003C94 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 @@ -1805,16 +1805,16 @@ ScrollWindow: ; 8003C94 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 @@ -1832,16 +1832,16 @@ ScrollWindow: ; 8003C94 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 @@ -1859,16 +1859,16 @@ ScrollWindow: ; 8003C94 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 @@ -1884,24 +1884,24 @@ ScrollWindow: ; 8003C94 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 @@ -1963,24 +1963,24 @@ SetWindowAttribute: ; 80040A8 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 .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 @@ -1988,9 +1988,9 @@ SetWindowAttribute: ; 80040A8 adds r0, r1 strb r2, [r0, 0x1] movs r0, 0 - b @08004144 + b _08004144 .pool -@080040F8: +_080040F8: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -1998,9 +1998,9 @@ SetWindowAttribute: ; 80040A8 adds r0, r1 strb r2, [r0, 0x2] movs r0, 0 - b @08004144 + b _08004144 .pool -@0800410C: +_0800410C: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2008,9 +2008,9 @@ SetWindowAttribute: ; 80040A8 adds r0, r1 strb r2, [r0, 0x5] movs r0, 0 - b @08004144 + b _08004144 .pool -@08004120: +_08004120: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2018,9 +2018,9 @@ SetWindowAttribute: ; 80040A8 adds r0, r1 strh r2, [r0, 0x6] movs r0, 0 - b @08004144 + b _08004144 .pool -@08004134: +_08004134: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2028,9 +2028,9 @@ SetWindowAttribute: ; 80040A8 adds r1, 0x8 adds r0, r1 str r2, [r0] -@08004142: +_08004142: movs r0, 0x1 -@08004144: +_08004144: pop {r1} bx r1 .pool @@ -2045,87 +2045,87 @@ GetWindowAttribute: ; 800414C 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 .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 .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 .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 .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 .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 .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 .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 .pool -@08004214: +_08004214: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 @@ -2133,11 +2133,11 @@ GetWindowAttribute: ; 800414C adds r0, 0x8 adds r1, r0 ldr r0, [r1] - b @0800422A + b _0800422A .pool -@08004228: +_08004228: movs r0, 0 -@0800422A: +_0800422A: pop {r1} bx r1 thumb_func_end GetWindowAttribute @@ -2151,18 +2151,18 @@ GetNumActiveWindowsOnBg: ; 8004230 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} @@ -2188,23 +2188,23 @@ AddWindow8Bit: ; 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 @@ -2215,7 +2215,7 @@ AddWindow8Bit: ; 8004260 add r0, r10 ldr r0, [r0] cmp r0, 0 - bne @080042EA + bne _080042EA adds r0, r7, 0 movs r1, 0x8 bl GetBgAttribute @@ -2223,32 +2223,32 @@ AddWindow8Bit: ; 8004260 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq @080042EA + beq _080042EA adds r0, r5, 0 bl Alloc 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 SetBgTilemap -@080042EA: +_080042EA: mov r2, r9 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -2258,27 +2258,27 @@ AddWindow8Bit: ; 8004260 bl Alloc adds r4, r0, 0 cmp r4, 0 - bne @08004338 + bne _08004338 adds r0, r7, 0 bl GetNumActiveWindowsOnBg8Bit 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 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 .pool -@08004338: +_08004338: ldr r1, =0x02020004 lsls r2, r6, 1 adds r2, r6 @@ -2294,7 +2294,7 @@ AddWindow8Bit: ; 8004260 str r0, [r2] str r1, [r2, 0x4] adds r0, r6, 0 -@08004356: +_08004356: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -2325,18 +2325,18 @@ FillWindowPixelBuffer8Bit: ; 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 @@ -2534,29 +2534,29 @@ CopyWindowToVram8Bit: ; 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 .pool -@08004540: +_08004540: cmp r5, 0x3 - beq @0800455C - b @08004570 -@08004546: + beq _0800455C + b _08004570 +_08004546: ldrb r0, [r3] bl CopyBgTilemapBufferToVram - b @08004570 -@0800454E: + b _08004570 +_0800454E: ldrb r0, [r3] ldr r1, [r3, 0x8] ldrh r2, [r4] ldrh r3, [r3, 0x6] bl LoadBgTiles - b @08004570 -@0800455C: + b _08004570 +_0800455C: ldrb r0, [r3] ldr r1, [r3, 0x8] ldrh r2, [r4] @@ -2565,7 +2565,7 @@ CopyWindowToVram8Bit: ; 8004500 ldr r0, [r6] ldrb r0, [r0] bl CopyBgTilemapBufferToVram -@08004570: +_08004570: pop {r4-r6} pop {r0} bx r0 @@ -2580,18 +2580,18 @@ GetNumActiveWindowsOnBg8Bit: ; 8004578 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} |