Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data

2018-09-09 15:51:13 +01:00
parent e1834c9d7b 6454740587
commit 1ba17e1666
74 changed files with 3838 additions and 10262 deletions
@@ -677,7 +677,7 @@ static void HandleInitWindows(void)

 static void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x)
 {
-    AddTextPrinterParameterized2(windowId, 1, x, 1, 0, 0, sTextColorInPokeblockMenu, 0, string);
+    AddTextPrinterParameterized4(windowId, 1, x, 1, 0, 0, sTextColorInPokeblockMenu, 0, string);
 }

 static void PutPokeblockInfoText(void)