Menu struct fixed for good this time

This commit is contained in:
theo3
2020-07-22 23:35:26 -07:00
parent e0cfbb15a5
commit f4320b6fcd
5 changed files with 53 additions and 72 deletions
-68
View File
@@ -6,74 +6,6 @@
.text
thumb_func_start sub_080A3BD0
sub_080A3BD0: @ 0x080A3BD0
push {r4, lr}
ldr r0, _080A3C54 @ =gMenu
movs r1, #0
movs r4, #1
strb r4, [r0, #1]
adds r0, #0x2a
strb r1, [r0]
bl sub_080A4D34
movs r0, #0xcb
bl LoadPalettesByPaletteGroupIndex
movs r0, #0x75
bl sub_0801D7EC
bl sub_080A4494
adds r1, r0, #7
cmp r1, #0
bge _080A3BFA
adds r1, #7
_080A3BFA:
asrs r0, r1, #3
subs r0, #6
cmp r0, #0
bge _080A3C04
movs r0, #0
_080A3C04:
cmp r0, #6
ble _080A3C0A
movs r0, #6
_080A3C0A:
adds r0, #0x76
bl sub_0801D7EC
ldr r1, _080A3C58 @ =gScreen
ldrh r2, [r1]
movs r3, #0xf0
lsls r3, r3, #5
adds r0, r3, #0
orrs r0, r2
strh r0, [r1]
ldr r0, _080A3C5C @ =0x00001C01
strh r0, [r1, #0x14]
ldr r0, _080A3C60 @ =0x00001D02
strh r0, [r1, #0x20]
ldr r0, _080A3C64 @ =0x00001E0B
strh r0, [r1, #0x2c]
strh r4, [r1, #0x1a]
strh r4, [r1, #0x26]
strh r4, [r1, #0x32]
bl sub_080A4528
bl sub_080A4398
movs r0, #0
bl sub_0801E738
ldr r0, _080A3C68 @ =gUnk_081280DC
bl sub_080A70AC
movs r0, #1
bl sub_080A7114
movs r0, #6
movs r1, #8
bl DoFade
pop {r4, pc}
.align 2, 0
_080A3C54: .4byte gMenu
_080A3C58: .4byte gScreen
_080A3C5C: .4byte 0x00001C01
_080A3C60: .4byte 0x00001D02
_080A3C64: .4byte 0x00001E0B
_080A3C68: .4byte gUnk_081280DC
thumb_func_start sub_080A3C6C
sub_080A3C6C: @ 0x080A3C6C
push {r4, r5, lr}