From 3620f79b175411fd0c9a87d345f3479d34766e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ni=C3=B1o=20D=C3=ADaz?= Date: Sun, 1 Dec 2024 21:33:43 +0000 Subject: [PATCH] Add some missing binary files --- Makefile.arm9 | 4 +- source/arm9/BitmapFont/bin/PA_BmpFont0.c | 12 ++--- source/arm9/BitmapFont/bin/PA_BmpFont1.c | 12 ++--- source/arm9/BitmapFont/bin/PA_BmpFont2.c | 12 ++--- source/arm9/BitmapFont/bin/PA_BmpFont3.c | 12 ++--- source/arm9/BitmapFont/bin/PA_BmpFont4.c | 12 ++--- source/arm9/PA_Inits.c | 32 ++++++------- source/arm9/PA_Text8bit.c | 20 ++++---- source/arm9/PA_TextBits.c | 60 ++++++++++++------------ source/arm9/TiledFont/bin/PA_TiledFont.c | 12 ++--- source/arm9/TransBg/bin/PA_TransBg.c | 12 ++--- 11 files changed, 101 insertions(+), 99 deletions(-) diff --git a/Makefile.arm9 b/Makefile.arm9 index 97faf76..2ee0f0c 100644 --- a/Makefile.arm9 +++ b/Makefile.arm9 @@ -14,7 +14,9 @@ ARM_NONE_EABI_PATH ?= $(WONDERFUL_TOOLCHAIN)/toolchain/gcc-arm-none-eabi/bin/ SOURCEDIRS := source/arm9 INCLUDEDIRS := include include/arm9 include/arm9/gif GFXDIRS := -BINDIRS := +BINDIRS := source/arm9/BitmapFont/bin \ + source/arm9/TiledFont/bin \ + source/arm9/TransBg/bin # Defines passed to all files # --------------------------- diff --git a/source/arm9/BitmapFont/bin/PA_BmpFont0.c b/source/arm9/BitmapFont/bin/PA_BmpFont0.c index 3518784..a518bd4 100644 --- a/source/arm9/BitmapFont/bin/PA_BmpFont0.c +++ b/source/arm9/BitmapFont/bin/PA_BmpFont0.c @@ -1,16 +1,16 @@ #include -extern const char PA_BmpFont0_Tiles[]; -extern const char PA_BmpFont0_Map[]; -extern const char PA_BmpFont0_Sizes[]; +#include "PA_BmpFont0_Tiles_bin.h" +#include "PA_BmpFont0_Map_bin.h" +#include "PA_BmpFont0_Sizes_bin.h" const PA_BgStruct PA_BmpFont0 = { PA_Font1bit, 256, 64, - PA_BmpFont0_Tiles, - PA_BmpFont0_Map, - {PA_BmpFont0_Sizes}, + PA_BmpFont0_Tiles_bin, + PA_BmpFont0_Map_bin, + {PA_BmpFont0_Sizes_bin}, 6400, {6} diff --git a/source/arm9/BitmapFont/bin/PA_BmpFont1.c b/source/arm9/BitmapFont/bin/PA_BmpFont1.c index 496e973..14d9b4d 100644 --- a/source/arm9/BitmapFont/bin/PA_BmpFont1.c +++ b/source/arm9/BitmapFont/bin/PA_BmpFont1.c @@ -1,16 +1,16 @@ #include -extern const char PA_BmpFont1_Tiles[]; -extern const char PA_BmpFont1_Map[]; -extern const char PA_BmpFont1_Sizes[]; +#include "PA_BmpFont1_Tiles_bin.h" +#include "PA_BmpFont1_Map_bin.h" +#include "PA_BmpFont1_Sizes_bin.h" const PA_BgStruct PA_BmpFont1 = { PA_Font1bit, 256, 64, - PA_BmpFont1_Tiles, - PA_BmpFont1_Map, - {PA_BmpFont1_Sizes}, + PA_BmpFont1_Tiles_bin, + PA_BmpFont1_Map_bin, + {PA_BmpFont1_Sizes_bin}, 6720, {8} diff --git a/source/arm9/BitmapFont/bin/PA_BmpFont2.c b/source/arm9/BitmapFont/bin/PA_BmpFont2.c index 3ee6eea..4a75b86 100644 --- a/source/arm9/BitmapFont/bin/PA_BmpFont2.c +++ b/source/arm9/BitmapFont/bin/PA_BmpFont2.c @@ -1,16 +1,16 @@ #include -extern const char PA_BmpFont2_Tiles[]; -extern const char PA_BmpFont2_Map[]; -extern const char PA_BmpFont2_Sizes[]; +#include "PA_BmpFont2_Tiles_bin.h" +#include "PA_BmpFont2_Map_bin.h" +#include "PA_BmpFont2_Sizes_bin.h" const PA_BgStruct PA_BmpFont2 = { PA_Font1bit, 512, 128, - PA_BmpFont2_Tiles, - PA_BmpFont2_Map, - {PA_BmpFont2_Sizes}, + PA_BmpFont2_Tiles_bin, + PA_BmpFont2_Map_bin, + {PA_BmpFont2_Sizes_bin}, 7360, {9} diff --git a/source/arm9/BitmapFont/bin/PA_BmpFont3.c b/source/arm9/BitmapFont/bin/PA_BmpFont3.c index 5a2d5c5..1cf31f6 100644 --- a/source/arm9/BitmapFont/bin/PA_BmpFont3.c +++ b/source/arm9/BitmapFont/bin/PA_BmpFont3.c @@ -1,16 +1,16 @@ #include -extern const char PA_BmpFont3_Tiles[]; -extern const char PA_BmpFont3_Map[]; -extern const char PA_BmpFont3_Sizes[]; +#include "PA_BmpFont3_Tiles_bin.h" +#include "PA_BmpFont3_Map_bin.h" +#include "PA_BmpFont3_Sizes_bin.h" const PA_BgStruct PA_BmpFont3 = { PA_Font1bit, 512, 128, - PA_BmpFont3_Tiles, - PA_BmpFont3_Map, - {PA_BmpFont3_Sizes}, + PA_BmpFont3_Tiles_bin, + PA_BmpFont3_Map_bin, + {PA_BmpFont3_Sizes_bin}, 12544, {12} diff --git a/source/arm9/BitmapFont/bin/PA_BmpFont4.c b/source/arm9/BitmapFont/bin/PA_BmpFont4.c index 09bc0a6..3a64ad0 100644 --- a/source/arm9/BitmapFont/bin/PA_BmpFont4.c +++ b/source/arm9/BitmapFont/bin/PA_BmpFont4.c @@ -1,16 +1,16 @@ #include -extern const char PA_BmpFont4_Tiles[]; -extern const char PA_BmpFont4_Map[]; -extern const char PA_BmpFont4_Sizes[]; +#include "PA_BmpFont4_Tiles_bin.h" +#include "PA_BmpFont4_Map_bin.h" +#include "PA_BmpFont4_Sizes_bin.h" const PA_BgStruct PA_BmpFont4 = { PA_Font1bit, 512, 128, - PA_BmpFont4_Tiles, - PA_BmpFont4_Map, - {PA_BmpFont4_Sizes}, + PA_BmpFont4_Tiles_bin, + PA_BmpFont4_Map_bin, + {PA_BmpFont4_Sizes_bin}, 16768, {14} diff --git a/source/arm9/PA_Inits.c b/source/arm9/PA_Inits.c index b421310..2b54c41 100644 --- a/source/arm9/PA_Inits.c +++ b/source/arm9/PA_Inits.c @@ -2,24 +2,24 @@ #include // Text stuff -extern const unsigned short PA_TiledFont_Map[]; -extern const unsigned char PA_TiledFont_Tiles[]; -extern const unsigned short PA_TiledFont_Pal[]; +#include "PA_TiledFont_Map_bin.h" +#include "PA_TiledFont_Tiles_bin.h" +#include "PA_TiledFont_Pal_bin.h" #include "BitmapFont/all_gfx.h" -extern const u32 PA_BmpFont0_Tiles_size; -extern const u32 PA_BmpFont1_Tiles_size; -extern const u32 PA_BmpFont2_Tiles_size; -extern const u32 PA_BmpFont3_Tiles_size; -extern const u32 PA_BmpFont4_Tiles_size; +#include "PA_BmpFont0_Tiles_bin.h" +#include "PA_BmpFont1_Tiles_bin.h" +#include "PA_BmpFont2_Tiles_bin.h" +#include "PA_BmpFont3_Tiles_bin.h" +#include "PA_BmpFont4_Tiles_bin.h" static void PAFillBitTextSizes(){ - pa_bittextsizes[0] = PA_BmpFont0_Tiles_size; - pa_bittextsizes[1] = PA_BmpFont1_Tiles_size; - pa_bittextsizes[2] = PA_BmpFont2_Tiles_size; - pa_bittextsizes[3] = PA_BmpFont3_Tiles_size; - pa_bittextsizes[4] = PA_BmpFont4_Tiles_size; + pa_bittextsizes[0] = PA_BmpFont0_Tiles_bin_size; + pa_bittextsizes[1] = PA_BmpFont1_Tiles_bin_size; + pa_bittextsizes[2] = PA_BmpFont2_Tiles_bin_size; + pa_bittextsizes[3] = PA_BmpFont3_Tiles_bin_size; + pa_bittextsizes[4] = PA_BmpFont4_Tiles_bin_size; pa_bittextpoliceheight[0] = PA_BmpFont0.FontHeight; pa_bittextpoliceheight[1] = PA_BmpFont1.FontHeight; @@ -100,9 +100,9 @@ void PA_Init(){ for(i = 0; i < 2; i ++){ PA_SetBrightness(i, 0); PA_font[i] = 0; - PA_textmap[i] = (u16*) PA_TiledFont_Map; - PA_texttiles[i] = (u8*) PA_TiledFont_Tiles; - PA_textpal[i] = (u16*) PA_TiledFont_Pal; + PA_textmap[i] = (u16*) PA_TiledFont_Map_bin; + PA_texttiles[i] = (u8*) PA_TiledFont_Tiles_bin; + PA_textpal[i] = (u16*) PA_TiledFont_Pal_bin; } PA_UpdateUserInfo(); diff --git a/source/arm9/PA_Text8bit.c b/source/arm9/PA_Text8bit.c index 27ed77d..34139ef 100644 --- a/source/arm9/PA_Text8bit.c +++ b/source/arm9/PA_Text8bit.c @@ -1,17 +1,17 @@ #include -extern u8 PA_BmpFont0_Tiles[]; -extern u8 PA_BmpFont1_Tiles[]; -extern u8 PA_BmpFont2_Tiles[]; -extern u8 PA_BmpFont3_Tiles[]; -extern u8 PA_BmpFont4_Tiles[]; +#include "PA_BmpFont0_Tiles_bin.h" +#include "PA_BmpFont1_Tiles_bin.h" +#include "PA_BmpFont2_Tiles_bin.h" +#include "PA_BmpFont3_Tiles_bin.h" +#include "PA_BmpFont4_Tiles_bin.h" u8* bit8_tiles[10] = { - PA_BmpFont0_Tiles, - PA_BmpFont1_Tiles, - PA_BmpFont2_Tiles, - PA_BmpFont3_Tiles, - PA_BmpFont4_Tiles + PA_BmpFont0_Tiles_bin, + PA_BmpFont1_Tiles_bin, + PA_BmpFont2_Tiles_bin, + PA_BmpFont3_Tiles_bin, + PA_BmpFont4_Tiles_bin }; void Letter(u8 size, u8 screen, u16 x, u16 y, char letter, u8 color); diff --git a/source/arm9/PA_TextBits.c b/source/arm9/PA_TextBits.c index 09dbb6e..81292f6 100644 --- a/source/arm9/PA_TextBits.c +++ b/source/arm9/PA_TextBits.c @@ -1,45 +1,45 @@ #include "PA_TextBits.h" -extern u16 PA_BmpFont0_Map[]; -extern u16 PA_BmpFont1_Map[]; -extern u16 PA_BmpFont2_Map[]; -extern u16 PA_BmpFont3_Map[]; -extern u16 PA_BmpFont4_Map[]; +#include "PA_BmpFont0_Tiles_bin.h" +#include "PA_BmpFont1_Tiles_bin.h" +#include "PA_BmpFont2_Tiles_bin.h" +#include "PA_BmpFont3_Tiles_bin.h" +#include "PA_BmpFont4_Tiles_bin.h" -extern u8 PA_BmpFont0_Tiles[]; -extern u8 PA_BmpFont1_Tiles[]; -extern u8 PA_BmpFont2_Tiles[]; -extern u8 PA_BmpFont3_Tiles[]; -extern u8 PA_BmpFont4_Tiles[]; +#include "PA_BmpFont0_Map_bin.h" +#include "PA_BmpFont1_Map_bin.h" +#include "PA_BmpFont2_Map_bin.h" +#include "PA_BmpFont3_Map_bin.h" +#include "PA_BmpFont4_Map_bin.h" -extern u8 PA_BmpFont0_Sizes[]; -extern u8 PA_BmpFont1_Sizes[]; -extern u8 PA_BmpFont2_Sizes[]; -extern u8 PA_BmpFont3_Sizes[]; -extern u8 PA_BmpFont4_Sizes[]; +#include "PA_BmpFont0_Sizes_bin.h" +#include "PA_BmpFont1_Sizes_bin.h" +#include "PA_BmpFont2_Sizes_bin.h" +#include "PA_BmpFont3_Sizes_bin.h" +#include "PA_BmpFont4_Sizes_bin.h" u16 *bittext_maps[10] = { - PA_BmpFont0_Map, - PA_BmpFont1_Map, - PA_BmpFont2_Map, - PA_BmpFont3_Map, - PA_BmpFont4_Map + (u16 *)PA_BmpFont0_Map_bin, + (u16 *)PA_BmpFont1_Map_bin, + (u16 *)PA_BmpFont2_Map_bin, + (u16 *)PA_BmpFont3_Map_bin, + (u16 *)PA_BmpFont4_Map_bin }; u8 *bittext_tiles_blank[10] = { - PA_BmpFont0_Tiles, - PA_BmpFont1_Tiles, - PA_BmpFont2_Tiles, - PA_BmpFont3_Tiles, - PA_BmpFont4_Tiles + PA_BmpFont0_Tiles_bin, + PA_BmpFont1_Tiles_bin, + PA_BmpFont2_Tiles_bin, + PA_BmpFont3_Tiles_bin, + PA_BmpFont4_Tiles_bin }; u8 *pa_bittextdefaultsize[10] = { - PA_BmpFont0_Sizes, - PA_BmpFont1_Sizes, - PA_BmpFont2_Sizes, - PA_BmpFont3_Sizes, - PA_BmpFont4_Sizes + PA_BmpFont0_Sizes_bin, + PA_BmpFont1_Sizes_bin, + PA_BmpFont2_Sizes_bin, + PA_BmpFont3_Sizes_bin, + PA_BmpFont4_Sizes_bin }; // Will be filled later diff --git a/source/arm9/TiledFont/bin/PA_TiledFont.c b/source/arm9/TiledFont/bin/PA_TiledFont.c index 182fcdb..b098183 100644 --- a/source/arm9/TiledFont/bin/PA_TiledFont.c +++ b/source/arm9/TiledFont/bin/PA_TiledFont.c @@ -1,16 +1,16 @@ #include -extern const char PA_TiledFont_Tiles[]; -extern const char PA_TiledFont_Map[]; -extern const char PA_TiledFont_Pal[]; +#include "PA_TiledFont_Tiles_bin.h" +#include "PA_TiledFont_Map_bin.h" +#include "PA_TiledFont_Pal_bin.h" const PA_BgStruct PA_TiledFont = { PA_BgNormal, 256, 192, - PA_TiledFont_Tiles, - PA_TiledFont_Map, - {PA_TiledFont_Pal}, + PA_TiledFont_Tiles_bin, + PA_TiledFont_Map_bin, + {PA_TiledFont_Pal_bin}, 13248, {1536} diff --git a/source/arm9/TransBg/bin/PA_TransBg.c b/source/arm9/TransBg/bin/PA_TransBg.c index a07805c..79233a5 100644 --- a/source/arm9/TransBg/bin/PA_TransBg.c +++ b/source/arm9/TransBg/bin/PA_TransBg.c @@ -1,16 +1,16 @@ #include -extern const char PA_TransBg_Tiles[]; -extern const char PA_TransBg_Map[]; -extern const char PA_TransBg_Pal[]; +#include "PA_TransBg_Tiles_bin.h" +#include "PA_TransBg_Map_bin.h" +#include "PA_TransBg_Pal_bin.h" const PA_BgStruct PA_TransBg = { PA_BgNormal, 256, 192, - PA_TransBg_Tiles, - PA_TransBg_Map, - {PA_TransBg_Pal}, + PA_TransBg_Tiles_bin, + PA_TransBg_Map_bin, + {PA_TransBg_Pal_bin}, 3584, {1536}