From 8e7202ec3d289305190aedc66d02435571747a76 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 21 Oct 2018 02:24:57 -0500 Subject: Fix LZ compressed data alignment --- src/naming_screen.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/naming_screen.c') diff --git a/src/naming_screen.c b/src/naming_screen.c index 4d4178c7a..ee1e78c60 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -16,6 +16,7 @@ #include "constants/vars.h" #include "constants/songs.h" #include "pokemon_storage_system.h" +#include "graphics.h" #include "sound.h" #include "trig.h" #include "field_effect.h" @@ -30,20 +31,6 @@ EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL; extern u16 gKeyRepeatStartDelay; -// extern graphics -extern const u16 gNamingScreenMenu_Pal[]; -extern const u8 gNamingScreenMenu_Gfx[]; -extern const u8 gUnknown_08DD4544[]; -extern const u8 gUnknown_08DD4620[]; -extern const u8 gUnknown_08DD46E0[]; -extern const u8 gUnknown_08DD47A0[]; -extern const u8 gNamingScreenRWindow_Gfx[]; -extern const u8 gNamingScreenKeyboardButton_Gfx[]; -extern const u8 gNamingScreenROptions_Gfx[]; -extern const u8 gNamingScreenCursor_Gfx[]; -extern const u8 gNamingScreenRightPointingTriangleTiles[]; -extern const u8 gNamingScreenUnderscoreTiles[]; - // extern text extern const u8 gExpandedPlaceholder_Empty[]; extern const u8 gText_PkmnTransferredSomeonesPC[]; -- cgit v1.2.3 From b252bd029279b6f28518c59df1ba03caf44d756f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 27 Oct 2018 00:53:07 +0200 Subject: Window priority to window bg --- src/naming_screen.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/naming_screen.c') diff --git a/src/naming_screen.c b/src/naming_screen.c index ee1e78c60..a67516602 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -103,7 +103,7 @@ static const struct BgTemplate gUnknown_0858BE00[] = static const struct WindowTemplate gUnknown_0858BE10[] = { { - .priority = 1, + .bg = 1, .tilemapLeft = 3, .tilemapTop = 10, .width = 19, @@ -112,7 +112,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] = .baseBlock = 0x030 }, { - .priority = 2, + .bg = 2, .tilemapLeft = 3, .tilemapTop = 10, .width = 19, @@ -121,7 +121,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] = .baseBlock = 0x0C8 }, { - .priority = 3, + .bg = 3, .tilemapLeft = 8, .tilemapTop = 6, .width = 17, @@ -130,7 +130,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] = .baseBlock = 0x030 }, { - .priority = 3, + .bg = 3, .tilemapLeft = 8, .tilemapTop = 4, .width = 17, @@ -139,7 +139,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] = .baseBlock = 0x052 }, { - .priority = 0, + .bg = 0, .tilemapLeft = 0, .tilemapTop = 0, .width = 30, -- cgit v1.2.3 From 6d38431c330a79d97bfb72fdaaaa65901ce0fa64 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 10:44:48 -0600 Subject: Begin cleaning text.c --- src/naming_screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/naming_screen.c') diff --git a/src/naming_screen.c b/src/naming_screen.c index a67516602..ae7d677fe 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -558,7 +558,7 @@ static void DisplaySentToPCMessage(void) StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]); NewMenuHelpers_DrawDialogueFrame(0, 0); - gTextFlags.flag_0 = TRUE; + gTextFlags.canABSpeedUpPrint = TRUE; AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeed(), 0, 2, 1, 3); CopyWindowToVram(0, 3); } -- cgit v1.2.3 From f8d337e491f531285f6067e2e7f39a8d606036d6 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 11:30:21 -0600 Subject: Finish cleaning up text.c --- src/naming_screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/naming_screen.c') diff --git a/src/naming_screen.c b/src/naming_screen.c index ae7d677fe..9902df04c 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -559,7 +559,7 @@ static void DisplaySentToPCMessage(void) StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]); NewMenuHelpers_DrawDialogueFrame(0, 0); gTextFlags.canABSpeedUpPrint = TRUE; - AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeed(), 0, 2, 1, 3); + AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeedDelay(), 0, 2, 1, 3); CopyWindowToVram(0, 3); } -- cgit v1.2.3