core, structural cleanup, fixes and improvements for type issues #2

This commit is contained in:
kub 2021-01-01 12:43:49 +01:00
parent 5ab80df952
commit f821bb7011
64 changed files with 140 additions and 150 deletions

View file

@ -8,9 +8,9 @@
#include "kgsdk/Framework2D.h"
#include "kgsdk/FrameworkAudio.h"
#include "../common/emu.h"
#include "../common/lprintf.h"
#include "../common/arm_utils.h"
#include "../common/config.h"
#include "../libpicofe/lprintf.h"
#include "emu.h"
#include "menu.h"
#include "giz.h"

View file

@ -11,7 +11,7 @@
#include "kgsdk/Framework.h"
#include "kgsdk/Framework2D.h"
#include "giz.h"
#include "version.h"
#include "../common/version.h"
#define LOG_FILE "log.log"

View file

@ -14,7 +14,7 @@
#include "../common/menu.h"
#include "../common/emu.h"
#include "../common/config.h"
#include "version.h"
#include "../common/version.h"
int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)

View file

@ -28,7 +28,7 @@
#include "../common/emu.h"
#include "../common/readpng.h"
#include "../common/input.h"
#include "version.h"
#include "../common/version.h"
#include <pico/pico_int.h>
#include <pico/patch.h>
@ -49,8 +49,6 @@ unsigned char *menu_screen = gfx_buffer; /* draw here and blit later, to avoid f
void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
static void menu_prepare_bg(int use_game_bg);
static unsigned int inp_prev = 0;
void menu_draw_begin(int use_bgbuff)
{
if (use_bgbuff)
@ -1457,14 +1455,14 @@ static void menu_loop_root(void)
// warning: alignment
void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
{
unsigned int *dest = dst;
const unsigned int *srce = src;
u32 *dest = dst;
const u32 *srce = src;
pixels /= 2;
if (darker)
{
while (pixels--)
{
unsigned int p = *srce++;
u32 p = *srce++;
*dest++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);
}
}
@ -1472,7 +1470,7 @@ void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
{
while (pixels--)
{
unsigned int p = *srce++;
u32 p = *srce++;
*dest++ = (p&0xf79ef79e)>>1;
}
}