From 278112886b6fe2e7b7da4cafd7dbb8480990a4d9 Mon Sep 17 00:00:00 2001 From: Ryan Myers Date: Fri, 4 Jul 2025 14:43:05 -0400 Subject: [PATCH] Sort Includes Alphabetically (#666) * Consistent tabs in makefile * Update clang format to fix broken config settings * Use new clang format settings to sort includes * Minor python script warning fixes * Fix a woopsy --- .clang-format | 6 +- Makefile | 30 +++++----- compile_all.sh | 6 +- format.sh | 4 +- mips_to_c.sh | 4 +- src/asset_loading.c | 4 +- src/audio.c | 6 +- src/audio_spatial.c | 14 ++--- src/audio_vehicle.c | 14 ++--- src/audiomgr.c | 10 ++-- src/audiosfx.c | 6 +- src/borders.c | 8 +-- src/camera.c | 10 ++-- src/fade_transition.c | 15 +++-- src/font.c | 8 +-- src/game.c | 36 ++++++------ src/game_text.c | 14 ++--- src/game_ui.c | 44 +++++++------- src/gzip.c | 2 +- src/hasm/collision.c | 2 +- src/hasm/math_util.c | 10 ++-- src/joypad.c | 2 +- src/lights.c | 10 ++-- src/main.c | 4 +- src/memory.c | 4 +- src/menu.c | 62 ++++++++++---------- src/object_functions.c | 52 ++++++++-------- src/object_models.c | 14 ++--- src/objects.c | 62 ++++++++++---------- src/particles.c | 12 ++-- src/printf.c | 8 +-- src/racer.c | 42 ++++++------- src/rcp_dkr.c | 14 ++--- src/save_data.c | 23 ++++---- src/screen_asset.c | 10 ++-- src/set_rsp_segment.c | 2 +- src/textures_sprites.c | 8 +-- src/thread0_epc.c | 10 ++-- src/thread30_bgload.c | 4 +- src/thread3_main.c | 75 ++++++++++++------------ src/tracks.c | 44 +++++++------- src/unused_string.c | 2 +- src/vehicle_bluey.c | 10 ++-- src/vehicle_bubbler.c | 8 +-- src/vehicle_rocket.c | 8 +-- src/vehicle_smokey.c | 12 ++-- src/vehicle_tricky.c | 20 +++---- src/vehicle_wizpig.c | 12 ++-- src/video.c | 2 +- src/waves.c | 22 +++---- src/weather.c | 22 +++---- tools/Makefile | 2 +- tools/python/calc_func_checksums.py | 1 - tools/python/check_if_need_to_extract.py | 1 - tools/python/patchmips3.py | 1 - tools/python/score.py | 4 +- 56 files changed, 417 insertions(+), 425 deletions(-) diff --git a/.clang-format b/.clang-format index 8b56ca8d..11d200eb 100644 --- a/.clang-format +++ b/.clang-format @@ -13,11 +13,11 @@ AlignAfterOpenBracket: Align AlignOperands: true BreakBeforeTernaryOperators: true BreakBeforeBinaryOperators: None -AllowShortBlocksOnASingleLine: true +AllowShortBlocksOnASingleLine: Always AllowShortIfStatementsOnASingleLine: false AllowShortLoopsOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None AlignEscapedNewlines: Left AlignTrailingComments: true -SortIncludes: false \ No newline at end of file +SortIncludes: CaseInsensitive \ No newline at end of file diff --git a/Makefile b/Makefile index a7c2b5ef..6d02a75a 100755 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ endif # Common build print status function define print - @$(PRINT) "$(GREEN)$(1) $(YELLOW)$(2)$(GREEN) -> $(BLUE)$(3)$(NO_COL)\n" + @$(PRINT) "$(GREEN)$(1) $(YELLOW)$(2)$(GREEN) -> $(BLUE)$(3)$(NO_COL)\n" endef # Directories @@ -56,7 +56,7 @@ SRC_DIR = src LIBULTRA_DIR = libultra ASM_DIRS = asm asm/data asm/assets asm/nonmatchings HASM_DIRS = $(SRC_DIR)/hasm $(LIBULTRA_DIR)/src/os $(LIBULTRA_DIR)/src/gu $(LIBULTRA_DIR)/src/libc -LIBULTRA_SRC_DIRS = $(LIBULTRA_DIR) $(LIBULTRA_DIR)/src $(LIBULTRA_DIR)/src/audio $(LIBULTRA_DIR)/src/audio/mips1 +LIBULTRA_SRC_DIRS = $(LIBULTRA_DIR) $(LIBULTRA_DIR)/src $(LIBULTRA_DIR)/src/audio $(LIBULTRA_DIR)/src/audio/mips1 LIBULTRA_SRC_DIRS += $(LIBULTRA_DIR)/src/debug $(LIBULTRA_DIR)/src/gu $(LIBULTRA_DIR)/src/io LIBULTRA_SRC_DIRS += $(LIBULTRA_DIR)/src/libc $(LIBULTRA_DIR)/src/os $(LIBULTRA_DIR)/src/sc @@ -105,17 +105,17 @@ find-command = $(shell which $(1) 2>/dev/null) # Tools ifeq ($(shell type mips-linux-gnu-ld >/dev/null 2>/dev/null; echo $$?), 0) - CROSS := mips-linux-gnu- + CROSS := mips-linux-gnu- else ifeq ($(shell type mips64-linux-gnu-ld >/dev/null 2>/dev/null; echo $$?), 0) - CROSS := mips64-linux-gnu- + CROSS := mips64-linux-gnu- else ifeq ($(shell type mips64-elf-ld >/dev/null 2>/dev/null; echo $$?), 0) - CROSS := mips64-elf- + CROSS := mips64-elf- else # No binutil packages were found, so we have to download the source & build it. ifeq ($(wildcard $(TOOLS_DIR)/binutils/.*),) - DUMMY != $(TOOLS_DIR)/get-binutils.sh >&2 || echo FAIL -endif - CROSS := $(TOOLS_DIR)/binutils/mips64-elf- + DUMMY != $(TOOLS_DIR)/get-binutils.sh >&2 || echo FAIL +endif + CROSS := $(TOOLS_DIR)/binutils/mips64-elf- endif AS = $(CROSS)as @@ -149,7 +149,7 @@ ifeq ($(NON_MATCHING),1) C_STANDARD := -std=gnu99 else MATCHDEFS += ANTI_TAMPER=1 - # Override compiler choice on matching builds. + # Override compiler choice on matching builds. COMPILER := ido C_STANDARD := -std=gnu90 endif @@ -181,7 +181,7 @@ ASM_DEFINES += --defsym BOOT_$(BOOT_CIC)=1 C_DEFINES += -DCIC_ID=$(BOOT_CIC) INCLUDE_CFLAGS = -I . -I include -I include/libc -I include/PR -I include/sys -I $(BIN_DIRS) -I $(SRC_DIR) -I $(LIBULTRA_DIR) -INCLUDE_CFLAGS += -I $(LIBULTRA_DIR)/src/gu -I $(LIBULTRA_DIR)/src/libc -I $(LIBULTRA_DIR)/src/io -I $(LIBULTRA_DIR)/src/sc +INCLUDE_CFLAGS += -I $(LIBULTRA_DIR)/src/gu -I $(LIBULTRA_DIR)/src/libc -I $(LIBULTRA_DIR)/src/io -I $(LIBULTRA_DIR)/src/sc INCLUDE_CFLAGS += -I $(LIBULTRA_DIR)/src/audio -I $(LIBULTRA_DIR)/src/os ASFLAGS = -march=vr4300 -32 -G0 $(ASM_DEFINES) $(INCLUDE_CFLAGS) @@ -189,9 +189,9 @@ OBJCOPYFLAGS = -O binary # Pad to 12MB if matching, otherwise build to a necessary minimum of 1.004MB ifeq ($(NON_MATCHING),1) - OBJCOPYFLAGS += --pad-to=0x101000 --gap-fill=0xFF + OBJCOPYFLAGS += --pad-to=0x101000 --gap-fill=0xFF else - OBJCOPYFLAGS += --pad-to=0xC00000 --gap-fill=0xFF + OBJCOPYFLAGS += --pad-to=0xC00000 --gap-fill=0xFF endif @@ -281,7 +281,7 @@ ifeq ($(COMPILER),gcc) endif $(GCC_SAFE_FILES): CC := $(CROSS)gcc -$(GCC_SAFE_FILES): CC_WARNINGS := +$(GCC_SAFE_FILES): CC_WARNINGS := $(GCC_SAFE_FILES): MIPSISET := -mips3 $(GCC_SAFE_FILES): OPT_FLAGS := -Os $(GCC_SAFE_FILES): CFLAGS := -DNDEBUG -DAVOID_UB -DNON_MATCHING $(INCLUDE_CFLAGS) $(C_DEFINES) \ @@ -361,7 +361,7 @@ clean_src: clean_assets: rm -rf $(ASM_DIRS) rm -rf $(BIN_DIRS) - + cleanall: rm -rf $(BUILD_DIR) @@ -442,7 +442,7 @@ $(BUILD_DIR)/$(LIBULTRA_DIR)/src/libc/ll.c.o: $(LIBULTRA_DIR)/src/libc/ll.c | bu $(BUILD_DIR)/%.s.o: %.s | build_assets $(call print,Assembling:,$<,$@) - $(V)$(AS) $(ASFLAGS) -MD $(BUILD_DIR)/$*.d -o $@ $< + $(V)$(AS) $(ASFLAGS) -MD $(BUILD_DIR)/$*.d -o $@ $< # Specifically override the header file from what splat extracted to be replaced by what we have in the hasm folder $(BUILD_DIR)/asm/header.s.o: src/hasm/header.s | build_assets diff --git a/compile_all.sh b/compile_all.sh index 300fac08..e526349a 100755 --- a/compile_all.sh +++ b/compile_all.sh @@ -4,10 +4,10 @@ regions=('pal' 'jpn' 'us' 'pal' 'us') versions=('v77' 'v79' 'v80' 'v80' 'v77') -for i in ${!regions[@]}; do +for i in "${!regions[@]}"; do region=${regions[$i]} version=${versions[$i]} echo "Compiling $region.$version" - make REGION=$region VERSION=$version cleanextract && make assets REGION=$region VERSION=$version -j12 - if [[ $(sha1sum -c --quiet ver/verification/dkr.$region.$version.sha1) = "" ]]; then echo "$region.$version OK"; else echo "Failed $region.$version"; exit 1; fi + make REGION="$region" VERSION="$version" cleanextract && make assets REGION="$region" VERSION="$version" -j12 + if [[ $(sha1sum -c --quiet ver/verification/dkr."$region"."$version".sha1) = "" ]]; then echo "$region.$version OK"; else echo "Failed $region.$version"; exit 1; fi done diff --git a/format.sh b/format.sh index 4d410481..e51dc804 100755 --- a/format.sh +++ b/format.sh @@ -9,7 +9,7 @@ shopt -s globstar if (( $# > 0 )); then echo "Formatting file(s) $*" echo "Running clang-format..." - clang-format-11 ${FORMAT_OPTS} "$@" + clang-format ${FORMAT_OPTS} "$@" echo "Running clang-tidy..." clang-tidy ${TIDY_OPTS} "$@" -- ${COMPILER_OPTS} &> /dev/null echo "Adding missing final new lines..." @@ -22,7 +22,7 @@ echo "Formatting C files. This will take a bit" echo "Running clang-format..." clang-format ${FORMAT_OPTS} src/**/*.c echo "Running clang-tidy..." -#clang-tidy ${TIDY_OPTS} src/**/*.c -- ${COMPILER_OPTS} &> /dev/null +clang-tidy ${TIDY_OPTS} src/**/*.c -- ${COMPILER_OPTS} &> /dev/null echo "Adding missing final new lines..." find src/ -type f -name "*.c" -exec sed -i -e '$a\' {} \; echo "Done formatting all files." \ No newline at end of file diff --git a/mips_to_c.sh b/mips_to_c.sh index 1669877a..1a9c6e7a 100755 --- a/mips_to_c.sh +++ b/mips_to_c.sh @@ -4,5 +4,5 @@ mkdir -p m2cfiles ASMFILE=$(find asm -type f -name "*$1.s") -echo '#include "../ctx.c"\n' > m2cfiles/$1.c -.venv/bin/python3 tools/m2c/m2c.py --target mips-ido-c --pointer-style right --context ctx.c -f $1 $ASMFILE >> m2cfiles/$1.c \ No newline at end of file +printf '#include "../ctx.c"\n' > m2cfiles/"$1".c +.venv/bin/python3 tools/m2c/m2c.py --target mips-ido-c --pointer-style right --context ctx.c -f "$1" "$ASMFILE" >> m2cfiles/"$1".c diff --git a/src/asset_loading.c b/src/asset_loading.c index 4ce87c27..53982428 100644 --- a/src/asset_loading.c +++ b/src/asset_loading.c @@ -1,10 +1,10 @@ #include "asset_loading.h" #include "common.h" -#include "macros.h" -#include "ultra64.h" #include "gzip.h" +#include "macros.h" #include "memory.h" +#include "ultra64.h" /************ .bss ************/ diff --git a/src/audio.c b/src/audio.c index 842e3f4c..323a798f 100644 --- a/src/audio.c +++ b/src/audio.c @@ -1,14 +1,14 @@ #include "audio.h" #include "memory.h" -#include "types.h" #include "asset_enums.h" #include "asset_loading.h" +#include "audio_spatial.h" #include "audiomgr.h" #include "audiosfx.h" -#include "audio_spatial.h" -#include "sched.h" #include "libultra/src/audio/seqchannel.h" +#include "sched.h" +#include "types.h" /************ .data ************/ diff --git a/src/audio_spatial.c b/src/audio_spatial.c index 2c0e50b7..9904355e 100644 --- a/src/audio_spatial.c +++ b/src/audio_spatial.c @@ -1,15 +1,15 @@ #include "audio_spatial.h" -#include "types.h" -#include "macros.h" -#include "audio_vehicle.h" -#include "memory.h" #include "audio.h" -#include "textures_sprites.h" -#include "objects.h" +#include "audio_vehicle.h" #include "audiosfx.h" -#include "tracks.h" +#include "macros.h" #include "math_util.h" +#include "memory.h" #include "menu.h" +#include "objects.h" +#include "textures_sprites.h" +#include "tracks.h" +#include "types.h" #define MAX_AUDIO_POINTS 40 #define MAX_AUDIO_LINES 7 diff --git a/src/audio_vehicle.c b/src/audio_vehicle.c index 60a7b536..8413cd8a 100644 --- a/src/audio_vehicle.c +++ b/src/audio_vehicle.c @@ -1,17 +1,17 @@ #include "audio_vehicle.h" -#include "types.h" -#include "macros.h" +#include "asset_loading.h" #include "audio_spatial.h" #include "audiosfx.h" -#include "objects.h" -#include "joypad.h" -#include "racer.h" -#include "PR/libaudio.h" #include "game_ui.h" +#include "joypad.h" +#include "macros.h" #include "math_util.h" +#include "objects.h" +#include "PR/libaudio.h" #include "printf.h" -#include "asset_loading.h" +#include "racer.h" +#include "types.h" /************ .data ************/ diff --git a/src/audiomgr.c b/src/audiomgr.c index 11c5a62e..211c2472 100644 --- a/src/audiomgr.c +++ b/src/audiomgr.c @@ -1,13 +1,13 @@ #include "audiomgr.h" -#include "memory.h" -#include "video.h" -#include "math_util.h" #include "asset_loading.h" +#include "common.h" +#include "math_util.h" +#include "memory.h" #include "objects.h" #include "PR/abi.h" -#include "common.h" -#include "stacks.h" #include "rcp_dkr.h" +#include "stacks.h" +#include "video.h" /**** type define's for structures unique to audiomgr ****/ typedef union { diff --git a/src/audiosfx.c b/src/audiosfx.c index 58c532c1..bba87ba1 100644 --- a/src/audiosfx.c +++ b/src/audiosfx.c @@ -1,10 +1,10 @@ #include "audiosfx.h" -#include "memory.h" -#include "video.h" -#include "math_util.h" #include "asset_loading.h" +#include "math_util.h" +#include "memory.h" #include "objects.h" #include "PR/libaudio.h" +#include "video.h" #define SOUND_PARAM_DURATION(m) (m->velocityMax * 33333) #define SOUND_PARAM_NEXT_SOUND(m) (m->velocityMin + (m->keyMin & 0xC0) * 4) diff --git a/src/borders.c b/src/borders.c index 03e6008f..7be4fb80 100644 --- a/src/borders.c +++ b/src/borders.c @@ -1,13 +1,13 @@ #include "borders.h" #include "camera.h" -#include "types.h" -#include "macros.h" -#include "structs.h" #include "f3ddkr.h" -#include "video.h" #include "game.h" #include "game_ui.h" +#include "macros.h" +#include "structs.h" +#include "types.h" +#include "video.h" /** * Renders the black borders that separate each viewport during multiplayer. diff --git a/src/camera.c b/src/camera.c index a2256724..fce95f55 100644 --- a/src/camera.c +++ b/src/camera.c @@ -1,16 +1,16 @@ #include "camera.h" #include "audio.h" -#include "objects.h" #include "game.h" -#include "tracks.h" -#include "video.h" #include "libultra/src/libc/rmonPrintf.h" #include "math_util.h" -#include "weather.h" +#include "menu.h" +#include "objects.h" #include "PRinternal/piint.h" #include "PRinternal/viint.h" #include "textures_sprites.h" -#include "menu.h" +#include "tracks.h" +#include "video.h" +#include "weather.h" #define CAMERA_MODEL_STACK_SIZE 5 diff --git a/src/fade_transition.c b/src/fade_transition.c index b6e830e4..a9cda4fc 100644 --- a/src/fade_transition.c +++ b/src/fade_transition.c @@ -1,15 +1,14 @@ #include "fade_transition.h" -#include "types.h" -#include "macros.h" -#include "f3ddkr.h" #include "asset_enums.h" -#include "memory.h" -#include "video.h" -#include "textures_sprites.h" -#include "math_util.h" -#include "PRinternal/viint.h" #include "camera.h" +#include "f3ddkr.h" +#include "macros.h" +#include "math_util.h" +#include "memory.h" +#include "PRinternal/viint.h" +#include "textures_sprites.h" +#include "types.h" #include "video.h" /************ .data ************/ diff --git a/src/font.c b/src/font.c index ac790042..b1b13155 100644 --- a/src/font.c +++ b/src/font.c @@ -1,11 +1,11 @@ #include "font.h" -#include "menu.h" -#include "textures_sprites.h" +#include "asset_loading.h" #include "camera.h" #include "common.h" -#include "video.h" -#include "asset_loading.h" #include "memory.h" +#include "menu.h" +#include "textures_sprites.h" +#include "video.h" /************ .data ************/ diff --git a/src/game.c b/src/game.c index d7fa7e27..2316856d 100644 --- a/src/game.c +++ b/src/game.c @@ -1,29 +1,29 @@ #include "game.h" -#include "memory.h" -#include "types.h" -#include "macros.h" -#include "structs.h" #include "asset_enums.h" #include "asset_loading.h" -#include "menu.h" -#include "video.h" -#include "set_rsp_segment.h" -#include "weather.h" #include "audio.h" -#include "objects.h" -#include "camera.h" -#include "save_data.h" -#include "rcp_dkr.h" -#include "audiosfx.h" -#include "lights.h" -#include "textures_sprites.h" #include "audio_spatial.h" -#include "tracks.h" -#include "racer.h" -#include "joypad.h" +#include "audiosfx.h" +#include "camera.h" #include "common.h" +#include "joypad.h" +#include "lights.h" +#include "macros.h" +#include "memory.h" +#include "menu.h" +#include "objects.h" +#include "racer.h" +#include "rcp_dkr.h" +#include "save_data.h" +#include "set_rsp_segment.h" +#include "structs.h" +#include "textures_sprites.h" #include "thread3_main.h" +#include "tracks.h" +#include "types.h" +#include "video.h" +#include "weather.h" /************ .data ************/ diff --git a/src/game_text.c b/src/game_text.c index 8a75431b..0a887a74 100644 --- a/src/game_text.c +++ b/src/game_text.c @@ -1,15 +1,15 @@ #include "game_text.h" +#include "asset_loading.h" +#include "camera.h" #include "common.h" -#include "menu.h" -#include "objects.h" -#include "racer.h" #include "game.h" #include "joypad.h" -#include "PRinternal/viint.h" -#include "asset_loading.h" -#include "thread3_main.h" #include "memory.h" -#include "camera.h" +#include "menu.h" +#include "objects.h" +#include "PRinternal/viint.h" +#include "racer.h" +#include "thread3_main.h" /************ .data ************/ diff --git a/src/game_ui.c b/src/game_ui.c index 0164c8c3..7f5684c3 100644 --- a/src/game_ui.c +++ b/src/game_ui.c @@ -1,28 +1,28 @@ #include "game_ui.h" -#include "common.h" -#include "types.h" -#include "macros.h" -#include "structs.h" -#include "f3ddkr.h" -#include "camera.h" -#include "game.h" -#include "audio.h" -#include "textures_sprites.h" -#include "racer.h" -#include "math_util.h" -#include "objects.h" -#include "game_text.h" -#include "object_models.h" -#include "tracks.h" -#include "rcp_dkr.h" -#include "audiosfx.h" -#include "printf.h" -#include "audio_spatial.h" -#include "joypad.h" -#include "PRinternal/viint.h" #include "asset_loading.h" -#include "thread3_main.h" +#include "audio.h" +#include "audio_spatial.h" +#include "audiosfx.h" +#include "camera.h" +#include "common.h" +#include "f3ddkr.h" +#include "game.h" +#include "game_text.h" +#include "joypad.h" +#include "macros.h" +#include "math_util.h" #include "menu.h" +#include "object_models.h" +#include "objects.h" +#include "PRinternal/viint.h" +#include "printf.h" +#include "racer.h" +#include "rcp_dkr.h" +#include "structs.h" +#include "textures_sprites.h" +#include "thread3_main.h" +#include "tracks.h" +#include "types.h" /************ .data ************/ diff --git a/src/gzip.c b/src/gzip.c index c11a36c2..667bf6a6 100644 --- a/src/gzip.c +++ b/src/gzip.c @@ -1,7 +1,7 @@ #include "gzip.h" #include "asset_loading.h" -#include "PR/os_libc.h" #include "memory.h" +#include "PR/os_libc.h" /************ .data ************/ diff --git a/src/hasm/collision.c b/src/hasm/collision.c index aa4a8fdb..da42830a 100644 --- a/src/hasm/collision.c +++ b/src/hasm/collision.c @@ -1,8 +1,8 @@ #include "collision.h" -#include "types.h" #include "macros.h" #include "textures_sprites.h" +#include "types.h" /*******************************/ diff --git a/src/hasm/math_util.c b/src/hasm/math_util.c index efa8e8b1..4b6b37c6 100644 --- a/src/hasm/math_util.c +++ b/src/hasm/math_util.c @@ -1,12 +1,12 @@ #include "math_util.h" -#include -#include "types.h" -#include "macros.h" -#include "structs.h" #include "game.h" -#include "string.h" +#include "macros.h" #include "PR/os_internal_reg.h" +#include "string.h" +#include "structs.h" +#include "types.h" +#include extern u8 gIntDisFlag; extern s32 gCurrentRNGSeed; // Official Name: rngSeed diff --git a/src/joypad.c b/src/joypad.c index fa5ddba1..157402a6 100644 --- a/src/joypad.c +++ b/src/joypad.c @@ -1,8 +1,8 @@ #include "joypad.h" #include "game.h" #include "menu.h" -#include "thread3_main.h" #include "save_layout.h" +#include "thread3_main.h" s32 sNoControllerPluggedIn = FALSE; // Looks to be a boolean for whether a controller is plugged in. FALSE if plugged in, and TRUE if not. diff --git a/src/lights.c b/src/lights.c index f714043b..04c01577 100644 --- a/src/lights.c +++ b/src/lights.c @@ -1,12 +1,12 @@ #include "lights.h" -#include "memory.h" -#include "types.h" -#include "macros.h" -#include "objects.h" #include "game.h" -#include "math_util.h" #include "libc/math.h" +#include "macros.h" +#include "math_util.h" +#include "memory.h" +#include "objects.h" +#include "types.h" /************ .data ************/ diff --git a/src/main.c b/src/main.c index aae441a6..2e4e49f9 100644 --- a/src/main.c +++ b/src/main.c @@ -1,8 +1,8 @@ #include "main.h" -#include "thread0_epc.h" #include "game.h" -#include "stacks.h" #include "memory.h" +#include "stacks.h" +#include "thread0_epc.h" #include "thread3_main.h" /************ .bss ************/ diff --git a/src/memory.c b/src/memory.c index bbaf10d4..92f1ff6e 100644 --- a/src/memory.c +++ b/src/memory.c @@ -1,8 +1,8 @@ #include "memory.h" +#include "config.h" +#include "math_util.h" #include "printf.h" #include "thread0_epc.h" -#include "math_util.h" -#include "config.h" /************ .bss ************/ diff --git a/src/menu.c b/src/menu.c index 341182b3..5de49d32 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1,39 +1,39 @@ -#include "common.h" #include "menu.h" -#include "memory.h" -#include "fade_transition.h" -#include #include "asset_enums.h" -#include "types.h" -#include "macros.h" -#include "structs.h" -#include "f3ddkr.h" -#include "video.h" -#include "audio.h" -#include "camera.h" -#include "font.h" -#include "game_text.h" -#include "object_models.h" -#include "printf.h" -#include "textures_sprites.h" -#include "thread30_bgload.h" -#include "objects.h" -#include "game.h" -#include "rcp_dkr.h" -#include "save_data.h" -#include "object_functions.h" -#include "audiosfx.h" -#include "racer.h" -#include "tracks.h" -#include "libultra/src/audio/synstartvoiceparam.h" -#include "joypad.h" -#include "math_util.h" -#include "PRinternal/viint.h" -#include "save_layout.h" #include "asset_loading.h" -#include "thread3_main.h" +#include "audio.h" +#include "audiosfx.h" +#include "camera.h" +#include "common.h" +#include "f3ddkr.h" +#include "fade_transition.h" +#include "font.h" +#include "game.h" +#include "game_text.h" +#include "joypad.h" +#include "libultra/src/audio/synstartvoiceparam.h" +#include "macros.h" +#include "math_util.h" +#include "memory.h" +#include "object_functions.h" +#include "object_models.h" +#include "objects.h" +#include "PR/os_cont.h" #include "PR/os_convert.h" #include "PR/os_system.h" +#include "PRinternal/viint.h" +#include "printf.h" +#include "racer.h" +#include "rcp_dkr.h" +#include "save_data.h" +#include "save_layout.h" +#include "structs.h" +#include "textures_sprites.h" +#include "thread30_bgload.h" +#include "thread3_main.h" +#include "tracks.h" +#include "types.h" +#include "video.h" /** * @file Contains all the code used for every menu in the game. diff --git a/src/object_functions.c b/src/object_functions.c index 1ee5ca1d..750a2d1f 100644 --- a/src/object_functions.c +++ b/src/object_functions.c @@ -1,37 +1,37 @@ #include "object_functions.h" -#include "PR/os_cont.h" -#include "types.h" -#include "macros.h" -#include "structs.h" -#include "video.h" -#include "camera.h" -#include "menu.h" // For cheats -#include "weather.h" -#include "racer.h" -#include "game.h" #include "audio.h" #include "audio_spatial.h" +#include "audio_vehicle.h" +#include "audiosfx.h" +#include "camera.h" +#include "collision.h" +#include "common.h" +#include "fade_transition.h" +#include "font.h" +#include "game.h" +#include "game_text.h" +#include "game_ui.h" +#include "joypad.h" +#include "lights.h" +#include "macros.h" +#include "math_util.h" +#include "menu.h" // For cheats +#include "object_models.h" #include "objects.h" #include "particles.h" -#include "tracks.h" -#include "font.h" -#include "lights.h" -#include "game_ui.h" -#include "waves.h" -#include "audiosfx.h" -#include "math_util.h" -#include "game_text.h" -#include "fade_transition.h" -#include "audio_vehicle.h" -#include "object_models.h" -#include "collision.h" -#include "joypad.h" -#include "printf.h" +#include "PR/os_cont.h" #include "PRinternal/viint.h" -#include "common.h" -#include "thread3_main.h" +#include "printf.h" +#include "racer.h" +#include "structs.h" #include "textures_sprites.h" +#include "thread3_main.h" +#include "tracks.h" +#include "types.h" +#include "video.h" +#include "waves.h" +#include "weather.h" /************ .data ************/ diff --git a/src/object_models.c b/src/object_models.c index a8490e7e..626a23f0 100644 --- a/src/object_models.c +++ b/src/object_models.c @@ -1,15 +1,15 @@ #include "object_models.h" -#include "common.h" -#include "macros.h" -#include "memory.h" #include "asset_enums.h" -#include "tracks.h" #include "asset_loading.h" -#include "textures_sprites.h" -#include "racer.h" -#include "objects.h" +#include "common.h" #include "gzip.h" #include "libc/math.h" +#include "macros.h" +#include "memory.h" +#include "objects.h" +#include "racer.h" +#include "textures_sprites.h" +#include "tracks.h" #define MODEL_LOADED_MAX 70 diff --git a/src/objects.c b/src/objects.c index da2484f5..0da3405d 100644 --- a/src/objects.c +++ b/src/objects.c @@ -1,45 +1,45 @@ #include "objects.h" #include "memory.h" -#include "types.h" -#include "macros.h" -#include "structs.h" -#include "level_object_entries.h" #include "asset_enums.h" #include "asset_loading.h" -#include "thread0_epc.h" -#include "save_data.h" -#include "menu.h" -#include "game.h" -#include "racer.h" -#include "particles.h" -#include "tracks.h" -#include "math_util.h" +#include "audio_spatial.h" +#include "audio_vehicle.h" +#include "audiosfx.h" #include "camera.h" -#include "waves.h" +#include "fade_transition.h" +#include "game.h" +#include "game_text.h" +#include "game_ui.h" +#include "gzip.h" +#include "joypad.h" +#include "level_object_entries.h" +#include "lights.h" +#include "macros.h" +#include "math_util.h" +#include "menu.h" #include "object_functions.h" #include "object_models.h" -#include "lights.h" -#include "game_ui.h" -#include "audio_spatial.h" -#include "joypad.h" -#include "game_text.h" -#include "audiosfx.h" -#include "audio_vehicle.h" -#include "vehicle_misc.h" -#include "PRinternal/viint.h" -#include "printf.h" -#include "weather.h" -#include "PRinternal/piint.h" -#include "gzip.h" -#include "video.h" -#include "thread3_main.h" -#include "textures_sprites.h" -#include "fade_transition.h" -#include "PR/os_system.h" +#include "particles.h" #include "PR/os_cont.h" #include "PR/os_convert.h" +#include "PR/os_system.h" #include "PR/rcp.h" +#include "PRinternal/piint.h" +#include "PRinternal/viint.h" +#include "printf.h" +#include "racer.h" +#include "save_data.h" +#include "structs.h" +#include "textures_sprites.h" +#include "thread0_epc.h" +#include "thread3_main.h" +#include "tracks.h" +#include "types.h" +#include "vehicle_misc.h" +#include "video.h" +#include "waves.h" +#include "weather.h" #define MAX_CHECKPOINTS 60 #define OBJECT_POOL_SIZE 0x15800 diff --git a/src/particles.c b/src/particles.c index 8730d1c4..8555c610 100644 --- a/src/particles.c +++ b/src/particles.c @@ -1,14 +1,12 @@ #include "particles.h" -#include "objects.h" -#include "math_util.h" -#include "tracks.h" -#include "textures_sprites.h" #include "asset_loading.h" -#include #include "camera.h" #include "libc/math.h" -#include "PR/os_system.h" -#include "PR/os_convert.h" +#include "math_util.h" +#include "objects.h" +#include "textures_sprites.h" +#include "tracks.h" +#include /************ .rodata ************/ diff --git a/src/printf.c b/src/printf.c index d0a0fb0e..495c7fae 100644 --- a/src/printf.c +++ b/src/printf.c @@ -1,11 +1,11 @@ #include "printf.h" -#include "types.h" -#include "macros.h" #include "f3ddkr.h" -#include "stdarg.h" #include "libc/string.h" -#include "textures_sprites.h" +#include "macros.h" #include "rcp_dkr.h" +#include "stdarg.h" +#include "textures_sprites.h" +#include "types.h" #include "video.h" /************ .data ************/ diff --git a/src/racer.c b/src/racer.c index eee998df..f46379cc 100644 --- a/src/racer.c +++ b/src/racer.c @@ -3,36 +3,36 @@ #include "menu.h" #include "video.h" -#include "types.h" -#include "macros.h" -#include "structs.h" #include "asset_enums.h" -#include "save_data.h" -#include "audio_spatial.h" -#include "objects.h" +#include "asset_loading.h" #include "audio.h" -#include "object_functions.h" -#include "game.h" -#include "printf.h" -#include "math_util.h" -#include "tracks.h" -#include "vehicle_misc.h" +#include "audio_spatial.h" #include "audio_vehicle.h" -#include "game_ui.h" -#include "object_models.h" #include "audiosfx.h" #include "collision.h" -#include "joypad.h" -#include "particles.h" -#include "PRinternal/viint.h" #include "common.h" -#include "asset_loading.h" -#include "thread3_main.h" -#include "textures_sprites.h" #include "fade_transition.h" -#include "PR/os_system.h" +#include "game.h" +#include "game_ui.h" +#include "joypad.h" +#include "macros.h" +#include "math_util.h" +#include "object_functions.h" +#include "object_models.h" +#include "objects.h" +#include "particles.h" #include "PR/os_cont.h" #include "PR/os_libc.h" +#include "PR/os_system.h" +#include "PRinternal/viint.h" +#include "printf.h" +#include "save_data.h" +#include "structs.h" +#include "textures_sprites.h" +#include "thread3_main.h" +#include "tracks.h" +#include "types.h" +#include "vehicle_misc.h" #define MAX_NUMBER_OF_GHOST_NODES 360 diff --git a/src/rcp_dkr.c b/src/rcp_dkr.c index a0374389..ea112080 100644 --- a/src/rcp_dkr.c +++ b/src/rcp_dkr.c @@ -1,13 +1,13 @@ #include "rcp_dkr.h" -#include "types.h" -#include "structs.h" -#include "macros.h" -#include "video.h" #include "camera.h" -#include "set_rsp_segment.h" -#include "racer.h" -#include "textures_sprites.h" +#include "macros.h" #include "memory.h" +#include "racer.h" +#include "set_rsp_segment.h" +#include "structs.h" +#include "textures_sprites.h" +#include "types.h" +#include "video.h" /************ .data ************/ diff --git a/src/save_data.c b/src/save_data.c index 847d7659..81fc55c9 100644 --- a/src/save_data.c +++ b/src/save_data.c @@ -1,21 +1,20 @@ #include "save_data.h" -#include "common.h" -#include "memory.h" -#include "PR/os_pfs.h" -#include "PR/os_cont.h" -#include "macros.h" -#include "structs.h" #include "camera.h" -#include "objects.h" +#include "common.h" #include "game.h" -#include "thread3_main.h" #include "joypad.h" -#include "PRinternal/viint.h" -#include "PR/os_motor.h" -#include "save_layout.h" #include "libc/string.h" -#include "save_layout.h" +#include "macros.h" +#include "memory.h" #include "menu.h" +#include "objects.h" +#include "PR/os_cont.h" +#include "PR/os_motor.h" +#include "PR/os_pfs.h" +#include "PRinternal/viint.h" +#include "save_layout.h" +#include "structs.h" +#include "thread3_main.h" /************ .data ************/ diff --git a/src/screen_asset.c b/src/screen_asset.c index 4768b568..4630f5c6 100644 --- a/src/screen_asset.c +++ b/src/screen_asset.c @@ -1,10 +1,10 @@ -#include "video.h" -#include "memory.h" -#include "types.h" -#include "macros.h" -#include "f3ddkr.h" #include "asset_enums.h" #include "asset_loading.h" +#include "f3ddkr.h" +#include "macros.h" +#include "memory.h" +#include "types.h" +#include "video.h" #define SCREEN_HEIGHT_PART 6 diff --git a/src/set_rsp_segment.c b/src/set_rsp_segment.c index 4ebda58a..7dc22ac9 100644 --- a/src/set_rsp_segment.c +++ b/src/set_rsp_segment.c @@ -1,6 +1,6 @@ #include "set_rsp_segment.h" -#include "PR/mbi.h" #include "PR/gbi.h" +#include "PR/mbi.h" #include "PR/R4300.h" /** diff --git a/src/textures_sprites.c b/src/textures_sprites.c index 7de70ad8..7362dd40 100644 --- a/src/textures_sprites.c +++ b/src/textures_sprites.c @@ -1,10 +1,10 @@ #include "textures_sprites.h" -#include "gzip.h" #include "asset_loading.h" -#include "memory.h" -#include "math_util.h" -#include "tracks.h" #include "game_ui.h" +#include "gzip.h" +#include "math_util.h" +#include "memory.h" +#include "tracks.h" #include #define MAX_NUM_TEXTURES 700 diff --git a/src/thread0_epc.c b/src/thread0_epc.c index fe718de1..3b1ffdce 100644 --- a/src/thread0_epc.c +++ b/src/thread0_epc.c @@ -1,15 +1,15 @@ #include "thread0_epc.h" #include "common.h" -#include "types.h" +#include "joypad.h" #include "macros.h" #include "menu.h" -#include "save_data.h" -#include "printf.h" #include "objects.h" -#include "joypad.h" -#include "stacks.h" #include "PR/os_internal_thread.h" #include "PRinternal/rmonint.h" +#include "printf.h" +#include "save_data.h" +#include "stacks.h" +#include "types.h" /************ .data ************/ diff --git a/src/thread30_bgload.c b/src/thread30_bgload.c index b86ae0f7..6c0785a8 100644 --- a/src/thread30_bgload.c +++ b/src/thread30_bgload.c @@ -1,9 +1,9 @@ #include "thread30_bgload.h" -#include "macros.h" -#include #include "game.h" +#include "macros.h" #include "stacks.h" #include "thread3_main.h" +#include /************ .data ************/ diff --git a/src/thread3_main.c b/src/thread3_main.c index d375d49f..229ffb5a 100644 --- a/src/thread3_main.c +++ b/src/thread3_main.c @@ -1,52 +1,51 @@ #include "thread3_main.h" -#include "common.h" -#include -#include -#include -#include "memory.h" -#include "types.h" -#include "macros.h" -#include "structs.h" -#include "f3ddkr.h" #include "asset_enums.h" #include "asset_loading.h" -#include "menu.h" -#include "video.h" -#include "set_rsp_segment.h" -#include "gzip.h" -#include "printf.h" -#include "thread0_epc.h" -#include "thread30_bgload.h" -#include "weather.h" #include "audio.h" -#include "objects.h" -#include "camera.h" -#include "save_data.h" -#include "rcp_dkr.h" -#include "audiosfx.h" -#include "audiomgr.h" -#include "lights.h" -#include "textures_sprites.h" -#include "PR/os_internal.h" -#include "printf.h" -#include "fade_transition.h" -#include "borders.h" #include "audio_spatial.h" -#include "tracks.h" +#include "audiomgr.h" +#include "audiosfx.h" +#include "borders.h" +#include "camera.h" +#include "common.h" +#include "f3ddkr.h" +#include "fade_transition.h" +#include "font.h" +#include "game.h" #include "game_text.h" #include "game_ui.h" -#include "main.h" -#include "object_models.h" -#include "racer.h" -#include "particles.h" -#include "math_util.h" +#include "gzip.h" #include "joypad.h" +#include "lights.h" +#include "macros.h" +#include "main.h" +#include "math_util.h" +#include "memory.h" +#include "menu.h" +#include "object_models.h" +#include "objects.h" +#include "particles.h" +#include "PR/os_internal.h" #include "PRinternal/viint.h" -#include "font.h" -#include "stacks.h" +#include "printf.h" +#include "racer.h" +#include "rcp_dkr.h" +#include "save_data.h" #include "save_layout.h" -#include "game.h" +#include "set_rsp_segment.h" +#include "stacks.h" +#include "structs.h" +#include "textures_sprites.h" +#include "thread0_epc.h" +#include "thread30_bgload.h" +#include "tracks.h" +#include "types.h" +#include "video.h" +#include "weather.h" +#include +#include +#include /************ .rodata ************/ diff --git a/src/tracks.c b/src/tracks.c index e55e5354..1eeaf783 100644 --- a/src/tracks.c +++ b/src/tracks.c @@ -1,30 +1,30 @@ #include "tracks.h" -#include "types.h" -#include "macros.h" -#include "structs.h" -#include "f3ddkr.h" -#include "PR/gu.h" -#include "textures_sprites.h" -#include "objects.h" -#include "game.h" -#include "memory.h" -#include "racer.h" -#include "camera.h" -#include "waves.h" -#include "game_ui.h" -#include "weather.h" -#include "particles.h" -#include "math_util.h" -#include "collision.h" -#include "PRinternal/viint.h" -#include "common.h" -#include "gzip.h" #include "asset_loading.h" -#include "video.h" -#include "thread3_main.h" +#include "camera.h" +#include "collision.h" +#include "common.h" +#include "f3ddkr.h" #include "fade_transition.h" +#include "game.h" +#include "game_ui.h" +#include "gzip.h" +#include "macros.h" +#include "math_util.h" +#include "memory.h" #include "menu.h" +#include "objects.h" +#include "particles.h" +#include "PR/gu.h" +#include "PRinternal/viint.h" +#include "racer.h" +#include "structs.h" +#include "textures_sprites.h" +#include "thread3_main.h" +#include "types.h" +#include "video.h" +#include "waves.h" +#include "weather.h" // Maximum size for a level model is 522.5 KiB #define LEVEL_MODEL_MAX_SIZE 0x82A00 diff --git a/src/unused_string.c b/src/unused_string.c index 00166fde..c3968941 100644 --- a/src/unused_string.c +++ b/src/unused_string.c @@ -1,5 +1,5 @@ -#include "types.h" #include "macros.h" +#include "types.h" /** * Copy a string to a given location. diff --git a/src/vehicle_bluey.c b/src/vehicle_bluey.c index 7d6ba48f..1da7e23f 100644 --- a/src/vehicle_bluey.c +++ b/src/vehicle_bluey.c @@ -1,14 +1,14 @@ #include "vehicle_misc.h" -#include "types.h" +#include "audio.h" +#include "audio_spatial.h" +#include "camera.h" #include "macros.h" #include "math_util.h" #include "objects.h" -#include "audio_spatial.h" -#include "racer.h" #include "particles.h" -#include "audio.h" -#include "camera.h" +#include "racer.h" +#include "types.h" /************ .data ************/ diff --git a/src/vehicle_bubbler.c b/src/vehicle_bubbler.c index 30f75482..e997ab55 100644 --- a/src/vehicle_bubbler.c +++ b/src/vehicle_bubbler.c @@ -1,14 +1,14 @@ #include "vehicle_misc.h" -#include "types.h" +#include "audio.h" +#include "camera.h" #include "macros.h" -#include "racer.h" #include "math_util.h" #include "objects.h" #include "particles.h" #include "printf.h" -#include "audio.h" -#include "camera.h" +#include "racer.h" +#include "types.h" /************ .data ************/ diff --git a/src/vehicle_rocket.c b/src/vehicle_rocket.c index 2bb63552..28734a14 100644 --- a/src/vehicle_rocket.c +++ b/src/vehicle_rocket.c @@ -1,12 +1,12 @@ #include "vehicle_misc.h" -#include "types.h" -#include "macros.h" -#include "racer.h" -#include "objects.h" #include "audio.h" #include "camera.h" +#include "macros.h" +#include "objects.h" #include "particles.h" +#include "racer.h" +#include "types.h" /************ .data ************/ diff --git a/src/vehicle_smokey.c b/src/vehicle_smokey.c index 80c8af6b..a8a8a56f 100644 --- a/src/vehicle_smokey.c +++ b/src/vehicle_smokey.c @@ -1,15 +1,15 @@ #include "vehicle_misc.h" -#include "types.h" +#include "audio.h" +#include "audio_spatial.h" +#include "camera.h" #include "macros.h" #include "math_util.h" -#include "objects.h" #include "object_functions.h" -#include "audio_spatial.h" -#include "racer.h" +#include "objects.h" #include "particles.h" -#include "audio.h" -#include "camera.h" +#include "racer.h" +#include "types.h" /************ .data ************/ diff --git a/src/vehicle_tricky.c b/src/vehicle_tricky.c index fcc887c7..ef5aee80 100644 --- a/src/vehicle_tricky.c +++ b/src/vehicle_tricky.c @@ -1,18 +1,18 @@ #include "vehicle_misc.h" -#include "structs.h" -#include "types.h" -#include "macros.h" #include "audio.h" -#include "objects.h" -#include "audio_vehicle.h" #include "audio_spatial.h" -#include "menu.h" -#include "game.h" -#include "particles.h" -#include "math_util.h" -#include "thread3_main.h" +#include "audio_vehicle.h" #include "fade_transition.h" +#include "game.h" +#include "macros.h" +#include "math_util.h" +#include "menu.h" +#include "objects.h" +#include "particles.h" +#include "structs.h" +#include "thread3_main.h" +#include "types.h" /************ .data ************/ diff --git a/src/vehicle_wizpig.c b/src/vehicle_wizpig.c index 82b97a0f..6ee7cf99 100644 --- a/src/vehicle_wizpig.c +++ b/src/vehicle_wizpig.c @@ -1,13 +1,13 @@ #include "vehicle_misc.h" -#include "types.h" -#include "macros.h" -#include "racer.h" -#include "objects.h" -#include "object_functions.h" -#include "particles.h" #include "audio.h" #include "camera.h" +#include "macros.h" +#include "object_functions.h" +#include "objects.h" +#include "particles.h" +#include "racer.h" +#include "types.h" /************ .data ************/ diff --git a/src/video.c b/src/video.c index d0eb0822..e5837d24 100644 --- a/src/video.c +++ b/src/video.c @@ -1,7 +1,7 @@ #include "video.h" +#include "memory.h" #include "PRinternal/viint.h" #include "types.h" -#include "memory.h" /************ .data ************/ diff --git a/src/waves.c b/src/waves.c index 530d7950..a64a720a 100644 --- a/src/waves.c +++ b/src/waves.c @@ -1,16 +1,16 @@ #include "waves.h" -#include "types.h" -#include "macros.h" -#include -#include "memory.h" -#include "textures_sprites.h" -#include "objects.h" -#include "tracks.h" -#include "math_util.h" -#include "PRinternal/viint.h" -#include "racer.h" -#include "printf.h" #include "camera.h" +#include "macros.h" +#include "math_util.h" +#include "memory.h" +#include "objects.h" +#include "PRinternal/viint.h" +#include "printf.h" +#include "racer.h" +#include "textures_sprites.h" +#include "tracks.h" +#include "types.h" +#include /************ .data ************/ diff --git a/src/weather.c b/src/weather.c index 79b2dc8d..032b85b2 100644 --- a/src/weather.c +++ b/src/weather.c @@ -1,20 +1,20 @@ #include "weather.h" -#include "types.h" -#include "macros.h" -#include "structs.h" -#include "f3ddkr.h" -#include "camera.h" -#include "tracks.h" +#include "asset_loading.h" +#include "audio.h" #include "audio_spatial.h" -#include "textures_sprites.h" +#include "camera.h" +#include "common.h" +#include "f3ddkr.h" +#include "fade_transition.h" +#include "macros.h" #include "math_util.h" #include "objects.h" #include "PRinternal/viint.h" -#include "common.h" +#include "structs.h" +#include "textures_sprites.h" +#include "tracks.h" +#include "types.h" #include "video.h" -#include "asset_loading.h" -#include "audio.h" -#include "fade_transition.h" #define WEATHER_OVERRIDE_COUNT 16 diff --git a/tools/Makefile b/tools/Makefile index a717c329..f00d25e7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,7 +3,7 @@ OPT := -O2 # If -g option was set, then add some debugging flags for the stack tracer. ifneq (,$(findstring -g,$(OPT))) - OPT += -rdynamic -ldl -lelf -ldwarf -DDEBUG -I/usr/include/libdwarf + OPT += -rdynamic -ldl -lelf -ldwarf -DDEBUG -I/usr/include/libdwarf endif CC := gcc diff --git a/tools/python/calc_func_checksums.py b/tools/python/calc_func_checksums.py index e529617e..d97da1df 100644 --- a/tools/python/calc_func_checksums.py +++ b/tools/python/calc_func_checksums.py @@ -1,5 +1,4 @@ import re -import os import sys from file_util import FileUtil diff --git a/tools/python/check_if_need_to_extract.py b/tools/python/check_if_need_to_extract.py index 1f746934..373cf070 100644 --- a/tools/python/check_if_need_to_extract.py +++ b/tools/python/check_if_need_to_extract.py @@ -1,7 +1,6 @@ import argparse import hashlib import subprocess -import time from file_util import FileUtil parser = argparse.ArgumentParser(description="") diff --git a/tools/python/patchmips3.py b/tools/python/patchmips3.py index 427c7e59..b4928054 100644 --- a/tools/python/patchmips3.py +++ b/tools/python/patchmips3.py @@ -1,4 +1,3 @@ -import os import sys """ diff --git a/tools/python/score.py b/tools/python/score.py index eccfd64d..fd5f4961 100644 --- a/tools/python/score.py +++ b/tools/python/score.py @@ -61,8 +61,8 @@ LIB_SRC_DIRECTORY = './libultra/src' FUNCTION_REGEX = r'^(?