From 29c2efd28768dd125bfff0addfe82b8ea47c3eb2 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 5 Oct 2024 11:06:58 -0400 Subject: [PATCH] process 2 sheets for font gfx data in message editor --- src/app/editor/message/message_editor.cc | 4 ++-- src/app/editor/message/message_editor.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/editor/message/message_editor.cc b/src/app/editor/message/message_editor.cc index 0487f1cd..fa459d55 100644 --- a/src/app/editor/message/message_editor.cc +++ b/src/app/editor/message/message_editor.cc @@ -14,6 +14,7 @@ #include "app/gui/canvas.h" #include "app/gui/style.h" #include "app/rom.h" +#include "imgui.h" namespace yaze { namespace app { @@ -53,7 +54,7 @@ absl::Status MessageEditor::Initialize() { for (int i = 0; i < 0x4000; i++) { data[i] = rom()->data()[kGfxFont + i]; } - font_gfx16_data_ = gfx::SnesTo8bppSheet(data, /*bpp=*/2); + font_gfx16_data_ = gfx::SnesTo8bppSheet(data, /*bpp=*/2, /*num_sheets=*/2); // 4bpp RETURN_IF_ERROR(Renderer::GetInstance().CreateAndRenderBitmap( @@ -253,7 +254,6 @@ void MessageEditor::DrawTextCommands() { } } - // TODO: Fix the command parsing. void MessageEditor::ReadAllTextDataV2() { // Read all text data from the ROM. diff --git a/src/app/editor/message/message_editor.h b/src/app/editor/message/message_editor.h index df611fd1..4dd331a0 100644 --- a/src/app/editor/message/message_editor.h +++ b/src/app/editor/message/message_editor.h @@ -5,7 +5,6 @@ #include #include "absl/status/status.h" -#include "absl/strings/str_format.h" #include "app/editor/message/message_data.h" #include "app/editor/utils/editor.h" #include "app/gfx/bitmap.h"