diff options
| -rw-r--r-- | include/menu.h | 19 | ||||
| -rw-r--r-- | src/bag.c | 1 | ||||
| -rw-r--r-- | src/fldeff_softboiled.c | 1 | ||||
| -rw-r--r-- | src/menu2.c | 2 | ||||
| -rw-r--r-- | src/mevent_8145654.c | 1 | ||||
| -rw-r--r-- | src/oak_speech.c | 18 | ||||
| -rw-r--r-- | src/quest_log.c | 1 |
7 files changed, 20 insertions, 23 deletions
diff --git a/include/menu.h b/include/menu.h index 55083db0e..3cd7b140a 100644 --- a/include/menu.h +++ b/include/menu.h @@ -23,22 +23,15 @@ struct WindowTemplateWithAttr u32 attr; }; -void AddTextPrinterParameterized3(u8, u8, u8, u8, const void *, s8, const u8 *); -void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing); -void sub_8198070(u8 windowId, bool8 copyToVram); -void ScheduleBgCopyTilemapToVram(u8 bgNum); -void PrintMenuTable(u8 idx, u8 nstrs, const struct MenuAction *strs); -void InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 idx, u8 nstrs,u8); -void ResetTempTileDataBuffers(void); -void *DecompressAndCopyTileDataToVram(u8 bg_id, const void *src, u32 size, u16 offset, u8 mode); -bool8 FreeTempTileDataBuffersIfPossible(void); -void DoScheduledBgTilemapCopiesToVram(void); -void ClearScheduledBgCopiesToVram(void); +// menu2 +void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * color, s8 speed, const u8 * str); void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str); -void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); -void *DecompressAndCopyTileDataToVram2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); +void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing); +void sub_812E6DC(u8 windowId, const u8 * src, u16 x, u16 y); void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority); bool8 IsBlendTaskActive(void); +u8 sub_812EA78(u16 species, u32 personality, u8 a2); +s8 sub_812EAE4(u16 species, u32 personality, u8 a2); // list_menu void sub_8107CD8(u8 palOffset, u16 speciesId); @@ -6,6 +6,7 @@ #include "window.h" #include "text_window.h" #include "menu_helpers.h" +#include "new_menu_helpers.h" #include "menu.h" #include "money.h" #include "bag.h" diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index 67000e315..400a1d382 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -3,6 +3,7 @@ #include "sound.h" #include "string_util.h" #include "menu.h" +#include "new_menu_helpers.h" #include "constants/songs.h" #include "fldeff.h" diff --git a/src/menu2.c b/src/menu2.c index ffe5865e4..6a3668cfa 100644 --- a/src/menu2.c +++ b/src/menu2.c @@ -504,7 +504,7 @@ void sub_812E6DC(u8 windowId, const u8 * src, u16 x, u16 y) // Yeah, no, I'm not bothering with this NAKED -void sub_819A080(void * a0, void * a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7) +static void sub_812E768(void * a0, void * a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7) { asm_unified("\tpush {r4-r7,lr}\n" "\tmov r7, r10\n" diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index de6e1caa5..c67cd1358 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -6,6 +6,7 @@ #include "decompress.h" #include "malloc.h" #include "menu.h" +#include "new_menu_helpers.h" #include "pokemon_icon.h" #include "mystery_gift_menu.h" #include "menu_indicators.h" diff --git a/src/oak_speech.c b/src/oak_speech.c index eb5357e3a..26736604e 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -37,7 +37,7 @@ struct OakSpeechResources u16 unk_0010; u16 unk_0012; u16 unk_0014[4]; - u8 unk_001C[3]; + struct TextColor textColor; u8 textSpeed; u8 filler_0020[0x1800]; u8 bg2TilemapBuffer[0x400]; @@ -1056,14 +1056,14 @@ static void Task_OakSpeech19(u8 taskId) PutWindowTilemap(gTasks[taskId].data[13]); DrawStdFrameWithCustomTileAndPalette(gTasks[taskId].data[13], 1, GetStdWindowBaseTileNum(), 14); FillWindowPixelBuffer(gTasks[taskId].data[13], 0x11); - sOakSpeechResources->unk_001C[0] = 1; - sOakSpeechResources->unk_001C[1] = 2; - sOakSpeechResources->unk_001C[2] = 3; - AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 1, sOakSpeechResources->unk_001C, 0, gText_Boy); - sOakSpeechResources->unk_001C[0] = 1; - sOakSpeechResources->unk_001C[1] = 2; - sOakSpeechResources->unk_001C[2] = 3; - AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 17, sOakSpeechResources->unk_001C, 0, gText_Girl); + sOakSpeechResources->textColor.fgColor = 1; + sOakSpeechResources->textColor.bgColor = 2; + sOakSpeechResources->textColor.shadowColor = 3; + AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 1, &sOakSpeechResources->textColor, 0, gText_Boy); + sOakSpeechResources->textColor.fgColor = 1; + sOakSpeechResources->textColor.bgColor = 2; + sOakSpeechResources->textColor.shadowColor = 3; + AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 17, &sOakSpeechResources->textColor, 0, gText_Girl); Menu_InitCursor(gTasks[taskId].data[13], 2, 0, 1, GetFontAttribute(2, 1) + 2, 2, 0); CopyWindowToVram(gTasks[taskId].data[13], 3); gTasks[taskId].func = Task_OakSpeech20; diff --git a/src/quest_log.c b/src/quest_log.c index d08724a56..0d1cb7984 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -37,6 +37,7 @@ #include "link.h" #include "quest_log_8150454.h" #include "quest_log.h" +#include "new_menu_helpers.h" u8 gUnknown_3005E88; |