Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Efxsound decompiled #489

Merged
merged 3 commits into from
Oct 20, 2023
Merged

Efxsound decompiled #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc46e66
decomp efxsound in process
MokhaLeee Oct 19, 2023
13f7cc6
exfsound decompiled
MokhaLeee Oct 20, 2023
8f2021f
update thanks to jiang
MokhaLeee Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions asm/banim-efxmagic-5BA64.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ sub_805BF40: @ 0x0805BF40
adds r0, r6, #0
bl StartBattleAnimHitEffectsDefault
adds r0, r6, #0
bl sub_8072400
bl GetEfxHpChangeType
lsls r0, r0, #0x10
asrs r0, r0, #0x10
cmp r0, #2
Expand All @@ -689,7 +689,7 @@ _0805BFB2:
cmp r0, #0
bne _0805BFD6
adds r0, r6, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805BFD6
_0805BFC0:
movs r1, #0x2c
Expand Down Expand Up @@ -1009,7 +1009,7 @@ sub_805C21C: @ 0x0805C21C
cmp r0, #8
bne _0805C25C
ldr r0, [r4, #0x60]
bl sub_807290C
bl GetProperAnimSoundLocation
ldr r1, [r4, #0x60]
ldrh r2, [r1, #2]
adds r2, r2, r0
Expand Down Expand Up @@ -1108,7 +1108,7 @@ sub_805C29C: @ 0x0805C29C
adds r0, r6, #0
bl StartBattleAnimHitEffectsDefault
adds r0, r6, #0
bl sub_8072400
bl GetEfxHpChangeType
lsls r0, r0, #0x10
asrs r0, r0, #0x10
cmp r0, #2
Expand All @@ -1131,7 +1131,7 @@ _0805C326:
cmp r0, #0
bne _0805C350
adds r0, r6, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805C350
_0805C334:
movs r3, #0x2c
Expand Down Expand Up @@ -1707,7 +1707,7 @@ sub_805C7E4: @ 0x0805C7E4
adds r0, r6, #0
bl StartBattleAnimHitEffectsDefault
adds r0, r6, #0
bl sub_8072400
bl GetEfxHpChangeType
lsls r0, r0, #0x10
asrs r0, r0, #0x10
cmp r0, #2
Expand All @@ -1730,7 +1730,7 @@ _0805C862:
cmp r0, #0
bne _0805C886
adds r0, r6, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805C886
_0805C870:
movs r3, #0x2c
Expand Down Expand Up @@ -2401,7 +2401,7 @@ _0805CDB0:
adds r0, r6, #0
bl StartBattleAnimHitEffectsDefault
adds r0, r6, #0
bl sub_8072400
bl GetEfxHpChangeType
lsls r0, r0, #0x10
asrs r0, r0, #0x10
cmp r0, #2
Expand All @@ -2424,7 +2424,7 @@ _0805CDF4:
cmp r0, #0
bne _0805CE14
adds r0, r6, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805CE14
_0805CE02:
cmp r0, #0x3e
Expand Down Expand Up @@ -2617,7 +2617,7 @@ _0805CF32:
cmp r0, #0
bne _0805CFB6
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805CFB6
.align 2, 0
_0805CF7C: .4byte 0x0000010D
Expand Down Expand Up @@ -2831,7 +2831,7 @@ _0805D110:
cmp r0, #0
bne _0805D142
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805D142
_0805D134:
cmp r0, #0x82
Expand Down Expand Up @@ -3206,7 +3206,7 @@ _0805D400:
cmp r0, #0
bne _0805D43E
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805D43E
_0805D428:
cmp r0, #0x32
Expand Down Expand Up @@ -3376,7 +3376,7 @@ _0805D558:
cmp r0, #0
bne _0805D596
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805D596
.align 2, 0
_0805D580: .4byte 0x0000011F
Expand Down
14 changes: 7 additions & 7 deletions asm/banim-efxmagic-66514.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ _08066636:
cmp r0, #0
bne _0806669C
adds r0, r4, #0
bl sub_8072450
bl EfxPlayHittedSFX
adds r0, r4, #0
movs r1, #0x78
movs r2, #0xa
Expand Down Expand Up @@ -2459,7 +2459,7 @@ _08067848:
cmp r0, #0
bne _08067886
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _08067886
_08067870:
adds r0, r2, #0
Expand Down Expand Up @@ -4528,7 +4528,7 @@ _08068884:
cmp r0, #0
bne _080688B6
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _080688B6
_080688A8:
cmp r0, #0x82
Expand Down Expand Up @@ -5027,7 +5027,7 @@ _08068C68:
cmp r0, #0
bne _08068D14
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _08068D14
_08068C8C:
movs r3, #0x9a
Expand Down Expand Up @@ -7550,7 +7550,7 @@ _08069FBC:
cmp r0, #0
bne _08069FFE
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _08069FFE
.align 2, 0
_08069FE4: .4byte 0x00000123
Expand Down Expand Up @@ -9589,7 +9589,7 @@ _0806AFAE:
cmp r0, #0
bne _0806B07A
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0806B07A
_0806AFD6:
adds r0, r2, #0
Expand Down Expand Up @@ -10381,7 +10381,7 @@ _0806B608:
cmp r0, #0
bne _0806B646
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0806B646
_0806B630:
adds r0, r2, #0
Expand Down
2 changes: 1 addition & 1 deletion asm/banim-efxmagic-ivaldi.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ _0806592A:
cmp r0, #0
bne _080659A4
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _080659A4
.align 2, 0
_0806595C: .4byte 0x00000107
Expand Down
28 changes: 14 additions & 14 deletions asm/banim-efxmagic.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ _0805E1E4:
cmp r0, #0
bne _0805E228
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805E228
_0805E20C:
adds r0, r6, #0
Expand Down Expand Up @@ -904,7 +904,7 @@ _0805E7F6:
cmp r0, #0
bne _0805E848
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805E848
.align 2, 0
_0805E828: .4byte 0x00000119
Expand Down Expand Up @@ -1484,7 +1484,7 @@ _0805EC80:
cmp r0, #0
bne _0805ECCC
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805ECCC
_0805ECAA:
adds r0, r2, #0
Expand Down Expand Up @@ -1895,7 +1895,7 @@ _0805EFB8:
cmp r0, #0
bne _0805EFFE
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805EFFE
_0805EFE8:
adds r0, r2, #0
Expand Down Expand Up @@ -2484,7 +2484,7 @@ _0805F468:
cmp r0, #0
bne _0805F4A8
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805F4A8
_0805F490:
adds r0, r6, #0
Expand Down Expand Up @@ -3106,7 +3106,7 @@ _0805F93E:
cmp r0, #0
bne _0805F9A0
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805F9A0
.align 2, 0
_0805F980: .4byte 0x00000121
Expand Down Expand Up @@ -3456,7 +3456,7 @@ _0805FC12:
cmp r0, #0
bne _0805FC88
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805FC88
.align 2, 0
_0805FC54: .4byte 0x00000101
Expand Down Expand Up @@ -3871,7 +3871,7 @@ _0805FF62:
cmp r0, #0
bne _0805FFAA
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _0805FFAA
_0805FF90:
adds r0, r3, #0
Expand Down Expand Up @@ -4419,7 +4419,7 @@ _080603B8:
cmp r0, #0
bne _08060438
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _08060438
.align 2, 0
_080603FC: .4byte 0x000002E2
Expand Down Expand Up @@ -5217,7 +5217,7 @@ _08060A04:
cmp r0, #0
bne _08060A94
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _08060A94
.align 2, 0
_08060A4C: .4byte 0x00000133
Expand Down Expand Up @@ -10672,7 +10672,7 @@ _0806354A:
cmp r0, #0
bne _08063588
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _08063588
_08063572:
adds r0, r6, #0
Expand Down Expand Up @@ -11389,7 +11389,7 @@ _08063B02:
cmp r0, #0
bne _08063B62
adds r0, r6, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _08063B62
_08063B32:
adds r0, r5, #0
Expand Down Expand Up @@ -12584,7 +12584,7 @@ _08064444:
adds r0, r4, #0
bl StartBattleAnimHitEffectsDefault
adds r0, r4, #0
bl sub_8072450
bl EfxPlayHittedSFX
_0806446E:
movs r0, #0x2c
ldrsh r1, [r5, r0]
Expand Down Expand Up @@ -14042,7 +14042,7 @@ _08064F86:
cmp r0, #0
bne _08064FFE
adds r0, r5, #0
bl sub_8072450
bl EfxPlayHittedSFX
b _08064FFE
_08064FB6:
adds r0, r2, #0
Expand Down
Loading