dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

decompile electric.s

Browse Source
This commit is contained in:
shinny456
2018-12-16 22:23:05 -05:00
parent d1e6e705cc
commit 60484153a5
22 changed files with 1146 additions and 2626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim_815A0D4.s
+7 -7
View File
@@ -5588,14 +5588,14 @@ sub_815CDFC: @ 815CDFC
_0815CE36:
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A82E4
bl GetBattlerSubpriority
subs r0, 0x1
b _0815CE52
.pool
_0815CE48:
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A82E4
bl GetBattlerSubpriority
adds r0, 0x1
_0815CE52:
adds r1, r4, 0
@@ -7393,7 +7393,7 @@ _0815DCEA:
lsrs r0, 24
strh r0, [r5, 0x12]
adds r0, r4, 0
bl sub_80A82E4
bl GetBattlerSubpriority
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
@@ -8395,7 +8395,7 @@ _0815E4EE:
ldrsh r6, [r7, r1]
mov r1, r8
ldrb r0, [r1]
bl sub_80A82E4
bl GetBattlerSubpriority
adds r3, r0, 0
subs r3, 0x5
lsls r3, 24
@@ -10367,7 +10367,7 @@ sub_815F48C: @ 815F48C
cmp r0, 0
bne _0815F4B8
ldrb r0, [r4]
bl sub_80A82E4
bl GetBattlerSubpriority
subs r0, 0x2
adds r1, r5, 0
adds r1, 0x43
@@ -10377,7 +10377,7 @@ sub_815F48C: @ 815F48C
.pool
_0815F4B8:
ldrb r0, [r4]
bl sub_80A82E4
bl GetBattlerSubpriority
adds r0, 0x2
adds r1, r5, 0
adds r1, 0x43
@@ -11038,7 +11038,7 @@ _0815F9F4:
ldrh r6, [r0]
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A82E4
bl GetBattlerSubpriority
lsls r0, 24
lsrs r4, r0, 24
movs r7, 0
asm/battle_anim_effects_2.s
+6 -6
View File
@@ -1357,7 +1357,7 @@ _08103F28:
ble _08103FA0
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl sub_80A82E4
bl GetBattlerSubpriority
lsls r0, 24
lsrs r0, 24
ldr r2, =0x0000ffc0
@@ -1374,7 +1374,7 @@ _08103F78:
ble _08103FA0
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl sub_80A82E4
bl GetBattlerSubpriority
lsls r0, 24
lsrs r0, 24
ldr r3, =0x0000ffc0
@@ -1387,7 +1387,7 @@ _08103F78:
_08103FA0:
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl sub_80A82E4
bl GetBattlerSubpriority
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x8]
@@ -2246,7 +2246,7 @@ sub_8104674: @ 8104674
strh r5, [r4, 0x14]
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A82E4
bl GetBattlerSubpriority
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x16]
@@ -6256,7 +6256,7 @@ sub_810673C: @ 810673C
ldrh r0, [r1, 0x2]
strh r0, [r4, 0x30]
ldrb r0, [r5]
bl sub_80A82E4
bl GetBattlerSubpriority
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x3C]
@@ -6774,7 +6774,7 @@ sub_8106B54: @ 8106B54
bl StartSpriteAnim
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl sub_80A82E4
bl GetBattlerSubpriority
subs r0, 0x1
adds r1, r4, 0
adds r1, 0x43
asm/electric.s
-2547
View File
File diff suppressed because it is too large Load Diff
asm/water.s
+4 -4
View File
@@ -711,7 +711,7 @@ sub_8107730: @ 8107730
ldr r6, =0x0000fff6
strh r6, [r4, 0x26]
ldrb r0, [r7]
bl sub_80A82E4
bl GetBattlerSubpriority
lsls r0, 24
lsrs r5, r0, 24
bl IsContest
@@ -2286,7 +2286,7 @@ sub_8108408: @ 8108408
lsrs r6, r0, 24
movs r5, 0xAC
ldrb r0, [r4]
bl sub_80A82E4
bl GetBattlerSubpriority
subs r0, 0x1
lsls r0, 24
lsrs r0, 24
@@ -3517,7 +3517,7 @@ _08108DE2:
strh r0, [r4, 0x30]
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A82E4
bl GetBattlerSubpriority
subs r0, 0x1
adds r1, r4, 0
adds r1, 0x43
@@ -3572,7 +3572,7 @@ _08108E58:
strh r0, [r4, 0x30]
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A82E4
bl GetBattlerSubpriority
subs r0, 0x1
adds r1, r4, 0
adds r1, 0x43