Game-Decompilation/katam
1
0
Fork 0
mirror of https://github.com/jiangzhengwenjz/katam.git synced 2024-11-23 13:10:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Cleverking2003 2020-05-24 18:32:23 +03:00
parent 870e06e83d
commit dbcc9e7a87
2 changed files with 73 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
asm/code.s
View File

@ -63833,77 +63833,3 @@ nullsub_108: @ 0x0801E628
nullsub_109: @ 0x0801E62C
bx lr
.align 2, 0
thumb_func_start sub_0801E630
sub_0801E630: @ 0x0801E630
push {r4, r5, lr}
sub sp, #8
adds r5, r0, #0
ldr r0, _0801E664 @ =sub_0801FD58
movs r1, #0xbe
lsls r1, r1, #1
movs r2, #0x80
lsls r2, r2, #1
ldr r3, _0801E668 @ =nullsub_29
str r3, [sp]
movs r3, #0
bl GameStateCreate
adds r2, r0, #0
ldrh r1, [r2, #0x12]
movs r0, #0x10
ands r0, r1
cmp r0, #0
beq _0801E66C
ldrh r0, [r2, #6]
lsls r0, r0, #2
movs r1, #0x80
lsls r1, r1, #0x12
adds r4, r0, r1
b _0801E674
.align 2, 0
_0801E664: .4byte sub_0801FD58
_0801E668: .4byte nullsub_29
_0801E66C:
ldrh r1, [r2, #6]
movs r0, #0xc0
lsls r0, r0, #0x12
adds r4, r1, r0
_0801E674:
add r1, sp, #4
movs r0, #0
strh r0, [r1]
ldr r2, _0801E6B8 @ =0x010000BE
adds r0, r1, #0
adds r1, r4, #0
bl CpuSet
movs r1, #0xa6
lsls r1, r1, #1
adds r0, r4, r1
movs r2, #0
str r2, [r0]
adds r1, #4
adds r0, r4, r1
str r5, [r0]
movs r0, #0xaa
lsls r0, r0, #1
adds r1, r4, r0
ldr r0, _0801E6BC @ =sub_0801ED94
str r0, [r1]
movs r1, #0xbc
lsls r1, r1, #1
adds r0, r4, r1
strh r2, [r0]
ldr r1, _0801E6C0 @ =gBldRegs
movs r0, #0xbf
strh r0, [r1]
movs r0, #0x10
strh r0, [r1, #4]
add sp, #8
pop {r4, r5}
pop {r0}
bx r0
.align 2, 0
_0801E6B8: .4byte 0x010000BE
_0801E6BC: .4byte sub_0801ED94
_0801E6C0: .4byte gBldRegs

73
asm/subgame_menu.s
View File

@ -5,6 +5,79 @@
.text
thumb_func_start sub_0801E630
sub_0801E630: @ 0x0801E630
push {r4, r5, lr}
sub sp, #8
adds r5, r0, #0
ldr r0, _0801E664 @ =sub_0801FD58
movs r1, #0xbe
lsls r1, r1, #1
movs r2, #0x80
lsls r2, r2, #1
ldr r3, _0801E668 @ =nullsub_29
str r3, [sp]
movs r3, #0
bl GameStateCreate
adds r2, r0, #0
ldrh r1, [r2, #0x12]
movs r0, #0x10
ands r0, r1
cmp r0, #0
beq _0801E66C
ldrh r0, [r2, #6]
lsls r0, r0, #2
movs r1, #0x80
lsls r1, r1, #0x12
adds r4, r0, r1
b _0801E674
.align 2, 0
_0801E664: .4byte sub_0801FD58
_0801E668: .4byte nullsub_29
_0801E66C:
ldrh r1, [r2, #6]
movs r0, #0xc0
lsls r0, r0, #0x12
adds r4, r1, r0
_0801E674:
add r1, sp, #4
movs r0, #0
strh r0, [r1]
ldr r2, _0801E6B8 @ =0x010000BE
adds r0, r1, #0
adds r1, r4, #0
bl CpuSet
movs r1, #0xa6
lsls r1, r1, #1
adds r0, r4, r1
movs r2, #0
str r2, [r0]
adds r1, #4
adds r0, r4, r1
str r5, [r0]
movs r0, #0xaa
lsls r0, r0, #1
adds r1, r4, r0
ldr r0, _0801E6BC @ =sub_0801ED94
str r0, [r1]
movs r1, #0xbc
lsls r1, r1, #1
adds r0, r4, r1
strh r2, [r0]
ldr r1, _0801E6C0 @ =gBldRegs
movs r0, #0xbf
strh r0, [r1]
movs r0, #0x10
strh r0, [r1, #4]
add sp, #8
pop {r4, r5}
pop {r0}
bx r0
.align 2, 0
_0801E6B8: .4byte 0x010000BE
_0801E6BC: .4byte sub_0801ED94
_0801E6C0: .4byte gBldRegs
thumb_func_start sub_0801E6C4
sub_0801E6C4: @ 0x0801E6C4
push {r4, r5, lr}