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

Merge branch 'master' into quest_log

Browse Source
This commit is contained in:
PikalaxALT
2018-10-12 20:18:48 -04:00
parent e143072f96 bd88c80379
commit 6c52f7ce04
88 changed files with 8986 additions and 17161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/item_use.s
+4 -4
View File
@@ -743,7 +743,7 @@ _080A1578:
movs r1, 0x11
adds r2, r4, 0
movs r3, 0
bl ExecuteTableBasedItemEffect_
bl ExecuteTableBasedItemEffect
lsls r0, 24
cmp r0, 0
bne _080A1592
@@ -1886,7 +1886,7 @@ sub_80A1E7C: @ 80A1E7C
lsls r0, 24
lsrs r4, r0, 24
ldr r1, _080A1EBC @ =gBattlerPartyIndexes
ldr r0, _080A1EC0 @ =gUnknown_2024004
ldr r0, _080A1EC0 @ =gBattlerInMenuId
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1900,7 +1900,7 @@ sub_80A1E7C: @ 80A1E7C
lsls r2, 24
lsrs r2, 24
movs r3, 0
bl ExecuteTableBasedItemEffect_
bl ExecuteTableBasedItemEffect
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -1913,7 +1913,7 @@ sub_80A1E7C: @ 80A1E7C
b _080A1EE4
.align 2, 0
_080A1EBC: .4byte gBattlerPartyIndexes
_080A1EC0: .4byte gUnknown_2024004
_080A1EC0: .4byte gBattlerInMenuId
_080A1EC4: .4byte gPlayerParty
_080A1EC8: .4byte gUnknown_203AD30
_080A1ECC: .4byte gUnknown_84169DC