Skip to content

Commit

Permalink
fragment8
Browse files Browse the repository at this point in the history
  • Loading branch information
Maide committed Aug 18, 2024
1 parent 04ead73 commit 5d606ce
Show file tree
Hide file tree
Showing 21 changed files with 1,545 additions and 74 deletions.
4 changes: 3 additions & 1 deletion include/global.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ typedef struct unk_D_86002F34_00C {
/* 0x30 */ char pad30[4];
/* 0x34 */ f32 unk_034;
/* 0x38 */ f32 unk_038;
/* 0x3C */ char pad3C[0x6C];
/* 0x3C */ char pad3C[0x28];
/* 0x64 */ Vec3f unk_064;
/* 0x70 */ char pad70[0x38];
/* 0xA8 */ f32 unk_0A8;
/* 0xAC */ f32 unk_0AC;
/* 0xB0 */ f32 unk_0B0;
Expand Down
2 changes: 2 additions & 0 deletions include/sections.h
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,8 @@ extern u8 _5C7AD0_ROM_START[];
extern u8 _5F6790_ROM_START[];
extern u8 _5F92A0_ROM_START[];
extern u8 _5FFC30_ROM_START[];
extern u8 _6C4CE0_ROM_START[];
extern u8 _6C4E50_ROM_START[];

extern u8 D_124570[];

Expand Down
5 changes: 5 additions & 0 deletions include/variables.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ extern Gfx* gDisplayListHead;

extern u32 D_1000000;
extern u32 D_3000000;
extern u32 D_4000000;
extern u32 D_4000008;
extern u32 D_4000810;
extern u32 D_4001018;
extern u32 D_4001820;
extern u32 D_5000000;
extern u32 D_6000000;
extern u32 D_81000000;
Expand Down
6 changes: 5 additions & 1 deletion linker_scripts/us/symbol_addrs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,8 @@ _79AFB0_ROM_END = 0x79B8F0; // defined:true
D_86002B84 = 0x86002B84; // size:3
D_86002B88 = 0x86002B88; // size:3
F3DEX2_bin = 0x80066090;
F3DEX2_data_bin = 0x8007E650;
F3DEX2_data_bin = 0x8007E650;
D_87A01178 = 0x87A01178;
D_87A01180 = 0x87A01180;
D_87A01190 = 0x87A01190;
D_87A011A4 = 0x87A011A4;
2 changes: 1 addition & 1 deletion src/18480.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "global.h"
#include "src/memory.h"

s32 func_80018B70(MemoryBlock*, void*);
unk_D_86002F34* func_80018B70(MemoryBlock*, void*);


#endif // _18480_H_
2 changes: 1 addition & 1 deletion src/19840.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ s32 func_80019C08(unk_D_86002F58_004_010*, unk_func_8001C248*);
s32 func_80019C58(unk_D_86002F58_004_010*, unk_func_8001C248*);
s32 func_80019CA8(unk_D_86002F58_004_010*);
void func_80019CE0(unk_D_86002F58_004_010*);
void* func_80019D18(s32);
unk_D_86002F30* func_80019D18(s32);
void func_800198E4(unk_D_86002F58_004_010*, u16, s32);


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

#pragma GLOBAL_ASM("asm/us/nonmatchings/30640/func_8002FA40.s")

Expand Down
8 changes: 8 additions & 0 deletions src/30640.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#ifndef _30640_H_
#define _30640_H_

#include "global.h"

void func_80031EF4(f32[4][4], Vec3f*);

#endif // _30640_H_
2 changes: 1 addition & 1 deletion src/490A0.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "global.h"
#include "490A0.h"

#pragma GLOBAL_ASM("asm/us/nonmatchings/490A0/func_800484A0.s")

Expand Down
8 changes: 8 additions & 0 deletions src/490A0.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#ifndef _490A0_H_
#define _490A0_H_

#include "global.h"

s32 func_800484E0(void);

#endif // _490A0_H_
2 changes: 1 addition & 1 deletion src/4BA90.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "global.h"
#include "4BA90.h"

#pragma GLOBAL_ASM("asm/us/nonmatchings/4BA90/func_8004AE90.s")

Expand Down
9 changes: 9 additions & 0 deletions src/4BA90.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#ifndef _4BA90_H_
#define _4BA90_H_

#include "global.h"

void func_8004B094(u32);
void func_8004B154(void);

#endif // _4BA90_H_
1 change: 1 addition & 0 deletions src/6BC0.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ void func_80006414(unk_D_80068BB0*, unk_D_80068BB0*);
void func_80006450(void);
void func_80006498(Gfx**, unk_D_80068BB0*);
void func_800067E4(Gfx**, s32, s32, s32, s32);
void func_8000699C(Gfx**, u16);


#endif // _6BC0_H_
5 changes: 4 additions & 1 deletion src/fragments/2/fragment2.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,24 @@ extern u16 D_8780FC94;
extern u16 D_8780FC96;
extern u16 D_8780FC98;

void func_8780005C(void);
u32 func_878001E8(s32);
void func_8780024C(s32, s32, s32, s32, s32);
void func_878010C8(s32);
void func_87801290(s32*, s32*, s32, s32, s32);
s32 func_878013D4(s32, s32);
void func_87801644(s32, s16, s16, f32);
void func_87801684(s32, s32, u8*);
void func_87801824(s32, s32, u8*);
void func_87801C8C(s32, s32, s32*);
void func_87801F48(s32, s32, s32);
void func_878021B4(s32, s32);
void func_87802528(void);
void func_878025D0(void);
void func_8780295C(s16);
s32 func_87802974(void);
void func_878029C0(void);
void func_87802EB8(s32);
void func_87802EB8(s16);
void func_87802F00(s32);
void func_87803118(void);
void func_87804FD4(void);
Expand Down
7 changes: 6 additions & 1 deletion src/fragments/4/fragment4.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@

#include "global.h"

extern u32 D_87A01178[];
extern u32 D_87A01180[];
extern u32 D_87A01190[];
extern u32 D_87A011A4[];

void func_87A00020(unk_D_86002F34_00C*);
Gfx* func_87A0002C(Gfx*);
Gfx* func_87A00098(Gfx*, Mtx*, f32, f32, f32, f32, void*, s32, s32);
void func_87A00DB8(s32);
void func_87A010D4(s32, s32, s32);


#endif // _FRAGMENT4_H_
4 changes: 2 additions & 2 deletions src/fragments/7/fragment7.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ extern unk_D_86002F58_004 D_86105BD0;
extern unk_D_86002F58_004 D_86105D38;

typedef struct unk_D_86105EA0 {
/* 0x0000 */ char unk000[0x4];
/* 0x0004 */ unk_D_86002F58_004 unk_004;
/* 0x000 */ char unk000[0x4];
/* 0x004 */ unk_D_86002F58_004 unk_004;
} unk_D_86105EA0; // size = 0x16C
extern unk_D_86105EA0 D_86105EA0[4];

Expand Down
Loading

0 comments on commit 5d606ce

Please sign in to comment.