Skip to content

Commit

Permalink
Updated resource names
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephane-D committed May 28, 2019
1 parent 4caf686 commit 8345495
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
6 changes: 3 additions & 3 deletions res/libres.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#define _RES_LIBRES_H_

extern const u8 stop_xgm[172];
extern const Palette font_pal_lib;
extern const TileSet font_lib;
extern const Bitmap logo_lib;
extern const Palette font_pal_default;
extern const TileSet font_default;
extern const Bitmap sgdk_logo;

#endif // _RES_LIBRES_H_
6 changes: 3 additions & 3 deletions res/libres.res
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BITMAP logo_lib "image/logo_lib.png" -1
TILESET font_lib "image/font_lib.png" -1
PALETTE font_pal_lib "image/font_lib.png"
BITMAP sgdk_logo "image/sgdk_logo.png" -1
TILESET font_default "image/font_default.png" -1
PALETTE font_pal_default "image/font_default.png"
BIN stop_xgm "sound/stop_xgm.bin"
4 changes: 2 additions & 2 deletions src/vdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void VDP_init()
VDP_setPalette(PAL3, palette_blue);

// load default font
if (!VDP_loadFont(&font_lib, 0))
if (!VDP_loadFont(&font_default, 0))
{
// fatal error --> die here
// VDP_setPaletteColors((PAL0 * 16) + (font_pal_lib.index & 0xF), font_pal_lib.data, font_pal_lib.length);
Expand Down Expand Up @@ -807,6 +807,6 @@ static void updateMapsAddress()
{
maps_addr = min_addr;
// reload default font as its VRAM address has changed
VDP_loadFont(&font_lib, TRUE);
VDP_loadFont(&font_default, TRUE);
}
}

0 comments on commit 8345495

Please sign in to comment.