mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-30 15:53:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

pal-final: Decompile fontLoad

Browse Source
This commit is contained in:
Ryan Dwyer
2021-09-06 18:38:43 +10:00
parent 6498c10ac3
commit 753706896a
20 changed files with 905 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/data.h
+10 -10
View File
@@ -454,16 +454,16 @@ extern struct weatherdata *g_WeatherData;
extern s32 g_NextShardNum;
extern bool g_ShardsActive;
extern s32 g_ScaleX;
extern struct font *g_FontNumeric2;
extern struct font2a4 *g_FontNumeric1;
extern struct font *g_FontHandelGothicXs2;
extern struct font2a4 *g_FontHandelGothicXs1;
extern struct font *g_FontHandelGothicSm2;
extern struct font2a4 *g_FontHandelGothicSm1;
extern struct font *g_FontHandelGothicMd2;
extern struct font2a4 *g_FontHandelGothicMd1;
extern struct font *g_FontHandelGothicLg2;
extern struct font2a4 *g_FontHandelGothicLg1;
extern struct font *g_FontNumeric;
extern struct fontchar *g_CharsNumeric;
extern struct font *g_FontHandelGothicXs;
extern struct fontchar *g_CharsHandelGothicXs;
extern struct font *g_FontHandelGothicSm;
extern struct fontchar *g_CharsHandelGothicSm;
extern struct font *g_FontHandelGothicMd;
extern struct fontchar *g_CharsHandelGothicMd;
extern struct font *g_FontHandelGothicLg;
extern struct fontchar *g_CharsHandelGothicLg;
extern u32 var8007fb9c;
extern s32 g_StageIndex;
extern s16 var8007fc0c;
src/include/game/game_1531a0.h
+5 -5
View File
@@ -7,7 +7,7 @@
void func0f1531a0(void);
u32 func0f1531b8(void);
void func0f1531dc(bool arg0);
void fontLoad(u8 *romstart, u8 *romend, struct font **font1, struct font2a4 **font2, bool monospace);
void fontLoad(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace);
void fontsLoadForCurrentStage(void);
Gfx *func0f153628(Gfx *gdl);
Gfx *func0f153780(Gfx *gdl);
@@ -39,12 +39,12 @@ u32 func0f1552d4(void);
u32 func0f15568c(void);
u32 func0f156024(void);
u32 func0f156030(void);
Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct font2a4 *font1, struct font *font2, s32 colour, s16 width, s16 height, s32 arg9, u32 arg10);
Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *font1, struct font *font2, s32 colour, s16 width, s16 height, s32 arg9, u32 arg10);
Gfx *func0f1566cc(Gfx *gdl, u32 arg1, u32 arg2);
u32 func0f156790(void);
u32 func0f156a24(void);
Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, struct font2a4 *font1, struct font *font2, u32 arg6, u32 colour, s16 arg8, s16 arg9, u32 arg10, u32 arg11);
void textMeasure(s32 *textheight, s32 *textwidth, char *text, struct font2a4 *font1, struct font *font2, s32 lineheight);
void textWrap(s32 width, char *in, char *out, struct font2a4 *font1, struct font *font2);
Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *font1, struct font *font2, u32 arg6, u32 colour, s16 arg8, s16 arg9, u32 arg10, u32 arg11);
void textMeasure(s32 *textheight, s32 *textwidth, char *text, struct fontchar *font1, struct font *font2, s32 lineheight);
void textWrap(s32 width, char *in, char *out, struct fontchar *font1, struct font *font2);
#endif
src/include/types.h
+3 -3
View File
@@ -6904,18 +6904,18 @@ struct escastepkeyframe {
struct coord pos;
};
struct font2a4 {
struct fontchar {
u8 index;
s8 baseline;
u8 height;
u8 width;
u32 unk04;
u8 *data;
u8 *pixeldata;
};
struct font {
u32 unk000[169];
struct font2a4 unk2a4[94];
struct fontchar chars[94]; // can be 135 in PAL
};
typedef union {