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

fragment36 #126

Merged
merged 1 commit into from
Sep 9, 2024
Merged

fragment36 #126

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
2 changes: 2 additions & 0 deletions include/functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ void func_8000D970(OSPfs *);
// exception_set.s
void set_watch_lohi(s32);

u32 osGetCount(void);

unsigned long long __ull_rshift(unsigned long long a0, unsigned long long a1);
unsigned long long __ull_rem(unsigned long long a0, unsigned long long a1);
unsigned long long __ull_div(unsigned long long a0, unsigned long long a1);
Expand Down
1 change: 1 addition & 0 deletions linker_scripts/us/symbol_addrs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,4 @@ D_800AE540 = 0x800AE540; // size:0x1200
D_80068080 = 0x80068080;
D_8007ED20 = 0x8007ED20;
D_800A60C0 = 0x800A60C0;
D_82100DC0 = 0x82100DC0;
2 changes: 1 addition & 1 deletion src/1CF30.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void func_8001C604(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4, u8 arg5, u8
func_8001C330(arg0, arg1, arg2, arg3, 0, 0, 0, 0, 0);
}

void func_8001C6AC(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u32* arg4, s16 arg5, s32 arg6) {
void func_8001C6AC(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8* arg4, s16 arg5, s32 arg6) {
gDPLoadTextureBlock(gDisplayListHead++, arg4, G_IM_FMT_RGBA, G_IM_SIZ_16b, arg5, arg3, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
G_TX_NOLOD);
Expand Down
2 changes: 1 addition & 1 deletion src/1CF30.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ void func_8001C330(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s
void func_8001C4E4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6);
void func_8001C560(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4, u8 arg5, u8 arg6);
void func_8001C604(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4, u8 arg5, u8 arg6, u8 arg7);
void func_8001C6AC(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u32* arg4, s16 arg5, s32 arg6);
void func_8001C6AC(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8* arg4, s16 arg5, s32 arg6);
void func_8001C8C4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u32* arg4, s16 arg5, s32 arg6);
void func_8001CADC(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u32* arg4, s16 arg5, s32 arg6);
void func_8001CCF8(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u32* arg4, s16 arg5, s32 arg6);
Expand Down
2 changes: 2 additions & 0 deletions src/20330.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "global.h"

void func_8001F730(void);
void func_8001F738(unk_D_80068BA0*);
void func_8001F750(void);


#endif // _20330_H_
6 changes: 6 additions & 0 deletions src/26820.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@ typedef struct unk_func_80027F24 {
/* 0x04 */ unk_func_8002A728* unk_04;
} unk_func_80027F24; // size = 0x8

typedef struct unk_func_80027FA0 {
/* 0x00 */ u16 unk_00;
/* 0x02 */ char unk02[0x5];
} unk_func_80027FA0; // size = 0x7

void func_80026684(s32, s32);
void func_80027F24(unk_func_80027F24*);
void func_80027F40(unk_func_80027F24*);
void func_80027FA0(unk_func_80027FA0*, s32);
void func_80028070(u16*);
void func_800280D4(s32);
void func_800284B4(s32);
Expand Down
2 changes: 1 addition & 1 deletion src/29BA0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static s32 gLastGameState = STATE_N64_LOGO_INTRO;
static s32 pad_D_80075670 = 0;
static s16 D_80075674 = 0;
static s16 D_80075678 = 0;
static s32 D_8007567C = 0;
static s16 D_8007567C = 0;

unk_D_800AE520 D_800AE520;
unk_D_800AE540 D_800AE540;
Expand Down
1 change: 1 addition & 0 deletions src/2C1C0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
void func_8002B5EC(s32, s32, s32);
s32 func_8002B700(s32, s32, const char*, s32);
void func_8002B840(s32, s32);
void func_8002BA34(u8, u8, s16, s16);
void func_8002BC64(s32, s32, s32, s32);
void func_8002C394(s16);

Expand Down
2 changes: 1 addition & 1 deletion src/50A00.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "global.h"
#include "50A00.h"

#pragma GLOBAL_ASM("asm/us/nonmatchings/50A00/func_8004FE00.s")

Expand Down
10 changes: 10 additions & 0 deletions src/50A00.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#ifndef _50A00_H_
#define _50A00_H_

#include "global.h"

void func_8004FE00(void*);
void func_8004FF20(void);


#endif // _50A00_H_
Loading
Loading