Implement StartGame

This commit is contained in:
Charles Lombardo 2024-11-14 21:45:07 -05:00
parent b8d764616a
commit d20f226b96
5 changed files with 23 additions and 1 deletions

View File

@ -773,6 +773,7 @@ CcharmMost__Fv = 0x160D98; // type:func
reload_post_death = 0x160DA0; // type:func
// data
D_00247AB0 = 0x247ab0; // size:0x2c
g_pgsCur = 0x2623c0; // size:0x4
g_pwsCur = 0x2623c4; // size:0x4
g_plsCur = 0x2623c8; // size:0x4
@ -1188,6 +1189,8 @@ LimitVectorLength = 0x1EE2B0; // type:func
////////////////////////////////////////////////////////////////
// P2/wipe.c
////////////////////////////////////////////////////////////////
func_001F0428 = 0x1F0428; // type:func
g_pwipe = 0x275f80;
g_wipe = 0x275f84;

View File

@ -225,6 +225,12 @@ struct GAME
int cgoldLatest;
};
struct LevelLoadData
{
};
extern const LevelLoadData *D_00247AB0[];
/**
* @brief Calls StartGame.
*/

View File

@ -6,6 +6,7 @@
#include "common.h"
#include <transition.h>
#include <oid.h>
/**
* @brief Wipe Kind
@ -48,4 +49,8 @@ struct WIPE
extern WIPE *g_pwipe;
extern WIPE g_wipe;
extern "C" {
void func_001F0428(const void *pchzWorld, OID oidWarp, WIPEK wipek);
}
#endif // WIPE_H

View File

@ -1,4 +1,5 @@
#include <game.h>
#include <wipe.h>
void StartupGame(void)
{
@ -51,7 +52,11 @@ INCLUDE_ASM(const s32, "P2/game", UnloadGame__Fv);
INCLUDE_ASM(const s32, "P2/game", RetryGame__Fv);
INCLUDE_ASM(const s32, "P2/game", StartGame__Fv);
void StartGame()
{
UnloadGame();
func_001F0428(D_00247AB0, OID_Nil, WIPEK_Fade);
}
INCLUDE_ASM(const s32, "P2/game", FUN_00160948);

3
src/P2/wipe.c Normal file
View File

@ -0,0 +1,3 @@
#include <wipe.h>
INCLUDE_ASM(const s32, "P2/wipe", func_001F0428);