summaryrefslogtreecommitdiff
path: root/src/skel/win
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-02 10:31:40 +0200
committeraap <aap@papnet.eu>2019-06-02 10:31:40 +0200
commitcb12ee03ca5fdd2c89be4daf2571736f4363fe95 (patch)
treecd5fa5516044c50bd777bbf2f513e2d20fa5e990 /src/skel/win
parent9c26e46e17b421288f7653f4c9cff81b4b6cdfb0 (diff)
fixed merge
Diffstat (limited to 'src/skel/win')
-rw-r--r--src/skel/win/win.cpp5
1 files changed, 3 insertions, 2 deletions
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);