dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-09-21 10:50:15 +02:00
parent 3919b7130b ed9e0e2054
commit 9ee9a20152
131 changed files with 13064 additions and 6461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/text.c
View File

@@ -2778,7 +2778,7 @@ _08005D6E:\n\
bx r1");
}
u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing)
u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing)
{
int i;
u8 width;
@@ -2787,7 +2787,7 @@ u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing)
u8 line;
int strPos;
u8 lineWidths[8];
u8 *strLocal;
const u8 *strLocal;
for (i = 0; i < 8; i++)
{
@@ -2882,7 +2882,7 @@ u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32)
return 0;
}
s32 GetStringWidth(u8 fontId, u8 *str, s16 letterSpacing)
u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
{
bool8 isJapanese;
int minGlyphWidth;