berry blender fix merge conflicts

2017-11-26 19:21:51 +01:00
parent ad3a97e178 1e4f12e6fa
commit b0657350a4
27 changed files with 1034 additions and 2406 deletions
@@ -704,7 +704,7 @@ sub_817A1C4: @ 817A1C4
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r4, 0
-	bl sub_8136FE4
+	bl PokeblockGetGain
 	ldr r6, =gUnknown_0203BC9E
 	strh r0, [r6]
 	ldr r1, =gStringVar1