Reorganizaton of main (#199)

* reorganize main

* more names

* libc

Makefile

@@ -253,22 +253,13 @@ build/src/libultra/gu/%.o: OPTFLAGS := -O3 -g0
 build/src/libultra/io/%.o: OPTFLAGS := -O1 -g0
 build/src/libultra/os/%.o: OPTFLAGS := -O1 -g0
 build/src/libultra/rmon/%.o: OPTFLAGS := -O1 -g0
+build/src/libultra/debug/%.o: OPTFLAGS := -O1 -g0
+build/src/libultra/host/%.o:	OPTFLAGS := -O1 -g0
+build/src/audio/%.o: OPTFLAGS := -O2 -g0
 
 # per-file flags
-build/src/main/audio_synthesis.o:  OPTFLAGS := -O2 -g0
-build/src/main/audio_seqplayer.o:  OPTFLAGS := -O2 -g0
-build/src/main/audio_effects.o:  OPTFLAGS := -O2 -g0
-build/src/main/audio_playback.o:  OPTFLAGS := -O2 -g0
-build/src/main/audio_load.o:  OPTFLAGS := -O2 -g0
-build/src/main/audio_general.o:  OPTFLAGS := -O2 -g0
-build/src/main/audio_heap.o:  OPTFLAGS := -O2 -g0
-build/src/main/audio_thread.o: OPTFLAGS := -O2 -g0
-build/src/main/sys_sprintf.o: OPTFLAGS := -O2 -g0
-build/src/main/sys_math64.o: OPTFLAGS := -O2 -g0
-
-build/src/libultra/debug/kdebugserver.o: OPTFLAGS := -O1 -g0
-
-build/src/libultra/host/readhost.o:	OPTFLAGS := -O1 -g0
+build/src/libc_sprintf.o: OPTFLAGS := -O2 -g0
+build/src/libc_math64.o: OPTFLAGS := -O2 -g0
 
 build/src/libultra/libc/ldiv.o: OPTFLAGS := -O2 -g0
 build/src/libultra/libc/string.o: OPTFLAGS := -O2 -g0

include/gfx.h

@@ -293,7 +293,7 @@ typedef enum SetupDL {
     /* 0x58 */ SETUPDL_MAX
 } SetupDL;
 
-extern Gfx gSetupDLs[SETUPDL_MAX][9]; // 0x800D31B0
+extern Gfx gRcpSetupDLs[SETUPDL_MAX][9]; // 0x800D31B0
 extern u8 D_80178580[];
 extern void* D_80178710;
 

include/variables.h

@@ -191,13 +191,13 @@ extern s32 sUnlockOnFoot; // sUnlockOnFoot
 extern s32 D_versus_80178768[];
 
 // gfx_data
-extern u16 D_Unk_800DACB8[][32];
+extern u16 D_Tex_800DACB8[][32];
 extern u16 D_Tex_800D99F8[];
-extern u16 D_Tex_800DBA20[];
-extern Gfx D_Gfx_800DBAA0[];
+extern u16 gTextCharPalettes[];
+extern Gfx gRcpInitDL[];
 extern Gfx D_Gfx_800DAC20[];
 extern Gfx D_Gfx_800D9688[];
-extern u8 D_Unk_800DB4B8[];
+extern u8 D_Tex_800DB4B8[];
 extern Gfx D_Gfx_800D94D0[];
 
 

linker_scripts/us/symbol_addrs.txt

@@ -71,7 +71,7 @@ D_edata_800CC124 = 0x800CC124;//type:u8
 D_boss_800C9E90 = 0x800C9E90;//size:0x70
 
 D_play_800D3180 = 0x800D3180; // size:0x20
-gSetupDLs = 0x800D31B0; // size:0x18C0
+gRcpSetupDLs = 0x800D31B0; // size:0x18C0
 
 D_edisplay_800CFCA0 = 0x800CFCA0;
 

linker_scripts/us/symbol_addrs_assets.txt

@@ -10,11 +10,11 @@ D_Gfx_800DAB28 = 0x800DAB28; // type:Gfx
 D_Gfx_800DAB80 = 0x800DAB80; // type:Gfx
 D_Gfx_800DAC20 = 0x800DAC20; // type:Gfx
 D_Gfx_800DACA0 = 0x800DACA0; // type:Gfx
-D_Gfx_800DBAA0 = 0x800DBAA0; // type:Gfx
+gRcpInitDL = 0x800DBAA0; // type:Gfx
 
 D_Tex_800DA1F8 = 0x800DA1F8;
 D_Tex_800D99F8 = 0x800D99F8;
-D_Tex_800DBA20 = 0x800DBA20;
+gTextCharPalettes = 0x800DBA20;
 
 D_Vtx_800D94A0 = 0x800D94A0;
 D_Vtx_800D94E8 = 0x800D94E8;
@@ -29,8 +29,8 @@ D_Vtx_800DAB40 = 0x800DAB40;
 D_Vtx_800DABE0 = 0x800DABE0;
 D_Vtx_800DAC80 = 0x800DAC80;
 
-D_Unk_800DACB8 = 0x800DACB8;
-D_Unk_800DB4B8 = 0x800DB4B8;
+D_Tex_800DACB8 = 0x800DACB8;
+D_Tex_800DB4B8 = 0x800DB4B8;
 D_Unk_800D96E8 = 0x800D96E8; // type:s16
 
 gSawtoothWaveSample = 0x800DBB10; // size:0x200 type:s16

linker_scripts/us/symbol_addrs_nlib_vars.txt

@@ -131,12 +131,12 @@ gDmaTable = 0x80178A70; //size:0x5A0
 D_80178A70 = 0x80178A78; //ignore:true
 
 // buffers
-gDramStack = 0x80281000; //size:0x400 segment:fox_buffers defined:true
-gOSYieldData = 0x80281400; //size:0xC00 segment:fox_buffers defined:true
-gZBuffer = 0x80282000; //size:0x25800 segment:fox_buffers defined:true
-gTaskOutputBuffer = 0x802A7800; //size:0x30000 name_end:gTaskOutputBufferEnd segment:fox_buffers defined:true
-gAudioHeap = 0x802D7800; //size:0xB0000 segment:fox_buffers defined:true
-gTextureRenderBuffer = 0x80387800; //size:0x7880 segment:fox_buffers defined:true
-gFillBuffer = 0x8038F080; //size:0x780 segment:fox_buffers defined:true
-gFrameBuffers = 0x8038F800; //size:0x70800 segment:fox_buffers defined:true
+gDramStack = 0x80281000; //size:0x400 segment:buffers defined:true
+gOSYieldData = 0x80281400; //size:0xC00 segment:buffers defined:true
+gZBuffer = 0x80282000; //size:0x25800 segment:buffers defined:true
+gTaskOutputBuffer = 0x802A7800; //size:0x30000 name_end:gTaskOutputBufferEnd segment:buffers defined:true
+gAudioHeap = 0x802D7800; //size:0xB0000 segment:buffers defined:true
+gTextureRenderBuffer = 0x80387800; //size:0x7880 segment:buffers defined:true
+gFillBuffer = 0x8038F080; //size:0x780 segment:buffers defined:true
+gFrameBuffers = 0x8038F800; //size:0x70800 segment:buffers defined:true
 D_8038F300 = 0x8038F300; //ignore:true

src/audio/audio_synthesis.c

@@ -345,7 +345,7 @@ void func_80008780(f32* arg0, s32 arg1, f32* arg2) {
     }
 }
 #else
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_synthesis/func_80008780.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/audio/audio_synthesis/func_80008780.s")
 #endif
 
 #ifdef NON_MATCHING
@@ -474,7 +474,7 @@ void func_80009124(s16** arg0) {
 }
 #else
 void func_80009124(s16** arg0);
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_synthesis/func_80009124.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/audio/audio_synthesis/func_80009124.s")
 #endif
 
 void func_80009504(s16* arg0, UnkStruct_800097A8* arg1) {
@@ -1122,7 +1122,7 @@ Acmd* func_8000A700(s32 noteIndex, NoteSubEu* noteSub, NoteSynthesisState* synth
     return aList;
 }
 #else
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_synthesis/func_8000A700.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/audio/audio_synthesis/func_8000A700.s")
 #endif
 
 Acmd* func_8000B3F0(Acmd* aList, NoteSubEu* noteSub, NoteSynthesisState* synthState, s32 numSamplesToLoad) {