kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #254 from gamemasterplc/main

Browse source 
Clean up fn_1_5630 match
This commit is contained in:
gamemasterplc 2024-04-05 23:37:39 -05:00 • committed by GitHub
commit 913412935b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/REL/m407dll/main.c
View file

@ -377,14 +377,6 @@ void fn_1_5574(void) {
void fn_1_5630(void) { void fn_1_5630(void) {
unkDominationData5* temp_r31; unkDominationData5* temp_r31;
s32 temp_r28;
s16 temp_r27;
s32 temp_r26;
s32 coins;
s32 coins2;
s32 temp_r23;
s32 temp_r22;
s32 temp_r21;
s32 i; s32 i;
temp_r31 = lbl_1_bss_397C->data; temp_r31 = lbl_1_bss_397C->data;
@ -398,21 +390,11 @@ void fn_1_5630(void) {
temp_r31->unk_06 = MGSeqCreate(3, 2); temp_r31->unk_06 = MGSeqCreate(3, 2);
HuAudSStreamPlay(4); HuAudSStreamPlay(4);
} else { } else {
temp_r21 = fn_1_4C0(temp_r31->unk_1C[3]); temp_r31->unk_06 = MGSeqCreate(5, 3, fn_1_4C0(temp_r31->unk_1C[0]), fn_1_4C0(temp_r31->unk_1C[1]), fn_1_4C0(temp_r31->unk_1C[2]), fn_1_4C0(temp_r31->unk_1C[3]));
temp_r22 = fn_1_4C0(temp_r31->unk_1C[2]);
temp_r23 = fn_1_4C0(temp_r31->unk_1C[1]);
temp_r31->unk_06 = MGSeqCreate(5, 3, fn_1_4C0(temp_r31->unk_1C[0]), temp_r23, temp_r22, temp_r21);
for (i = 0; i < ARRAY_COUNT(temp_r31->unk_1C); i++) { for (i = 0; i < ARRAY_COUNT(temp_r31->unk_1C); i++) {
if (temp_r31->unk_1C[i] != -1) { if (temp_r31->unk_1C[i] != -1) {
fn_1_3C4(temp_r31->unk_1C[i]); fn_1_3C4(temp_r31->unk_1C[i]);
temp_r26 = temp_r31->unk_1C[i]; GWPlayerCoinWinSet(temp_r31->unk_1C[i], GWPlayerCoinWinGet(temp_r31->unk_1C[i])+10);
coins = GWPlayer[temp_r26].coin_win;
coins2 = coins;
temp_r27 = coins2 + 10;
temp_r28 = temp_r31->unk_1C[i];
if (_CheckFlag(0x1000C) == 0) {
GWPlayer[temp_r28].coin_win = temp_r27;
}
} }
} }
HuAudSStreamPlay(1); HuAudSStreamPlay(1);