dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ported battle_gfx_sfx_util from pokeem

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-29 02:39:41 +08:00
parent 37be39117a
commit 935f93a075
58 changed files with 2588 additions and 5115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/electric.s
+33 -33
View File
@@ -123,13 +123,13 @@ sub_80ADCB8: @ 80ADCB8
ldr r4, _080ADCFC @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -260,7 +260,7 @@ _080ADDC8:
bne _080ADDF0
adds r0, r4, 0
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -273,14 +273,14 @@ _080ADDEC: .4byte gBattleAnimArgs
_080ADDF0:
adds r0, r4, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
adds r0, r4, 0
movs r1, 0x3
_080ADE02:
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -379,7 +379,7 @@ sub_80ADEB0: @ 80ADEB0
ldr r6, _080ADF28 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -387,7 +387,7 @@ sub_80ADEB0: @ 80ADEB0
strh r0, [r4, 0x34]
ldrb r0, [r6]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -555,7 +555,7 @@ _080AE024:
ldr r5, _080AE060 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080AE064 @ =gBattleAnimArgs
lsrs r0, 24
@@ -564,7 +564,7 @@ _080AE024:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -626,7 +626,7 @@ _080AE0AA:
_080AE0B2:
adds r0, r6, 0
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080AE11C @ =gBattleAnimArgs
lsrs r0, 24
@@ -635,7 +635,7 @@ _080AE0B2:
strh r0, [r5, 0x20]
adds r0, r6, 0
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
@@ -811,7 +811,7 @@ sub_80AE220: @ 80AE220
ldr r6, _080AE268 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r1, 0
bl sub_8074480
bl GetBattlerSpriteCoord
ldr r1, _080AE26C @ =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -825,7 +825,7 @@ sub_80AE220: @ 80AE220
strh r0, [r4, 0x8]
ldrb r0, [r6]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r5, 0x2]
@@ -1233,13 +1233,13 @@ _080AE56C:
_080AE56E:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x26]
@@ -1466,13 +1466,13 @@ _080AE738:
_080AE73A:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1509,13 +1509,13 @@ _080AE790:
_080AE792:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1548,13 +1548,13 @@ sub_80AE7DC: @ 80AE7DC
ldr r4, _080AE834 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1680,7 +1680,7 @@ _080AE8D4:
ldr r4, _080AE908 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
@@ -1897,13 +1897,13 @@ _080AEA88: .4byte 0x0000fff0
_080AEA8C:
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -1923,13 +1923,13 @@ _080AEAB4:
ldr r4, _080AEAE8 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r2, 0xA
@@ -2175,13 +2175,13 @@ _080AEC92:
ldr r4, _080AECC0 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2245,13 +2245,13 @@ _080AED20:
ldr r4, _080AEDA4 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldrb r0, [r4]
movs r1, 0x3
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x16]
@@ -2260,7 +2260,7 @@ _080AED20:
ldr r0, _080AEDA8 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1C]
@@ -2603,7 +2603,7 @@ _080AEFCE:
ldr r0, _080AF018 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x1
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2625,7 +2625,7 @@ _080AEFF8:
ldr r4, _080AF018 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]