Skip to content

mp: Match island collision functions #2044

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
ribbanya merged 6 commits into from
Jan 5, 2026
Merged

mp: Match island collision functions #2044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a4f7cb
Match mpIsland_8005AE1C
itsgrimetime Dec 30, 2025
9eed9fd
Match mpIsland_8005B334, update struct layout
itsgrimetime Dec 30, 2025
d2c5219
Fix broken function
ribbanya Dec 30, 2025
c268abb
Merge branch 'master' into mp-functions
ribbanya Dec 30, 2025
1852623
Merge branch 'master' into mp-functions
itsgrimetime Jan 1, 2026
8cdc6a7
Merge branch 'master' into mp-functions
ribbanya Jan 5, 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
199 changes: 188 additions & 11 deletions src/melee/mp/mpisland.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
void mpIsland_8005A6F8(void)
{
mpIsland_80458E88.next = NULL;
mpIsland_80458E88.x4 = 0;
mpIsland_80458E88.x8.x = 0;
mpIsland_80458E88.x8.y = 0;
mpIsland_80458E88.x14.y = 0;
mpIsland_80458E88.x14.z = 0;
mpIsland_80458E88.x8.z = 0;
mpIsland_80458E88.x14.x = 0;
mpIsland_80458E88.x20 = 0;
mpIsland_80458E88.x4 = NULL;
mpIsland_80458E88.x8 = NULL;
mpIsland_80458E88.xC = NULL;
mpIsland_80458E88.x18 = NULL;
mpIsland_80458E88.x1C = NULL;
mpIsland_80458E88.x10 = NULL;
mpIsland_80458E88.x14 = NULL;
mpIsland_80458E88.x20 = NULL;
}

void mpIsland_8005A728(void)
Expand Down Expand Up @@ -88,9 +88,9 @@ void mpIsland_8005A728(void)
v0 = (short*) mpLib_8004D164();
v1 = mpGetGroundCollLine();
v2 = mpGetGroundCollVtx();
v23 = &mpIsland_80458E88.x4;
v24_2 = &mpIsland_80458E88.x8.x;
v22_2 = &mpIsland_80458E88.x8.y;
v23 = (int*) &mpIsland_80458E88.x4;
v24_2 = (s32*) &mpIsland_80458E88.x8;
v22_2 = (s32*) &mpIsland_80458E88.xC;
mpIsland_8005A6F8();

memzero(v33, 0x600u);
Expand Down Expand Up @@ -347,3 +347,180 @@ void mpIsland_8005ACE8(mp_UnkStruct0* arg0, Vec3* arg1, Vec3* arg2)
var_r30++;
}
}

static float mpIsland_804D8158;

void mpIsland_8005AE1C(mp_UnkStruct0** arg0, mp_UnkStruct0** arg1, int arg2,
int arg3, bool arg4)
{
mp_UnkStruct0* prev_b;
mp_UnkStruct0* prev_a;
mp_UnkStruct0* cur;
mp_UnkStruct0* next;
CollVtx* vtx;
int end;
float z_val;
u16 v0;

prev_b = NULL;
prev_a = NULL;

vtx = mpGetGroundCollVtx();
cur = *arg0;
end = arg2 + arg3;
z_val = mpIsland_804D8158;

goto loop1_check;
loop1_body:
v0 = cur->x4;
next = cur->next;

if ((int) v0 < arg2) {
if ((int) cur->x6 < arg2) {
goto add_to_prev_b_1;
}
}

if (end > (int) v0) {
goto do_assign_1;
}
if (end <= (int) cur->x6) {
goto add_to_prev_b_1;
}

do_assign_1:
cur->x8.x = vtx[v0].pos.x;
cur->x8.y = vtx[cur->x4].pos.y;
cur->x8.z = z_val;
cur->x14.x = vtx[cur->x6].pos.x;
cur->x14.y = vtx[cur->x6].pos.y;
cur->x14.z = z_val;

if (arg4) {
goto add_to_prev_b_1;
}
if (cur->x20 & 2) {
goto add_to_prev_b_1;
}
cur->x20 |= 2;
cur->next = prev_a;
prev_a = cur;
goto loop1_next;

add_to_prev_b_1:
cur->next = prev_b;
prev_b = cur;

loop1_next:
cur = next;
loop1_check:
if (cur != NULL) {
goto loop1_body;
}

cur = *arg1;
z_val = mpIsland_804D8158;

goto loop2_check;
loop2_body:
v0 = cur->x4;
next = cur->next;

if ((int) v0 < arg2) {
if ((int) cur->x6 < arg2) {
goto add_to_prev_a_2;
}
}

if (end > (int) v0) {
goto do_assign_2;
}
if (end <= (int) cur->x6) {
goto add_to_prev_a_2;
}

do_assign_2:
cur->x8.x = vtx[v0].pos.x;
cur->x8.y = vtx[cur->x4].pos.y;
cur->x8.z = z_val;
cur->x14.x = vtx[cur->x6].pos.x;
cur->x14.y = vtx[cur->x6].pos.y;
cur->x14.z = z_val;

if (arg4 == false) {
goto add_to_prev_a_2;
}
if ((cur->x20 & 2) == 0) {
goto add_to_prev_a_2;
}
cur->x20 &= ~2;
cur->next = prev_b;
prev_b = cur;
goto loop2_next;

add_to_prev_a_2:
cur->next = prev_a;
prev_a = cur;

loop2_next:
cur = next;
loop2_check:
if (cur != NULL) {
goto loop2_body;
}

*arg0 = prev_b;
*arg1 = prev_a;
}

