From e31afcbae37a4f12378d03de38019d381caac3c6 Mon Sep 17 00:00:00 2001 From: Remnants of Forgotten Disney Date: Fri, 25 Aug 2023 00:28:09 -0500 Subject: [PATCH] Font importing --- graphics/{brin.grit => background.grit} | 0 graphics/background.png | Bin 0 -> 1647 bytes graphics/brin.png | Bin 6923 -> 0 bytes graphics/unused graphics/crystal_font.png | Bin 0 -> 27324 bytes graphics/unused graphics/pkmn_font.png | Bin 0 -> 790 bytes include/pkmn_font.h | 14 ++++ source/main.cpp | 1 + source/pkmn_font.s | 91 ++++++++++++++++++++++ source/pokedex.cpp | 24 +++--- source/pokemon_data.cpp | 4 +- source/sprite_data.cpp | 8 +- source/text_engine.cpp | 5 +- 12 files changed, 130 insertions(+), 17 deletions(-) rename graphics/{brin.grit => background.grit} (100%) create mode 100644 graphics/background.png delete mode 100644 graphics/brin.png create mode 100644 graphics/unused graphics/crystal_font.png create mode 100644 graphics/unused graphics/pkmn_font.png create mode 100644 include/pkmn_font.h create mode 100644 source/pkmn_font.s diff --git a/graphics/brin.grit b/graphics/background.grit similarity index 100% rename from graphics/brin.grit rename to graphics/background.grit diff --git a/graphics/background.png b/graphics/background.png new file mode 100644 index 0000000000000000000000000000000000000000..b4d0935180de0712e8bd1aefe4b639b0f73c131f GIT binary patch literal 1647 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 diff --git a/graphics/unused graphics/crystal_font.png b/graphics/unused graphics/crystal_font.png new file mode 100644 index 0000000000000000000000000000000000000000..ca0882cf022f0d07656dedbcd2d269e0b7d40632 GIT binary patch literal 27324 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", "Nidorino", "Nidoking", "Clefairy", diff --git a/source/sprite_data.cpp b/source/sprite_data.cpp index ccd9388..047d5ca 100644 --- a/source/sprite_data.cpp +++ b/source/sprite_data.cpp @@ -5,17 +5,17 @@ OBJ_ATTR obj_buffer[128]; OBJ_AFFINE *obj_aff_buffer = (OBJ_AFFINE *)obj_buffer; -#include "brin.h" +#include "background.h" void load_background() { int CBB = 0; int SBB = 1; // Load palette - memcpy(pal_bg_mem, brinPal, brinPalLen); + memcpy(pal_bg_mem, backgroundPal, backgroundPalLen); // Load tiles into CBB 0 - memcpy(&tile_mem[CBB][0], brinTiles, brinTilesLen); + memcpy(&tile_mem[CBB][0], backgroundTiles, backgroundTilesLen); // Load map into SBB 30 - memcpy(&se_mem[SBB][0], brinMap, brinMapLen); + memcpy(&se_mem[SBB][0], backgroundMap, backgroundMapLen); REG_BG0CNT = BG_CBB(CBB) | BG_SBB(SBB) | BG_4BPP | BG_REG_32x32 | BG_PRIO(2); } diff --git a/source/text_engine.cpp b/source/text_engine.cpp index 73cdf26..590a799 100644 --- a/source/text_engine.cpp +++ b/source/text_engine.cpp @@ -1,9 +1,10 @@ #include #include +#include #include "text_engine.h" #include "global_frame_counter.h" -#include +#include "pkmn_font.h" #define TEXT_CBB 3 #define TEXT_SBB 28 @@ -22,7 +23,7 @@ bool disabled; void init_text_engine() { // Load the TTE - tte_init_se(3, BG_CBB(TEXT_CBB) | BG_SBB(TEXT_SBB) | BG_PRIO(0), 0xF000, CLR_ORANGE, 0, &fwf_default, NULL); + tte_init_se(3, BG_CBB(TEXT_CBB) | BG_SBB(TEXT_SBB) | BG_PRIO(0), 0xF000, 0b0001100011100110, 0, &pkmn_fontFont, NULL); tte_set_margins(LEFT, TOP, RIGHT, BOTTOM); tte_set_pos(LEFT, TOP);