Skip to content

Decompile func_80048C94 (marina) #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

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

Decompile func_80048C94 (marina) #17

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
7 changes: 6 additions & 1 deletion src/marina.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "common.h"

extern s32 D_800D5794[];
extern f32 D_800EF630;

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

#pragma GLOBAL_ASM("asm/nonmatchings/marina/func_800486F4.s")
Expand All @@ -10,7 +13,9 @@

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

#pragma GLOBAL_ASM("asm/nonmatchings/marina/func_80048C94.s")
s32 func_80048C94(s32 index) {
return (s32)((f32)D_800D5794[index] * D_800EF630);
}

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

Expand Down
2 changes: 1 addition & 1 deletion versions/us1/mischiefmakers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ segments:
- [0x027F70, asm] # has to do with on screen text
- [0x0438E0, asm]
- [0x048A30, asm]
- [0x049200, asm, marina]
- [0x049200, c, marina] # marina code segment
- [0x04FEB0, asm]
- [0x059EA0, asm]
- [0x05D120, asm]
Expand Down