fix rom3 conflicts

2017-10-13 19:58:45 +02:00
parent 20d158cf4a 3040c1e1aa
commit 72ed861715
93 changed files with 13360 additions and 18899 deletions
@@ -2297,7 +2297,7 @@ _080B3750:
 	b _080B37CC
 _080B375A:
 	ldr r0, =gUnknown_08278091
-	bl box_related_two__2
+	bl ShowFieldMessage
 	movs r0, 0x1
 	strh r0, [r5, 0x8]
 	b _080B37CC