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

ported reshow_battle_screen from pokeem

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-08-02 07:28:09 +08:00
parent c2964e8181
commit 742a7ee1be
38 changed files with 465 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/water.s
+4 -4
View File
@@ -750,7 +750,7 @@ sub_80AB168: @ 80AB168
ldr r6, _080AB1B8 @ =0x0000fff6
strh r6, [r4, 0x26]
ldrb r0, [r7]
bl sub_807685C
bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r5, r0, 24
bl IsContest
@@ -2408,7 +2408,7 @@ sub_80ABE4C: @ 80ABE4C
lsrs r6, r0, 24
movs r5, 0xAC
ldrb r0, [r4]
bl sub_807685C
bl GetBattlerSpriteSubpriority
subs r0, 0x1
lsls r0, 24
lsrs r0, 24
@@ -3679,7 +3679,7 @@ _080AC826:
strh r0, [r4, 0x30]
ldr r0, _080AC870 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
subs r0, 0x1
adds r1, r4, 0
adds r1, 0x43
@@ -3737,7 +3737,7 @@ _080AC89C:
strh r0, [r4, 0x30]
ldr r0, _080AC8E8 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_807685C
bl GetBattlerSpriteSubpriority
subs r0, 0x1
adds r1, r4, 0
adds r1, 0x43