From cb12ee03ca5fdd2c89be4daf2571736f4363fe95 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sun, 2 Jun 2019 10:31:40 +0200
Subject: [PATCH] fixed merge

---
 src/main.cpp         | 2 +-
 src/skel/win/win.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index cd2da378..dd5804d0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -506,7 +506,7 @@ float NumberOfChunksLoaded;
 
 // TODO: compare with PS2
 void
-LoadingScreen(char *str1, char *str2, char *splashscreen)
+LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
 {
 	CSprite2d *splash;
 
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 35575892..9d71861b 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -130,12 +130,13 @@ WRAPPER HRESULT _InputInitialise() { EAXJMP(0x5830D0); }
 WRAPPER void _InputShutdown() { EAXJMP(0x583910); }
 WRAPPER HRESULT _InputInitialiseMouse() { EAXJMP(0x583110); }
 WRAPPER void _InputInitialiseJoys() { EAXJMP(0x583580); }
-WRAPPER void LoadingScreen(char const *msg1, char const *msg2, char const *screen) { EAXJMP(0x48D770); }
 WRAPPER Bool InitialiseGame(void) { EAXJMP(0x48E7E0); }
 WRAPPER const Char *GetLevelSplashScreen(Int32 number) { EAXJMP(0x48D750); }
-WRAPPER CSprite2d *LoadSplash(const char *name) { EAXJMP(0x48D550); }
 //
 
+void LoadingScreen(char const *msg1, char const *msg2, char const *screen);
+CSprite2d *LoadSplash(const char *name);
+
 void InitialiseLanguage();
 RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode);
 HRESULT CenterVideo(void);