Decompile some functions

This commit is contained in:
octorock
2022-08-05 21:04:33 +02:00
parent aa57b04756
commit 167710b4d4
17 changed files with 291 additions and 932 deletions
@@ -1,179 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
sub sp, #0x14
adds r4, r0, #0
bl AreaHasMap
cmp r0, #0
bne _0801DDB8
b _0801DEEA
_0801DDB8:
ldr r1, _0801DDD8 @ =gUnk_080C9C50
ldr r0, _0801DDDC @ =gArea
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
lsls r0, r4, #2
adds r0, r0, r1
ldr r4, [r0]
ldr r0, _0801DDE0 @ =gMapDataBottomSpecial
movs r1, #0x80
lsls r1, r1, #8
bl MemClear
b _0801DEE2
.align 2, 0
_0801DDD8: .4byte gUnk_080C9C50
_0801DDDC: .4byte gArea
_0801DDE0: .4byte gMapDataBottomSpecial
_0801DDE4:
ldrb r0, [r4]
ldrb r1, [r4, #1]
movs r2, #3
bl GetRoomProperty
adds r6, r0, #0
adds r0, r4, #0
bl sub_0801DF10
adds r5, r0, #0
movs r0, #0
str r0, [sp, #0xc]
ldrh r2, [r4]
ldr r0, _0801DE14 @ =gUI
ldrh r3, [r0, #0x20]
ldr r1, _0801DE18 @ =0x0000FFFF
ands r1, r2
ldr r0, _0801DE18 @ =0x0000FFFF
ands r0, r3
cmp r1, r0
bne _0801DE1C
movs r3, #8
b _0801DE36
.align 2, 0
_0801DE14: .4byte gUI
_0801DE18: .4byte 0x0000FFFF
_0801DE1C:
bl HasDungeonSmallKey
cmp r0, #0
beq _0801DE28
movs r0, #2
str r0, [sp, #0xc]
_0801DE28:
adds r0, r6, #0
adds r1, r5, #0
bl sub_0801DF90
cmp r0, #0
beq _0801DE38
movs r3, #3
_0801DE36:
str r3, [sp, #0xc]
_0801DE38:
ldrb r1, [r4, #2]
movs r0, #1
ands r0, r1
cmp r0, #0
beq _0801DE46
movs r0, #0
str r0, [sp, #0xc]
_0801DE46:
adds r3, r4, #0
adds r3, #8
str r3, [sp, #0x10]
ldr r0, [sp, #0xc]
cmp r0, #0
beq _0801DEE0
ldr r2, _0801DEF8 @ =0x040000D4
ldr r0, [r4, #4]
ldr r1, _0801DEFC @ =gMapData
adds r0, r0, r1
str r0, [r2]
ldr r0, _0801DF00 @ =gMapDataBottomSpecial
str r0, [r2, #4]
ldr r0, _0801DF04 @ =0x84000100
str r0, [r2, #8]
ldr r0, [r2, #8]
ldr r0, _0801DF08 @ =gAreaRoomHeaders
ldrb r2, [r4]
lsls r2, r2, #2
adds r2, r2, r0
ldrb r1, [r4, #1]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #1
ldr r2, [r2]
adds r2, r2, r0
ldrh r0, [r2]
lsrs r0, r0, #4
str r0, [sp]
ldrh r0, [r2, #2]
ldr r1, _0801DF0C @ =0x000007FF
ands r0, r1
lsrs r0, r0, #4
str r0, [sp, #4]
ldrh r0, [r2, #4]
lsrs r7, r0, #4
ldrh r0, [r2, #6]
lsrs r0, r0, #4
mov sl, r0
adds r0, r7, #3
lsrs r0, r0, #2
str r0, [sp, #8]
movs r6, #0
cmp r6, sl
bhs _0801DEE0
_0801DEA0:
ldr r3, [sp, #8]
adds r1, r6, #0
muls r1, r3, r1
ldr r0, _0801DF00 @ =gMapDataBottomSpecial
adds r1, r1, r0
mov r8, r1
movs r5, #0
adds r0, r6, #1
mov sb, r0
cmp r5, r7
bhs _0801DEDA
_0801DEB6:
ldr r3, [sp]
adds r4, r3, r5
adds r0, r5, #0
mov r1, r8
bl sub_0801DF60
ldr r1, [sp, #0xc]
bl sub_0801DF78
adds r2, r0, #0
adds r0, r4, #0
ldr r3, [sp, #4]
adds r1, r3, r6
bl sub_0801DF28
adds r5, #1
cmp r5, r7
blo _0801DEB6
_0801DEDA:
mov r6, sb
cmp r6, sl
blo _0801DEA0
_0801DEE0:
ldr r4, [sp, #0x10]
_0801DEE2:
ldrb r0, [r4]
cmp r0, #0
beq _0801DEEA
b _0801DDE4
_0801DEEA:
add sp, #0x14
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0801DEF8: .4byte 0x040000D4
_0801DEFC: .4byte gMapData
_0801DF00: .4byte gMapDataBottomSpecial
_0801DF04: .4byte 0x84000100
_0801DF08: .4byte gAreaRoomHeaders
_0801DF0C: .4byte 0x000007FF
.syntax divided
@@ -1,100 +0,0 @@
.syntax unified
push {r4, r5, lr}
ldr r4, _08079498 @ =gPlayerEntity
movs r1, #0
movs r0, #0x19
strb r0, [r4, #0xc]
str r1, [r4, #0x34]
str r1, [r4, #0x20]
adds r0, r4, #0
adds r0, #0x42
strb r1, [r0]
bl ResetPlayerPosition
ldr r2, _0807949C @ =gPlayerState
ldr r1, [r2, #0x30]
movs r0, #0x80
lsls r0, r0, #0xa
ands r0, r1
cmp r0, #0
bne _08079514
movs r0, #0x80
lsls r0, r0, #9
ands r1, r0
cmp r1, #0
beq _080794E4
adds r0, r2, #0
adds r0, #0x84
ldr r1, [r0]
ldrh r0, [r1, #0x2e]
strh r0, [r4, #0x2e]
ldrh r0, [r1, #0x32]
strh r0, [r4, #0x32]
b _08079514
.align 2, 0
_08079498: .4byte gPlayerEntity
_0807949C: .4byte gPlayerState
_080794A0:
ldr r2, _080794DC @ =gPlayerEntity
ldr r0, [r4]
lsrs r0, r0, #0x1e
adds r1, r2, #0
adds r1, #0x38
strb r0, [r1]
ldr r3, _080794E0 @ =gRoomControls
ldr r0, [r4]
movs r1, #0x3f
ands r0, r1
lsls r0, r0, #4
ldrh r1, [r3, #6]
adds r0, r0, r1
adds r0, #8
strh r0, [r2, #0x2e]
ldr r0, [r4]
movs r1, #0xfc
lsls r1, r1, #4
ands r0, r1
lsrs r0, r0, #2
ldrh r3, [r3, #8]
adds r0, r0, r3
adds r0, #8
strh r0, [r2, #0x32]
ldrb r1, [r2, #0x10]
movs r0, #0x80
orrs r0, r1
strb r0, [r2, #0x10]
b _08079514
.align 2, 0
_080794DC: .4byte gPlayerEntity
_080794E0: .4byte gRoomControls
_080794E4:
movs r5, #0
ldr r1, [r2, #0x40]
movs r0, #1
rsbs r0, r0, #0
cmp r1, r0
beq _08079514
adds r4, r2, #0
adds r4, #0x40
_080794F4:
ldr r1, [r4]
ldrh r0, [r4]
lsrs r1, r1, #0x1e
bl sub_080B1B44
cmp r0, #0xf
bne _080794A0
adds r4, #4
adds r5, #1
cmp r5, #0xf
bhi _08079514
ldr r1, [r4]
movs r0, #1
rsbs r0, r0, #0
cmp r1, r0
bne _080794F4
_08079514:
ldr r0, _0807951C @ =gPlayerEntity
bl UpdateSpriteForCollisionLayer
pop {r4, r5, pc}
.align 2, 0
_0807951C: .4byte gPlayerEntity
.syntax divided
@@ -1,99 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r5, _08078FE0 @ =gPlayerState
ldrb r1, [r5, #6]
movs r6, #0x80
adds r0, r6, #0
ands r0, r1
cmp r0, #0
bne _08078FCA
adds r1, r5, #0
adds r1, #0x35
movs r0, #0xff
strb r0, [r1]
_08078FCA:
adds r0, r4, #0
bl sub_08079064
ldr r1, [r5, #0x30]
movs r0, #8
ands r0, r1
cmp r0, #0
beq _08078FE4
movs r2, #0x58
b _08078FFA
.align 2, 0
_08078FE0: .4byte gPlayerState
_08078FE4:
ands r1, r6
cmp r1, #0
beq _08078FEE
movs r2, #0x18
b _08078FFA
_08078FEE:
ldrh r0, [r5, #8]
lsrs r0, r0, #8
movs r2, #0xb8
cmp r0, #7
bne _08078FFA
movs r2, #0x34
_08078FFA:
ldr r0, _08079014 @ =gPlayerState
adds r3, r0, #0
ldrb r1, [r0, #8]
cmp r2, r1
bls _08079040
ldrb r0, [r4, #0x14]
adds r2, r0, #0
cmp r2, #4
bls _08079018
ldrb r0, [r4, #0x18]
movs r1, #0x40
orrs r0, r1
b _08079020
.align 2, 0
_08079014: .4byte gPlayerState
_08079018:
ldrb r1, [r4, #0x18]
movs r0, #0x41
rsbs r0, r0, #0
ands r0, r1
_08079020:
strb r0, [r4, #0x18]
ldr r0, [r3, #0x30]
movs r1, #0x80
lsls r1, r1, #0xc
ands r0, r1
cmp r0, #0
beq _08079036
ldrh r1, [r3, #8]
ldrb r0, [r4, #0x14]
adds r2, r1, r0
b _08079042
_08079036:
lsls r0, r2, #0x18
lsrs r0, r0, #0x19
ldrh r3, [r3, #8]
adds r2, r0, r3
b _08079042
_08079040:
ldrh r2, [r0, #8]
_08079042:
ldrh r0, [r4, #0x12]
lsls r0, r0, #8
adds r1, r4, #0
adds r1, #0x58
ldrb r1, [r1]
orrs r0, r1
cmp r2, r0
beq _08079062
lsrs r0, r2, #8
strh r0, [r4, #0x12]
movs r0, #0xff
ands r2, r0
adds r0, r4, #0
adds r1, r2, #0
bl InitAnimationForceUpdate
_08079062:
pop {r4, r5, r6, pc}
.syntax divided
@@ -1,111 +0,0 @@
.syntax unified
push {r4, r5, lr}
bl sub_0807BFD0
bl LoadRoomGfx
ldr r4, _0807C780 @ =gRoomControls
ldr r2, [r4, #0x30]
cmp r2, #0
beq _0807C788
ldrh r1, [r2, #0x2e]
lsls r0, r1, #0x10
cmp r0, #0
bge _0807C764
ldr r0, _0807C784 @ =0x00007FFF
ands r0, r1
ldrh r1, [r4, #6]
subs r0, r0, r1
strh r0, [r2, #0x2e]
_0807C764:
movs r0, #0x2e
ldrsh r3, [r2, r0]
ldrh r1, [r2, #0x32]
lsls r0, r1, #0x10
cmp r0, #0
bge _0807C77A
ldr r0, _0807C784 @ =0x00007FFF
ands r0, r1
ldrh r1, [r4, #8]
subs r0, r0, r1
strh r0, [r2, #0x32]
_0807C77A:
movs r0, #0x32
ldrsh r5, [r2, r0]
b _0807C78C
.align 2, 0
_0807C780: .4byte gRoomControls
_0807C784: .4byte 0x00007FFF
_0807C788:
movs r3, #0
movs r5, #0
_0807C78C:
cmp r3, #0x77
bgt _0807C794
movs r0, #0
b _0807C7A2
_0807C794:
ldrh r1, [r4, #0x1e]
adds r0, r1, #0
subs r0, #0x78
cmp r0, r3
blt _0807C7A0
adds r0, r3, #0
_0807C7A0:
subs r0, #0x78
_0807C7A2:
strh r0, [r4, #0xa]
ldrh r1, [r4, #6]
ldrh r2, [r4, #0xa]
adds r0, r1, r2
strh r0, [r4, #0xa]
cmp r5, #0x4f
bgt _0807C7B4
movs r0, #0
b _0807C7C2
_0807C7B4:
ldrh r2, [r4, #0x20]
adds r0, r2, #0
subs r0, #0x50
cmp r0, r5
blt _0807C7C0
adds r0, r5, #0
_0807C7C0:
subs r0, #0x50
_0807C7C2:
strh r0, [r4, #0xc]
ldrh r0, [r4, #8]
ldrh r3, [r4, #0xc]
adds r0, r0, r3
strh r0, [r4, #0xc]
ldr r2, [r4, #0x30]
cmp r2, #0
beq _0807C7FC
ldrh r3, [r2, #0x2e]
adds r0, r1, r3
strh r0, [r2, #0x2e]
ldr r1, [r4, #0x30]
ldrh r0, [r4, #8]
ldrh r2, [r1, #0x32]
adds r0, r0, r2
strh r0, [r1, #0x32]
ldr r0, _0807C80C @ =gRoomControls
ldrb r1, [r0, #0xf]
movs r0, #2
ands r0, r1
cmp r0, #0
beq _0807C7FC
ldr r0, [r4, #0x30]
adds r0, #0x38
movs r1, #1
strb r1, [r0]
ldr r0, [r4, #0x30]
bl UpdateSpriteForCollisionLayer
_0807C7FC:
ldrb r1, [r4, #0xf]
movs r0, #0xfb
ands r0, r1
strb r0, [r4, #0xf]
bl sub_08080BC4
pop {r4, r5, pc}
.align 2, 0
_0807C80C: .4byte gRoomControls
.syntax divided
@@ -1,170 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
adds r4, r0, #0
movs r2, #1
strb r2, [r4, #0xc]
movs r3, #0
movs r0, #0x80
strh r0, [r4, #0x24]
ldrb r0, [r4, #0xe]
strb r0, [r4, #0xf]
strb r3, [r4, #0xe]
ldrb r1, [r4, #0x11]
movs r0, #0x10
rsbs r0, r0, #0
ands r0, r1
movs r1, #3
orrs r0, r1
strb r0, [r4, #0x11]
adds r0, r4, #0
adds r0, #0x81
strb r3, [r0]
adds r0, #2
strb r3, [r0]
ldrb r1, [r4, #0x19]
movs r0, #0x3f
ands r0, r1
movs r1, #0x80
orrs r0, r1
strb r0, [r4, #0x19]
ldrb r0, [r4, #0xa]
cmp r0, #1
bne _0808F9E8
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #4
orrs r0, r1
strb r0, [r2]
adds r0, r4, #0
adds r0, #0x80
strb r3, [r0]
b _0808FA1C
_0808F9E8:
adds r0, r4, #0
adds r0, #0x80
strb r2, [r0]
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #5
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4, #0xa]
cmp r0, #2
beq _0808FA0A
cmp r0, #4
bne _0808FA1C
_0808FA0A:
ldrh r0, [r4, #0x32]
adds r0, #2
strh r0, [r4, #0x32]
adds r1, r4, #0
adds r1, #0x63
movs r0, #0xfe
strb r0, [r1]
strb r3, [r4, #0xd]
strb r3, [r4, #0x1e]
_0808FA1C:
ldrb r0, [r4, #0xf]
cmp r0, #0
beq _0808FAC4
movs r6, #0
cmp r0, #0x80
beq _0808FA84
ldrh r1, [r4, #0xa]
ldr r0, _0808FA38 @ =0x00000101
cmp r1, r0
bne _0808FA3C
movs r0, #0xf
ldrsb r0, [r4, r0]
ldrh r1, [r4, #0x32]
b _0808FA42
.align 2, 0
_0808FA38: .4byte 0x00000101
_0808FA3C:
movs r0, #0xf
ldrsb r0, [r4, r0]
ldrh r1, [r4, #0x2e]
_0808FA42:
adds r0, r0, r1
adds r1, r4, #0
adds r1, #0x7e
strh r0, [r1]
adds r5, r1, #0
ldr r3, [r4, #0x50]
cmp r3, #0
bne _0808FA5E
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl CheckFlags
b _0808FA7C
_0808FA5E:
adds r2, r4, #0
adds r2, #0x82
ldrb r1, [r2]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _0808FA76
ldrb r0, [r3, #0xc]
cmp r0, #2
bne _0808FAA2
adds r6, #1
b _0808FAA2
_0808FA76:
ldrb r0, [r2]
bl CheckLocalFlag
_0808FA7C:
cmp r0, #0
beq _0808FAA2
adds r6, #1
b _0808FAA2
_0808FA84:
movs r6, #1
ldrh r1, [r4, #0xa]
ldr r0, _0808FA94 @ =0x00000101
cmp r1, r0
bne _0808FA98
ldrh r1, [r4, #0x32]
b _0808FA9A
.align 2, 0
_0808FA94: .4byte 0x00000101
_0808FA98:
ldrh r1, [r4, #0x2e]
_0808FA9A:
adds r0, r4, #0
adds r0, #0x7e
strh r1, [r0]
adds r5, r0, #0
_0808FAA2:
cmp r6, #0
beq _0808FAC4
adds r1, r4, #0
adds r1, #0x81
movs r0, #1
strb r0, [r1]
ldrh r1, [r4, #0xa]
ldr r0, _0808FABC @ =0x00000101
cmp r1, r0
bne _0808FAC0
ldrh r0, [r5]
strh r0, [r4, #0x32]
b _0808FAC4
.align 2, 0
_0808FABC: .4byte 0x00000101
_0808FAC0:
ldrh r0, [r5]
strh r0, [r4, #0x2e]
_0808FAC4:
adds r0, r4, #0
bl sub_0808FF50
pop {r4, r5, r6, pc}
.syntax divided
-135
View File
@@ -1,135 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
adds r2, r0, #0
lsls r0, r2, #1
adds r0, r0, r2
lsls r0, r0, #2
ldr r1, _080ADF00 @ =gUnk_02024494
adds r3, r0, r1
ldrb r1, [r3]
movs r0, #0xf0
ands r0, r1
cmp r0, #0
beq _080ADF7C
movs r0, #0xf
ands r0, r1
movs r1, #0x10
orrs r0, r1
strb r0, [r3]
ldrh r1, [r3, #6]
ldr r0, _080ADF04 @ =0x0000FFFF
cmp r1, r0
beq _080ADF18
ldrb r0, [r3, #3]
cmp r0, #0
beq _080ADF18
lsls r0, r0, #6
ldr r1, _080ADF08 @ =gUnk_020000C0
adds r4, r0, r1
movs r5, #4
movs r6, #9
rsbs r6, r6, #0
_080ADEB0:
ldrb r1, [r4]
movs r0, #4
ands r0, r1
cmp r0, #0
beq _080ADEF6
ldr r0, _080ADF0C @ =gGFXSlots
ldrb r0, [r0, #3]
cmp r0, #0
bne _080ADECA
movs r0, #8
ands r0, r1
cmp r0, #0
beq _080ADEF6
_080ADECA:
adds r0, r6, #0
ands r0, r1
strb r0, [r4]
ldrb r0, [r4, #9]
lsls r2, r0, #5
cmp r2, #0
beq _080ADEF6
ldrh r0, [r4, #0xa]
lsls r0, r0, #5
ldr r3, _080ADF10 @ =0x06010000
adds r1, r0, r3
ldr r3, _080ADF14 @ =0x040000D4
ldr r0, [r4, #0xc]
str r0, [r3]
str r1, [r3, #4]
adds r0, r2, #0
asrs r0, r0, #2
movs r1, #0x84
lsls r1, r1, #0x18
orrs r0, r1
str r0, [r3, #8]
ldr r0, [r3, #8]
_080ADEF6:
adds r4, #0x10
subs r5, #1
cmp r5, #0
bgt _080ADEB0
b _080ADF7C
.align 2, 0
_080ADF00: .4byte gUnk_02024494
_080ADF04: .4byte 0x0000FFFF
_080ADF08: .4byte gUnk_020000C0
_080ADF0C: .4byte gGFXSlots
_080ADF10: .4byte 0x06010000
_080ADF14: .4byte 0x040000D4
_080ADF18:
lsls r0, r2, #9
ldr r2, _080ADF4C @ =0x06012800
adds r1, r0, r2
ldrh r2, [r3, #6]
cmp r2, #0
beq _080ADF58
ldr r0, _080ADF50 @ =0x0000FFFF
cmp r2, r0
beq _080ADF62
ldr r2, _080ADF54 @ =0x040000D4
ldr r0, [r3, #8]
str r0, [r2]
str r1, [r2, #4]
ldrh r0, [r3, #6]
lsls r0, r0, #3
movs r1, #0x84
lsls r1, r1, #0x18
orrs r0, r1
str r0, [r2, #8]
ldr r0, [r2, #8]
ldrh r2, [r3, #6]
subs r2, #0x10
cmp r2, #0
ble _080ADF7C
b _080ADF70
.align 2, 0
_080ADF4C: .4byte 0x06012800
_080ADF50: .4byte 0x0000FFFF
_080ADF54: .4byte 0x040000D4
_080ADF58:
ldrb r1, [r3]
movs r0, #0xf
ands r0, r1
strb r0, [r3]
b _080ADF7C
_080ADF62:
ldrb r0, [r3, #3]
cmp r0, #0
bne _080ADF7C
ldr r0, [r3, #8]
bl LZ77UnCompVram
b _080ADF7C
_080ADF70:
adds r3, #0xc
movs r0, #0
strh r0, [r3, #6]
subs r2, #0x10
cmp r2, #0
bgt _080ADF70
_080ADF7C:
pop {r4, r5, r6, pc}
.align 2, 0
.syntax divided