diff options
Diffstat (limited to 'asm/rom5.s')
| -rw-r--r-- | asm/rom5.s | 105 |
1 files changed, 99 insertions, 6 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 3792b1948..7cf87e636 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -198128,15 +198128,15 @@ sub_80DB564: @ 80DB564 strh r1, [r0, 0x3A] movs r1, 0x40 strh r1, [r0, 0x3C] - ldr r1, sub_80DB574 + ldr r1, _080DB574 str r1, [r0, 0x1C] bx lr + .align 2, 0 +_080DB574: .4byte sub_80DB578 thumb_func_end sub_80DB564 - thumb_func_start sub_80DB574 -sub_80DB574: @ 80DB574 - push {r0,r3-r6,lr} - lsrs r5, r1, 32 + thumb_func_start sub_80DB578 +sub_80DB578: @ 80DB578 push {lr} adds r3, r0, 0 movs r0, 0x2E @@ -198192,7 +198192,7 @@ _080DB5D8: _080DB5DE: pop {r0} bx r0 - thumb_func_end sub_80DB574 + thumb_func_end sub_80DB578 thumb_func_start sub_80DB5E4 sub_80DB5E4: @ 80DB5E4 @@ -418750,19 +418750,38 @@ _08146E6C: bl SetUpWindowConfig ldr r0, _08146FF8 bl InitMenuWindow + .if REVISION >= 1 + movs r0, 0xD + movs r1, 0x6 + movs r2, 0x10 + movs r3, 0x9 + .else movs r0, 0xD movs r1, 0x8 movs r2, 0x10 movs r3, 0xB + .endif bl MenuDrawTextWindow + .if REVISION >= 1 + movs r0, 0x1 + movs r1, 0xA + movs r2, 0x1C + movs r3, 0x13 + .else movs r0, 0x1 movs r1, 0xC movs r2, 0x1C movs r3, 0x13 + .endif bl MenuDrawTextWindow ldr r0, _08146FFC + .if REVISION >= 1 + movs r1, 0x2 + movs r2, 0xB + .else movs r1, 0x2 movs r2, 0xD + .endif bl MenuPrint movs r0, 0x1 negs r0, r0 @@ -418874,14 +418893,26 @@ _0814705C: lsls r0, 24 cmp r0, 0 bne _0814710C + .if REVISION >= 1 + movs r0, 0x1 + movs r1, 0xA + movs r2, 0x1C + movs r3, 0x13 + .else movs r0, 0x1 movs r1, 0xC movs r2, 0x1C movs r3, 0x13 + .endif bl MenuDrawTextWindow ldr r0, _081470D0 + .if REVISION >= 1 + movs r1, 0x2 + movs r2, 0xB + .else movs r1, 0x2 movs r2, 0xD + .endif bl MenuPrint ldr r0, _081470D4 ldrb r0, [r0] @@ -418890,8 +418921,13 @@ _0814705C: cmp r0, 0 beq _08147096 ldr r0, _081470D8 + .if REVISION >= 1 + movs r1, 0x2 + movs r2, 0xB + .else movs r1, 0x2 movs r2, 0xD + .endif bl MenuPrint _08147096: adds r0, r4, 0x1 @@ -418905,14 +418941,26 @@ _08147096: _081470A6: cmp r4, 0x3 bne _081470E4 + .if REVISION >= 1 + movs r0, 0x1 + movs r1, 0xA + movs r2, 0x1C + movs r3, 0x13 + .else movs r0, 0x1 movs r1, 0xC movs r2, 0x1C movs r3, 0x13 + .endif bl MenuDrawTextWindow ldr r0, _081470DC + .if REVISION >= 1 + movs r1, 0x2 + movs r2, 0xB + .else movs r1, 0x2 movs r2, 0xD + .endif bl MenuPrint ldr r0, _081470E0 bl SetMainCallback2 @@ -418926,32 +418974,56 @@ _081470D8: .4byte gUnknown_084115F9 _081470DC: .4byte gUnknown_0841164E _081470E0: .4byte sub_81471A4 _081470E4: + .if REVISION >= 1 + movs r0, 0x1 + movs r1, 0xA + movs r2, 0x1C + movs r3, 0x13 + .else movs r0, 0x1 movs r1, 0xC movs r2, 0x1C movs r3, 0x13 + .endif bl MenuDrawTextWindow ldr r0, _08147104 ldr r0, [r0] cmp r0, 0 bne _08147134 ldr r0, _08147108 + .if REVISION >= 1 + movs r1, 0x2 + movs r2, 0xB + .else movs r1, 0x2 movs r2, 0xD + .endif bl MenuPrint b _0814713E .align 2, 0 _08147104: .4byte 0x03005ebc _08147108: .4byte gUnknown_08411747 _0814710C: + .if REVISION >= 1 + movs r0, 0x1 + movs r1, 0xA + movs r2, 0x1C + movs r3, 0x13 + .else movs r0, 0x1 movs r1, 0xC movs r2, 0x1C movs r3, 0x13 + .endif bl MenuDrawTextWindow ldr r0, _0814712C + .if REVISION >= 1 + movs r1, 0x2 + movs r2, 0xB + .else movs r1, 0x2 movs r2, 0xD + .endif bl MenuPrint ldr r0, _08147130 bl SetMainCallback2 @@ -418961,8 +419033,13 @@ _0814712C: .4byte gUnknown_0841164E _08147130: .4byte sub_8147154 _08147134: ldr r0, _0814714C + .if REVISION >= 1 + movs r1, 0x2 + movs r2, 0xB + .else movs r1, 0x2 movs r2, 0xD + .endif bl MenuPrint _0814713E: ldr r0, _08147150 @@ -418988,14 +419065,26 @@ sub_8147154: @ 8147154 ands r0, r1 cmp r0, 0 beq _0814718A + .if REVISION >= 1 + movs r0, 0x1 + movs r1, 0xA + movs r2, 0x1C + movs r3, 0x13 + .else movs r0, 0x1 movs r1, 0xC movs r2, 0x1C movs r3, 0x13 + .endif bl MenuDrawTextWindow ldr r0, _08147198 + .if REVISION >= 1 + movs r1, 0x2 + movs r2, 0xB + .else movs r1, 0x2 movs r2, 0xD + .endif bl MenuPrint ldr r0, _0814719C bl SetVBlankCallback @@ -419094,7 +419183,11 @@ sub_8147218: @ 8147218 strh r0, [r2, 0x3E] mov r1, r12 adds r1, 0x3C + .if REVISION >= 1 + movs r0, 0x38 + .else movs r0, 0x48 + .endif strb r0, [r1] ldr r0, _0814729C ldrh r0, [r0] |