From e73ce5317dfc243474faa9187181ed323faf4ed5 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 30 May 2019 17:05:30 -0400 Subject: Parametrized to Parameterized --- src/wireless_communication_status_screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/wireless_communication_status_screen.c') diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index baf44cafc..fa4e27422 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -359,7 +359,7 @@ void sub_814F65C(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx) break; // default: UB } - AddTextPrinterParametrized2(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, &textColor, -1, str); + AddTextPrinterParameterized2(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, &textColor, -1, str); } u32 sub_814F714(struct UnkStruct_x20 * unk20, u32 * arg1) -- cgit v1.2.3 From b249154009efceb5710848a2567fb821d3e7217a Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 30 May 2019 17:44:48 -0400 Subject: synchronize text printer function names with pokeemerald --- src/wireless_communication_status_screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/wireless_communication_status_screen.c') diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index fa4e27422..1eb29be1b 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -359,7 +359,7 @@ void sub_814F65C(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx) break; // default: UB } - AddTextPrinterParameterized2(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, &textColor, -1, str); + AddTextPrinterParameterized4(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, &textColor, -1, str); } u32 sub_814F714(struct UnkStruct_x20 * unk20, u32 * arg1) -- cgit v1.2.3 From 40a808351a5b76b0a536c5fac6c9479284468af8 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 2 Jul 2019 11:28:48 +0800 Subject: finished safari_zone --- src/wireless_communication_status_screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/wireless_communication_status_screen.c') diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 1eb29be1b..846e86779 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -229,7 +229,7 @@ void sub_814F32C(void) Free(GetBgTilemapBuffer(i)); } Free(gUnknown_3002040); - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } void sub_814F364(s16 * unk0, s16 * unk1) -- cgit v1.2.3 From cc4d2f524cbac1610e6ff517d55d7de48ebcafc7 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 6 Jul 2019 05:53:42 +0800 Subject: finished dynamic_placeholder_text_util --- src/wireless_communication_status_screen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/wireless_communication_status_screen.c') diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 846e86779..cc80d37b6 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -10,7 +10,7 @@ #include "scanline_effect.h" #include "m4a.h" #include "string_util.h" -#include "unk_text_util.h" +#include "dynamic_placeholder_text_util.h" #include "overworld.h" #include "sound.h" #include "menu.h" @@ -208,7 +208,7 @@ void sub_814F1E4(void) ChangeBgY(1, 0, 0); LoadPalette(gUnknown_846F4D0, 0, 0x20); Menu_LoadStdPalAt(0xf0); - UnkTextUtil_Reset(); + DynamicPlaceholderTextUtil_Reset(); FillBgTilemapBufferRect(0, 0x000, 0, 0, 32, 32, 0xF); CopyBgTilemapBufferToVram(1); SetMainCallback2(sub_814F19C); -- cgit v1.2.3