/// #mpIsland_8005B004

void mpIsland_8005B334(int arg0, int arg1, int arg2, bool arg3)
{
mp_UnkStruct0* temp;

if (mpIsland_80458E88.x8 != NULL) {
mpIsland_80458E88.x8->next = NULL;
} else {
mpIsland_80458E88.next = NULL;
}

if (mpIsland_80458E88.xC != NULL) {
mpIsland_80458E88.xC->next = NULL;
} else {
mpIsland_80458E88.x4 = NULL;
}

mpIsland_8005AE1C(&mpIsland_80458E88.next, &mpIsland_80458E88.x18, arg1,
arg2, arg3);
mpIsland_8005AE1C(&mpIsland_80458E88.x4, &mpIsland_80458E88.x1C, arg1,
arg2, arg3);
mpIsland_8005B004(&mpIsland_80458E88.x10, &mpIsland_80458E88.x20, arg0, 1,
arg1, arg2, arg3);
mpIsland_8005B004(&mpIsland_80458E88.x14, &mpIsland_80458E88.x20, arg0, 2,
arg1, arg2, arg3);

// Find end of first list and link
temp = mpIsland_80458E88.next;
while (temp != NULL && temp->next != NULL) {
temp = temp->next;
}
if (temp != NULL) {
temp->next = mpIsland_80458E88.x10;
} else {
mpIsland_80458E88.next = mpIsland_80458E88.x10;
}
mpIsland_80458E88.x8 = temp;

// Find end of second list and link
temp = mpIsland_80458E88.x4;
while (temp != NULL && temp->next != NULL) {
temp = temp->next;
}
if (temp != NULL) {
temp->next = mpIsland_80458E88.x14;
} else {
mpIsland_80458E88.x4 = mpIsland_80458E88.x14;
}
mpIsland_80458E88.xC = temp;
}
6 changes: 3 additions & 3 deletions src/melee/mp/mpisland.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
/* 05AC14 */ mp_UnkStruct0* mpIsland_8005AC14(Vec3*, float);
/* 05AC8C */ bool mpIsland_8005AC8C(mp_UnkStruct0* arg0);
/* 05ACE8 */ void mpIsland_8005ACE8(mp_UnkStruct0*, Vec3*, Vec3*);
/* 05AE1C */ UNK_RET mpIsland_8005AE1C(UNK_PARAMS);
/* 05B004 */ UNK_RET mpIsland_8005B004(UNK_PARAMS);
/* 05B334 */ UNK_RET mpIsland_8005B334(int, int, int, bool);
/* 05AE1C */ void mpIsland_8005AE1C(mp_UnkStruct0** arg0, mp_UnkStruct0** arg1, int arg2, int arg3, bool arg4);
/* 05B004 */ void mpIsland_8005B004(mp_UnkStruct0** arg0, mp_UnkStruct0** arg1, int arg2, int arg3, int arg4, int arg5, bool arg6);
/* 05B334 */ void mpIsland_8005B334(int arg0, int arg1, int arg2, bool arg3);

extern mpIsland_Palette mpIsland_TerrainPalette;
struct mpIsland_80458E88_t;
Expand Down
17 changes: 8 additions & 9 deletions src/melee/mp/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

struct mpIsland_80458E88_t {
/* +0 */ mp_UnkStruct0* next;
/* +4 */ int x4;
/* +8 */ S32Vec3 x8;
/* +14 */ S32Vec3 x14;
/* +20 */ int x20;
/* +24 */ short x24;
/* +26 */ short x26;
/* +28 */ short x28;
/* +2A */ short x2A;
/* +2C */ mp_UnkStruct3* ptr;
/* +4 */ mp_UnkStruct0* x4;
/* +8 */ mp_UnkStruct0* x8;
/* +C */ mp_UnkStruct0* xC;
/* +10 */ mp_UnkStruct0* x10;
/* +14 */ mp_UnkStruct0* x14;
/* +18 */ mp_UnkStruct0* x18;
/* +1C */ mp_UnkStruct0* x1C;
/* +20 */ mp_UnkStruct0* x20;
};

struct mpIsland_PaletteEntry {
Expand Down