Merge remote-tracking branch 'upstream/master' into shop

# Conflicts: # asm/shop.s
2018-10-13 10:22:58 -05:00
parent fa9d1759bd a2a6700966
commit b24559d69b
3192 changed files with 42738 additions and 556806 deletions
--- a/src/money.c
+++ b/src/money.c
@@ -151,7 +151,7 @@ void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed)
        *(txtPtr++) = 0x77;

    StringExpandPlaceholders(txtPtr, gText_PokedollarVar1);
-    PrintTextOnWindow(windowId, 1, gStringVar4, x, y, speed, NULL);
+    AddTextPrinterParameterized(windowId, 1, gStringVar4, x, y, speed, NULL);
 }

 void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount)