From 24074d678d5d87a987bbda221f7da1a0dd02ea35 Mon Sep 17 00:00:00 2001
From: Prakxo <87568477+Prakxo@users.noreply.github.com>
Date: Wed, 31 Jan 2024 19:39:03 +0100
Subject: m_private OK (#139)

* update m2ctx

* size fixes?

* size fix

* work

* more work

* m_private OK

* fix style

* format

* fix warnings

* format..
---
 src/code/m_start_data_init.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/code/m_start_data_init.c')

diff --git a/src/code/m_start_data_init.c b/src/code/m_start_data_init.c
index 9e2e00f..a50fc80 100644
--- a/src/code/m_start_data_init.c
+++ b/src/code/m_start_data_init.c
@@ -352,7 +352,7 @@ s32 mSDI_StartInitPak(Game* game2, s32 playerNumber, s32 mallocFlag) {
     Game_Play* game_play = (Game_Play*)game;
     UNUSED s32 pad;
     s32 res = FALSE;
-    s32 sp1C;
+    void* sp1C;
 
     if (mallocFlag == 1) {
         game = NULL;
@@ -364,7 +364,7 @@ s32 mSDI_StartInitPak(Game* game2, s32 playerNumber, s32 mallocFlag) {
 
     if (mFRm_CheckSaveData() == TRUE) {
         sp1C = mCPk_get_pkinfo();
-        if ((func_80078E90_jp(sp1C, 0) == TRUE) && (func_800B8D64_jp(playerNumber, sp1C) == TRUE)) {
+        if ((func_80078E90_jp(sp1C, 0) == TRUE) && (mPr_LoadPak_and_SetPrivateInfo2(playerNumber, sp1C) == TRUE)) {
             mFM_SetBlockKindLoadCombi(game);
             mEv_init_force(&game_play->event);
             mHsRm_GetHuusuiRoom(game, playerNumber);
@@ -417,7 +417,7 @@ void mSDI_StartInitAfter(Game* game, s32 renewalReserveFlag, s32 mallocFlag) {
     mTRC_init(game_play);
     common_data.gokiShockedFlag = FALSE;
     func_800A6548_jp();
-    func_800B9B2C_jp();
+    mPr_SendMailFromMother();
     mNpc_Remail();
     mPr_SendForeingerAnimalMail(common_data.privateInfo);
     mPr_StartSetCompleteTalkInfo();
-- 
cgit v1.2.3