diff --git a/Makefile b/Makefile index 7e78fca8..313a817f 100755 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ endif BUILD_DIR = build ##################### Compiler Options ####################### + IRIX_ROOT := tools/ido5.3_compiler ifeq ($(shell type mips-linux-gnu-ld >/dev/null 2>/dev/null; echo $$?), 0) @@ -41,11 +42,12 @@ LD = $(CROSS)ld OBJDUMP = $(CROSS)objdump OBJCOPY = $(CROSS)objcopy --pad-to=0xC00000 --gap-fill=0xFF +MIPSISET := -mips1 +OPT_FLAGS := -O2 + ASFLAGS = -mtune=vr4300 -march=vr4300 $(INCLUDE_FLAGS) INCLUDE_CFLAGS := -I include -I $(BUILD_DIR) -I $(BUILD_DIR)/include -I src -I . -COMMON_CFLAGS = -c -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -Xfullwarn -signed -O2 $(INCLUDE_CFLAGS) -CFLAGS = $(COMMON_CFLAGS) -mips1 -CFLAGS_MIPS2 = $(COMMON_CFLAGS) -mips2 +CFLAGS = -c -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -Xfullwarn -signed $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(MIPSISET) LDFLAGS = undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/dkr.map ####################### Other Tools ######################### @@ -64,11 +66,12 @@ TEXBUILDER = $(TOOLS_DIR)/dkr_texbuilder COMPRESS = $(TOOLS_DIR)/dkr_decompressor -c CHEAT_ENCRYPTOR = $(TOOLS_DIR)/dkr_cheats_encryptor -ASM_DIRS := asm asm/boot asm/assets data -SRC_DIRS := src src/mips1 src/mips2 +LIB_DIRS := lib +ASM_DIRS := asm asm/boot asm/assets data lib/asm +SRC_DIRS := src src/mips1 lib/src ASSETS_DIRS := animations audio billboards bin cheats fonts levels objects particles text textures textures/2d textures/3d tt_ghosts ucode -GLOBAL_ASM_C_FILES != grep -rl 'GLOBAL_ASM(' $(wildcard src/*.c src/mips1/*.c src/mips2/*.c) +GLOBAL_ASM_C_FILES != grep -rl 'GLOBAL_ASM(' $(wildcard src/*.c lib/src/*.c) GLOBAL_ASM_O_FILES = $(foreach file,$(GLOBAL_ASM_C_FILES),$(BUILD_DIR)/$(file:.c=.o)) S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) @@ -81,6 +84,8 @@ O_FILES := $(foreach file,$(S_FILES),$(BUILD_DIR)/$(file:.s=.o)) \ ####################### ASSETS ######################### +# TODO: Clean this up if possible + ASSETS_DIR = assets/us_1.0 ASSETS_OBJCOPY = $(CROSS)objcopy --input-target=binary --output-target=binary @@ -163,6 +168,10 @@ UCODE_BUILT := $(patsubst $(UCODE_IN_DIR)/%.bin,$(UCODE_OUT_DIR)/%.bin,$(UCODE)) ALL_ASSETS_BUILT := $(ANIMATIONS_BUILT) $(AUDIO_BUILT) $(BILLBOARDS_BUILT) $(BINS_BUILT) $(CHEATS_BUILT) $(FONTS_BUILT) $(LEVELS_BUILT) $(OBJECTS_BUILT) $(TEXTURES_BUILT) $(PARTICLES_BUILT) $(TEXT_BUILT) $(TT_GHOSTS_BUILT) $(UCODE_BUILT) +####################### LIBULTRA ######################### + +$(BUILD_DIR)/lib/%.o: OPT_FLAGS := -O2 +$(BUILD_DIR)/lib/%.o: MIPSISET := -mips2 ######################## Targets ############################# @@ -181,7 +190,7 @@ else endif $(BUILD_DIR): - mkdir $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(ASM_DIRS) $(SRC_DIRS) $(ASSETS_DIRS)) + mkdir $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(LIB_DIRS) $(ASM_DIRS) $(SRC_DIRS) $(ASSETS_DIRS)) # This is here to prevent make from deleting all the asset files after the build completes/fails. dont_remove_asset_files: $(ALL_ASSETS_BUILT) @@ -246,11 +255,8 @@ $(UCODE_OUT_DIR)/%.bin: $(UCODE_IN_DIR)/%.bin $(BUILD_DIR)/%.o: %.s Makefile $(MAKEFILE_SPLIT) | $(BUILD_DIR) $(ALL_ASSETS_BUILT) $(AS) $(ASFLAGS) -o $@ $< - -$(BUILD_DIR)/src/mips2/%.o: src/mips2/%.c - $(CC) $(CFLAGS_MIPS2) -o $@ $< -$(BUILD_DIR)/src/mips1/%.o: src/mips1/%.c +$(BUILD_DIR)/%.o: %.c $(CC) $(CFLAGS) -o $@ $< $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) diff --git a/asm/non_matchings/osCreateThread_0C9450/osCreateThread.s b/lib/asm/non_matchings/osCreateThread_0C9450/osCreateThread.s similarity index 100% rename from asm/non_matchings/osCreateThread_0C9450/osCreateThread.s rename to lib/asm/non_matchings/osCreateThread_0C9450/osCreateThread.s diff --git a/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s b/lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s similarity index 100% rename from asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s rename to lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s diff --git a/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s b/lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s similarity index 100% rename from asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s rename to lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s diff --git a/asm/non_matchings/osSetEventMsg_0CD7B0/osSetEventMsg.s b/lib/asm/non_matchings/osSetEventMsg_0CD7B0/osSetEventMsg.s similarity index 100% rename from asm/non_matchings/osSetEventMsg_0CD7B0/osSetEventMsg.s rename to lib/asm/non_matchings/osSetEventMsg_0CD7B0/osSetEventMsg.s diff --git a/asm/non_matchings/osSetTime_0CDE60/osSetTime.s b/lib/asm/non_matchings/osSetTime_0CDE60/osSetTime.s similarity index 100% rename from asm/non_matchings/osSetTime_0CDE60/osSetTime.s rename to lib/asm/non_matchings/osSetTime_0CDE60/osSetTime.s diff --git a/asm/non_matchings/osStartThread_0C95A0/osStartThread.s b/lib/asm/non_matchings/osStartThread_0C95A0/osStartThread.s similarity index 100% rename from asm/non_matchings/osStartThread_0C95A0/osStartThread.s rename to lib/asm/non_matchings/osStartThread_0C95A0/osStartThread.s diff --git a/asm/non_matchings/osViSetEventMsg_0D2980/osViSetEventMsg.s b/lib/asm/non_matchings/osViSetEventMsg_0D2980/osViSetEventMsg.s similarity index 100% rename from asm/non_matchings/osViSetEventMsg_0D2980/osViSetEventMsg.s rename to lib/asm/non_matchings/osViSetEventMsg_0D2980/osViSetEventMsg.s diff --git a/asm/non_matchings/unknown_0C8490/func_800C7890.s b/lib/asm/non_matchings/unknown_0C8490/func_800C7890.s similarity index 100% rename from asm/non_matchings/unknown_0C8490/func_800C7890.s rename to lib/asm/non_matchings/unknown_0C8490/func_800C7890.s diff --git a/asm/non_matchings/unknown_0C8490/func_800C78D0.s b/lib/asm/non_matchings/unknown_0C8490/func_800C78D0.s similarity index 100% rename from asm/non_matchings/unknown_0C8490/func_800C78D0.s rename to lib/asm/non_matchings/unknown_0C8490/func_800C78D0.s diff --git a/asm/non_matchings/unknown_0C84E0/func_800C78E0.s b/lib/asm/non_matchings/unknown_0C84E0/func_800C78E0.s similarity index 100% rename from asm/non_matchings/unknown_0C84E0/func_800C78E0.s rename to lib/asm/non_matchings/unknown_0C84E0/func_800C78E0.s diff --git a/asm/non_matchings/unknown_0C8540/func_800C7940.s b/lib/asm/non_matchings/unknown_0C8540/func_800C7940.s similarity index 100% rename from asm/non_matchings/unknown_0C8540/func_800C7940.s rename to lib/asm/non_matchings/unknown_0C8540/func_800C7940.s diff --git a/asm/non_matchings/unknown_0C85A0/func_800C79A0.s b/lib/asm/non_matchings/unknown_0C85A0/func_800C79A0.s similarity index 100% rename from asm/non_matchings/unknown_0C85A0/func_800C79A0.s rename to lib/asm/non_matchings/unknown_0C85A0/func_800C79A0.s diff --git a/asm/non_matchings/unknown_0C85C0/func_800C79C0.s b/lib/asm/non_matchings/unknown_0C85C0/func_800C79C0.s similarity index 100% rename from asm/non_matchings/unknown_0C85C0/func_800C79C0.s rename to lib/asm/non_matchings/unknown_0C85C0/func_800C79C0.s diff --git a/asm/non_matchings/unknown_0C85E0/func_800C79E0.s b/lib/asm/non_matchings/unknown_0C85E0/func_800C79E0.s similarity index 100% rename from asm/non_matchings/unknown_0C85E0/func_800C79E0.s rename to lib/asm/non_matchings/unknown_0C85E0/func_800C79E0.s diff --git a/asm/non_matchings/unknown_0C8650/func_800C7A50.s b/lib/asm/non_matchings/unknown_0C8650/func_800C7A50.s similarity index 100% rename from asm/non_matchings/unknown_0C8650/func_800C7A50.s rename to lib/asm/non_matchings/unknown_0C8650/func_800C7A50.s diff --git a/asm/non_matchings/unknown_0C8660/func_800C7A60.s b/lib/asm/non_matchings/unknown_0C8660/func_800C7A60.s similarity index 100% rename from asm/non_matchings/unknown_0C8660/func_800C7A60.s rename to lib/asm/non_matchings/unknown_0C8660/func_800C7A60.s diff --git a/asm/non_matchings/unknown_0C86A0/func_800C7AA0.s b/lib/asm/non_matchings/unknown_0C86A0/func_800C7AA0.s similarity index 100% rename from asm/non_matchings/unknown_0C86A0/func_800C7AA0.s rename to lib/asm/non_matchings/unknown_0C86A0/func_800C7AA0.s diff --git a/asm/non_matchings/unknown_0C86A0/func_800C7B40.s b/lib/asm/non_matchings/unknown_0C86A0/func_800C7B40.s similarity index 100% rename from asm/non_matchings/unknown_0C86A0/func_800C7B40.s rename to lib/asm/non_matchings/unknown_0C86A0/func_800C7B40.s diff --git a/asm/non_matchings/unknown_0C86A0/func_800C7BE0.s b/lib/asm/non_matchings/unknown_0C86A0/func_800C7BE0.s similarity index 100% rename from asm/non_matchings/unknown_0C86A0/func_800C7BE0.s rename to lib/asm/non_matchings/unknown_0C86A0/func_800C7BE0.s diff --git a/asm/non_matchings/unknown_0C86A0/func_800C7CA4.s b/lib/asm/non_matchings/unknown_0C86A0/func_800C7CA4.s similarity index 100% rename from asm/non_matchings/unknown_0C86A0/func_800C7CA4.s rename to lib/asm/non_matchings/unknown_0C86A0/func_800C7CA4.s diff --git a/asm/non_matchings/unknown_0C86A0/func_800C7D04.s b/lib/asm/non_matchings/unknown_0C86A0/func_800C7D04.s similarity index 100% rename from asm/non_matchings/unknown_0C86A0/func_800C7D04.s rename to lib/asm/non_matchings/unknown_0C86A0/func_800C7D04.s diff --git a/asm/non_matchings/unknown_0C86A0/func_800C7FFC.s b/lib/asm/non_matchings/unknown_0C86A0/func_800C7FFC.s similarity index 100% rename from asm/non_matchings/unknown_0C86A0/func_800C7FFC.s rename to lib/asm/non_matchings/unknown_0C86A0/func_800C7FFC.s diff --git a/asm/non_matchings/unknown_0C86A0/func_800C83EC.s b/lib/asm/non_matchings/unknown_0C86A0/func_800C83EC.s similarity index 100% rename from asm/non_matchings/unknown_0C86A0/func_800C83EC.s rename to lib/asm/non_matchings/unknown_0C86A0/func_800C83EC.s diff --git a/asm/non_matchings/unknown_0C9160/func_800C8560.s b/lib/asm/non_matchings/unknown_0C9160/func_800C8560.s similarity index 100% rename from asm/non_matchings/unknown_0C9160/func_800C8560.s rename to lib/asm/non_matchings/unknown_0C9160/func_800C8560.s diff --git a/asm/non_matchings/unknown_0C91A0/func_800C85A0.s b/lib/asm/non_matchings/unknown_0C91A0/func_800C85A0.s similarity index 100% rename from asm/non_matchings/unknown_0C91A0/func_800C85A0.s rename to lib/asm/non_matchings/unknown_0C91A0/func_800C85A0.s diff --git a/asm/non_matchings/unknown_0C91A0/func_800C85D0.s b/lib/asm/non_matchings/unknown_0C91A0/func_800C85D0.s similarity index 100% rename from asm/non_matchings/unknown_0C91A0/func_800C85D0.s rename to lib/asm/non_matchings/unknown_0C91A0/func_800C85D0.s diff --git a/asm/non_matchings/unknown_0C91A0/func_800C8600.s b/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s similarity index 100% rename from asm/non_matchings/unknown_0C91A0/func_800C8600.s rename to lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s diff --git a/asm/non_matchings/unknown_0C91A0/func_800C8760.s b/lib/asm/non_matchings/unknown_0C91A0/func_800C8760.s similarity index 100% rename from asm/non_matchings/unknown_0C91A0/func_800C8760.s rename to lib/asm/non_matchings/unknown_0C91A0/func_800C8760.s diff --git a/asm/non_matchings/unknown_0C91A0/func_800C8790.s b/lib/asm/non_matchings/unknown_0C91A0/func_800C8790.s similarity index 100% rename from asm/non_matchings/unknown_0C91A0/func_800C8790.s rename to lib/asm/non_matchings/unknown_0C91A0/func_800C8790.s diff --git a/asm/non_matchings/unknown_0C91A0/func_800C87B4.s b/lib/asm/non_matchings/unknown_0C91A0/func_800C87B4.s similarity index 100% rename from asm/non_matchings/unknown_0C91A0/func_800C87B4.s rename to lib/asm/non_matchings/unknown_0C91A0/func_800C87B4.s diff --git a/asm/non_matchings/unknown_0C91A0/func_800C87EC.s b/lib/asm/non_matchings/unknown_0C91A0/func_800C87EC.s similarity index 100% rename from asm/non_matchings/unknown_0C91A0/func_800C87EC.s rename to lib/asm/non_matchings/unknown_0C91A0/func_800C87EC.s diff --git a/asm/non_matchings/unknown_0C91A0/osCreateMesgQueue.s b/lib/asm/non_matchings/unknown_0C91A0/osCreateMesgQueue.s similarity index 100% rename from asm/non_matchings/unknown_0C91A0/osCreateMesgQueue.s rename to lib/asm/non_matchings/unknown_0C91A0/osCreateMesgQueue.s diff --git a/asm/non_matchings/unknown_0C96F0/func_800C8AF0.s b/lib/asm/non_matchings/unknown_0C96F0/func_800C8AF0.s similarity index 100% rename from asm/non_matchings/unknown_0C96F0/func_800C8AF0.s rename to lib/asm/non_matchings/unknown_0C96F0/func_800C8AF0.s diff --git a/asm/non_matchings/unknown_0C96F0/osRecvMesg.s b/lib/asm/non_matchings/unknown_0C96F0/osRecvMesg.s similarity index 100% rename from asm/non_matchings/unknown_0C96F0/osRecvMesg.s rename to lib/asm/non_matchings/unknown_0C96F0/osRecvMesg.s diff --git a/asm/non_matchings/unknown_0C98F0/func_800C8CF0.s b/lib/asm/non_matchings/unknown_0C98F0/func_800C8CF0.s similarity index 100% rename from asm/non_matchings/unknown_0C98F0/func_800C8CF0.s rename to lib/asm/non_matchings/unknown_0C98F0/func_800C8CF0.s diff --git a/asm/non_matchings/unknown_0C9970/func_800C8D70.s b/lib/asm/non_matchings/unknown_0C9970/func_800C8D70.s similarity index 100% rename from asm/non_matchings/unknown_0C9970/func_800C8D70.s rename to lib/asm/non_matchings/unknown_0C9970/func_800C8D70.s diff --git a/asm/non_matchings/unknown_0C9A20/func_800C8E20.s b/lib/asm/non_matchings/unknown_0C9A20/func_800C8E20.s similarity index 100% rename from asm/non_matchings/unknown_0C9A20/func_800C8E20.s rename to lib/asm/non_matchings/unknown_0C9A20/func_800C8E20.s diff --git a/asm/non_matchings/unknown_0C9A30/func_800C8E30.s b/lib/asm/non_matchings/unknown_0C9A30/func_800C8E30.s similarity index 100% rename from asm/non_matchings/unknown_0C9A30/func_800C8E30.s rename to lib/asm/non_matchings/unknown_0C9A30/func_800C8E30.s diff --git a/asm/non_matchings/unknown_0C9B80/func_800C8F80.s b/lib/asm/non_matchings/unknown_0C9B80/func_800C8F80.s similarity index 100% rename from asm/non_matchings/unknown_0C9B80/func_800C8F80.s rename to lib/asm/non_matchings/unknown_0C9B80/func_800C8F80.s diff --git a/asm/non_matchings/unknown_0C9C90/func_800C9090.s b/lib/asm/non_matchings/unknown_0C9C90/func_800C9090.s similarity index 100% rename from asm/non_matchings/unknown_0C9C90/func_800C9090.s rename to lib/asm/non_matchings/unknown_0C9C90/func_800C9090.s diff --git a/asm/non_matchings/unknown_0C9C90/func_800C91AC.s b/lib/asm/non_matchings/unknown_0C9C90/func_800C91AC.s similarity index 100% rename from asm/non_matchings/unknown_0C9C90/func_800C91AC.s rename to lib/asm/non_matchings/unknown_0C9C90/func_800C91AC.s diff --git a/asm/non_matchings/unknown_0C9C90/func_800C92D0.s b/lib/asm/non_matchings/unknown_0C9C90/func_800C92D0.s similarity index 100% rename from asm/non_matchings/unknown_0C9C90/func_800C92D0.s rename to lib/asm/non_matchings/unknown_0C9C90/func_800C92D0.s diff --git a/asm/non_matchings/unknown_0C9C90/func_800C935C.s b/lib/asm/non_matchings/unknown_0C9C90/func_800C935C.s similarity index 100% rename from asm/non_matchings/unknown_0C9C90/func_800C935C.s rename to lib/asm/non_matchings/unknown_0C9C90/func_800C935C.s diff --git a/asm/non_matchings/unknown_0C9C90/func_800C93D0.s b/lib/asm/non_matchings/unknown_0C9C90/func_800C93D0.s similarity index 100% rename from asm/non_matchings/unknown_0C9C90/func_800C93D0.s rename to lib/asm/non_matchings/unknown_0C9C90/func_800C93D0.s diff --git a/asm/non_matchings/unknown_0C9C90/func_800C9420.s b/lib/asm/non_matchings/unknown_0C9C90/func_800C9420.s similarity index 100% rename from asm/non_matchings/unknown_0C9C90/func_800C9420.s rename to lib/asm/non_matchings/unknown_0C9C90/func_800C9420.s diff --git a/asm/non_matchings/unknown_0C9C90/func_800C9508.s b/lib/asm/non_matchings/unknown_0C9C90/func_800C9508.s similarity index 100% rename from asm/non_matchings/unknown_0C9C90/func_800C9508.s rename to lib/asm/non_matchings/unknown_0C9C90/func_800C9508.s diff --git a/asm/non_matchings/unknown_0CA250/func_800C9650.s b/lib/asm/non_matchings/unknown_0CA250/func_800C9650.s similarity index 100% rename from asm/non_matchings/unknown_0CA250/func_800C9650.s rename to lib/asm/non_matchings/unknown_0CA250/func_800C9650.s diff --git a/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s b/lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s similarity index 100% rename from asm/non_matchings/unknown_0CA2F0/func_800C96F0.s rename to lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s diff --git a/asm/non_matchings/unknown_0CA380/func_800C9780.s b/lib/asm/non_matchings/unknown_0CA380/func_800C9780.s similarity index 100% rename from asm/non_matchings/unknown_0CA380/func_800C9780.s rename to lib/asm/non_matchings/unknown_0CA380/func_800C9780.s diff --git a/asm/non_matchings/unknown_0CA410/func_800C9810.s b/lib/asm/non_matchings/unknown_0CA410/func_800C9810.s similarity index 100% rename from asm/non_matchings/unknown_0CA410/func_800C9810.s rename to lib/asm/non_matchings/unknown_0CA410/func_800C9810.s diff --git a/asm/non_matchings/unknown_0CA4B0/func_800C98B0.s b/lib/asm/non_matchings/unknown_0CA4B0/func_800C98B0.s similarity index 100% rename from asm/non_matchings/unknown_0CA4B0/func_800C98B0.s rename to lib/asm/non_matchings/unknown_0CA4B0/func_800C98B0.s diff --git a/asm/non_matchings/unknown_0CA530/func_800C9930.s b/lib/asm/non_matchings/unknown_0CA530/func_800C9930.s similarity index 100% rename from asm/non_matchings/unknown_0CA530/func_800C9930.s rename to lib/asm/non_matchings/unknown_0CA530/func_800C9930.s diff --git a/asm/non_matchings/unknown_0CA530/func_800C99E0.s b/lib/asm/non_matchings/unknown_0CA530/func_800C99E0.s similarity index 100% rename from asm/non_matchings/unknown_0CA530/func_800C99E0.s rename to lib/asm/non_matchings/unknown_0CA530/func_800C99E0.s diff --git a/asm/non_matchings/unknown_0CA530/func_800C9A30.s b/lib/asm/non_matchings/unknown_0CA530/func_800C9A30.s similarity index 100% rename from asm/non_matchings/unknown_0CA530/func_800C9A30.s rename to lib/asm/non_matchings/unknown_0CA530/func_800C9A30.s diff --git a/asm/non_matchings/unknown_0CA530/sqrtf.s b/lib/asm/non_matchings/unknown_0CA530/sqrtf.s similarity index 100% rename from asm/non_matchings/unknown_0CA530/sqrtf.s rename to lib/asm/non_matchings/unknown_0CA530/sqrtf.s diff --git a/asm/non_matchings/unknown_0CA6E0/func_800C9AE0.s b/lib/asm/non_matchings/unknown_0CA6E0/func_800C9AE0.s similarity index 100% rename from asm/non_matchings/unknown_0CA6E0/func_800C9AE0.s rename to lib/asm/non_matchings/unknown_0CA6E0/func_800C9AE0.s diff --git a/asm/non_matchings/unknown_0CA730/func_800C9B30.s b/lib/asm/non_matchings/unknown_0CA730/func_800C9B30.s similarity index 100% rename from asm/non_matchings/unknown_0CA730/func_800C9B30.s rename to lib/asm/non_matchings/unknown_0CA730/func_800C9B30.s diff --git a/asm/non_matchings/unknown_0CA730/func_800C9B4C.s b/lib/asm/non_matchings/unknown_0CA730/func_800C9B4C.s similarity index 100% rename from asm/non_matchings/unknown_0CA730/func_800C9B4C.s rename to lib/asm/non_matchings/unknown_0CA730/func_800C9B4C.s diff --git a/asm/non_matchings/unknown_0CA730/func_800C9CBC.s b/lib/asm/non_matchings/unknown_0CA730/func_800C9CBC.s similarity index 100% rename from asm/non_matchings/unknown_0CA730/func_800C9CBC.s rename to lib/asm/non_matchings/unknown_0CA730/func_800C9CBC.s diff --git a/asm/non_matchings/unknown_0CA940/D_800C9D40.s b/lib/asm/non_matchings/unknown_0CA940/D_800C9D40.s similarity index 100% rename from asm/non_matchings/unknown_0CA940/D_800C9D40.s rename to lib/asm/non_matchings/unknown_0CA940/D_800C9D40.s diff --git a/asm/non_matchings/unknown_0CA940/func_800C9D54.s b/lib/asm/non_matchings/unknown_0CA940/func_800C9D54.s similarity index 100% rename from asm/non_matchings/unknown_0CA940/func_800C9D54.s rename to lib/asm/non_matchings/unknown_0CA940/func_800C9D54.s diff --git a/asm/non_matchings/unknown_0CA9A0/D_800CA0D0.s b/lib/asm/non_matchings/unknown_0CA9A0/D_800CA0D0.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/D_800CA0D0.s rename to lib/asm/non_matchings/unknown_0CA9A0/D_800CA0D0.s diff --git a/asm/non_matchings/unknown_0CA9A0/D_800CAA7C.s b/lib/asm/non_matchings/unknown_0CA9A0/D_800CAA7C.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/D_800CAA7C.s rename to lib/asm/non_matchings/unknown_0CA9A0/D_800CAA7C.s diff --git a/asm/non_matchings/unknown_0CA9A0/D_800CB540.s b/lib/asm/non_matchings/unknown_0CA9A0/D_800CB540.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/D_800CB540.s rename to lib/asm/non_matchings/unknown_0CA9A0/D_800CB540.s diff --git a/asm/non_matchings/unknown_0CA9A0/D_800CB714.s b/lib/asm/non_matchings/unknown_0CA9A0/D_800CB714.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/D_800CB714.s rename to lib/asm/non_matchings/unknown_0CA9A0/D_800CB714.s diff --git a/asm/non_matchings/unknown_0CA9A0/D_800CBBEC.s b/lib/asm/non_matchings/unknown_0CA9A0/D_800CBBEC.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/D_800CBBEC.s rename to lib/asm/non_matchings/unknown_0CA9A0/D_800CBBEC.s diff --git a/asm/non_matchings/unknown_0CA9A0/D_800CC090.s b/lib/asm/non_matchings/unknown_0CA9A0/D_800CC090.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/D_800CC090.s rename to lib/asm/non_matchings/unknown_0CA9A0/D_800CC090.s diff --git a/asm/non_matchings/unknown_0CA9A0/D_800CC17C.s b/lib/asm/non_matchings/unknown_0CA9A0/D_800CC17C.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/D_800CC17C.s rename to lib/asm/non_matchings/unknown_0CA9A0/D_800CC17C.s diff --git a/asm/non_matchings/unknown_0CA9A0/bcopy.s b/lib/asm/non_matchings/unknown_0CA9A0/bcopy.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/bcopy.s rename to lib/asm/non_matchings/unknown_0CA9A0/bcopy.s diff --git a/asm/non_matchings/unknown_0CA9A0/func_800CA0B0.s b/lib/asm/non_matchings/unknown_0CA9A0/func_800CA0B0.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/func_800CA0B0.s rename to lib/asm/non_matchings/unknown_0CA9A0/func_800CA0B0.s diff --git a/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s b/lib/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s rename to lib/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s diff --git a/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s b/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s rename to lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s diff --git a/asm/non_matchings/unknown_0CA9A0/func_800CB498.s b/lib/asm/non_matchings/unknown_0CA9A0/func_800CB498.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/func_800CB498.s rename to lib/asm/non_matchings/unknown_0CA9A0/func_800CB498.s diff --git a/asm/non_matchings/unknown_0CA9A0/func_800CBAC0.s b/lib/asm/non_matchings/unknown_0CA9A0/func_800CBAC0.s similarity index 100% rename from asm/non_matchings/unknown_0CA9A0/func_800CBAC0.s rename to lib/asm/non_matchings/unknown_0CA9A0/func_800CBAC0.s diff --git a/asm/non_matchings/unknown_0CCF90/D_800CC390.s b/lib/asm/non_matchings/unknown_0CCF90/D_800CC390.s similarity index 100% rename from asm/non_matchings/unknown_0CCF90/D_800CC390.s rename to lib/asm/non_matchings/unknown_0CCF90/D_800CC390.s diff --git a/asm/non_matchings/unknown_0CCF90/D_800CC3C0.s b/lib/asm/non_matchings/unknown_0CCF90/D_800CC3C0.s similarity index 100% rename from asm/non_matchings/unknown_0CCF90/D_800CC3C0.s rename to lib/asm/non_matchings/unknown_0CCF90/D_800CC3C0.s diff --git a/asm/non_matchings/unknown_0CCF90/D_800CC4E0.s b/lib/asm/non_matchings/unknown_0CCF90/D_800CC4E0.s similarity index 100% rename from asm/non_matchings/unknown_0CCF90/D_800CC4E0.s rename to lib/asm/non_matchings/unknown_0CCF90/D_800CC4E0.s diff --git a/asm/non_matchings/unknown_0CCF90/D_800CC514.s b/lib/asm/non_matchings/unknown_0CCF90/D_800CC514.s similarity index 100% rename from asm/non_matchings/unknown_0CCF90/D_800CC514.s rename to lib/asm/non_matchings/unknown_0CCF90/D_800CC514.s diff --git a/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s b/lib/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s similarity index 100% rename from asm/non_matchings/unknown_0CCF90/func_800CC5A0.s rename to lib/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s diff --git a/asm/non_matchings/unknown_0CCF90/func_800CC840.s b/lib/asm/non_matchings/unknown_0CCF90/func_800CC840.s similarity index 100% rename from asm/non_matchings/unknown_0CCF90/func_800CC840.s rename to lib/asm/non_matchings/unknown_0CCF90/func_800CC840.s diff --git a/asm/non_matchings/unknown_0CCF90/func_800CC920.s b/lib/asm/non_matchings/unknown_0CCF90/func_800CC920.s similarity index 100% rename from asm/non_matchings/unknown_0CCF90/func_800CC920.s rename to lib/asm/non_matchings/unknown_0CCF90/func_800CC920.s diff --git a/asm/non_matchings/unknown_0CD820/func_800CCC20.s b/lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s similarity index 100% rename from asm/non_matchings/unknown_0CD820/func_800CCC20.s rename to lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s diff --git a/asm/non_matchings/unknown_0CD820/func_800CCE18.s b/lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s similarity index 100% rename from asm/non_matchings/unknown_0CD820/func_800CCE18.s rename to lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s diff --git a/asm/non_matchings/unknown_0CD820/func_800CCEE8.s b/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s similarity index 100% rename from asm/non_matchings/unknown_0CD820/func_800CCEE8.s rename to lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s diff --git a/asm/non_matchings/unknown_0CD820/func_800CCFE0.s b/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s similarity index 100% rename from asm/non_matchings/unknown_0CD820/func_800CCFE0.s rename to lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s diff --git a/asm/non_matchings/unknown_0CD820/func_800CD0A4.s b/lib/asm/non_matchings/unknown_0CD820/func_800CD0A4.s similarity index 100% rename from asm/non_matchings/unknown_0CD820/func_800CD0A4.s rename to lib/asm/non_matchings/unknown_0CD820/func_800CD0A4.s diff --git a/asm/non_matchings/unknown_0CD820/func_800CD14C.s b/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s similarity index 100% rename from asm/non_matchings/unknown_0CD820/func_800CD14C.s rename to lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s diff --git a/asm/non_matchings/unknown_0CDE50/func_800CD250.s b/lib/asm/non_matchings/unknown_0CDE50/func_800CD250.s similarity index 100% rename from asm/non_matchings/unknown_0CDE50/func_800CD250.s rename to lib/asm/non_matchings/unknown_0CDE50/func_800CD250.s diff --git a/asm/non_matchings/unknown_0CDE90/func_800CD290.s b/lib/asm/non_matchings/unknown_0CDE90/func_800CD290.s similarity index 100% rename from asm/non_matchings/unknown_0CDE90/func_800CD290.s rename to lib/asm/non_matchings/unknown_0CDE90/func_800CD290.s diff --git a/asm/non_matchings/unknown_0CDE90/func_800CD430.s b/lib/asm/non_matchings/unknown_0CDE90/func_800CD430.s similarity index 100% rename from asm/non_matchings/unknown_0CDE90/func_800CD430.s rename to lib/asm/non_matchings/unknown_0CDE90/func_800CD430.s diff --git a/asm/non_matchings/unknown_0CDE90/func_800CD52C.s b/lib/asm/non_matchings/unknown_0CDE90/func_800CD52C.s similarity index 100% rename from asm/non_matchings/unknown_0CDE90/func_800CD52C.s rename to lib/asm/non_matchings/unknown_0CDE90/func_800CD52C.s diff --git a/asm/non_matchings/unknown_0CE200/func_800CD600.s b/lib/asm/non_matchings/unknown_0CE200/func_800CD600.s similarity index 100% rename from asm/non_matchings/unknown_0CE200/func_800CD600.s rename to lib/asm/non_matchings/unknown_0CE200/func_800CD600.s diff --git a/asm/non_matchings/unknown_0CE200/func_800CD650.s b/lib/asm/non_matchings/unknown_0CE200/func_800CD650.s similarity index 100% rename from asm/non_matchings/unknown_0CE200/func_800CD650.s rename to lib/asm/non_matchings/unknown_0CE200/func_800CD650.s diff --git a/asm/non_matchings/unknown_0CE200/func_800CD694.s b/lib/asm/non_matchings/unknown_0CE200/func_800CD694.s similarity index 100% rename from asm/non_matchings/unknown_0CE200/func_800CD694.s rename to lib/asm/non_matchings/unknown_0CE200/func_800CD694.s diff --git a/asm/non_matchings/unknown_0CE200/func_800CD6C0.s b/lib/asm/non_matchings/unknown_0CE200/func_800CD6C0.s similarity index 100% rename from asm/non_matchings/unknown_0CE200/func_800CD6C0.s rename to lib/asm/non_matchings/unknown_0CE200/func_800CD6C0.s diff --git a/asm/non_matchings/unknown_0CE370/func_800CD770.s b/lib/asm/non_matchings/unknown_0CE370/func_800CD770.s similarity index 100% rename from asm/non_matchings/unknown_0CE370/func_800CD770.s rename to lib/asm/non_matchings/unknown_0CE370/func_800CD770.s diff --git a/asm/non_matchings/unknown_0CE370/func_800CD820.s b/lib/asm/non_matchings/unknown_0CE370/func_800CD820.s similarity index 100% rename from asm/non_matchings/unknown_0CE370/func_800CD820.s rename to lib/asm/non_matchings/unknown_0CE370/func_800CD820.s diff --git a/asm/non_matchings/unknown_0CE370/func_800CD8F0.s b/lib/asm/non_matchings/unknown_0CE370/func_800CD8F0.s similarity index 100% rename from asm/non_matchings/unknown_0CE370/func_800CD8F0.s rename to lib/asm/non_matchings/unknown_0CE370/func_800CD8F0.s diff --git a/asm/non_matchings/unknown_0CE370/func_800CDB20.s b/lib/asm/non_matchings/unknown_0CE370/func_800CDB20.s similarity index 100% rename from asm/non_matchings/unknown_0CE370/func_800CDB20.s rename to lib/asm/non_matchings/unknown_0CE370/func_800CDB20.s diff --git a/asm/non_matchings/unknown_0CE8A0/func_800CDCA0.s b/lib/asm/non_matchings/unknown_0CE8A0/func_800CDCA0.s similarity index 100% rename from asm/non_matchings/unknown_0CE8A0/func_800CDCA0.s rename to lib/asm/non_matchings/unknown_0CE8A0/func_800CDCA0.s diff --git a/asm/non_matchings/unknown_0CE8A0/func_800CDEE4.s b/lib/asm/non_matchings/unknown_0CE8A0/func_800CDEE4.s similarity index 100% rename from asm/non_matchings/unknown_0CE8A0/func_800CDEE4.s rename to lib/asm/non_matchings/unknown_0CE8A0/func_800CDEE4.s diff --git a/asm/non_matchings/unknown_0CEC50/func_800CE050.s b/lib/asm/non_matchings/unknown_0CEC50/func_800CE050.s similarity index 100% rename from asm/non_matchings/unknown_0CEC50/func_800CE050.s rename to lib/asm/non_matchings/unknown_0CEC50/func_800CE050.s diff --git a/asm/non_matchings/unknown_0CEE10/func_800CE210.s b/lib/asm/non_matchings/unknown_0CEE10/func_800CE210.s similarity index 100% rename from asm/non_matchings/unknown_0CEE10/func_800CE210.s rename to lib/asm/non_matchings/unknown_0CEE10/func_800CE210.s diff --git a/asm/non_matchings/unknown_0CF070/func_800CE470.s b/lib/asm/non_matchings/unknown_0CF070/func_800CE470.s similarity index 100% rename from asm/non_matchings/unknown_0CF070/func_800CE470.s rename to lib/asm/non_matchings/unknown_0CF070/func_800CE470.s diff --git a/asm/non_matchings/unknown_0CF330/__ll_div.s b/lib/asm/non_matchings/unknown_0CF330/__ll_div.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/__ll_div.s rename to lib/asm/non_matchings/unknown_0CF330/__ll_div.s diff --git a/asm/non_matchings/unknown_0CF330/__ll_lshift.s b/lib/asm/non_matchings/unknown_0CF330/__ll_lshift.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/__ll_lshift.s rename to lib/asm/non_matchings/unknown_0CF330/__ll_lshift.s diff --git a/asm/non_matchings/unknown_0CF330/__ll_mul.s b/lib/asm/non_matchings/unknown_0CF330/__ll_mul.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/__ll_mul.s rename to lib/asm/non_matchings/unknown_0CF330/__ll_mul.s diff --git a/asm/non_matchings/unknown_0CF330/__ull_div.s b/lib/asm/non_matchings/unknown_0CF330/__ull_div.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/__ull_div.s rename to lib/asm/non_matchings/unknown_0CF330/__ull_div.s diff --git a/asm/non_matchings/unknown_0CF330/__ull_divremi.s b/lib/asm/non_matchings/unknown_0CF330/__ull_divremi.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/__ull_divremi.s rename to lib/asm/non_matchings/unknown_0CF330/__ull_divremi.s diff --git a/asm/non_matchings/unknown_0CF330/__ull_rem.s b/lib/asm/non_matchings/unknown_0CF330/__ull_rem.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/__ull_rem.s rename to lib/asm/non_matchings/unknown_0CF330/__ull_rem.s diff --git a/asm/non_matchings/unknown_0CF330/__ull_rshift.s b/lib/asm/non_matchings/unknown_0CF330/__ull_rshift.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/__ull_rshift.s rename to lib/asm/non_matchings/unknown_0CF330/__ull_rshift.s diff --git a/asm/non_matchings/unknown_0CF330/func_800CE730.s b/lib/asm/non_matchings/unknown_0CF330/func_800CE730.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/func_800CE730.s rename to lib/asm/non_matchings/unknown_0CF330/func_800CE730.s diff --git a/asm/non_matchings/unknown_0CF330/func_800CE83C.s b/lib/asm/non_matchings/unknown_0CF330/func_800CE83C.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/func_800CE83C.s rename to lib/asm/non_matchings/unknown_0CF330/func_800CE83C.s diff --git a/asm/non_matchings/unknown_0CF330/func_800CED20.s b/lib/asm/non_matchings/unknown_0CF330/func_800CED20.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/func_800CED20.s rename to lib/asm/non_matchings/unknown_0CF330/func_800CED20.s diff --git a/asm/non_matchings/unknown_0CF330/func_800CEDD4.s b/lib/asm/non_matchings/unknown_0CF330/func_800CEDD4.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/func_800CEDD4.s rename to lib/asm/non_matchings/unknown_0CF330/func_800CEDD4.s diff --git a/asm/non_matchings/unknown_0CF330/func_800CEEE0.s b/lib/asm/non_matchings/unknown_0CF330/func_800CEEE0.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/func_800CEEE0.s rename to lib/asm/non_matchings/unknown_0CF330/func_800CEEE0.s diff --git a/asm/non_matchings/unknown_0CF330/func_800CEFDC.s b/lib/asm/non_matchings/unknown_0CF330/func_800CEFDC.s similarity index 100% rename from asm/non_matchings/unknown_0CF330/func_800CEFDC.s rename to lib/asm/non_matchings/unknown_0CF330/func_800CEFDC.s diff --git a/asm/non_matchings/unknown_0CFFE0/func_800CF3E0.s b/lib/asm/non_matchings/unknown_0CFFE0/func_800CF3E0.s similarity index 100% rename from asm/non_matchings/unknown_0CFFE0/func_800CF3E0.s rename to lib/asm/non_matchings/unknown_0CFFE0/func_800CF3E0.s diff --git a/asm/non_matchings/unknown_0D0130/func_800CF530.s b/lib/asm/non_matchings/unknown_0D0130/func_800CF530.s similarity index 100% rename from asm/non_matchings/unknown_0D0130/func_800CF530.s rename to lib/asm/non_matchings/unknown_0D0130/func_800CF530.s diff --git a/asm/non_matchings/unknown_0D0130/func_800CFBF4.s b/lib/asm/non_matchings/unknown_0D0130/func_800CFBF4.s similarity index 100% rename from asm/non_matchings/unknown_0D0130/func_800CFBF4.s rename to lib/asm/non_matchings/unknown_0D0130/func_800CFBF4.s diff --git a/asm/non_matchings/unknown_0D0130/func_800CFDA8.s b/lib/asm/non_matchings/unknown_0D0130/func_800CFDA8.s similarity index 100% rename from asm/non_matchings/unknown_0D0130/func_800CFDA8.s rename to lib/asm/non_matchings/unknown_0D0130/func_800CFDA8.s diff --git a/asm/non_matchings/unknown_0D0130/func_800CFF90.s b/lib/asm/non_matchings/unknown_0D0130/func_800CFF90.s similarity index 100% rename from asm/non_matchings/unknown_0D0130/func_800CFF90.s rename to lib/asm/non_matchings/unknown_0D0130/func_800CFF90.s diff --git a/asm/non_matchings/unknown_0D0130/func_800D0390.s b/lib/asm/non_matchings/unknown_0D0130/func_800D0390.s similarity index 100% rename from asm/non_matchings/unknown_0D0130/func_800D0390.s rename to lib/asm/non_matchings/unknown_0D0130/func_800D0390.s diff --git a/asm/non_matchings/unknown_0D10E0/memzero.s b/lib/asm/non_matchings/unknown_0D10E0/memzero.s similarity index 100% rename from asm/non_matchings/unknown_0D10E0/memzero.s rename to lib/asm/non_matchings/unknown_0D10E0/memzero.s diff --git a/asm/non_matchings/unknown_0D1180/func_800D0580.s b/lib/asm/non_matchings/unknown_0D1180/func_800D0580.s similarity index 100% rename from asm/non_matchings/unknown_0D1180/func_800D0580.s rename to lib/asm/non_matchings/unknown_0D1180/func_800D0580.s diff --git a/asm/non_matchings/unknown_0D1180/func_800D0870.s b/lib/asm/non_matchings/unknown_0D1180/func_800D0870.s similarity index 100% rename from asm/non_matchings/unknown_0D1180/func_800D0870.s rename to lib/asm/non_matchings/unknown_0D1180/func_800D0870.s diff --git a/asm/non_matchings/unknown_0D1180/func_800D0B50.s b/lib/asm/non_matchings/unknown_0D1180/func_800D0B50.s similarity index 100% rename from asm/non_matchings/unknown_0D1180/func_800D0B50.s rename to lib/asm/non_matchings/unknown_0D1180/func_800D0B50.s diff --git a/asm/non_matchings/unknown_0D1180/func_800D0D88.s b/lib/asm/non_matchings/unknown_0D1180/func_800D0D88.s similarity index 100% rename from asm/non_matchings/unknown_0D1180/func_800D0D88.s rename to lib/asm/non_matchings/unknown_0D1180/func_800D0D88.s diff --git a/asm/non_matchings/unknown_0D1A80/func_800D0E80.s b/lib/asm/non_matchings/unknown_0D1A80/func_800D0E80.s similarity index 100% rename from asm/non_matchings/unknown_0D1A80/func_800D0E80.s rename to lib/asm/non_matchings/unknown_0D1A80/func_800D0E80.s diff --git a/asm/non_matchings/unknown_0D1C40/func_800D1040.s b/lib/asm/non_matchings/unknown_0D1C40/func_800D1040.s similarity index 100% rename from asm/non_matchings/unknown_0D1C40/func_800D1040.s rename to lib/asm/non_matchings/unknown_0D1C40/func_800D1040.s diff --git a/asm/non_matchings/unknown_0D1C40/func_800D14C4.s b/lib/asm/non_matchings/unknown_0D1C40/func_800D14C4.s similarity index 100% rename from asm/non_matchings/unknown_0D1C40/func_800D14C4.s rename to lib/asm/non_matchings/unknown_0D1C40/func_800D14C4.s diff --git a/asm/non_matchings/unknown_0D1C40/func_800D1728.s b/lib/asm/non_matchings/unknown_0D1C40/func_800D1728.s similarity index 100% rename from asm/non_matchings/unknown_0D1C40/func_800D1728.s rename to lib/asm/non_matchings/unknown_0D1C40/func_800D1728.s diff --git a/asm/non_matchings/unknown_0D23F0/func_800D17F0.s b/lib/asm/non_matchings/unknown_0D23F0/func_800D17F0.s similarity index 100% rename from asm/non_matchings/unknown_0D23F0/func_800D17F0.s rename to lib/asm/non_matchings/unknown_0D23F0/func_800D17F0.s diff --git a/asm/non_matchings/unknown_0D24A0/func_800D18A0.s b/lib/asm/non_matchings/unknown_0D24A0/func_800D18A0.s similarity index 100% rename from asm/non_matchings/unknown_0D24A0/func_800D18A0.s rename to lib/asm/non_matchings/unknown_0D24A0/func_800D18A0.s diff --git a/asm/non_matchings/unknown_0D24D0/func_800D18D0.s b/lib/asm/non_matchings/unknown_0D24D0/func_800D18D0.s similarity index 100% rename from asm/non_matchings/unknown_0D24D0/func_800D18D0.s rename to lib/asm/non_matchings/unknown_0D24D0/func_800D18D0.s diff --git a/asm/non_matchings/unknown_0D24E0/func_800D18E0.s b/lib/asm/non_matchings/unknown_0D24E0/func_800D18E0.s similarity index 100% rename from asm/non_matchings/unknown_0D24E0/func_800D18E0.s rename to lib/asm/non_matchings/unknown_0D24E0/func_800D18E0.s diff --git a/asm/non_matchings/unknown_0D2590/D_800D1B08.s b/lib/asm/non_matchings/unknown_0D2590/D_800D1B08.s similarity index 100% rename from asm/non_matchings/unknown_0D2590/D_800D1B08.s rename to lib/asm/non_matchings/unknown_0D2590/D_800D1B08.s diff --git a/asm/non_matchings/unknown_0D2590/func_800D1990.s b/lib/asm/non_matchings/unknown_0D2590/func_800D1990.s similarity index 100% rename from asm/non_matchings/unknown_0D2590/func_800D1990.s rename to lib/asm/non_matchings/unknown_0D2590/func_800D1990.s diff --git a/asm/non_matchings/unknown_0D28A0/func_800D1CA0.s b/lib/asm/non_matchings/unknown_0D28A0/func_800D1CA0.s similarity index 100% rename from asm/non_matchings/unknown_0D28A0/func_800D1CA0.s rename to lib/asm/non_matchings/unknown_0D28A0/func_800D1CA0.s diff --git a/asm/non_matchings/unknown_0D2910/func_800D1D10.s b/lib/asm/non_matchings/unknown_0D2910/func_800D1D10.s similarity index 100% rename from asm/non_matchings/unknown_0D2910/func_800D1D10.s rename to lib/asm/non_matchings/unknown_0D2910/func_800D1D10.s diff --git a/asm/non_matchings/unknown_0D29F0/func_800D1DF0.s b/lib/asm/non_matchings/unknown_0D29F0/func_800D1DF0.s similarity index 100% rename from asm/non_matchings/unknown_0D29F0/func_800D1DF0.s rename to lib/asm/non_matchings/unknown_0D29F0/func_800D1DF0.s diff --git a/asm/non_matchings/unknown_0D29F0/func_800D1E70.s b/lib/asm/non_matchings/unknown_0D29F0/func_800D1E70.s similarity index 100% rename from asm/non_matchings/unknown_0D29F0/func_800D1E70.s rename to lib/asm/non_matchings/unknown_0D29F0/func_800D1E70.s diff --git a/asm/non_matchings/unknown_0D29F0/func_800D1EB0.s b/lib/asm/non_matchings/unknown_0D29F0/func_800D1EB0.s similarity index 100% rename from asm/non_matchings/unknown_0D29F0/func_800D1EB0.s rename to lib/asm/non_matchings/unknown_0D29F0/func_800D1EB0.s diff --git a/asm/non_matchings/unknown_0D29F0/func_800D1EF0.s b/lib/asm/non_matchings/unknown_0D29F0/func_800D1EF0.s similarity index 100% rename from asm/non_matchings/unknown_0D29F0/func_800D1EF0.s rename to lib/asm/non_matchings/unknown_0D29F0/func_800D1EF0.s diff --git a/asm/non_matchings/unknown_0D29F0/func_800D200C.s b/lib/asm/non_matchings/unknown_0D29F0/func_800D200C.s similarity index 100% rename from asm/non_matchings/unknown_0D29F0/func_800D200C.s rename to lib/asm/non_matchings/unknown_0D29F0/func_800D200C.s diff --git a/asm/non_matchings/unknown_0D29F0/func_800D216C.s b/lib/asm/non_matchings/unknown_0D29F0/func_800D216C.s similarity index 100% rename from asm/non_matchings/unknown_0D29F0/func_800D216C.s rename to lib/asm/non_matchings/unknown_0D29F0/func_800D216C.s diff --git a/asm/non_matchings/unknown_0D29F0/func_800D21B0.s b/lib/asm/non_matchings/unknown_0D29F0/func_800D21B0.s similarity index 100% rename from asm/non_matchings/unknown_0D29F0/func_800D21B0.s rename to lib/asm/non_matchings/unknown_0D29F0/func_800D21B0.s diff --git a/asm/non_matchings/unknown_0D2E40/func_800D2240.s b/lib/asm/non_matchings/unknown_0D2E40/func_800D2240.s similarity index 100% rename from asm/non_matchings/unknown_0D2E40/func_800D2240.s rename to lib/asm/non_matchings/unknown_0D2E40/func_800D2240.s diff --git a/asm/non_matchings/unknown_0D2E40/func_800D2260.s b/lib/asm/non_matchings/unknown_0D2E40/func_800D2260.s similarity index 100% rename from asm/non_matchings/unknown_0D2E40/func_800D2260.s rename to lib/asm/non_matchings/unknown_0D2E40/func_800D2260.s diff --git a/asm/non_matchings/unknown_0D3020/D_800D25A0.s b/lib/asm/non_matchings/unknown_0D3020/D_800D25A0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/D_800D25A0.s rename to lib/asm/non_matchings/unknown_0D3020/D_800D25A0.s diff --git a/asm/non_matchings/unknown_0D3020/D_800D2680.s b/lib/asm/non_matchings/unknown_0D3020/D_800D2680.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/D_800D2680.s rename to lib/asm/non_matchings/unknown_0D3020/D_800D2680.s diff --git a/asm/non_matchings/unknown_0D3020/D_800D2760.s b/lib/asm/non_matchings/unknown_0D3020/D_800D2760.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/D_800D2760.s rename to lib/asm/non_matchings/unknown_0D3020/D_800D2760.s diff --git a/asm/non_matchings/unknown_0D3020/D_800D2CB0.s b/lib/asm/non_matchings/unknown_0D3020/D_800D2CB0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/D_800D2CB0.s rename to lib/asm/non_matchings/unknown_0D3020/D_800D2CB0.s diff --git a/asm/non_matchings/unknown_0D3020/D_800D2CC0.s b/lib/asm/non_matchings/unknown_0D3020/D_800D2CC0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/D_800D2CC0.s rename to lib/asm/non_matchings/unknown_0D3020/D_800D2CC0.s diff --git a/asm/non_matchings/unknown_0D3020/D_800D35A0.s b/lib/asm/non_matchings/unknown_0D3020/D_800D35A0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/D_800D35A0.s rename to lib/asm/non_matchings/unknown_0D3020/D_800D35A0.s diff --git a/asm/non_matchings/unknown_0D3020/__osDisableInt.s b/lib/asm/non_matchings/unknown_0D3020/__osDisableInt.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/__osDisableInt.s rename to lib/asm/non_matchings/unknown_0D3020/__osDisableInt.s diff --git a/asm/non_matchings/unknown_0D3020/__osEnqueueAndYield.s b/lib/asm/non_matchings/unknown_0D3020/__osEnqueueAndYield.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/__osEnqueueAndYield.s rename to lib/asm/non_matchings/unknown_0D3020/__osEnqueueAndYield.s diff --git a/asm/non_matchings/unknown_0D3020/__osPopThread.s b/lib/asm/non_matchings/unknown_0D3020/__osPopThread.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/__osPopThread.s rename to lib/asm/non_matchings/unknown_0D3020/__osPopThread.s diff --git a/asm/non_matchings/unknown_0D3020/__osRestoreInt.s b/lib/asm/non_matchings/unknown_0D3020/__osRestoreInt.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/__osRestoreInt.s rename to lib/asm/non_matchings/unknown_0D3020/__osRestoreInt.s diff --git a/asm/non_matchings/unknown_0D3020/cosf.s b/lib/asm/non_matchings/unknown_0D3020/cosf.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/cosf.s rename to lib/asm/non_matchings/unknown_0D3020/cosf.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D2420.s b/lib/asm/non_matchings/unknown_0D3020/func_800D2420.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D2420.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D2420.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D2470.s b/lib/asm/non_matchings/unknown_0D3020/func_800D2470.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D2470.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D2470.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D2480.s b/lib/asm/non_matchings/unknown_0D3020/func_800D2480.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D2480.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D2480.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D2540.s b/lib/asm/non_matchings/unknown_0D3020/func_800D2540.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D2540.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D2540.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D2B10.s b/lib/asm/non_matchings/unknown_0D3020/func_800D2B10.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D2B10.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D2B10.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D2C60.s b/lib/asm/non_matchings/unknown_0D3020/func_800D2C60.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D2C60.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D2C60.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D2C70.s b/lib/asm/non_matchings/unknown_0D3020/func_800D2C70.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D2C70.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D2C70.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D31E4.s b/lib/asm/non_matchings/unknown_0D3020/func_800D31E4.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D31E4.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D31E4.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D33CC.s b/lib/asm/non_matchings/unknown_0D3020/func_800D33CC.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D33CC.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D33CC.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D3424.s b/lib/asm/non_matchings/unknown_0D3020/func_800D3424.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D3424.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D3424.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D35B0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D35B0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D35B0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D35B0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D3670.s b/lib/asm/non_matchings/unknown_0D3020/func_800D3670.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D3670.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D3670.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D36A0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D36A0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D36A0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D36A0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D37F0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D37F0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D37F0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D37F0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D3820.s b/lib/asm/non_matchings/unknown_0D3020/func_800D3820.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D3820.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D3820.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D38A0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D38A0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D38A0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D38A0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D3F10.s b/lib/asm/non_matchings/unknown_0D3020/func_800D3F10.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D3F10.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D3F10.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4560.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4560.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4560.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4560.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4570.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4570.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4570.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4570.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4580.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4580.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4580.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4580.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4590.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4590.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4590.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4590.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D45E0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D45E0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D45E0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D45E0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4630.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4630.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4630.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4630.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D46B0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D46B0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D46B0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D46B0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4730.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4730.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4730.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4730.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4790.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4790.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4790.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4790.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D47F0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D47F0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D47F0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D47F0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4840.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4840.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4840.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4840.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4940.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4940.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4940.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4940.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4DE0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4DE0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4DE0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4DE0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4EC0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4EC0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4EC0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4EC0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D4F4C.s b/lib/asm/non_matchings/unknown_0D3020/func_800D4F4C.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D4F4C.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D4F4C.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D50C4.s b/lib/asm/non_matchings/unknown_0D3020/func_800D50C4.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D50C4.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D50C4.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D5138.s b/lib/asm/non_matchings/unknown_0D3020/func_800D5138.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D5138.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D5138.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D52C0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D52C0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D52C0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D52C0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D52F0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D52F0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D52F0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D52F0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D534C.s b/lib/asm/non_matchings/unknown_0D3020/func_800D534C.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D534C.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D534C.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D53B4.s b/lib/asm/non_matchings/unknown_0D3020/func_800D53B4.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D53B4.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D53B4.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D57CC.s b/lib/asm/non_matchings/unknown_0D3020/func_800D57CC.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D57CC.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D57CC.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D5964.s b/lib/asm/non_matchings/unknown_0D3020/func_800D5964.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D5964.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D5964.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D5BC0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D5BC0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D5BC0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D5BC0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D5CBC.s b/lib/asm/non_matchings/unknown_0D3020/func_800D5CBC.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D5CBC.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D5CBC.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D5FDC.s b/lib/asm/non_matchings/unknown_0D3020/func_800D5FDC.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D5FDC.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D5FDC.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D6050.s b/lib/asm/non_matchings/unknown_0D3020/func_800D6050.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D6050.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D6050.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D6080.s b/lib/asm/non_matchings/unknown_0D3020/func_800D6080.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D6080.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D6080.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D6090.s b/lib/asm/non_matchings/unknown_0D3020/func_800D6090.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D6090.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D6090.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D63F0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D63F0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D63F0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D63F0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D6400.s b/lib/asm/non_matchings/unknown_0D3020/func_800D6400.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D6400.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D6400.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D6440.s b/lib/asm/non_matchings/unknown_0D3020/func_800D6440.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D6440.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D6440.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D64D0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D64D0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D64D0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D64D0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D6500.s b/lib/asm/non_matchings/unknown_0D3020/func_800D6500.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D6500.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D6500.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D6560.s b/lib/asm/non_matchings/unknown_0D3020/func_800D6560.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D6560.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D6560.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D65B0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D65B0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D65B0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D65B0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D6600.s b/lib/asm/non_matchings/unknown_0D3020/func_800D6600.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D6600.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D6600.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D6700.s b/lib/asm/non_matchings/unknown_0D3020/func_800D6700.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D6700.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D6700.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D69A0.s b/lib/asm/non_matchings/unknown_0D3020/func_800D69A0.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D69A0.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D69A0.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D6F10.s b/lib/asm/non_matchings/unknown_0D3020/func_800D6F10.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D6F10.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D6F10.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D7460.s b/lib/asm/non_matchings/unknown_0D3020/func_800D7460.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D7460.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D7460.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D7470.s b/lib/asm/non_matchings/unknown_0D3020/func_800D7470.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D7470.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D7470.s diff --git a/asm/non_matchings/unknown_0D3020/func_800D7570.s b/lib/asm/non_matchings/unknown_0D3020/func_800D7570.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/func_800D7570.s rename to lib/asm/non_matchings/unknown_0D3020/func_800D7570.s diff --git a/asm/non_matchings/unknown_0D3020/sinf.s b/lib/asm/non_matchings/unknown_0D3020/sinf.s similarity index 100% rename from asm/non_matchings/unknown_0D3020/sinf.s rename to lib/asm/non_matchings/unknown_0D3020/sinf.s diff --git a/src/mips2/__osSpSetStatus.c b/lib/src/__osSpSetStatus.c similarity index 100% rename from src/mips2/__osSpSetStatus.c rename to lib/src/__osSpSetStatus.c diff --git a/src/mips1/osCreateThread_0C9450.c b/lib/src/osCreateThread.c similarity index 66% rename from src/mips1/osCreateThread_0C9450.c rename to lib/src/osCreateThread.c index dd05e20c..18b578f6 100644 --- a/src/mips1/osCreateThread_0C9450.c +++ b/lib/src/osCreateThread.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/osCreateThread_0C9450/osCreateThread.s") +GLOBAL_ASM("lib/asm/non_matchings/osCreateThread_0C9450/osCreateThread.s") diff --git a/src/mips1/osEepromRead_0CEE80.c b/lib/src/osEepromRead.c similarity index 67% rename from src/mips1/osEepromRead_0CEE80.c rename to lib/src/osEepromRead.c index 4fbbd8fb..11aaebaa 100644 --- a/src/mips1/osEepromRead_0CEE80.c +++ b/lib/src/osEepromRead.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s") +GLOBAL_ASM("lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s") diff --git a/src/mips1/osEepromWrite_0CF180.c b/lib/src/osEepromWrite.c similarity index 66% rename from src/mips1/osEepromWrite_0CF180.c rename to lib/src/osEepromWrite.c index 6a0a0858..7a214308 100644 --- a/src/mips1/osEepromWrite_0CF180.c +++ b/lib/src/osEepromWrite.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s") +GLOBAL_ASM("lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s") diff --git a/src/mips1/osSetEventMsg_0CD7B0.c b/lib/src/osSetEventMsg.c similarity index 66% rename from src/mips1/osSetEventMsg_0CD7B0.c rename to lib/src/osSetEventMsg.c index aecc2305..acf045bc 100644 --- a/src/mips1/osSetEventMsg_0CD7B0.c +++ b/lib/src/osSetEventMsg.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/osSetEventMsg_0CD7B0/osSetEventMsg.s") +GLOBAL_ASM("lib/asm/non_matchings/osSetEventMsg_0CD7B0/osSetEventMsg.s") diff --git a/src/mips1/osSetTime_0CDE60.c b/lib/src/osSetTime.c similarity index 69% rename from src/mips1/osSetTime_0CDE60.c rename to lib/src/osSetTime.c index 4c00c7b5..a33ca664 100644 --- a/src/mips1/osSetTime_0CDE60.c +++ b/lib/src/osSetTime.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/osSetTime_0CDE60/osSetTime.s") +GLOBAL_ASM("lib/asm/non_matchings/osSetTime_0CDE60/osSetTime.s") diff --git a/src/mips1/osStartThread_0C95A0.c b/lib/src/osStartThread.c similarity index 66% rename from src/mips1/osStartThread_0C95A0.c rename to lib/src/osStartThread.c index aaa730cd..2e458661 100644 --- a/src/mips1/osStartThread_0C95A0.c +++ b/lib/src/osStartThread.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/osStartThread_0C95A0/osStartThread.s") +GLOBAL_ASM("lib/asm/non_matchings/osStartThread_0C95A0/osStartThread.s") diff --git a/src/mips1/osViSetEventMsg_0D2980.c b/lib/src/osViSetEventMsg.c similarity index 65% rename from src/mips1/osViSetEventMsg_0D2980.c rename to lib/src/osViSetEventMsg.c index a167fc7a..df67605b 100644 --- a/src/mips1/osViSetEventMsg_0D2980.c +++ b/lib/src/osViSetEventMsg.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/osViSetEventMsg_0D2980/osViSetEventMsg.s") +GLOBAL_ASM("lib/asm/non_matchings/osViSetEventMsg_0D2980/osViSetEventMsg.s") diff --git a/src/mips2/string.c b/lib/src/string.c similarity index 100% rename from src/mips2/string.c rename to lib/src/string.c diff --git a/src/mips1/unknown_0C8490.c b/lib/src/unknown_0C8490.c similarity index 52% rename from src/mips1/unknown_0C8490.c rename to lib/src/unknown_0C8490.c index 9100f3e5..b20298b7 100644 --- a/src/mips1/unknown_0C8490.c +++ b/lib/src/unknown_0C8490.c @@ -4,5 +4,5 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C8490/func_800C7890.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C8490/func_800C78D0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C8490/func_800C7890.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C8490/func_800C78D0.s") diff --git a/src/mips1/unknown_0C84E0.c b/lib/src/unknown_0C84E0.c similarity index 68% rename from src/mips1/unknown_0C84E0.c rename to lib/src/unknown_0C84E0.c index 67fcdaa8..d1458b75 100644 --- a/src/mips1/unknown_0C84E0.c +++ b/lib/src/unknown_0C84E0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C84E0/func_800C78E0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C84E0/func_800C78E0.s") diff --git a/src/mips1/unknown_0C8540.c b/lib/src/unknown_0C8540.c similarity index 68% rename from src/mips1/unknown_0C8540.c rename to lib/src/unknown_0C8540.c index 9033affe..2d05a43f 100644 --- a/src/mips1/unknown_0C8540.c +++ b/lib/src/unknown_0C8540.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C8540/func_800C7940.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C8540/func_800C7940.s") diff --git a/src/mips1/unknown_0C85A0.c b/lib/src/unknown_0C85A0.c similarity index 68% rename from src/mips1/unknown_0C85A0.c rename to lib/src/unknown_0C85A0.c index 6f4a6f05..c794fe8b 100644 --- a/src/mips1/unknown_0C85A0.c +++ b/lib/src/unknown_0C85A0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C85A0/func_800C79A0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C85A0/func_800C79A0.s") diff --git a/src/mips1/unknown_0C85C0.c b/lib/src/unknown_0C85C0.c similarity index 68% rename from src/mips1/unknown_0C85C0.c rename to lib/src/unknown_0C85C0.c index e55dbf48..5b7e2e47 100644 --- a/src/mips1/unknown_0C85C0.c +++ b/lib/src/unknown_0C85C0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C85C0/func_800C79C0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C85C0/func_800C79C0.s") diff --git a/src/mips1/unknown_0C85E0.c b/lib/src/unknown_0C85E0.c similarity index 68% rename from src/mips1/unknown_0C85E0.c rename to lib/src/unknown_0C85E0.c index cfc85456..d9fb0081 100644 --- a/src/mips1/unknown_0C85E0.c +++ b/lib/src/unknown_0C85E0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C85E0/func_800C79E0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C85E0/func_800C79E0.s") diff --git a/src/mips1/unknown_0C8650.c b/lib/src/unknown_0C8650.c similarity index 68% rename from src/mips1/unknown_0C8650.c rename to lib/src/unknown_0C8650.c index ed3bc93a..0867e066 100644 --- a/src/mips1/unknown_0C8650.c +++ b/lib/src/unknown_0C8650.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C8650/func_800C7A50.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C8650/func_800C7A50.s") diff --git a/src/mips1/unknown_0C8660.c b/lib/src/unknown_0C8660.c similarity index 68% rename from src/mips1/unknown_0C8660.c rename to lib/src/unknown_0C8660.c index 62649a45..f9d9f896 100644 --- a/src/mips1/unknown_0C8660.c +++ b/lib/src/unknown_0C8660.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C8660/func_800C7A60.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C8660/func_800C7A60.s") diff --git a/lib/src/unknown_0C86A0.c b/lib/src/unknown_0C86A0.c new file mode 100644 index 00000000..b489ba82 --- /dev/null +++ b/lib/src/unknown_0C86A0.c @@ -0,0 +1,13 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800C7AA0 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7AA0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7B40.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7BE0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7CA4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7D04.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7FFC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C83EC.s") diff --git a/src/mips1/unknown_0C9160.c b/lib/src/unknown_0C9160.c similarity index 68% rename from src/mips1/unknown_0C9160.c rename to lib/src/unknown_0C9160.c index 63b83cd8..b759f273 100644 --- a/src/mips1/unknown_0C9160.c +++ b/lib/src/unknown_0C9160.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C9160/func_800C8560.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9160/func_800C8560.s") diff --git a/lib/src/unknown_0C91A0.c b/lib/src/unknown_0C91A0.c new file mode 100644 index 00000000..593d5caf --- /dev/null +++ b/lib/src/unknown_0C91A0.c @@ -0,0 +1,14 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800C85A0 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C85A0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C85D0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C8760.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C8790.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C87B4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C87EC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/osCreateMesgQueue.s") diff --git a/src/mips1/unknown_0C96F0.c b/lib/src/unknown_0C96F0.c similarity index 52% rename from src/mips1/unknown_0C96F0.c rename to lib/src/unknown_0C96F0.c index 7d0743c4..0ca2bbdc 100644 --- a/src/mips1/unknown_0C96F0.c +++ b/lib/src/unknown_0C96F0.c @@ -4,5 +4,5 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C96F0/func_800C8AF0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C96F0/osRecvMesg.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C96F0/func_800C8AF0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C96F0/osRecvMesg.s") diff --git a/src/mips1/unknown_0C98F0.c b/lib/src/unknown_0C98F0.c similarity index 68% rename from src/mips1/unknown_0C98F0.c rename to lib/src/unknown_0C98F0.c index 8eea984b..8d08bd44 100644 --- a/src/mips1/unknown_0C98F0.c +++ b/lib/src/unknown_0C98F0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C98F0/func_800C8CF0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C98F0/func_800C8CF0.s") diff --git a/src/mips1/unknown_0C9970.c b/lib/src/unknown_0C9970.c similarity index 68% rename from src/mips1/unknown_0C9970.c rename to lib/src/unknown_0C9970.c index f161b8a1..66f52bc3 100644 --- a/src/mips1/unknown_0C9970.c +++ b/lib/src/unknown_0C9970.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C9970/func_800C8D70.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9970/func_800C8D70.s") diff --git a/src/mips1/unknown_0C9A20.c b/lib/src/unknown_0C9A20.c similarity index 68% rename from src/mips1/unknown_0C9A20.c rename to lib/src/unknown_0C9A20.c index 57753631..6d463f96 100644 --- a/src/mips1/unknown_0C9A20.c +++ b/lib/src/unknown_0C9A20.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C9A20/func_800C8E20.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9A20/func_800C8E20.s") diff --git a/src/mips1/unknown_0C9A30.c b/lib/src/unknown_0C9A30.c similarity index 68% rename from src/mips1/unknown_0C9A30.c rename to lib/src/unknown_0C9A30.c index bab3a1ac..c2ec12fa 100644 --- a/src/mips1/unknown_0C9A30.c +++ b/lib/src/unknown_0C9A30.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C9A30/func_800C8E30.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9A30/func_800C8E30.s") diff --git a/src/mips1/unknown_0C9B80.c b/lib/src/unknown_0C9B80.c similarity index 68% rename from src/mips1/unknown_0C9B80.c rename to lib/src/unknown_0C9B80.c index 4b83e79a..64c80c80 100644 --- a/src/mips1/unknown_0C9B80.c +++ b/lib/src/unknown_0C9B80.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C9B80/func_800C8F80.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9B80/func_800C8F80.s") diff --git a/lib/src/unknown_0C9C90.c b/lib/src/unknown_0C9C90.c new file mode 100644 index 00000000..ac4cf806 --- /dev/null +++ b/lib/src/unknown_0C9C90.c @@ -0,0 +1,13 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800C9090 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/func_800C9090.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/func_800C91AC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/func_800C92D0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/func_800C935C.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/func_800C93D0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/func_800C9420.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/func_800C9508.s") diff --git a/src/mips1/unknown_0CA250.c b/lib/src/unknown_0CA250.c similarity index 68% rename from src/mips1/unknown_0CA250.c rename to lib/src/unknown_0CA250.c index 262e8ddf..9ef488df 100644 --- a/src/mips1/unknown_0CA250.c +++ b/lib/src/unknown_0CA250.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CA250/func_800C9650.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA250/func_800C9650.s") diff --git a/src/mips1/unknown_0CA2F0.c b/lib/src/unknown_0CA2F0.c similarity index 68% rename from src/mips1/unknown_0CA2F0.c rename to lib/src/unknown_0CA2F0.c index 4e85c566..869642ed 100644 --- a/src/mips1/unknown_0CA2F0.c +++ b/lib/src/unknown_0CA2F0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CA2F0/func_800C96F0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s") diff --git a/src/mips1/unknown_0CA380.c b/lib/src/unknown_0CA380.c similarity index 68% rename from src/mips1/unknown_0CA380.c rename to lib/src/unknown_0CA380.c index dfea8e9e..dbba8637 100644 --- a/src/mips1/unknown_0CA380.c +++ b/lib/src/unknown_0CA380.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CA380/func_800C9780.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA380/func_800C9780.s") diff --git a/src/mips1/unknown_0CA410.c b/lib/src/unknown_0CA410.c similarity index 68% rename from src/mips1/unknown_0CA410.c rename to lib/src/unknown_0CA410.c index d6e98280..6d33a87a 100644 --- a/src/mips1/unknown_0CA410.c +++ b/lib/src/unknown_0CA410.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CA410/func_800C9810.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA410/func_800C9810.s") diff --git a/src/mips1/unknown_0CA4B0.c b/lib/src/unknown_0CA4B0.c similarity index 68% rename from src/mips1/unknown_0CA4B0.c rename to lib/src/unknown_0CA4B0.c index ed2dbdc4..d19cd0b4 100644 --- a/src/mips1/unknown_0CA4B0.c +++ b/lib/src/unknown_0CA4B0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CA4B0/func_800C98B0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA4B0/func_800C98B0.s") diff --git a/lib/src/unknown_0CA530.c b/lib/src/unknown_0CA530.c new file mode 100644 index 00000000..18cd56bc --- /dev/null +++ b/lib/src/unknown_0CA530.c @@ -0,0 +1,10 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800C9930 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/func_800C9930.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/func_800C99E0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/func_800C9A30.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/sqrtf.s") diff --git a/src/mips1/unknown_0CA6E0.c b/lib/src/unknown_0CA6E0.c similarity index 68% rename from src/mips1/unknown_0CA6E0.c rename to lib/src/unknown_0CA6E0.c index e0d228fa..83cd4c5b 100644 --- a/src/mips1/unknown_0CA6E0.c +++ b/lib/src/unknown_0CA6E0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CA6E0/func_800C9AE0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA6E0/func_800C9AE0.s") diff --git a/lib/src/unknown_0CA730.c b/lib/src/unknown_0CA730.c new file mode 100644 index 00000000..079aa413 --- /dev/null +++ b/lib/src/unknown_0CA730.c @@ -0,0 +1,9 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800C9B30 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/func_800C9B30.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/func_800C9B4C.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/func_800C9CBC.s") diff --git a/src/mips1/unknown_0CA940.c b/lib/src/unknown_0CA940.c similarity index 52% rename from src/mips1/unknown_0CA940.c rename to lib/src/unknown_0CA940.c index 2035ef3b..94f2b719 100644 --- a/src/mips1/unknown_0CA940.c +++ b/lib/src/unknown_0CA940.c @@ -4,5 +4,5 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CA940/D_800C9D40.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA940/func_800C9D54.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA940/D_800C9D40.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA940/func_800C9D54.s") diff --git a/lib/src/unknown_0CA9A0.c b/lib/src/unknown_0CA9A0.c new file mode 100644 index 00000000..81d89f83 --- /dev/null +++ b/lib/src/unknown_0CA9A0.c @@ -0,0 +1,19 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800C9DA0 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/bcopy.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CA0B0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CA0D0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CAA7C.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CB498.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CB540.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CB714.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CBAC0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CBBEC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CC090.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CC17C.s") diff --git a/lib/src/unknown_0CCF90.c b/lib/src/unknown_0CCF90.c new file mode 100644 index 00000000..becbf75c --- /dev/null +++ b/lib/src/unknown_0CCF90.c @@ -0,0 +1,13 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800CC390 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/D_800CC390.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/D_800CC3C0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/D_800CC4E0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/D_800CC514.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/func_800CC840.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/func_800CC920.s") diff --git a/lib/src/unknown_0CD820.c b/lib/src/unknown_0CD820.c new file mode 100644 index 00000000..0d2c9720 --- /dev/null +++ b/lib/src/unknown_0CD820.c @@ -0,0 +1,12 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800CCC20 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CD0A4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s") diff --git a/src/mips1/unknown_0CDE50.c b/lib/src/unknown_0CDE50.c similarity index 68% rename from src/mips1/unknown_0CDE50.c rename to lib/src/unknown_0CDE50.c index 2bdc9379..f6f309c2 100644 --- a/src/mips1/unknown_0CDE50.c +++ b/lib/src/unknown_0CDE50.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CDE50/func_800CD250.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CDE50/func_800CD250.s") diff --git a/lib/src/unknown_0CDE90.c b/lib/src/unknown_0CDE90.c new file mode 100644 index 00000000..12780912 --- /dev/null +++ b/lib/src/unknown_0CDE90.c @@ -0,0 +1,9 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800CD290 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CDE90/func_800CD290.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CDE90/func_800CD430.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CDE90/func_800CD52C.s") diff --git a/lib/src/unknown_0CE200.c b/lib/src/unknown_0CE200.c new file mode 100644 index 00000000..0e69d410 --- /dev/null +++ b/lib/src/unknown_0CE200.c @@ -0,0 +1,10 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800CD600 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/func_800CD600.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/func_800CD650.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/func_800CD694.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/func_800CD6C0.s") diff --git a/lib/src/unknown_0CE370.c b/lib/src/unknown_0CE370.c new file mode 100644 index 00000000..92e4c222 --- /dev/null +++ b/lib/src/unknown_0CE370.c @@ -0,0 +1,10 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800CD770 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE370/func_800CD770.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE370/func_800CD820.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE370/func_800CD8F0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE370/func_800CDB20.s") diff --git a/src/mips1/unknown_0CE8A0.c b/lib/src/unknown_0CE8A0.c similarity index 52% rename from src/mips1/unknown_0CE8A0.c rename to lib/src/unknown_0CE8A0.c index 3925323e..e84ed2c4 100644 --- a/src/mips1/unknown_0CE8A0.c +++ b/lib/src/unknown_0CE8A0.c @@ -4,5 +4,5 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CE8A0/func_800CDCA0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CE8A0/func_800CDEE4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE8A0/func_800CDCA0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE8A0/func_800CDEE4.s") diff --git a/src/mips1/unknown_0CEC50.c b/lib/src/unknown_0CEC50.c similarity index 68% rename from src/mips1/unknown_0CEC50.c rename to lib/src/unknown_0CEC50.c index fb6d8dae..adf6124b 100644 --- a/src/mips1/unknown_0CEC50.c +++ b/lib/src/unknown_0CEC50.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CEC50/func_800CE050.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CEC50/func_800CE050.s") diff --git a/src/mips1/unknown_0CEE10.c b/lib/src/unknown_0CEE10.c similarity index 68% rename from src/mips1/unknown_0CEE10.c rename to lib/src/unknown_0CEE10.c index f59da60d..f331a2ef 100644 --- a/src/mips1/unknown_0CEE10.c +++ b/lib/src/unknown_0CEE10.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CEE10/func_800CE210.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CEE10/func_800CE210.s") diff --git a/src/mips1/unknown_0CF070.c b/lib/src/unknown_0CF070.c similarity index 68% rename from src/mips1/unknown_0CF070.c rename to lib/src/unknown_0CF070.c index 406a82fa..501334cb 100644 --- a/src/mips1/unknown_0CF070.c +++ b/lib/src/unknown_0CF070.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CF070/func_800CE470.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF070/func_800CE470.s") diff --git a/lib/src/unknown_0CF330.c b/lib/src/unknown_0CF330.c new file mode 100644 index 00000000..6aa9967d --- /dev/null +++ b/lib/src/unknown_0CF330.c @@ -0,0 +1,19 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800CE730 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/func_800CE730.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/func_800CE83C.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ull_rshift.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ull_rem.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ull_div.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ll_lshift.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ll_div.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ll_mul.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/__ull_divremi.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/func_800CED20.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/func_800CEDD4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/func_800CEEE0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CF330/func_800CEFDC.s") diff --git a/src/mips1/unknown_0CFFE0.c b/lib/src/unknown_0CFFE0.c similarity index 68% rename from src/mips1/unknown_0CFFE0.c rename to lib/src/unknown_0CFFE0.c index 54bb02d3..bc892590 100644 --- a/src/mips1/unknown_0CFFE0.c +++ b/lib/src/unknown_0CFFE0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0CFFE0/func_800CF3E0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CFFE0/func_800CF3E0.s") diff --git a/lib/src/unknown_0D0130.c b/lib/src/unknown_0D0130.c new file mode 100644 index 00000000..714571ac --- /dev/null +++ b/lib/src/unknown_0D0130.c @@ -0,0 +1,11 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800CF530 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/func_800CF530.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/func_800CFBF4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/func_800CFDA8.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/func_800CFF90.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/func_800D0390.s") diff --git a/src/mips1/unknown_0D10E0.c b/lib/src/unknown_0D10E0.c similarity index 70% rename from src/mips1/unknown_0D10E0.c rename to lib/src/unknown_0D10E0.c index 167d1930..30c7cb10 100644 --- a/src/mips1/unknown_0D10E0.c +++ b/lib/src/unknown_0D10E0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0D10E0/memzero.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D10E0/memzero.s") diff --git a/lib/src/unknown_0D1180.c b/lib/src/unknown_0D1180.c new file mode 100644 index 00000000..ce7a3ca3 --- /dev/null +++ b/lib/src/unknown_0D1180.c @@ -0,0 +1,10 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800D0580 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/func_800D0580.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/func_800D0870.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/func_800D0B50.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/func_800D0D88.s") diff --git a/src/mips1/unknown_0D1A80.c b/lib/src/unknown_0D1A80.c similarity index 68% rename from src/mips1/unknown_0D1A80.c rename to lib/src/unknown_0D1A80.c index 09a11fc5..bf94d3dd 100644 --- a/src/mips1/unknown_0D1A80.c +++ b/lib/src/unknown_0D1A80.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0D1A80/func_800D0E80.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1A80/func_800D0E80.s") diff --git a/lib/src/unknown_0D1C40.c b/lib/src/unknown_0D1C40.c new file mode 100644 index 00000000..4b8bff58 --- /dev/null +++ b/lib/src/unknown_0D1C40.c @@ -0,0 +1,9 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800D1040 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1C40/func_800D1040.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1C40/func_800D14C4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1C40/func_800D1728.s") diff --git a/src/mips1/unknown_0D23F0.c b/lib/src/unknown_0D23F0.c similarity index 68% rename from src/mips1/unknown_0D23F0.c rename to lib/src/unknown_0D23F0.c index bbf956ff..d90a08ab 100644 --- a/src/mips1/unknown_0D23F0.c +++ b/lib/src/unknown_0D23F0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0D23F0/func_800D17F0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D23F0/func_800D17F0.s") diff --git a/src/mips1/unknown_0D24A0.c b/lib/src/unknown_0D24A0.c similarity index 68% rename from src/mips1/unknown_0D24A0.c rename to lib/src/unknown_0D24A0.c index 19cd7476..8f3239bc 100644 --- a/src/mips1/unknown_0D24A0.c +++ b/lib/src/unknown_0D24A0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0D24A0/func_800D18A0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D24A0/func_800D18A0.s") diff --git a/src/mips1/unknown_0D24D0.c b/lib/src/unknown_0D24D0.c similarity index 68% rename from src/mips1/unknown_0D24D0.c rename to lib/src/unknown_0D24D0.c index 6bc6fd78..f1f578fa 100644 --- a/src/mips1/unknown_0D24D0.c +++ b/lib/src/unknown_0D24D0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0D24D0/func_800D18D0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D24D0/func_800D18D0.s") diff --git a/src/mips1/unknown_0D24E0.c b/lib/src/unknown_0D24E0.c similarity index 68% rename from src/mips1/unknown_0D24E0.c rename to lib/src/unknown_0D24E0.c index 802d1a1a..e1210274 100644 --- a/src/mips1/unknown_0D24E0.c +++ b/lib/src/unknown_0D24E0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0D24E0/func_800D18E0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D24E0/func_800D18E0.s") diff --git a/src/mips1/unknown_0D2590.c b/lib/src/unknown_0D2590.c similarity index 52% rename from src/mips1/unknown_0D2590.c rename to lib/src/unknown_0D2590.c index eb1fc40f..170c2a7f 100644 --- a/src/mips1/unknown_0D2590.c +++ b/lib/src/unknown_0D2590.c @@ -4,5 +4,5 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0D2590/func_800D1990.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D2590/D_800D1B08.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D2590/func_800D1990.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D2590/D_800D1B08.s") diff --git a/src/mips1/unknown_0D28A0.c b/lib/src/unknown_0D28A0.c similarity index 68% rename from src/mips1/unknown_0D28A0.c rename to lib/src/unknown_0D28A0.c index b4922564..1376a235 100644 --- a/src/mips1/unknown_0D28A0.c +++ b/lib/src/unknown_0D28A0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0D28A0/func_800D1CA0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D28A0/func_800D1CA0.s") diff --git a/src/mips1/unknown_0D2910.c b/lib/src/unknown_0D2910.c similarity index 68% rename from src/mips1/unknown_0D2910.c rename to lib/src/unknown_0D2910.c index dfff51a6..a3ac9eba 100644 --- a/src/mips1/unknown_0D2910.c +++ b/lib/src/unknown_0D2910.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0D2910/func_800D1D10.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D2910/func_800D1D10.s") diff --git a/lib/src/unknown_0D29F0.c b/lib/src/unknown_0D29F0.c new file mode 100644 index 00000000..2bd34c67 --- /dev/null +++ b/lib/src/unknown_0D29F0.c @@ -0,0 +1,13 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800D1DF0 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D29F0/func_800D1DF0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D29F0/func_800D1E70.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D29F0/func_800D1EB0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D29F0/func_800D1EF0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D29F0/func_800D200C.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D29F0/func_800D216C.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D29F0/func_800D21B0.s") diff --git a/src/mips1/unknown_0D2E40.c b/lib/src/unknown_0D2E40.c similarity index 52% rename from src/mips1/unknown_0D2E40.c rename to lib/src/unknown_0D2E40.c index 32e6ff71..228731cf 100644 --- a/src/mips1/unknown_0D2E40.c +++ b/lib/src/unknown_0D2E40.c @@ -4,5 +4,5 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0D2E40/func_800D2240.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D2E40/func_800D2260.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D2E40/func_800D2240.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D2E40/func_800D2260.s") diff --git a/lib/src/unknown_0D3020.c b/lib/src/unknown_0D3020.c new file mode 100644 index 00000000..f0525b5a --- /dev/null +++ b/lib/src/unknown_0D3020.c @@ -0,0 +1,78 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800D2420 */ + +#include "types.h" +#include "macros.h" + +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D2420.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D2470.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D2480.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D2540.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osDisableInt.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osRestoreInt.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/D_800D25A0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/D_800D2680.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/D_800D2760.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D2B10.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D2C60.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D2C70.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/D_800D2CB0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/D_800D2CC0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D31E4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osEnqueueAndYield.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D33CC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osPopThread.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D3424.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/D_800D35A0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D35B0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D3670.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D36A0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D37F0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D3820.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D38A0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D3F10.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4560.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4570.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4580.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4590.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D45E0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4630.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D46B0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4730.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4790.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D47F0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4840.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4940.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/cosf.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/sinf.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4DE0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4EC0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D4F4C.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D50C4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D5138.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D52C0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D52F0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D534C.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D53B4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D57CC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D5964.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D5BC0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D5CBC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D5FDC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D6050.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D6080.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D6090.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D63F0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D6400.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D6440.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D64D0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D6500.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D6560.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D65B0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D6600.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D6700.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D69A0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D6F10.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D7460.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D7470.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D7570.s") diff --git a/rename_sym.sh b/rename_sym.sh index 4a04c185..9f458cd0 100755 --- a/rename_sym.sh +++ b/rename_sym.sh @@ -10,4 +10,4 @@ fi #echo "Replace $1 with $2?" #read -grep -rl "$1" asm/**/*.s src/**/*.{c,h} include/*.h data/dkr.data.s undefined_syms.txt | xargs sed -i "s/\b$1\b/$2/g" \ No newline at end of file +grep -rl "$1" asm/**/*.s src/**/*.{c,h} lib/**/*.{c} include/*.h data/dkr.data.s undefined_syms.txt | xargs sed -i "s/\b$1\b/$2/g" \ No newline at end of file diff --git a/src/mips1/unknown_0C86A0.c b/src/mips1/unknown_0C86A0.c deleted file mode 100644 index 2872c710..00000000 --- a/src/mips1/unknown_0C86A0.c +++ /dev/null @@ -1,13 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800C7AA0 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0C86A0/func_800C7AA0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C86A0/func_800C7B40.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C86A0/func_800C7BE0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C86A0/func_800C7CA4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C86A0/func_800C7D04.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C86A0/func_800C7FFC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C86A0/func_800C83EC.s") diff --git a/src/mips1/unknown_0C91A0.c b/src/mips1/unknown_0C91A0.c deleted file mode 100644 index 38d430af..00000000 --- a/src/mips1/unknown_0C91A0.c +++ /dev/null @@ -1,14 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800C85A0 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0C91A0/func_800C85A0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C91A0/func_800C85D0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C91A0/func_800C8600.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C91A0/func_800C8760.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C91A0/func_800C8790.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C91A0/func_800C87B4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C91A0/func_800C87EC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C91A0/osCreateMesgQueue.s") diff --git a/src/mips1/unknown_0C9C90.c b/src/mips1/unknown_0C9C90.c deleted file mode 100644 index 25f9e0de..00000000 --- a/src/mips1/unknown_0C9C90.c +++ /dev/null @@ -1,13 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800C9090 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0C9C90/func_800C9090.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C9C90/func_800C91AC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C9C90/func_800C92D0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C9C90/func_800C935C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C9C90/func_800C93D0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C9C90/func_800C9420.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C9C90/func_800C9508.s") diff --git a/src/mips1/unknown_0CA530.c b/src/mips1/unknown_0CA530.c deleted file mode 100644 index 3bf383b4..00000000 --- a/src/mips1/unknown_0CA530.c +++ /dev/null @@ -1,10 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800C9930 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0CA530/func_800C9930.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA530/func_800C99E0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA530/func_800C9A30.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA530/sqrtf.s") diff --git a/src/mips1/unknown_0CA730.c b/src/mips1/unknown_0CA730.c deleted file mode 100644 index 20575f32..00000000 --- a/src/mips1/unknown_0CA730.c +++ /dev/null @@ -1,9 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800C9B30 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0CA730/func_800C9B30.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA730/func_800C9B4C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA730/func_800C9CBC.s") diff --git a/src/mips1/unknown_0CA9A0.c b/src/mips1/unknown_0CA9A0.c deleted file mode 100644 index 75e27316..00000000 --- a/src/mips1/unknown_0CA9A0.c +++ /dev/null @@ -1,19 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800C9DA0 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/bcopy.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/func_800CA0B0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/D_800CA0D0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/D_800CAA7C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/func_800CB498.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/D_800CB540.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/D_800CB714.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/func_800CBAC0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/D_800CBBEC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/D_800CC090.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CA9A0/D_800CC17C.s") diff --git a/src/mips1/unknown_0CCF90.c b/src/mips1/unknown_0CCF90.c deleted file mode 100644 index 58f44d3c..00000000 --- a/src/mips1/unknown_0CCF90.c +++ /dev/null @@ -1,13 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800CC390 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0CCF90/D_800CC390.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CCF90/D_800CC3C0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CCF90/D_800CC4E0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CCF90/D_800CC514.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CCF90/func_800CC5A0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CCF90/func_800CC840.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CCF90/func_800CC920.s") diff --git a/src/mips1/unknown_0CD820.c b/src/mips1/unknown_0CD820.c deleted file mode 100644 index c7ca3c89..00000000 --- a/src/mips1/unknown_0CD820.c +++ /dev/null @@ -1,12 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800CCC20 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0CD820/func_800CCC20.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CD820/func_800CCE18.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CD820/func_800CCEE8.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CD820/func_800CCFE0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CD820/func_800CD0A4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CD820/func_800CD14C.s") diff --git a/src/mips1/unknown_0CDE90.c b/src/mips1/unknown_0CDE90.c deleted file mode 100644 index f714179f..00000000 --- a/src/mips1/unknown_0CDE90.c +++ /dev/null @@ -1,9 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800CD290 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0CDE90/func_800CD290.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CDE90/func_800CD430.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CDE90/func_800CD52C.s") diff --git a/src/mips1/unknown_0CE200.c b/src/mips1/unknown_0CE200.c deleted file mode 100644 index 14ad8254..00000000 --- a/src/mips1/unknown_0CE200.c +++ /dev/null @@ -1,10 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800CD600 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0CE200/func_800CD600.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CE200/func_800CD650.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CE200/func_800CD694.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CE200/func_800CD6C0.s") diff --git a/src/mips1/unknown_0CE370.c b/src/mips1/unknown_0CE370.c deleted file mode 100644 index 4b4c373c..00000000 --- a/src/mips1/unknown_0CE370.c +++ /dev/null @@ -1,10 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800CD770 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0CE370/func_800CD770.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CE370/func_800CD820.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CE370/func_800CD8F0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CE370/func_800CDB20.s") diff --git a/src/mips1/unknown_0CF330.c b/src/mips1/unknown_0CF330.c deleted file mode 100644 index d2f419c5..00000000 --- a/src/mips1/unknown_0CF330.c +++ /dev/null @@ -1,19 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800CE730 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/func_800CE730.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/func_800CE83C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/__ull_rshift.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/__ull_rem.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/__ull_div.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/__ll_lshift.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/__ll_div.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/__ll_mul.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/__ull_divremi.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/func_800CED20.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/func_800CEDD4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/func_800CEEE0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0CF330/func_800CEFDC.s") diff --git a/src/mips1/unknown_0D0130.c b/src/mips1/unknown_0D0130.c deleted file mode 100644 index 8c0619f4..00000000 --- a/src/mips1/unknown_0D0130.c +++ /dev/null @@ -1,11 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800CF530 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0D0130/func_800CF530.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D0130/func_800CFBF4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D0130/func_800CFDA8.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D0130/func_800CFF90.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D0130/func_800D0390.s") diff --git a/src/mips1/unknown_0D1180.c b/src/mips1/unknown_0D1180.c deleted file mode 100644 index 03d7f6cf..00000000 --- a/src/mips1/unknown_0D1180.c +++ /dev/null @@ -1,10 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800D0580 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0D1180/func_800D0580.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D1180/func_800D0870.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D1180/func_800D0B50.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D1180/func_800D0D88.s") diff --git a/src/mips1/unknown_0D1C40.c b/src/mips1/unknown_0D1C40.c deleted file mode 100644 index f688e78f..00000000 --- a/src/mips1/unknown_0D1C40.c +++ /dev/null @@ -1,9 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800D1040 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0D1C40/func_800D1040.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D1C40/func_800D14C4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D1C40/func_800D1728.s") diff --git a/src/mips1/unknown_0D29F0.c b/src/mips1/unknown_0D29F0.c deleted file mode 100644 index 19b40534..00000000 --- a/src/mips1/unknown_0D29F0.c +++ /dev/null @@ -1,13 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800D1DF0 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0D29F0/func_800D1DF0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D29F0/func_800D1E70.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D29F0/func_800D1EB0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D29F0/func_800D1EF0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D29F0/func_800D200C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D29F0/func_800D216C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D29F0/func_800D21B0.s") diff --git a/src/mips1/unknown_0D3020.c b/src/mips1/unknown_0D3020.c deleted file mode 100644 index 6dbfe576..00000000 --- a/src/mips1/unknown_0D3020.c +++ /dev/null @@ -1,78 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x800D2420 */ - -#include "types.h" -#include "macros.h" - -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D2420.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D2470.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D2480.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D2540.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/__osDisableInt.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/__osRestoreInt.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/D_800D25A0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/D_800D2680.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/D_800D2760.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D2B10.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D2C60.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D2C70.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/D_800D2CB0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/D_800D2CC0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D31E4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/__osEnqueueAndYield.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D33CC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/__osPopThread.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D3424.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/D_800D35A0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D35B0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D3670.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D36A0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D37F0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D3820.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D38A0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D3F10.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4560.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4570.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4580.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4590.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D45E0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4630.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D46B0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4730.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4790.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D47F0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4840.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4940.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/cosf.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/sinf.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4DE0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4EC0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D4F4C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D50C4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D5138.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D52C0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D52F0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D534C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D53B4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D57CC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D5964.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D5BC0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D5CBC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D5FDC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D6050.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D6080.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D6090.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D63F0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D6400.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D6440.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D64D0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D6500.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D6560.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D65B0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D6600.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D6700.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D69A0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D6F10.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D7460.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D7470.s") -GLOBAL_ASM("asm/non_matchings/unknown_0D3020/func_800D7570.s") diff --git a/src/mips1/unknown_001050.c b/src/unknown_001050.c similarity index 100% rename from src/mips1/unknown_001050.c rename to src/unknown_001050.c diff --git a/src/mips1/unknown_003260.c b/src/unknown_003260.c similarity index 100% rename from src/mips1/unknown_003260.c rename to src/unknown_003260.c diff --git a/src/mips1/unknown_005740.c b/src/unknown_005740.c similarity index 100% rename from src/mips1/unknown_005740.c rename to src/unknown_005740.c diff --git a/src/mips1/unknown_00BC20.c b/src/unknown_00BC20.c similarity index 100% rename from src/mips1/unknown_00BC20.c rename to src/unknown_00BC20.c diff --git a/src/mips1/unknown_0255E0.c b/src/unknown_0255E0.c similarity index 100% rename from src/mips1/unknown_0255E0.c rename to src/unknown_0255E0.c diff --git a/src/mips1/unknown_032760.c b/src/unknown_032760.c similarity index 100% rename from src/mips1/unknown_032760.c rename to src/unknown_032760.c diff --git a/src/mips1/unknown_043920.c b/src/unknown_043920.c similarity index 100% rename from src/mips1/unknown_043920.c rename to src/unknown_043920.c diff --git a/src/mips1/unknown_05CEF0.c b/src/unknown_05CEF0.c similarity index 100% rename from src/mips1/unknown_05CEF0.c rename to src/unknown_05CEF0.c diff --git a/src/mips1/unknown_05DCD0.c b/src/unknown_05DCD0.c similarity index 100% rename from src/mips1/unknown_05DCD0.c rename to src/unknown_05DCD0.c diff --git a/src/mips1/unknown_05F0C0.c b/src/unknown_05F0C0.c similarity index 100% rename from src/mips1/unknown_05F0C0.c rename to src/unknown_05F0C0.c diff --git a/src/mips1/unknown_05F690.c b/src/unknown_05F690.c similarity index 100% rename from src/mips1/unknown_05F690.c rename to src/unknown_05F690.c diff --git a/src/mips1/unknown_061D30.c b/src/unknown_061D30.c similarity index 100% rename from src/mips1/unknown_061D30.c rename to src/unknown_061D30.c diff --git a/src/mips1/unknown_064690.c b/src/unknown_064690.c similarity index 100% rename from src/mips1/unknown_064690.c rename to src/unknown_064690.c diff --git a/src/mips1/unknown_0646F0.c b/src/unknown_0646F0.c similarity index 100% rename from src/mips1/unknown_0646F0.c rename to src/unknown_0646F0.c diff --git a/src/mips1/unknown_0647A0.c b/src/unknown_0647A0.c similarity index 100% rename from src/mips1/unknown_0647A0.c rename to src/unknown_0647A0.c diff --git a/src/mips1/unknown_064800.c b/src/unknown_064800.c similarity index 100% rename from src/mips1/unknown_064800.c rename to src/unknown_064800.c diff --git a/src/mips1/unknown_064830.c b/src/unknown_064830.c similarity index 100% rename from src/mips1/unknown_064830.c rename to src/unknown_064830.c diff --git a/src/mips1/unknown_065D30.c b/src/unknown_065D30.c similarity index 100% rename from src/mips1/unknown_065D30.c rename to src/unknown_065D30.c diff --git a/src/mips1/unknown_066460.c b/src/unknown_066460.c similarity index 100% rename from src/mips1/unknown_066460.c rename to src/unknown_066460.c diff --git a/src/mips1/unknown_066500.c b/src/unknown_066500.c similarity index 100% rename from src/mips1/unknown_066500.c rename to src/unknown_066500.c diff --git a/src/mips1/unknown_0667D0.c b/src/unknown_0667D0.c similarity index 100% rename from src/mips1/unknown_0667D0.c rename to src/unknown_0667D0.c diff --git a/src/mips1/unknown_066AA0.c b/src/unknown_066AA0.c similarity index 100% rename from src/mips1/unknown_066AA0.c rename to src/unknown_066AA0.c diff --git a/src/mips1/unknown_071730.c b/src/unknown_071730.c similarity index 100% rename from src/mips1/unknown_071730.c rename to src/unknown_071730.c diff --git a/src/mips1/unknown_072E50.c b/src/unknown_072E50.c similarity index 100% rename from src/mips1/unknown_072E50.c rename to src/unknown_072E50.c diff --git a/src/mips1/unknown_077C50.c b/src/unknown_077C50.c similarity index 100% rename from src/mips1/unknown_077C50.c rename to src/unknown_077C50.c diff --git a/src/mips1/unknown_078050.c b/src/unknown_078050.c similarity index 100% rename from src/mips1/unknown_078050.c rename to src/unknown_078050.c diff --git a/src/mips1/unknown_079F50.c b/src/unknown_079F50.c similarity index 100% rename from src/mips1/unknown_079F50.c rename to src/unknown_079F50.c diff --git a/src/mips1/unknown_07AF10.c b/src/unknown_07AF10.c similarity index 100% rename from src/mips1/unknown_07AF10.c rename to src/unknown_07AF10.c diff --git a/src/mips1/unknown_07B870.c b/src/unknown_07B870.c similarity index 100% rename from src/mips1/unknown_07B870.c rename to src/unknown_07B870.c diff --git a/src/mips1/unknown_080240.c b/src/unknown_080240.c similarity index 100% rename from src/mips1/unknown_080240.c rename to src/unknown_080240.c diff --git a/src/mips1/unknown_080500.c b/src/unknown_080500.c similarity index 100% rename from src/mips1/unknown_080500.c rename to src/unknown_080500.c diff --git a/src/mips1/unknown_09F8F0.c b/src/unknown_09F8F0.c similarity index 100% rename from src/mips1/unknown_09F8F0.c rename to src/unknown_09F8F0.c diff --git a/src/mips1/unknown_0AEE70.c b/src/unknown_0AEE70.c similarity index 100% rename from src/mips1/unknown_0AEE70.c rename to src/unknown_0AEE70.c diff --git a/src/mips1/unknown_0B8920.c b/src/unknown_0B8920.c similarity index 100% rename from src/mips1/unknown_0B8920.c rename to src/unknown_0B8920.c diff --git a/src/mips1/unknown_0C7F40.c b/src/unknown_0C7F40.c similarity index 100% rename from src/mips1/unknown_0C7F40.c rename to src/unknown_0C7F40.c diff --git a/src/mips1/unknown_0C7F50.c b/src/unknown_0C7F50.c similarity index 100% rename from src/mips1/unknown_0C7F50.c rename to src/unknown_0C7F50.c diff --git a/src/mips1/unknown_0C8160.c b/src/unknown_0C8160.c similarity index 100% rename from src/mips1/unknown_0C8160.c rename to src/unknown_0C8160.c diff --git a/src/mips1/unknown_0C81A0.c b/src/unknown_0C81A0.c similarity index 100% rename from src/mips1/unknown_0C81A0.c rename to src/unknown_0C81A0.c diff --git a/src/mips1/unknown_0C83F0.c b/src/unknown_0C83F0.c similarity index 100% rename from src/mips1/unknown_0C83F0.c rename to src/unknown_0C83F0.c diff --git a/src/mips1/unknown_0C8450.c b/src/unknown_0C8450.c similarity index 100% rename from src/mips1/unknown_0C8450.c rename to src/unknown_0C8450.c diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 64c7b9a4..ca58e169 100755 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -8,6 +8,8 @@ from file_util import FileUtil LD_NAME = 'dkr.ld' ASM_DIR = './asm' SRC_DIR = './src' +LIB_ASM_DIR = './lib/asm' +LIB_SRC_DIR = './lib/src' ASSETS_S_FILENAME = './asm/assets/assets.s' ASSETS_UCODE_S_FILENAME = './asm/assets/ucode.s' ASSETS_DIR = './assets/us_1.0' @@ -137,37 +139,30 @@ class LD: def gen_newline(self): self.file.write('\n') + + + def append_files(self, files, extensions, directory, outputDir): + filenames = FileUtil.get_filenames_from_directory(directory, extensions) + regex = r'[\/][*]+\s*RAM_POS:\s*0x([0-9a-fA-F]+)\s*[*]+[\/]' + for filename in filenames: + with open(directory + '/' + filename, 'r') as inFile: + notDone = True + line = inFile.readline() + while line: + matches = re.match(regex, line) + if matches is None: + line = inFile.readline() + continue + matchedGroups = matches.groups() + files.append((outputDir + filename[:-2] + '.o', '', matchedGroups[0], 0)) + break def get_code_files(self): files = [] - asmFilenames = FileUtil.get_filenames_from_directory(ASM_DIR, ('.s',)) - regex = r'[\/][*]+\s*RAM_POS:\s*0x([0-9a-fA-F]+)\s*[*]+[\/]' - for filename in asmFilenames: - with open(ASM_DIR + '/' + filename, 'r') as asmFile: - notDone = True - line = asmFile.readline() - while line: - matches = re.match(regex, line) - if matches is None: - line = asmFile.readline() - continue - matchedGroups = matches.groups() - files.append(('build/asm/' + filename[:-2] + '.o', '', matchedGroups[0], 0)) - break - srcFilenames = FileUtil.get_filenames_from_directory_recursive(SRC_DIR, ('.c','.2')) - regex = r'[\/][*]+\s*RAM_POS:\s*0x([0-9a-fA-F]+)\s*[*]+[\/]' - for filename in srcFilenames: - with open(SRC_DIR + '/' + filename, 'r') as srcFile: - notDone = True - line = srcFile.readline() - while line: - matches = re.match(regex, line) - if matches is None: - line = srcFile.readline() - continue - matchedGroups = matches.groups() - files.append(('build/src/' + filename[:-2] + '.o', '', matchedGroups[0], 0)) - break + self.append_files(files, ('.s',), ASM_DIR, 'build/asm/') + self.append_files(files, ('.c',), SRC_DIR, 'build/src/') + self.append_files(files, ('.s',), LIB_ASM_DIR, 'build/lib/asm/') + self.append_files(files, ('.c',), LIB_SRC_DIR, 'build/lib/src/') files.sort(key = lambda x: (x[2], x[3])) # Sort tuples by RAM address and prioritize src files first. return files diff --git a/tools/python/score.py b/tools/python/score.py index 2eeaf8ec..e790095f 100644 --- a/tools/python/score.py +++ b/tools/python/score.py @@ -8,6 +8,7 @@ ASM_FOLDERS = [ './asm/unknown_062930', './asm/unknown_070110', './asm/gzip', + './lib/asm', ] # These will automatically be added to the adventure one percentage. @@ -23,8 +24,9 @@ for folder in ASM_FOLDERS: ASM_FUNCTIONS.append(match.groups()[0]) SRC_DIRECTORY = './src' +LIB_SRC_DIRECTORY = './lib/src' FUNCTION_REGEX = r'([/][*]([^*]|([*][^/]))*[*][/][\n]\s*)?(void|s64|s32|s16|s8|u64|u32|u16|u8|f32|f64)(\s|[*])*([0-9A-Za-z_]+)\s*[(][^)]*[)]\s*{' -GLOBAL_ASM_REGEX = r'GLOBAL_ASM[(]\"[^/]*/[^/]*/[^/]*/([a-zA-Z0-9_]*).s\"[)]' +GLOBAL_ASM_REGEX = r'GLOBAL_ASM[(]".*(?=\/)\/([^.]+).s"[)]' WIP_REGEX = r'#if(.|\n)*?(GLOBAL_ASM[(]([^)]*)[)])(.|\n)*?#else(.|\n)*?#endif' CODE_START = 0x80000400 @@ -125,12 +127,13 @@ def main(): showTopFiles = int(num) scoreFiles = [] - srcFilenames = FileUtil.get_filenames_from_directory_recursive(SRC_DIRECTORY, extensions=('.c')) totalNumberOfDecompiledFunctions = 0 totalNumberOfDocumentedFunctions = 0 totalNumberOfGlobalAsms = 0 totalSizeOfDecompiledFunctions = 0 totalSizeOfDocumentedFunctions = 0 + + srcFilenames = FileUtil.get_filenames_from_directory_recursive(SRC_DIRECTORY, extensions=('.c')) for filename in srcFilenames: scoreFile = ScoreFile(SRC_DIRECTORY + '/' + filename) totalNumberOfDecompiledFunctions += len(scoreFile.functions) @@ -139,6 +142,16 @@ def main(): totalSizeOfDecompiledFunctions += scoreFile.get_size_of_functions() totalSizeOfDocumentedFunctions += scoreFile.get_size_of_documented_functions() scoreFiles.append(scoreFile) + srcFilenames = FileUtil.get_filenames_from_directory_recursive(LIB_SRC_DIRECTORY, extensions=('.c')) + for filename in srcFilenames: + scoreFile = ScoreFile(LIB_SRC_DIRECTORY + '/' + filename) + totalNumberOfDecompiledFunctions += len(scoreFile.functions) + totalNumberOfGlobalAsms += scoreFile.numGlobalAsms + totalNumberOfDocumentedFunctions += scoreFile.get_number_of_documented_functions() + totalSizeOfDecompiledFunctions += scoreFile.get_size_of_functions() + totalSizeOfDocumentedFunctions += scoreFile.get_size_of_documented_functions() + scoreFiles.append(scoreFile) + totalNumberOfFunctions = MAP_FILE.numFunctions for asm_function in ASM_FUNCTIONS: