Skip to content

Match Task_SetupPartnerCharIndices #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JaceCear merged 2 commits into from
Nov 3, 2026
Merged

Match Task_SetupPartnerCharIndices #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fca505c
Match Task_SetupPartnerCharIndices
idefix02 Nov 2, 2026
b5ff87f
Get rid of magic constant (feedback on #30)
idefix02 Nov 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
246 changes: 0 additions & 246 deletions asm/non_matching/game/char_select__Task_SetupPartnerCharIndices.inc
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions src/game/sa3/character_select.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,8 +1337,7 @@ void Task_8099300()
}
}

// (96.04%) https://decomp.me/scratch/f1JNY
NONMATCH("asm/non_matching/game/char_select__Task_SetupPartnerCharIndices.inc", void Task_SetupPartnerCharIndices())
void Task_SetupPartnerCharIndices()
{
Background *bg;
#ifndef BUG_FIX
Expand All @@ -1362,10 +1361,12 @@ NONMATCH("asm/non_matching/game/char_select__Task_SetupPartnerCharIndices.inc",

cs->unk3 = 0;
for (i = 0; i < 4; i++) {
if (cs->unk3 == cs->listIndex[CS_CHARID_PLAYER]) {
cs->unk3++;
if (cs->unk3 != cs->listIndex[CS_CHARID_PLAYER]) {
if (cs->unk3 < CSLI_COUNT) {
break;
}
} else {
break;
cs->unk3++;
}
}

Expand Down Expand Up @@ -1411,7 +1412,6 @@ NONMATCH("asm/non_matching/game/char_select__Task_SetupPartnerCharIndices.inc",
DrawBackground(bg);
gCurTask->main = Task_8099680;
}
END_NONMATCH

void Task_8099680(void)
{
Expand Down