mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-30 08:51:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename most text functions

Browse Source
This commit is contained in:
Ryan Dwyer
2022-07-06 19:22:01 +10:00
parent 0d65d02a3e
commit e82da009d2
32 changed files with 1091 additions and 1081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/game/game_1531a0.h
+41 -37
View File
@@ -4,46 +4,50 @@
#include "data.h"
#include "types.h"
void fontsInit(void);
#define DIAGMODE_FADEIN 0
#define DIAGMODE_REDRAW 1
#define DIAGMODE_FADEOUT 2
void textInit(void);
void textSetRotation90(bool rotated);
void textSetWrapIndent(s32 count);
void func0f1531d0(s32 arg0);
void func0f1531dc(bool arg0);
void fontLoad(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace);
void fontsReset(void);
Gfx *func0f153628(Gfx *gdl);
Gfx *func0f153780(Gfx *gdl);
Gfx *gfxSetPrimColour(Gfx *gdl, u32 colour);
Gfx *func0f153838(Gfx *gdl);
Gfx *func0f153858(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2);
Gfx *func0f1538e4(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2);
Gfx *func0f153990(Gfx *gdl, s32 left, s32 top, s32 width, s32 height);
Gfx *func0f153a34(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour);
Gfx *func0f153ab0(Gfx *gdl);
void func0f153b40(void);
void func0f153b6c(s32 arg0);
void func0f153c20(s32 x, s32 y, f32 redrawtimer, u8 populated);
void func0f153c50(void);
void func0f153c88(void);
void func0f153ce8(s32 x1, s32 x2, u32 arg2);
void func0f153d24(void);
void func0f153d3c(void);
void func0f153d50(s32 arg0, s32 arg1, s32 cthresh);
void func0f153d88(f32 arg0);
void func0f153e38(u32 colour1, u32 colour2);
void func0f153e4c(void);
bool func0f153e58(void);
u32 func0f153e94(s32 x, s32 y, u32 colour);
u32 func0f1543ac(s32 x, s32 y, u32 colour);
Gfx *func0f154ecc(Gfx *gdl, u32 arg1, u32 arg2);
Gfx *func0f154f38(Gfx *gdl, s32 *arg1, struct fontchar *curchar, struct fontchar *prevchar, struct font *font, f32 widthscale, f32 heightscale, f32 x, f32 y);
Gfx *func0f1552d4(Gfx *gdl, f32 x, f32 y, f32 widthscale, f32 heightscale, char *text, struct fontchar *chars, struct font *font, u32 colour, s32 hdir, s32 vdir);
Gfx *func0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fontchar *prevchar, struct font *font, s32 savedx, s32 savedy, s32 width, s32 height, s32 arg10);
void func0f156024(s32 arg0);
void func0f156030(u32 colour);
void text0f1531d0(s32 arg0);
void text0f1531dc(bool arg0);
void textLoadFont(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace);
void textReset(void);
Gfx *text0f153628(Gfx *gdl);
Gfx *text0f153780(Gfx *gdl);
Gfx *textSetPrimColour(Gfx *gdl, u32 colour);
Gfx *text0f153838(Gfx *gdl);
Gfx *text0f153858(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2);
Gfx *text0f1538e4(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2);
Gfx *text0f153990(Gfx *gdl, s32 left, s32 top, s32 width, s32 height);
Gfx *text0f153a34(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour);
Gfx *text0f153ab0(Gfx *gdl);
void text0f153b40(void);
void text0f153b6c(s32 arg0);
void textSetDiagonalBlend(s32 x, s32 y, f32 redrawtimer, u8 populated);
void textBackupDiagonalBlendSettings(void);
void textRestoreDiagonalBlendSettings(void);
void textSetHorizontalBlend(s32 x1, s32 x2, u32 arg2);
void textBackupAndResetBlends(void);
void textRestoreBlends(void);
void textSetWaveBlend(s32 arg0, s32 arg1, s32 cthresh);
void textSetMenuBlend(f32 arg0);
void textSetWaveColours(u32 colour1, u32 colour2);
void textResetBlends(void);
bool textHasDiagonalBlend(void);
u32 text0f153e94(s32 x, s32 y, u32 colour);
u32 text0f1543ac(s32 x, s32 y, u32 colour);
Gfx *text0f154ecc(Gfx *gdl, u32 arg1, u32 arg2);
Gfx *text0f154f38(Gfx *gdl, s32 *arg1, struct fontchar *curchar, struct fontchar *prevchar, struct font *font, f32 widthscale, f32 heightscale, f32 x, f32 y);
Gfx *text0f1552d4(Gfx *gdl, f32 x, f32 y, f32 widthscale, f32 heightscale, char *text, struct fontchar *chars, struct font *font, u32 colour, s32 hdir, s32 vdir);
Gfx *text0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fontchar *prevchar, struct font *font, s32 savedx, s32 savedy, s32 width, s32 height, s32 arg10);
void text0f156024(s32 arg0);
void text0f156030(u32 colour);
Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *chars, struct font *font, s32 colour, s32 width, s32 height, s32 arg9, s32 lineheight);
Gfx *func0f1566cc(Gfx *gdl, u32 arg1, u32 arg2);
Gfx *func0f156a24(Gfx *gdl, s32 x, s32 y, struct fontchar *char1, s32 arg4, s32 arg5, s32 arg6, s32 arg7);
Gfx *text0f1566cc(Gfx *gdl, u32 arg1, u32 arg2);
Gfx *text0f156a24(Gfx *gdl, s32 x, s32 y, struct fontchar *char1, s32 arg4, s32 arg5, s32 arg6, s32 arg7);
Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *font1, struct font *font2, u32 arg6, u32 colour, s32 arg8, s32 arg9, u32 arg10, s32 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);
src/include/types.h
-30
View File
@@ -5544,36 +5544,6 @@ struct menucolourpalette {
/*0x38*/ u32 unk38;
};
struct var800a45d0 {
/*0x00*/ u8 unk00;
/*0x04*/ u32 colour04;
/*0x08*/ u32 colour08;
/*0x0c*/ s32 unk0c;
/*0x10*/ s32 unk10;
/*0x14*/ f32 unk14;
/*0x18*/ u8 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ f32 unk24;
/*0x28*/ u8 unk28;
/*0x29*/ u8 unk29;
/*0x2a*/ u8 unk2a;
/*0x2c*/ s32 unk2c;
/*0x30*/ s32 unk30;
/*0x34*/ s32 unk34;
/*0x38*/ s32 x1;
/*0x3c*/ s32 x2;
/*0x40*/ s32 unk40;
/*0x44*/ u32 colour44;
/*0x48*/ u32 colour48;
/*0x4c*/ u32 unk4c;
/*0x50*/ u32 unk50;
/*0x54*/ s32 cthresh;
/*0x58*/ u32 colour58;
/*0x5c*/ u32 colour5c;
/*0x60*/ u32 unk60;
};
struct bytelist {
u8 b0;
u8 b1;