zeldaret/af
1
0
Fork 0
mirror of https://github.com/zeldaret/af.git synced 2026-10-03 16:16:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

m_private OK (#139)

Browse Source 
* update m2ctx

* size fixes?

* size fix

* work

* more work

* m_private OK

* fix style

* format

* fix warnings

* format..
This commit is contained in:
Prakxo
2024-01-31 19:39:03 +01:00
committed by GitHub
parent eee794d4b6
commit 24074d678d
20 changed files with 1693 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/m_field_info.c
+1 -1
View File
@@ -343,7 +343,7 @@
#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_8008D574_jp.s")
#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_8008D6E0_jp.s")
#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/mFI_GetOtherFruit.s")
#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_8008D7B0_jp.s")
src/code/m_mail.c
+2 -2
View File
@@ -94,8 +94,8 @@ void mMl_set_to_name(Mail_c* arg0, Mail_c* arg1) {
mMl_copy_header_name(&arg0->header.recipient, &arg1->header.recipient);
}
void mMl_set_to_plname(Mail_c* arg0, Mail_c* arg1) {
mPr_CopyPersonalID(&arg0->header.recipient.personalID, &arg1->header.recipient.personalID);
void mMl_set_to_plname(Mail_c* arg0, PersonalID_c* arg1) {
mPr_CopyPersonalID(&arg0->header.recipient.personalID, arg1);
arg0->header.recipient.type = 0;
}
src/code/m_private.c
+1397
View File
File diff suppressed because it is too large Load Diff
src/code/m_start_data_init.c
+3 -3
View File
@@ -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();