Merge branch 'master' into dodrio_berry_picking

This commit is contained in:
PikalaxALT
2019-04-05 08:41:31 -04:00
306 changed files with 20985 additions and 31720 deletions
+1 -1
View File
@@ -2454,7 +2454,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD
bl sub_8098858
bl DrawTextBorderOuter
adds r0, r7, 0
movs r1, 0x11
bl FillWindowPixelBuffer