Game-Decompilation/spm-decomp
1
0
Fork 0
mirror of https://github.com/SeekyCt/spm-decomp.git synced 2024-11-23 13:29:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pouchReInit

Browse Source
This commit is contained in:
Seeky 2023-09-23 19:25:20 +01:00
parent efb302d72d
commit afd372c8e4
2 changed files with 82 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spm-headers/include/spm/spmario.h
View File

@ -46,7 +46,8 @@ typedef struct
/* 0x00E0 */ u32 unknown_0xe0; // not read from save file /* 0x00E0 */ u32 unknown_0xe0; // not read from save file
/* 0x00E4 */ u8 unknown_0xe4[0xf8 - 0xe4]; /* 0x00E4 */ u8 unknown_0xe4[0xf8 - 0xe4];
/* 0x00F8 */ OSTime time; /* 0x00F8 */ OSTime time;
/* 0x0100 */ u8 unknown_0x100[0x110 - 0x100]; /* 0x0100 */ OSTime timePlayed;
/* 0x0108 */ u8 unknown_0x108[0x110 - 0x108];
/* 0x0110 */ OSTime lastSaveLoadTime; /* 0x0110 */ OSTime lastSaveLoadTime;
/* 0x0118 */ u8 unknown_0x118[0x138 - 0x118]; /* 0x0118 */ u8 unknown_0x118[0x138 - 0x118];
/* 0x0138 */ OSTime lastButtonPressTime; // uncertain /* 0x0138 */ OSTime lastButtonPressTime; // uncertain

82
src/mario_pouch.c
View File

@ -165,9 +165,87 @@ void pouch2Init()
wp2->unknown_0x18 = OSGetTime(); wp2->unknown_0x18 = OSGetTime();
} }
asm void pouchReInit()
void pouchReInit()
{ {
#include "asm/8014c728.s" MarioPouchWork * pp;
s32 i;
s32 j;
pp = pouchGetPtr();
memset(pp, 0, sizeof(work));
// Init stats
pouchSetLevel(1);
pouchSetAttack(1);
pouchSetMaxHp(10);
pouchSetHp(10);
pouchSetXp(0);
pouchSetCoin(0);
pouchSetArcadeTokens(0);
pp->flipTimer = 10;
pp->totalCoinsCollected = 0;
pp->maxJumpCombo = 0;
pp->maxStylishCombo = 0;
pp->enemiesDefeated = 0;
// Reset items
for (i = 0; i < POUCH_KEY_ITEM_MAX; i++)
pp->keyItem[i] = 0;
for (i = 0; i < POUCH_USE_ITEM_MAX; i++)
pp->useItem[i] = 0;
for (i = 0; i < POUCH_SHOP_ITEM_MAX; i++)
pp->shopItem[i] = 0;
for (i = 0; i < POUCH_CHAR_ITEM_MAX; i++)
{
pp->characters[i].selectable = false;
pp->characters[i].itemType = ITEM_ID_NULL;
pp->characters[i].selected = false;
}
for (i = 0; i < POUCH_FAIRY_ITEM_MAX; i++)
{
pp->pixls[i].selectable = false;
pp->pixls[i].itemType = ITEM_ID_NULL;
pp->pixls[i].selected = false;
}
pouchAddItem(ITEM_ID_CHAR_MARIO);
pouch2Init();
gp->timePlayed = 0;
// Setup merlee charms
pp->charmsRemaining = 0;
pp->killsBeforeNextCharm = 0;
pp->unknown_0x350 = pp->unknown_0x35c = (Vec3) {0, 0, 0};
// Setup minigame scores
for (i = 0; i < 4; i++)
{
for (j = 0; j < 5; j++)
{
pp->minigameScores[i][j].characterId = 0;
pp->minigameScores[i][j].score = 0;
pp->minigameScores[i][j].unknown_0xc = 0;
pp->minigameScores[i][j].unknown_0x8 = 0;
pp->minigameScores[i][j].unknown_0x10 = 0;
}
}
for (i = 0; i < 2; i++)
{
for (j = 0; j < 5; j++)
{
pp->unknown_0x548[i][j].unknown_0x0 = 0;
pp->unknown_0x548[i][j].unknown_0x4 = 0;
pp->unknown_0x548[i][j].unknown_0x8 = 0;
pp->unknown_0x548[i][j].unknown_0x14 = 0;
pp->unknown_0x548[i][j].unknown_0x10 = 0;
pp->unknown_0x548[i][j].unknown_0x18 = 0;
}
}
} }
asm void pouchMain() asm void pouchMain()