Merge branch 'master' into asset-extraction

This commit is contained in:
octorock
2021-11-06 00:33:07 +01:00
413 changed files with 6686 additions and 12843 deletions
+4 -4
View File
@@ -3185,7 +3185,7 @@ sub_0807A050: @ 0x0807A050
ldrb r2, [r3, #0xf]
cmp r2, #0
beq _0807A06A
ldr r0, _0807A08C @ =gTextBox
ldr r0, _0807A08C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -3209,7 +3209,7 @@ _0807A084:
pop {pc}
.align 2, 0
_0807A088: .4byte gPlayerState
_0807A08C: .4byte gTextBox
_0807A08C: .4byte gMessage
_0807A090: .4byte gPlayerEntity
thumb_func_start sub_0807A094
@@ -3327,13 +3327,13 @@ sub_0807A158: @ 0x0807A158
adds r0, r4, #0
adds r0, #0xb4
ldrb r0, [r0]
bl sub_0805449C
bl ItemIsSword
cmp r0, #0
bne _0807A17C
adds r0, r4, #0
adds r0, #0xb5
ldrb r0, [r0]
bl sub_0805449C
bl ItemIsSword
b _0807A17E
.align 2, 0
_0807A178: .4byte gSave