Skip to content
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

Match sub_08066490 #648

Merged
merged 4 commits into from
Dec 11, 2023
Merged

Match sub_08066490 #648

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8f7378
Nuke sub_08066490.inc
KEKW555 Dec 10, 2023
4991d44
Match sub_08066490
KEKW555 Dec 11, 2023
976347a
Merge branch 'zeldaret:master' into ok_sub_08066490
KEKW555 Dec 11, 2023
22cd6f9
Remove extra bracket
KEKW555 Dec 11, 2023
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/npc23/sub_08066490.inc
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions src/npc/npc23.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void sub_08066474(NPC23Entity* this) {
}
}

NONMATCH("asm/non_matching/npc23/sub_08066490.inc", void sub_08066490(NPC23Entity* this, Entity* entity)) {
void sub_08066490(NPC23Entity* this, Entity* entity)) {
u32 uVar1;
u32 uVar2;
u32 uVar3;
Expand All @@ -134,7 +134,7 @@ NONMATCH("asm/non_matching/npc23/sub_08066490.inc", void sub_08066490(NPC23Entit
uVar3 = uVar2 + this->unk_82;
uVar4 = uVar2 - this->unk_82;
if (((entity->x.HALF.HI < (int)uVar3) && (entity->x.HALF.HI > (int)uVar4))) {
uVar2 = entity->x.HALF.HI;
uVar2 += (entity->x.HALF.HI - uVar2);
} else {
if (entity->x.HALF.HI >= (int)uVar3) {
uVar2 = uVar3;
Expand All @@ -157,7 +157,6 @@ NONMATCH("asm/non_matching/npc23/sub_08066490.inc", void sub_08066490(NPC23Entit
}
}
}
END_NONMATCH

bool32 sub_0806650C(NPC23Entity* this) {
u32 dir = 0;
Expand Down
Loading