gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up `main.c` for consistent formatting

This commit is contained in:
gijs 2023-10-19 17:58:39 +02:00
parent 120e13f0c0
commit 3a78de26ae
1 changed files with 61 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/main.c
View File

@ -2,56 +2,6 @@
#include "libmus.h"
extern u16 D_800AEDE2;
INCLUDE_ASM(const s32, "main", func_80070C60);
INCLUDE_ASM(const s32, "main", AddHeap);
INCLUDE_ASM(const s32, "main", func_80070F14);
INCLUDE_ASM(const s32, "main", __virtual_mem_alloc);
INCLUDE_ASM(const s32, "main", func_800710DC);
/* 1688 80071288 */
void* func_80071288(u32 arg0) {
u16 temp_s0;
void* ret;
temp_s0 = D_800AEDE2;
D_800AEDE2 = 1;
ret = __virtual_mem_alloc(arg0);
D_800AEDE2 = temp_s0;
return ret;
}
INCLUDE_ASM(const s32, "main", func_800712C4);
INCLUDE_ASM(const s32, "main", func_800713EC);
INCLUDE_ASM(const s32, "main", HIsAllocatedPointer);
INCLUDE_ASM(const s32, "main", func_80071634);
INCLUDE_ASM(const s32, "main", func_8007163C);
INCLUDE_ASM(const s32, "main", func_80071644);
INCLUDE_ASM(const s32, "main", func_80071950);
INCLUDE_ASM(const s32, "main", func_800719E8);
INCLUDE_ASM(const s32, "main", func_80071A3C);
INCLUDE_ASM(const s32, "main", func_80071A74);
INCLUDE_ASM(const s32, "main", func_80071B9C);
INCLUDE_ASM(const s32, "main", func_80071C04);
INCLUDE_ASM(const s32, "main", func_80071E74);
typedef struct {
u8 field_0x0;
u8 field_0x1;
@ -120,6 +70,16 @@ extern s8 D_800A8211;
extern s8 D_800A8212;
extern s8 D_800A8213;
extern Arg_800712C4* D_800AEF9C;
extern s32 D_800A81F4;
extern s32 D_800A81F8;
extern s32 D_800C4BCC;
extern s8 D_800AEF9A;
extern void* D_800C4BB8;
extern OSContPad __GLOBAL_CONTROLLER_DATA_COPY[4];
extern struct {
// s32 field_0x0;
@ -134,6 +94,8 @@ extern s16 __MAIN_START_BUT_STATE;
extern void func_8007284C(u16);
extern void func_8016AF80();
extern void func_80197B70();
extern void func_8007328C();
extern u8 __reset_compared_osTvType();
extern struct {
s8 field_0x0;
@ -144,6 +106,55 @@ extern struct {
DECLARE_SEGMENT(segment_song);
DECLARE_SEGMENT(segment_obdata);
INCLUDE_ASM(const s32, "main", func_80070C60);
INCLUDE_ASM(const s32, "main", AddHeap);
INCLUDE_ASM(const s32, "main", func_80070F14);
INCLUDE_ASM(const s32, "main", __virtual_mem_alloc);
INCLUDE_ASM(const s32, "main", func_800710DC);
/* 1688 80071288 */
void* func_80071288(u32 arg0) {
u16 temp_s0;
void* ret;
temp_s0 = D_800AEDE2;
D_800AEDE2 = 1;
ret = __virtual_mem_alloc(arg0);
D_800AEDE2 = temp_s0;
return ret;
}
INCLUDE_ASM(const s32, "main", func_800712C4);
INCLUDE_ASM(const s32, "main", func_800713EC);
INCLUDE_ASM(const s32, "main", HIsAllocatedPointer);
INCLUDE_ASM(const s32, "main", func_80071634);
INCLUDE_ASM(const s32, "main", func_8007163C);
INCLUDE_ASM(const s32, "main", func_80071644);
INCLUDE_ASM(const s32, "main", func_80071950);
INCLUDE_ASM(const s32, "main", func_800719E8);
INCLUDE_ASM(const s32, "main", func_80071A3C);
INCLUDE_ASM(const s32, "main", func_80071A74);
INCLUDE_ASM(const s32, "main", func_80071B9C);
INCLUDE_ASM(const s32, "main", func_80071C04);
INCLUDE_ASM(const s32, "main", func_80071E74);
INCLUDE_ASM(const s32, "main", obMain);
INCLUDE_ASM(const s32, "main", func_80072398);
@ -189,9 +200,6 @@ loop_2:
bzero(__GLOBAL_CONTROLLER_DATA_COPY, sizeof(__GLOBAL_CONTROLLER_DATA_COPY));
}
extern s8 D_800AEF9A;
void func_8007284C(u16 __unused) {
const u16 pattern_a = CONT_A | CONT_B | CONT_L | CONT_START;
const u16 pattern_b = CONT_A | CONT_B | CONT_G | CONT_START;
@ -240,12 +248,8 @@ s32 func_80072944(void) {
return temp_s0 & 4;
}
INCLUDE_ASM(const s32, "main", __calls_copy_controller_data);
extern u8 __reset_compared_osTvType(); /* extern */
extern void* D_800C4BB8;
/* 347C 8007307C */
void __calls_osViSwapBuffer_8007307C(void** buffers)
{
@ -291,7 +295,6 @@ void __calls_osViSwapBuffer_8007307C(void** buffers)
osViSwapBuffer(buffers[3]);
}
/* 3564 80073164 */
void func_80073164(u8 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6) {
if (arg0 == 0) {
@ -358,14 +361,6 @@ u8 func_8007338C(void) {
return D_800A8213;
}
// INCLUDE_ASM(const s32, "main", func_80073398);
void func_8007328C(); /* extern */
extern s8 D_800A8210;
extern s8 D_800A8211;
extern s8 D_800A8212;
extern s8 D_800A8213;
extern Arg_800712C4* D_800AEF9C;
void func_80073398(void) {
func_80089A10();
func_8007328C();
@ -377,7 +372,6 @@ void func_80073398(void) {
D_800C4B20 = 0;
}
INCLUDE_ASM(const s32, "main", func_800733F8);
/* 3BA0 800737A0 */
@ -402,15 +396,10 @@ void func_80073BD0(void) {
gDPSetAlphaDither(obPtrDisplayList++, G_AD_DISABLE);
}
INCLUDE_ASM(const s32, "main", func_80073C48);
INCLUDE_ASM(const s32, "main", func_80073CB0);
extern s32 D_800A81F4;
extern s32 D_800A81F8;
extern s32 D_800C4BCC;
/* 42D8 80073ED8 */
void func_80073ED8(void) {
if (D_800A81F4 == 0) {
@ -427,7 +416,6 @@ void func_80073ED8(void) {
}
}
INCLUDE_ASM(const s32, "main", func_80073F58);
/* 43D4 80073FD4 */
@ -448,7 +436,6 @@ void __initialize_song_mem(void) {
osSetIntMask(mask);
}
INCLUDE_ASM(const s32, "main", func_80074050);
INCLUDE_ASM(const s32, "main", func_80074080);