Skip to content

Commit

Permalink
Merge pull request #576 from MokhaLeee/eventfx
Browse files Browse the repository at this point in the history
decomp eventfx related code
  • Loading branch information
RevoSucks authored Feb 19, 2024
2 parents c07a245 + 135a24f commit 102a1dd
Show file tree
Hide file tree
Showing 29 changed files with 702 additions and 1,143 deletions.
62 changes: 0 additions & 62 deletions asm/boomfogfx.s

This file was deleted.

214 changes: 0 additions & 214 deletions asm/code_8086934.s
Original file line number Diff line number Diff line change
Expand Up @@ -4,220 +4,6 @@

@ I don't know, so graphical effect stuff probably

THUMB_FUNC_START sub_8086690
sub_8086690: @ 0x08086690
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, r9
mov r5, r8
push {r5, r6, r7}
ldr r5, [sp, #0x20]
ldr r6, [sp, #0x24]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
ldr r4, _08086788 @ gUnknown_03001CC8
lsls r7, r0, #3
mov sl, r7
add sl, r4
lsls r5, r5, #0x18
asrs r5, r5, #0x18
movs r4, #0x3f
ands r5, r4
mov r7, sl
ldrb r7, [r7]
mov r8, r7
subs r4, #0x7f
mov r9, r4
mov r7, r8
ands r4, r7
orrs r4, r5
mov r5, sl
strb r4, [r5]
lsls r6, r6, #0x18
asrs r6, r6, #0x18
movs r4, #0x3f
ands r6, r4
lsls r6, r6, #6
ldrh r5, [r5]
ldr r7, _0808678C @ 0xFFFFF03F
mov r8, r7
mov r4, r8
ands r4, r5
orrs r4, r6
mov r5, sl
strh r4, [r5]
ldr r4, [r5]
ldr r5, _08086790 @ 0xFFFC0FFF
ands r4, r5
mov r7, sl
str r4, [r7]
movs r4, #0
strb r4, [r7, #3]
ldr r4, _08086794 @ 0x0000FFFF
strh r4, [r7, #4]
movs r6, #0
movs r4, #0x1e
strh r4, [r7, #6]
ldr r4, _08086798 @ UnitDef_03001CE8
mov ip, r4
lsls r5, r0, #2
adds r5, r5, r0
lsls r5, r5, #2
adds r4, r5, r4
movs r7, #1
strb r7, [r4]
strb r1, [r4, #1]
strb r6, [r4, #2]
ldrb r1, [r4, #3]
movs r0, #2
negs r0, r0
ands r0, r1
movs r1, #7
negs r1, r1
ands r0, r1
movs r1, #4
orrs r0, r1
movs r1, #7
ands r0, r1
movs r1, #8
orrs r0, r1
strb r0, [r4, #3]
movs r0, #0x3f
ands r2, r0
ldrb r0, [r4, #4]
mov r1, r9
ands r1, r0
orrs r1, r2
strb r1, [r4, #4]
lsls r3, r3, #0x18
asrs r3, r3, #0x18
movs r0, #0x3f
ands r3, r0
lsls r3, r3, #6
ldrh r0, [r4, #4]
mov r1, r8
ands r1, r0
orrs r1, r3
strh r1, [r4, #4]
ldrb r1, [r4, #5]
movs r0, #0x11
negs r0, r0
ands r0, r1
movs r1, #0x20
orrs r0, r1
movs r1, #0x7f
ands r0, r1
strb r0, [r4, #5]
strb r6, [r4, #6]
strb r7, [r4, #7]
movs r7, #8
add ip, r7
add r5, ip
mov r0, sl
str r0, [r5]
strb r6, [r4, #0xc]
strb r6, [r4, #0xd]
strb r6, [r4, #0xe]
strb r6, [r4, #0xf]
strb r6, [r4, #0x10]
strb r6, [r4, #0x11]
strb r6, [r4, #0x12]
strb r6, [r4, #0x13]
pop {r3, r4, r5}
mov r8, r3
mov r9, r4
mov sl, r5
pop {r4, r5, r6, r7}
pop {r0}
bx r0
.align 2, 0
_08086788: .4byte gUnknown_03001CC8
_0808678C: .4byte 0xFFFFF03F
_08086790: .4byte 0xFFFC0FFF
_08086794: .4byte 0x0000FFFF
_08086798: .4byte UnitDef_03001CE8

THUMB_FUNC_END sub_8086690

THUMB_FUNC_START sub_808679C
sub_808679C: @ 0x0808679C
push {r4, r5, r6, lr}
sub sp, #8
ldr r5, _08086830 @ gUnknown_089FF480
ldr r6, _08086834 @ gUnknown_03001CC0
ldrb r0, [r6]
lsls r0, r0, #2
adds r0, r0, r5
ldrb r1, [r0]
movs r4, #0xe
str r4, [sp]
movs r0, #2
str r0, [sp, #4]
movs r0, #0
movs r2, #0
movs r3, #2
bl sub_8086690
ldrb r0, [r6]
lsls r0, r0, #2
adds r1, r5, #1
adds r0, r0, r1
ldrb r1, [r0]
str r4, [sp]
movs r0, #3
str r0, [sp, #4]
movs r0, #1
movs r2, #0
movs r3, #3
bl sub_8086690
ldrb r0, [r6]
lsls r0, r0, #2
adds r1, r5, #2
adds r0, r0, r1
ldrb r1, [r0]
str r4, [sp]
movs r0, #4
str r0, [sp, #4]
movs r0, #2
movs r2, #0
movs r3, #4
bl sub_8086690
ldrb r0, [r6]
lsls r0, r0, #2
adds r1, r5, #3
adds r0, r0, r1
ldrb r1, [r0]
str r4, [sp]
movs r0, #5
str r0, [sp, #4]
movs r0, #3
movs r2, #0
movs r3, #5
bl sub_8086690
ldr r0, _08086838 @ UnitDef_03001CE8
adds r0, #0x50
movs r1, #0
strb r1, [r0]
ldrb r0, [r6]
adds r0, #1
strb r0, [r6]
ldrb r0, [r6]
lsls r0, r0, #2
adds r0, r0, r5
ldrb r0, [r0]
cmp r0, #0
bne _08086828
strb r0, [r6]
_08086828:
add sp, #8
pop {r4, r5, r6}
pop {r0}
bx r0
.align 2, 0
_08086830: .4byte gUnknown_089FF480
_08086834: .4byte gUnknown_03001CC0
_08086838: .4byte UnitDef_03001CE8

THUMB_FUNC_END sub_808679C

THUMB_FUNC_START sub_808683C
sub_808683C: @ 0x0808683C
Expand Down
Loading

0 comments on commit 102a1dd

Please sign in to comment.