Skip to content

match sub_805F024 #17

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 4 commits into from
Jun 26, 2026
Merged

match sub_805F024 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18b6413
match sub_805F024
SketchyGear Jun 26, 2026
bd025da
Merge branch 'SAT-R:main' into main
SketchyGear Jun 26, 2026
e4fbe7a
re-delete the re-added file
SketchyGear Jun 26, 2026
6beaa66
Merge branch 'SAT-R:main' into main
SketchyGear Jun 26, 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
66 changes: 0 additions & 66 deletions asm/non_matching/game/enemies/bubu__sub_805F024.inc
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions src/game/enemies/bu_bu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,16 +252,17 @@ bool32 sub_805EEB4(BuBu *enemy)
}
}

// NOTE: Unused
// (94.17%) https://decomp.me/scratch/sd7x3
NONMATCH("asm/non_matching/game/enemies/bubu__sub_805F024.inc", bool32 sub_805F024(BuBu *enemy))
UNUSED bool32 sub_805F024(BuBu *enemy)
{
s32 qJumpHeight = Q(64);

enemy->qPos.y -= Q(gUnknown_080D1FAC[enemy->unk6]);
if (enemy->qPos.y < enemy->qUnk14.y - Q(64)) {
enemy->qPos.y = enemy->qUnk14.y - Q(64);

if (enemy->qPos.y < enemy->qUnk14.y - qJumpHeight) {
enemy->qPos.y = enemy->qUnk14.y - qJumpHeight;
}

if (enemy->qPos.y == enemy->qUnk14.y - Q(64)) {
if (enemy->qPos.y == enemy->qUnk14.y - qJumpHeight) {
if (enemy->unkE == 0) {
enemy->unkE = 90;
return TRUE;
Expand All @@ -282,7 +283,6 @@ NONMATCH("asm/non_matching/game/enemies/bubu__sub_805F024.inc", bool32 sub_805F0

return FALSE;
}
END_NONMATCH

void sub_805F094(void)
{
Expand Down