Skip to content

Decomp func_80048C28 (marina) #16

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

Open
DodongoRex wants to merge 1 commit into
base: cleanup2024
Choose a base branch
from
Open

Decomp func_80048C28 (marina) #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions include/data_symbols.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ extern s16 D_800EF5F0;

// func_8000147C
extern u16 D_800BE674;
extern u16 D_801373D8;
extern u16 D_8013747C;
extern u16 D_80171B30[128];
extern u16 D_80171C30[128];
Expand Down
30 changes: 29 additions & 1 deletion src/marina.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,35 @@

#pragma GLOBAL_ASM("asm/nonmatchings/marina/func_80048BB0.s")

#pragma GLOBAL_ASM("asm/nonmatchings/marina/func_80048C28.s")
u32 func_80048C28(s32 arg0) {
u16 flags;
u32 result;

if ((arg0 == 0) && ((D_801373D8 & 0x33) == 0)) {
return 0xFF;
}

flags = D_801373D8;
result = 4;

if (flags & 0x10) {
if (flags & 3) {
result = 6;
} else {
result = 8;
}
}

if (flags & 0x20) {
if (flags & 3) {
result = 2;
} else {
result = 0;
}
}

return result;
}

#pragma GLOBAL_ASM("asm/nonmatchings/marina/func_80048C94.s")

Expand Down