mazaal bracelet decomp

This commit is contained in:
Henny022p
2021-04-29 20:37:55 +02:00
parent 010c0456eb
commit f72a051069
10 changed files with 1700 additions and 3597 deletions
-3486
View File
File diff suppressed because it is too large Load Diff
+105
View File
@@ -0,0 +1,105 @@
.syntax unified
push {r4, r5, lr}
adds r4, r0, #0
ldrb r3, [r4, #0xa]
cmp r3, #1
bhi _0803A23E
ldrb r0, [r4, #0xc]
cmp r0, #0x2b
beq _0803A210
adds r0, r4, #0
adds r0, #0x3d
movs r1, #0
ldrsb r1, [r0, r1]
adds r5, r0, #0
cmp r1, #0
ble _0803A23E
adds r0, #4
ldrb r0, [r0]
cmp r0, #0x95
beq _0803A1B2
cmp r0, #0x8e
bne _0803A23E
_0803A1B2:
movs r0, #0x28
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x10]
movs r0, #0x7f
ands r0, r1
strb r0, [r4, #0x10]
ldr r2, [r4, #0x50]
adds r0, r2, #0
adds r0, #0x7d
ldrb r1, [r0]
cmp r3, #0
bne _0803A1CE
movs r0, #1
b _0803A1D0
_0803A1CE:
movs r0, #2
_0803A1D0:
orrs r1, r0
adds r0, r2, #0
adds r0, #0x7d
strb r1, [r0]
adds r0, #3
ldrb r2, [r0]
ldrb r1, [r4, #0xa]
adds r3, r0, #0
cmp r1, #0
bne _0803A1E8
movs r0, #1
b _0803A1EA
_0803A1E8:
movs r0, #2
_0803A1EA:
orrs r0, r2
strb r0, [r3]
ldr r2, [r4, #0x54]
ldrb r1, [r5]
adds r0, r2, #0
adds r0, #0x3d
strb r1, [r0]
ldr r2, [r4, #0x74]
ldrb r1, [r5]
adds r0, r2, #0
adds r0, #0x3d
strb r1, [r0]
ldr r0, _0803A20C @ =0x00000127
bl SoundReq
b _0803A23E
.align 2, 0
_0803A20C: .4byte 0x00000127
_0803A210:
ldr r2, [r4, #0x54]
adds r3, r4, #0
adds r3, #0x3d
ldrb r1, [r3]
adds r0, r2, #0
adds r0, #0x3d
strb r1, [r0]
ldr r2, [r4, #0x74]
ldrb r1, [r3]
adds r0, r2, #0
adds r0, #0x3d
strb r1, [r0]
adds r0, r4, #0
movs r1, #0x18
bl InitializeAnimation
ldr r0, [r4, #0x54]
movs r1, #9
bl InitAnimationForceUpdate
ldr r0, _0803A248 @ =0x00000127
bl SoundReq
_0803A23E:
ldr r1, _0803A24C @ =gUnk_080CFC14
adds r0, r4, #0
bl sub_0804AA30
pop {r4, r5, pc}
.align 2, 0
_0803A248: .4byte 0x00000127
_0803A24C: .4byte gUnk_080CFC14
.syntax divided
+60
View File
@@ -0,0 +1,60 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldr r2, _0803AB0C @ =gUnk_080CED6C
ldr r0, [r4, #0x50]
ldrb r0, [r0, #0xf]
lsrs r0, r0, #4
adds r0, #3
ldrb r1, [r4, #0xa]
lsls r1, r1, #1
adds r0, r0, r1
movs r1, #7
ands r0, r1
adds r0, r0, r2
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
adds r0, #4
strh r0, [r4, #0x36]
adds r0, r4, #0
bl sub_0803B870
cmp r0, #0
bne _0803AB0A
adds r0, r4, #0
bl sub_0806F69C
adds r0, r4, #0
bl sub_0803B6F4
cmp r0, #0
beq _0803AB0A
movs r0, #0x14
strb r0, [r4, #0xc]
movs r0, #0x40
strh r0, [r4, #0x24]
adds r0, r4, #0
movs r1, #0xa
bl InitializeAnimation
ldr r2, [r4, #0x74]
ldrb r1, [r2, #0x10]
movs r0, #0x80
orrs r0, r1
strb r0, [r2, #0x10]
ldr r2, [r4, #0x54]
adds r1, r2, #0
adds r1, #0x3f
movs r0, #0x13
strb r0, [r1]
adds r0, r2, #0
movs r1, #5
bl InitAnimationForceUpdate
movs r0, #0xb7
lsls r0, r0, #1
bl SoundReq
_0803AB0A:
pop {r4, pc}
.align 2, 0
_0803AB0C: .4byte gUnk_080CED6C
.syntax divided
+129
View File
@@ -0,0 +1,129 @@
.syntax unified
push {r4, r5, r6, lr}
adds r6, r0, #0
adds r5, r1, #0
movs r1, #0
adds r4, r6, #0
adds r4, #0x74
ldrb r3, [r4]
movs r2, #0xe0
ands r2, r3
cmp r2, #0
bne _0803BAEC
cmp r3, #0
bne _0803BAD2
adds r2, r6, #0
adds r2, #0x75
ldrb r0, [r2]
adds r0, #1
strb r0, [r2]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #9
bls _0803BABA
strb r1, [r2]
_0803BABA:
ldrb r0, [r6, #0xa]
cmp r0, #2
bne _0803BAC8
ldr r1, _0803BAC4 @ =gUnk_080CFD30
b _0803BACA
.align 2, 0
_0803BAC4: .4byte gUnk_080CFD30
_0803BAC8:
ldr r1, _0803BAE8 @ =gUnk_080CFD44
_0803BACA:
ldrb r0, [r2]
lsls r0, r0, #1
adds r0, r0, r1
ldrh r1, [r0]
_0803BAD2:
adds r2, r6, #0
adds r2, #0x74
ldrb r0, [r2]
adds r0, #1
strb r0, [r2]
cmp r5, r0
bhi _0803BB18
movs r0, #0
strb r0, [r2]
b _0803BB18
.align 2, 0
_0803BAE8: .4byte gUnk_080CFD44
_0803BAEC:
movs r0, #0x80
ands r0, r2
cmp r0, #0
bne _0803BB18
movs r0, #0x80
orrs r0, r3
strb r0, [r4]
movs r0, #0x20
ands r2, r0
cmp r2, #0
beq _0803BB0C
ldr r1, _0803BB08 @ =gUnk_080CFD58
b _0803BB0E
.align 2, 0
_0803BB08: .4byte gUnk_080CFD58
_0803BB0C:
ldr r1, _0803BB78 @ =gUnk_080CFD5C
_0803BB0E:
ldrb r0, [r6, #0xa]
subs r0, #2
lsls r0, r0, #1
adds r0, r0, r1
ldrh r1, [r0]
_0803BB18:
cmp r1, #0
beq _0803BB74
adds r0, r6, #0
bl sub_0801D2B4
ldr r0, [r6, #0x50]
ldr r4, [r0, #0x78]
ldrb r1, [r6, #0x1a]
lsls r1, r1, #0x1c
lsrs r1, r1, #0x1c
ldrb r2, [r4, #0x1a]
movs r3, #0x10
rsbs r3, r3, #0
adds r0, r3, #0
ands r0, r2
orrs r0, r1
strb r0, [r4, #0x1a]
ldr r0, [r6, #0x50]
ldr r5, [r0, #0x78]
ldrb r1, [r6, #0x1a]
lsls r1, r1, #0x1c
lsrs r1, r1, #0x18
ldrb r4, [r5, #0x1a]
movs r2, #0xf
adds r0, r2, #0
ands r0, r4
orrs r0, r1
strb r0, [r5, #0x1a]
ldr r0, [r6, #0x50]
ldr r4, [r0, #0x54]
ldrb r0, [r6, #0x1a]
lsls r0, r0, #0x1c
lsrs r0, r0, #0x1c
ldrb r1, [r4, #0x1a]
ands r3, r1
orrs r3, r0
strb r3, [r4, #0x1a]
ldr r0, [r6, #0x50]
ldr r3, [r0, #0x54]
ldrb r0, [r6, #0x1a]
lsls r0, r0, #0x1c
lsrs r0, r0, #0x18
ldrb r1, [r3, #0x1a]
ands r2, r1
orrs r2, r0
strb r2, [r3, #0x1a]
_0803BB74:
pop {r4, r5, r6, pc}
.align 2, 0
_0803BB78: .4byte gUnk_080CFD5C
.syntax divided
-109
View File
@@ -1,109 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CFC14:: @ 080CFC14
.4byte sub_0803A170
.4byte sub_0803A188
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte nullsub_167
gUnk_080CFC2C:: @ 080CFC2C
.4byte sub_0803A254
.4byte sub_0803A254
.4byte sub_0803B8F8
.4byte sub_0803B8F8
gUnk_080CFC3C:: @ 080CFC3C
.4byte sub_0803A274
.4byte sub_0803A364
.4byte sub_0803A548
.4byte sub_0803A58C
.4byte sub_0803A5D0
.4byte sub_0803A60C
.4byte sub_0803A660
.4byte sub_0803A6E8
.4byte sub_0803A720
.4byte sub_0803A740
.4byte sub_0803A780
.4byte sub_0803A7AC
.4byte sub_0803A7CC
.4byte sub_0803A814
.4byte sub_0803A86C
.4byte sub_0803A8B8
.4byte sub_0803A90C
.4byte sub_0803A978
.4byte sub_0803AA00
.4byte sub_0803AA98
.4byte sub_0803AB10
.4byte sub_0803AB5C
.4byte sub_0803ABB4
.4byte sub_0803AC1C
.4byte sub_0803AC60
.4byte sub_0803ACC0
.4byte sub_0803ADAC
.4byte sub_0803ADF4
.4byte sub_0803AE48
.4byte sub_0803AEC4
.4byte sub_0803AF18
.4byte sub_0803AF50
.4byte sub_0803AF7C
.4byte sub_0803AF9C
.4byte sub_0803AFC8
.4byte sub_0803AFE0
.4byte sub_0803B01C
.4byte sub_0803B04C
.4byte sub_0803B074
.4byte sub_0803B0D4
.4byte sub_0803B100
.4byte sub_0803B144
.4byte sub_0803B17C
.4byte sub_0803B1B8
.4byte sub_0803B2D0
.4byte sub_0803B30C
.4byte sub_0803B338
.4byte sub_0803B35C
.4byte sub_0803B398
.4byte sub_0803B3F4
.4byte sub_0803B480
gUnk_080CFD08:: @ 080CFD08
.incbin "baserom.gba", 0x0CFD08, 0x0000002
gUnk_080CFD0A:: @ 080CFD0A
.incbin "baserom.gba", 0x0CFD0A, 0x0000002
gUnk_080CFD0C:: @ 080CFD0C
.incbin "baserom.gba", 0x0CFD0C, 0x000000D
gUnk_080CFD19:: @ 080CFD19
.incbin "baserom.gba", 0x0CFD19, 0x0000002
gUnk_080CFD1B:: @ 080CFD1B
.incbin "baserom.gba", 0x0CFD1B, 0x0000002
gUnk_080CFD1D:: @ 080CFD1D
.incbin "baserom.gba", 0x0CFD1D, 0x0000003
gUnk_080CFD20:: @ 080CFD20
.4byte sub_0803B910
.4byte sub_0803B978
.4byte sub_0803BA6C
.4byte sub_0803BA80
gUnk_080CFD30:: @ 080CFD30
.incbin "baserom.gba", 0x0CFD30, 0x0000014
gUnk_080CFD44:: @ 080CFD44
.incbin "baserom.gba", 0x0CFD44, 0x0000014
gUnk_080CFD58:: @ 080CFD58
.incbin "baserom.gba", 0x0CFD58, 0x0000004
gUnk_080CFD5C:: @ 080CFD5C
.incbin "baserom.gba", 0x0CFD5C, 0x0000004
+2 -2
View File
@@ -410,7 +410,7 @@ SECTIONS {
asm/cuccoAggr.o(.text);
asm/stalfos.o(.text);
asm/flyingSkull.o(.text);
asm/mazaalBracelet.o(.text);
src/enemy/mazaalBracelet.o(.text);
asm/takkuri.o(.text);
src/enemy/bowMoblin.o(.text);
asm/bowMoblin.o(.text);
@@ -1117,7 +1117,7 @@ SECTIONS {
data/animations/enemy/stalfos.o(.rodata);
data/const/enemy/flyingSkull.o(.rodata);
data/animations/enemy/flyingSkull.o(.rodata);
data/const/enemy/mazaalBracelet.o(.rodata);
src/enemy/mazaalBracelet.o(.rodata);
data/animations/enemy/mazaalBracelet.o(.rodata);
data/const/enemy/takkuri.o(.rodata);
data/const/enemy/bowMoblin.o(.rodata);
File diff suppressed because it is too large Load Diff
+1
View File
@@ -0,0 +1 @@
#include "global.h"
+1
View File
@@ -0,0 +1 @@
#include "global.h"
+1
View File
@@ -0,0 +1 @@
#include "global.h"