nearly matching PokemonItemEffects2

This commit is contained in:
ProjectRevoTPP
2018-10-08 13:17:04 -04:00
parent e54247c225
commit 02fb51cbe7
3 changed files with 550 additions and 8 deletions
+4 -4
View File
@@ -13278,7 +13278,7 @@ _08125330:
adds r0, r5, 0
adds r1, r6, 0
movs r3, 0
bl sub_8042414
bl PokemonUseItemEffects2
lsls r0, 24
lsrs r4, r0, 24
_08125342:
@@ -13882,7 +13882,7 @@ sub_812580C: @ 812580C
ldrh r1, [r1]
ldrb r2, [r3, 0x9]
ldrb r3, [r3, 0xE]
bl sub_8042414
bl PokemonUseItemEffects2
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -15175,7 +15175,7 @@ dp05_rare_candy: @ 81262AC
adds r0, r4, 0
adds r1, r5, 0
movs r3, 0
bl sub_8042414
bl PokemonUseItemEffects2
lsls r0, 24
lsrs r4, r0, 24
b _081262F6
@@ -16210,7 +16210,7 @@ sub_8126B60: @ 8126B60
ldrh r1, [r1]
ldrb r2, [r2, 0x9]
movs r3, 0
bl sub_8042414
bl PokemonUseItemEffects2
lsls r0, 24
cmp r0, 0
beq _08126BC8
+3 -3
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_8042414
sub_8042414: @ 8042414
thumb_func_start PokemonUseItemEffects2
PokemonUseItemEffects2: @ 8042414
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1000,7 +1000,7 @@ _08042BD8:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8042414
thumb_func_end PokemonUseItemEffects2
thumb_func_start sub_8042BE8
sub_8042BE8: @ 8042BE8