mirrors
/
Mother2GbaTranslation
mirror of https://github.com/jeffman/Mother2GbaTranslation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some VWF bugs

This commit is contained in:
jeffman 2017-04-13 18:11:46 -04:00
parent 714c4d65a7
commit 89a848376a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiled/vwf.c
View File

@ -27,20 +27,20 @@ byte reduce_bit_depth(int row, int foreground)
byte __attribute__ ((noinline)) print_character(byte chr, byte x, byte y, byte font, byte foreground)
{
int tileWidth = m2_font_widths[font];
int tileHeight = m2_font_heights[font];
int widths = m2_widths_table[font][chr];
int tileOffset = *tile_offset;
int paletteMask = *palette_mask;
byte const *glyphRows = &m2_font_table[font][chr * 32];
byte const *glyphRows = &m2_font_table[font][chr * tileWidth * tileHeight * 8];
int widths = m2_widths_table[font][chr];
int virtualWidth = widths & 0xFF;
int tileHeight = m2_font_heights[font];
int leftPortionWidth = 8 - (x & 7);
int tileX = x >> 3;
int tileY = y >> 3;
int leftPortionWidth = 8 - (x & 7);
for (int dTileY = 0; dTileY < tileHeight; dTileY++) // dest tile Y
{
int dTileX = 0;
@ -54,7 +54,7 @@ byte __attribute__ ((noinline)) print_character(byte chr, byte x, byte y, byte f
for (int row = 0; row < 8; row++)
{
int canvasRow = vram[(tileIndex * 8) + row];
byte glyphRow = glyphRows[row + (dTileY * 16) + (dTileX * 8)] & ((1 << leftPortionWidth) - 1);
byte glyphRow = glyphRows[row + (dTileY * 8 * tileWidth) + (dTileX * 8)] & ((1 << leftPortionWidth) - 1);
glyphRow <<= (8 - leftPortionWidth);
int expandedGlyphRow = expand_bit_depth(glyphRow, foreground);
@ -76,7 +76,7 @@ byte __attribute__ ((noinline)) print_character(byte chr, byte x, byte y, byte f
for (int row = 0; row < 8; row++)
{
int canvasRow = vram[(tileIndex * 8) + row];
byte glyphRow = glyphRows[row + (dTileY * 16) + (dTileX * 8)] >> leftPortionWidth;
byte glyphRow = glyphRows[row + (dTileY * 8 * tileWidth) + (dTileX * 8)] >> leftPortionWidth;
int expandedGlyphRow = expand_bit_depth(glyphRow, foreground);
int expandedGlyphRowMask = ~expand_bit_depth(glyphRow, 0xF);

1
compiled/vwf.h
View File

@ -25,6 +25,7 @@ extern unsigned short const m2_coord_table[];
extern int const m2_bits_to_nybbles[];
extern const byte m2_nybbles_to_bits[];
extern const byte *m2_font_table[];
extern const byte m2_font_widths[];
extern const byte m2_font_heights[];
extern unsigned short const *m2_widths_table[];