From 7868cc26dfdd0b0b7a9cb311fd4efc47422cb4ba Mon Sep 17 00:00:00 2001 From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com> Date: Wed, 20 Dec 2023 19:42:00 +1000 Subject: [PATCH] remove external data (#551) * remove external data * fix tabs --- src/audio/load.c | 2 +- src/game/ingame_menu.c | 2 +- src/pc/gfx/gfx_pc.c | 3 ++- src/pc/gfx/gfx_pc.h | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/audio/load.c b/src/audio/load.c index 23b092fa..83140700 100644 --- a/src/audio/load.c +++ b/src/audio/load.c @@ -1842,7 +1842,7 @@ void audio_init() { } #ifdef VERSION_EU - // We want the refresh rate to be 60 FPS on PC. + // We want the refresh rate to be 60 FPS on PC. // We shouldn't need to worry about PAL specfic computers anymore. D_EU_802298D0 = 16.713f; gRefreshRate = 60; diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index f7e95ddd..a10ce041 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -140,7 +140,7 @@ u8 gMenuHoldKeyIndex = 0; u8 gMenuHoldKeyTimer = 0; s32 gDialogResponse = 0; -#if (defined(VERSION_JP) || defined(VERSION_SH) || defined(VERSION_EU)) +#if defined(VERSION_JP) || defined(VERSION_SH) || defined(VERSION_EU) #ifdef VERSION_EU #define CHCACHE_BUFLEN (8 * 8) // EU only converts 8x8 #else diff --git a/src/pc/gfx/gfx_pc.c b/src/pc/gfx/gfx_pc.c index 1178f76a..dbd53865 100644 --- a/src/pc/gfx/gfx_pc.c +++ b/src/pc/gfx/gfx_pc.c @@ -216,6 +216,7 @@ static void gfx_update_loaded_texture(uint8_t tile_number, uint32_t size_bytes, // forward declaration // //////////////////////// void ext_gfx_run_dl(Gfx* cmd); + ////////////////////////////////// static unsigned long get_time(void) { @@ -366,7 +367,7 @@ void gfx_texture_cache_clear(void) { static bool gfx_texture_cache_lookup(int tile, struct TextureHashmapNode **n, const uint8_t *orig_addr, uint32_t fmt, uint32_t siz) { size_t hash = (uintptr_t)orig_addr; - #define CMPADDR(x, y) x == y +#define CMPADDR(x, y) x == y hash = (hash >> HASH_SHIFT) & HASH_MASK; diff --git a/src/pc/gfx/gfx_pc.h b/src/pc/gfx/gfx_pc.h index 3fcbf7c1..175c14d9 100644 --- a/src/pc/gfx/gfx_pc.h +++ b/src/pc/gfx/gfx_pc.h @@ -28,7 +28,6 @@ struct GfxRenderingAPI *gfx_get_current_rendering_api(void); void gfx_start_frame(void); void gfx_run(Gfx *commands); void gfx_end_frame(void); -void gfx_precache_textures(void); void gfx_shutdown(void); void gfx_pc_precomp_shader(uint32_t rgb1, uint32_t alpha1, uint32_t rgb2, uint32_t alpha2, uint32_t flags);