fix pokeblock conflicts

2017-12-18 16:58:14 +01:00
parent c3abe2863f 6a674e1e83
commit cb229f56e8
174 changed files with 5529 additions and 7226 deletions
@@ -266,7 +266,7 @@ sub_80FD254: @ 80FD254
 	ldr r1, =bag_menu_mail_related
 	mov r0, sp
 	movs r2, 0
-	bl sub_8121478
+	bl ReadMail
 	add sp, 0x24
 	pop {r0}
 	bx r0