mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 05:50:00 +00:00
fixed merge
This commit is contained in:
parent
9c26e46e17
commit
cb12ee03ca
|
@ -506,7 +506,7 @@ float NumberOfChunksLoaded;
|
||||||
|
|
||||||
// TODO: compare with PS2
|
// TODO: compare with PS2
|
||||||
void
|
void
|
||||||
LoadingScreen(char *str1, char *str2, char *splashscreen)
|
LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
|
||||||
{
|
{
|
||||||
CSprite2d *splash;
|
CSprite2d *splash;
|
||||||
|
|
||||||
|
|
|
@ -130,12 +130,13 @@ WRAPPER HRESULT _InputInitialise() { EAXJMP(0x5830D0); }
|
||||||
WRAPPER void _InputShutdown() { EAXJMP(0x583910); }
|
WRAPPER void _InputShutdown() { EAXJMP(0x583910); }
|
||||||
WRAPPER HRESULT _InputInitialiseMouse() { EAXJMP(0x583110); }
|
WRAPPER HRESULT _InputInitialiseMouse() { EAXJMP(0x583110); }
|
||||||
WRAPPER void _InputInitialiseJoys() { EAXJMP(0x583580); }
|
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 Bool InitialiseGame(void) { EAXJMP(0x48E7E0); }
|
||||||
WRAPPER const Char *GetLevelSplashScreen(Int32 number) { EAXJMP(0x48D750); }
|
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();
|
void InitialiseLanguage();
|
||||||
RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode);
|
RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode);
|
||||||
HRESULT CenterVideo(void);
|
HRESULT CenterVideo(void);
|
||||||
|
|
Loading…
Reference in a new issue