diff --git a/Makefile b/Makefile index be84f2db4..05092f445 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ UCODE_BIN_FILES := \ $(B_DIR)/ucode/game.bin \ $(B_DIR)/ucode/gamedata.bin \ $(B_DIR)/ucode/gvars.bin \ - $(B_DIR)/ucode/library.bin \ + $(B_DIR)/ucode/lib.bin \ $(B_DIR)/ucode/inflate.bin default: all @@ -220,13 +220,13 @@ $(B_DIR)/ucode/boot.bin: $(B_DIR)/pd.bin boot: $(B_DIR)/ucode/boot.bin ################################################################################ -# Library +# Lib -$(B_DIR)/ucode/library.bin: $(B_DIR)/pd.bin +$(B_DIR)/ucode/lib.bin: $(B_DIR)/pd.bin @mkdir -p $(B_DIR)/ucode - B_DIR=$(B_DIR) tools/extract-segment library + B_DIR=$(B_DIR) tools/extract-segment lib -library: $(B_DIR)/ucode/library.bin +lib: $(B_DIR)/ucode/lib.bin ################################################################################ # Game data file @@ -320,4 +320,4 @@ clean: binclean: rm -f build/ntsc-final/ucode/*.bin - find src/{boot,game,gvars,library,inflate} -name '*.o' -delete + find src/{boot,game,gvars,lib,inflate} -name '*.o' -delete diff --git a/README.md b/README.md index a79855712..f66413102 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Actual decompilation: | Segment | Progress | |-----------------|--------------------------------------------| | 0x1000 boot | 206/2,068 words decompiled (9.96%) | -| 0x3050 library | 8,225/89,060 words decompiled (9.24%) | +| 0x3050 lib | 8,225/89,060 words decompiled (9.24%) | | 0x4e850 inflate | 150/1,276 words decompiled (11.76%) | | 0x4fc40 game | 47,897/452,216 words decompiled (10.59%) | | Total | 56,478/544,620 words decompiled (10.37%) | @@ -76,7 +76,7 @@ Before you do anything you need an existing ROM to extract assets from. The project can do the following: -* Build individual ucode binaries (boot, library, setup, inflate and game) which match the ones extracted from the base ROM. +* Build individual ucode binaries (boot, lib, setup, inflate and game) which match the ones extracted from the base ROM. * Build a functioning ROM by splicing the C source and assets into an existing ROM. The built ROM is not byte perfect yet, but is is functionally equivalent. * Run `make` to build the assets that will be included in the ROM. These files will be written to `build/ntsc-final` and are matching what's in the `extracted/ntsc-final` folder. diff --git a/checksums.md5 b/checksums.md5 index 63eefdecc..9d323fc91 100644 --- a/checksums.md5 +++ b/checksums.md5 @@ -2015,4 +2015,4 @@ d41d8cd98f00b204e9800998ecf8427e build/ntsc-final/files/ob/ob_mid.seg ed0462324d1287de21611707172d316a build/ntsc-final/ucode/game.bin 11c9c4c2737f66e7312949909b894dcc build/ntsc-final/ucode/gamedata.bin 843285fdc0e80a77576eeb73940d2fd3 build/ntsc-final/ucode/inflate.bin -6a227624d708b43a10f220e005aef486 build/ntsc-final/ucode/library.bin +6a227624d708b43a10f220e005aef486 build/ntsc-final/ucode/lib.bin diff --git a/ld/libfiles.inc b/ld/libfiles.inc new file mode 100644 index 000000000..bf1950fdc --- /dev/null +++ b/ld/libfiles.inc @@ -0,0 +1,143 @@ +#define LIBFILES(section) \ + src/lib/lib_03050.o (section); \ + src/lib/lib_034f0.o (section); \ + src/lib/lib_03ee0.o (section); \ + src/lib/lib_03fb0.o (section); \ + src/lib/lib_04320.o (section); \ + src/lib/lib_04790.o (section); \ + src/lib/lib_04840.o (section); \ + src/lib/lib_04a80.o (section); \ + src/lib/lib_05e40.o (section); \ + src/lib/lib_06100.o (section); \ + src/lib/lib_06330.o (section); \ + src/lib/lib_06440.o (section); \ + src/lib/lib_06550.o (section); \ + src/lib/lib_070d0.o (section); \ + src/lib/lib_074f0.o (section); \ + src/lib/lib_08a20.o (section); \ + src/lib/lib_09660.o (section); \ + src/lib/lib_0bfb0.o (section); \ + src/lib/lib_0c000.o (section); \ + src/lib/lib_0d0a0.o (section); \ + src/lib/lib_0d520.o (section); \ + src/lib/lib_0e9d0.o (section); \ + src/lib/lib_11420.o (section); \ + src/lib/lib_121e0.o (section); \ + src/lib/lib_126b0.o (section); \ + src/lib/lib_12dc0.o (section); \ + src/lib/lib_13130.o (section); \ + src/lib/lib_13710.o (section); \ + src/lib/lib_13750.o (section); \ + src/lib/lib_13790.o (section); \ + src/lib/lib_13820.o (section); \ + src/lib/lib_13900.o (section); \ + src/lib/lib_15860.o (section); \ + src/lib/lib_159b0.o (section); \ + src/lib/lib_16110.o (section); \ + src/lib/lib_1a500.o (section); \ + src/lib/lib_233c0.o (section); \ + src/lib/lib_2f490.o (section); \ + src/lib/lib_2fa00.o (section); \ + src/lib/lib_2faf0.o (section); \ + src/lib/lib_2fba0.o (section); \ + src/lib/lib_2fc60.o (section); \ + src/lib/lib_30ce0.o (section); \ + src/lib/lib_317f0.o (section); \ + src/lib/lib_37650.o (section); \ + src/lib/lib_37b00.o (section); \ + src/lib/lib_38d10.o (section); \ + src/lib/lib_38d30.o (section); \ + src/lib/lib_39c80.o (section); \ + src/lib/lib_39f70.o (section); \ + src/lib/lib_39fc0.o (section); \ + src/lib/lib_39fe0.o (section); \ + src/lib/lib_3a100.o (section); \ + src/lib/lib_3c430.o (section); \ + src/lib/lib_3c4d0.o (section); \ + src/lib/lib_3ccf0.o (section); \ + src/lib/lib_3cdc0.o (section); \ + src/lib/lib_3cef0.o (section); \ + src/lib/lib_3d280.o (section); \ + src/lib/lib_3e3e0.o (section); \ + src/lib/lib_3e730.o (section); \ + src/lib/lib_43dd0.o (section); \ + src/lib/lib_446d0.o (section); \ + src/lib/lib_44bc0.o (section); \ + src/lib/lib_44f60.o (section); \ + src/lib/lib_45ed0.o (section); \ + src/lib/lib_461c0.o (section); \ + src/lib/lib_46650.o (section); \ + src/lib/lib_47550.o (section); \ + src/lib/lib_47a90.o (section); \ + src/lib/lib_47d20.o (section); \ + src/lib/lib_48120.o (section); \ + src/lib/lib_48150.o (section); \ + src/lib/lib_481d0.o (section); \ + src/lib/lib_481e0.o (section); \ + src/lib/lib_48520.o (section); \ + src/lib/lib_485e0.o (section); \ + src/lib/lib_48650.o (section); \ + src/lib/lib_48830.o (section); \ + src/lib/lib_488e0.o (section); \ + src/lib/lib_48b20.o (section); \ + src/lib/lib_48c00.o (section); \ + src/lib/lib_48cd0.o (section); \ + src/lib/lib_48dc0.o (section); \ + src/lib/lib_48ef0.o (section); \ + src/lib/lib_48f50.o (section); \ + src/lib/lib_490b0.o (section); \ + src/lib/lib_491b0.o (section); \ + src/lib/lib_49640.o (section); \ + src/lib/lib_49780.o (section); \ + src/lib/lib_49a90.o (section); \ + src/lib/lib_49c20.o (section); \ + src/lib/lib_4a360.o (section); \ + src/lib/lib_4a5e0.o (section); \ + src/lib/lib_4a680.o (section); \ + src/lib/lib_4a810.o (section); \ + src/lib/lib_4a980.o (section); \ + src/lib/lib_4acc0.o (section); \ + src/lib/lib_4ace0.o (section); \ + src/lib/lib_4ad30.o (section); \ + src/lib/lib_4ad80.o (section); \ + src/lib/lib_4ae00.o (section); \ + src/lib/lib_4b160.o (section); \ + src/lib/lib_4b170.o (section); \ + src/lib/lib_4b480.o (section); \ + src/lib/lib_4b500.o (section); \ + src/lib/lib_4b550.o (section); \ + src/lib/lib_4b5e0.o (section); \ + src/lib/lib_4ba90.o (section); \ + src/lib/lib_4c090.o (section); \ + src/lib/lib_4cc10.o (section); \ + src/lib/lib_4cde0.o (section); \ + src/lib/lib_4ce60.o (section); \ + src/lib/lib_4d000.o (section); \ + src/lib/lib_4d480.o (section); \ + src/lib/lib_4d6f0.o (section); \ + src/lib/lib_4e270.o (section); \ + src/lib/lib_4e3c0.o (section); \ + src/lib/lib_4e470.o (section); \ + src/lib/lib_4e530.o (section); \ + src/lib/lib_4e690.o (section); \ + src/lib/lib_4f350.o (section); \ + src/lib/lib_4f400.o (section); \ + src/lib/lib_4f5e0.o (section); \ + src/lib/lib_4fe20.o (section); \ + src/lib/lib_4fff0.o (section); \ + src/lib/lib_50090.o (section); \ + src/lib/lib_50130.o (section); \ + src/lib/lib_50480.o (section); \ + src/lib/lib_50a00.o (section); \ + src/lib/lib_50f20.o (section); \ + src/lib/lib_513b0.o (section); \ + src/lib/lib_51880.o (section); \ + src/lib/lib_51890.o (section); \ + src/lib/lib_51900.o (section); \ + src/lib/lib_51a60.o (section); \ + src/lib/lib_51c10.o (section); \ + src/lib/lib_51c60.o (section); \ + src/lib/lib_51d50.o (section); \ + src/lib/lib_51ec0.o (section); \ + src/lib/lib_52070.o (section); \ + src/lib/lib_52360.o (section); diff --git a/ld/libraryfiles.inc b/ld/libraryfiles.inc deleted file mode 100644 index b3617f20d..000000000 --- a/ld/libraryfiles.inc +++ /dev/null @@ -1,143 +0,0 @@ -#define LIBRARYFILES(section) \ - src/library/library_03050.o (section); \ - src/library/library_034f0.o (section); \ - src/library/library_03ee0.o (section); \ - src/library/library_03fb0.o (section); \ - src/library/library_04320.o (section); \ - src/library/library_04790.o (section); \ - src/library/library_04840.o (section); \ - src/library/library_04a80.o (section); \ - src/library/library_05e40.o (section); \ - src/library/library_06100.o (section); \ - src/library/library_06330.o (section); \ - src/library/library_06440.o (section); \ - src/library/library_06550.o (section); \ - src/library/library_070d0.o (section); \ - src/library/library_074f0.o (section); \ - src/library/library_08a20.o (section); \ - src/library/library_09660.o (section); \ - src/library/library_0bfb0.o (section); \ - src/library/library_0c000.o (section); \ - src/library/library_0d0a0.o (section); \ - src/library/library_0d520.o (section); \ - src/library/library_0e9d0.o (section); \ - src/library/library_11420.o (section); \ - src/library/library_121e0.o (section); \ - src/library/library_126b0.o (section); \ - src/library/library_12dc0.o (section); \ - src/library/library_13130.o (section); \ - src/library/library_13710.o (section); \ - src/library/library_13750.o (section); \ - src/library/library_13790.o (section); \ - src/library/library_13820.o (section); \ - src/library/library_13900.o (section); \ - src/library/library_15860.o (section); \ - src/library/library_159b0.o (section); \ - src/library/library_16110.o (section); \ - src/library/library_1a500.o (section); \ - src/library/library_233c0.o (section); \ - src/library/library_2f490.o (section); \ - src/library/library_2fa00.o (section); \ - src/library/library_2faf0.o (section); \ - src/library/library_2fba0.o (section); \ - src/library/library_2fc60.o (section); \ - src/library/library_30ce0.o (section); \ - src/library/library_317f0.o (section); \ - src/library/library_37650.o (section); \ - src/library/library_37b00.o (section); \ - src/library/library_38d10.o (section); \ - src/library/library_38d30.o (section); \ - src/library/library_39c80.o (section); \ - src/library/library_39f70.o (section); \ - src/library/library_39fc0.o (section); \ - src/library/library_39fe0.o (section); \ - src/library/library_3a100.o (section); \ - src/library/library_3c430.o (section); \ - src/library/library_3c4d0.o (section); \ - src/library/library_3ccf0.o (section); \ - src/library/library_3cdc0.o (section); \ - src/library/library_3cef0.o (section); \ - src/library/library_3d280.o (section); \ - src/library/library_3e3e0.o (section); \ - src/library/library_3e730.o (section); \ - src/library/library_43dd0.o (section); \ - src/library/library_446d0.o (section); \ - src/library/library_44bc0.o (section); \ - src/library/library_44f60.o (section); \ - src/library/library_45ed0.o (section); \ - src/library/library_461c0.o (section); \ - src/library/library_46650.o (section); \ - src/library/library_47550.o (section); \ - src/library/library_47a90.o (section); \ - src/library/library_47d20.o (section); \ - src/library/library_48120.o (section); \ - src/library/library_48150.o (section); \ - src/library/library_481d0.o (section); \ - src/library/library_481e0.o (section); \ - src/library/library_48520.o (section); \ - src/library/library_485e0.o (section); \ - src/library/library_48650.o (section); \ - src/library/library_48830.o (section); \ - src/library/library_488e0.o (section); \ - src/library/library_48b20.o (section); \ - src/library/library_48c00.o (section); \ - src/library/library_48cd0.o (section); \ - src/library/library_48dc0.o (section); \ - src/library/library_48ef0.o (section); \ - src/library/library_48f50.o (section); \ - src/library/library_490b0.o (section); \ - src/library/library_491b0.o (section); \ - src/library/library_49640.o (section); \ - src/library/library_49780.o (section); \ - src/library/library_49a90.o (section); \ - src/library/library_49c20.o (section); \ - src/library/library_4a360.o (section); \ - src/library/library_4a5e0.o (section); \ - src/library/library_4a680.o (section); \ - src/library/library_4a810.o (section); \ - src/library/library_4a980.o (section); \ - src/library/library_4acc0.o (section); \ - src/library/library_4ace0.o (section); \ - src/library/library_4ad30.o (section); \ - src/library/library_4ad80.o (section); \ - src/library/library_4ae00.o (section); \ - src/library/library_4b160.o (section); \ - src/library/library_4b170.o (section); \ - src/library/library_4b480.o (section); \ - src/library/library_4b500.o (section); \ - src/library/library_4b550.o (section); \ - src/library/library_4b5e0.o (section); \ - src/library/library_4ba90.o (section); \ - src/library/library_4c090.o (section); \ - src/library/library_4cc10.o (section); \ - src/library/library_4cde0.o (section); \ - src/library/library_4ce60.o (section); \ - src/library/library_4d000.o (section); \ - src/library/library_4d480.o (section); \ - src/library/library_4d6f0.o (section); \ - src/library/library_4e270.o (section); \ - src/library/library_4e3c0.o (section); \ - src/library/library_4e470.o (section); \ - src/library/library_4e530.o (section); \ - src/library/library_4e690.o (section); \ - src/library/library_4f350.o (section); \ - src/library/library_4f400.o (section); \ - src/library/library_4f5e0.o (section); \ - src/library/library_4fe20.o (section); \ - src/library/library_4fff0.o (section); \ - src/library/library_50090.o (section); \ - src/library/library_50130.o (section); \ - src/library/library_50480.o (section); \ - src/library/library_50a00.o (section); \ - src/library/library_50f20.o (section); \ - src/library/library_513b0.o (section); \ - src/library/library_51880.o (section); \ - src/library/library_51890.o (section); \ - src/library/library_51900.o (section); \ - src/library/library_51a60.o (section); \ - src/library/library_51c10.o (section); \ - src/library/library_51c60.o (section); \ - src/library/library_51d50.o (section); \ - src/library/library_51ec0.o (section); \ - src/library/library_52070.o (section); \ - src/library/library_52360.o (section); diff --git a/ld/pd.ld b/ld/pd.ld index 99d8ce267..76b20a147 100644 --- a/ld/pd.ld +++ b/ld/pd.ld @@ -1,5 +1,5 @@ #include "gamefiles.inc" -#include "libraryfiles.inc" +#include "libfiles.inc" OUTPUT_ARCH (mips) @@ -21,11 +21,11 @@ SECTIONS } __rompos += SIZEOF(.boot); - .library 0x70003050 : AT(__rompos) { - LIBRARYFILES(.text) - LIBRARYFILES(.rodata) + .lib 0x70003050 : AT(__rompos) { + LIBFILES(.text) + LIBFILES(.rodata) } - __rompos += SIZEOF(.library); + __rompos += SIZEOF(.lib); .gamedata 0x80059fe0 : AT(__rompos) { GAMEFILES(.data) diff --git a/src/boot/boot.c b/src/boot/boot.c index 40712e932..59a5bb5c8 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -7,36 +7,36 @@ #include "game/data/data_020df0.h" #include "game/game_0dcdb0.h" #include "gvars/gvars.h" -#include "library/library_03050.h" -#include "library/library_03ee0.h" -#include "library/library_04a80.h" -#include "library/library_05e40.h" -#include "library/library_074f0.h" -#include "library/library_08a20.h" -#include "library/library_09660.h" -#include "library/library_0c000.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_12dc0.h" -#include "library/library_13710.h" -#include "library/library_13750.h" -#include "library/library_13900.h" -#include "library/library_48120.h" -#include "library/library_48150.h" -#include "library/library_481d0.h" -#include "library/library_481e0.h" -#include "library/library_48520.h" -#include "library/library_485e0.h" -#include "library/library_48650.h" -#include "library/library_48830.h" -#include "library/library_488e0.h" -#include "library/library_48b20.h" -#include "library/library_48c00.h" -#include "library/library_48cd0.h" -#include "library/library_48dc0.h" -#include "library/library_48ef0.h" -#include "library/library_48f50.h" -#include "library/library_490b0.h" +#include "lib/lib_03050.h" +#include "lib/lib_03ee0.h" +#include "lib/lib_04a80.h" +#include "lib/lib_05e40.h" +#include "lib/lib_074f0.h" +#include "lib/lib_08a20.h" +#include "lib/lib_09660.h" +#include "lib/lib_0c000.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13710.h" +#include "lib/lib_13750.h" +#include "lib/lib_13900.h" +#include "lib/lib_48120.h" +#include "lib/lib_48150.h" +#include "lib/lib_481d0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48520.h" +#include "lib/lib_485e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_48830.h" +#include "lib/lib_488e0.h" +#include "lib/lib_48b20.h" +#include "lib/lib_48c00.h" +#include "lib/lib_48cd0.h" +#include "lib/lib_48dc0.h" +#include "lib/lib_48ef0.h" +#include "lib/lib_48f50.h" +#include "lib/lib_490b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/cheats.c b/src/game/cheats.c index 6f5de653b..4c05bc38b 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -13,7 +13,7 @@ #include "game/game_19c990.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "library/library_13130.h" +#include "lib/lib_13130.h" #include "types.h" u32 cheatIsUnlocked(s32 cheat_id) diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index f39229d53..d1d9558a8 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -41,17 +41,17 @@ #include "game/game_1999b0.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_04a80.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_12dc0.h" -#include "library/library_13900.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" +#include "lib/lib_04790.h" +#include "lib/lib_04a80.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13900.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" #include "types.h" const char var7f1a8ac0[] = "chraction.c"; diff --git a/src/game/chr/chrai.c b/src/game/chr/chrai.c index c549a98d2..3dd9b20be 100644 --- a/src/game/chr/chrai.c +++ b/src/game/chr/chrai.c @@ -8,9 +8,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" #include "types.h" s32 chraiGetListIdByList(u8 *ailist, bool *is_global) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 23ee5cd7d..286a3706e 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -41,20 +41,20 @@ #include "game/pad.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_04a80.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_11420.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" -#include "library/library_317f0.h" -#include "library/library_481e0.h" -#include "library/library_48830.h" -#include "library/library_4ae00.h" +#include "lib/lib_04790.h" +#include "lib/lib_04a80.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_11420.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" +#include "lib/lib_317f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48830.h" +#include "lib/lib_4ae00.h" #include "types.h" const char var7f1a9450[] = " (%d)\n"; diff --git a/src/game/game_000000.c b/src/game/game_000000.c index 999561906..6cb6cac6a 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_000090.c b/src/game/game_000090.c index 110da300b..1e424ba9d 100644 --- a/src/game/game_000090.c +++ b/src/game/game_000090.c @@ -8,7 +8,7 @@ #include "game/game_000130.h" #include "game/game_01e250.h" #include "gvars/gvars.h" -#include "library/library_1a500.h" +#include "lib/lib_1a500.h" #include "types.h" void func0f000090(void) diff --git a/src/game/game_000130.c b/src/game/game_000130.c index 716f4869a..ef272ab93 100644 --- a/src/game/game_000130.c +++ b/src/game/game_000130.c @@ -7,7 +7,7 @@ #include "game/game_000130.h" #include "game/game_097890.h" #include "gvars/gvars.h" -#include "library/library_233c0.h" +#include "lib/lib_233c0.h" #include "types.h" const u32 var7f1a78c0[] = {0x40c907a9}; diff --git a/src/game/game_000880.c b/src/game/game_000880.c index d3a575360..7d714c23a 100644 --- a/src/game/game_000880.c +++ b/src/game/game_000880.c @@ -6,7 +6,7 @@ #include "game/data/data_020df0.h" #include "game/game_000880.h" #include "gvars/gvars.h" -#include "library/library_50090.h" +#include "lib/lib_50090.h" #include "types.h" void func0f000880(void) diff --git a/src/game/game_000920.c b/src/game/game_000920.c index 86caca4a0..4c6e27a41 100644 --- a/src/game/game_000920.c +++ b/src/game/game_000920.c @@ -20,14 +20,14 @@ #include "game/game_176d70.h" #include "game/game_179060.h" #include "gvars/gvars.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_16110.h" -#include "library/library_2f490.h" -#include "library/library_317f0.h" -#include "library/library_481e0.h" -#include "library/library_4a360.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_16110.h" +#include "lib/lib_2f490.h" +#include "lib/lib_317f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_4a360.h" #include "types.h" const char var7f1a78e0[] = "LIGHTS : Hit occured on light %d in room %d\n"; diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index bf8e4a533..85096922c 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -17,16 +17,16 @@ #include "game/game_157db0.h" #include "game/game_166e40.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_09660.h" -#include "library/library_0e9d0.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_317f0.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_04790.h" +#include "lib/lib_09660.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_317f0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" const u32 var7f1a7df0[] = {0x7f006060}; diff --git a/src/game/game_00b190.c b/src/game/game_00b190.c index 51da2c99a..4c4041565 100644 --- a/src/game/game_00b190.c +++ b/src/game/game_00b190.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_0d0a0.h" -#include "library/library_121e0.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_00b320.c b/src/game/game_00b320.c index 516f8b1aa..fd80df711 100644 --- a/src/game/game_00b320.c +++ b/src/game/game_00b320.c @@ -7,7 +7,7 @@ #include "game/game_166e40.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_00b480.c b/src/game/game_00b480.c index 6566e5a59..6ac9a62c3 100644 --- a/src/game/game_00b480.c +++ b/src/game/game_00b480.c @@ -7,7 +7,7 @@ #include "game/game_00b320.h" #include "game/game_00b820.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c index a32e7e660..ccf977f01 100644 --- a/src/game/game_00b820.c +++ b/src/game/game_00b820.c @@ -11,8 +11,8 @@ #include "game/game_02cde0.h" #include "game/game_066310.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_00c240.c b/src/game/game_00c240.c index e5d7bfb0b..2d07addf8 100644 --- a/src/game/game_00c240.c +++ b/src/game/game_00c240.c @@ -6,7 +6,7 @@ #include "game/data/data_020df0.h" #include "game/game_00c240.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 61e19d9db..b6bcf62d4 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -32,13 +32,13 @@ #include "game/lang.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" #include "types.h" const char var7f1a7f60[] = "-nochr"; diff --git a/src/game/game_0108d0.c b/src/game/game_0108d0.c index dc607f3b5..a3053c1d5 100644 --- a/src/game/game_0108d0.c +++ b/src/game/game_0108d0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0109d0.c b/src/game/game_0109d0.c index ff9dc0b94..50c06dbad 100644 --- a/src/game/game_0109d0.c +++ b/src/game/game_0109d0.c @@ -6,7 +6,7 @@ #include "game/data/data_020df0.h" #include "game/data/inventory.h" #include "gvars/gvars.h" -#include "library/library_0d520.h" +#include "lib/lib_0d520.h" #include "types.h" const u32 var7f1a8230[] = {0x3f666666}; diff --git a/src/game/game_010b20.c b/src/game/game_010b20.c index 1b55683b9..5f5a2d3dd 100644 --- a/src/game/game_010b20.c +++ b/src/game/game_010b20.c @@ -7,7 +7,7 @@ #include "game/game_097ba0.h" #include "game/game_1655c0.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_011110.c b/src/game/game_011110.c index 690aa387c..68bee7c17 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -20,9 +20,9 @@ #include "game/game_187770.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" -#include "library/library_16110.h" -#include "library/library_233c0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_16110.h" +#include "lib/lib_233c0.h" #include "types.h" const u32 var7f1a8240[] = {0x7f011a44}; diff --git a/src/game/game_012450.c b/src/game/game_012450.c index 268732c37..aa2b5f986 100644 --- a/src/game/game_012450.c +++ b/src/game/game_012450.c @@ -8,7 +8,7 @@ #include "game/game_012450.h" #include "game/game_111600.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" void currentPlayerInitGunsHeld(void) diff --git a/src/game/game_0125a0.c b/src/game/game_0125a0.c index 251303d68..f496da74b 100644 --- a/src/game/game_0125a0.c +++ b/src/game/game_0125a0.c @@ -10,9 +10,9 @@ #include "game/game_157db0.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_159b0.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" #include "types.h" const u32 var7f1a8280[] = {0x3dccccce}; diff --git a/src/game/game_012d50.c b/src/game/game_012d50.c index 41f7355fa..204a8672c 100644 --- a/src/game/game_012d50.c +++ b/src/game/game_012d50.c @@ -6,7 +6,7 @@ #include "game/data/data_020df0.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_013010.c b/src/game/game_013010.c index 13f3f5ddc..d0bdfc61c 100644 --- a/src/game/game_013010.c +++ b/src/game/game_013010.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0132a0.c b/src/game/game_0132a0.c index 8473d83db..ddbe67c16 100644 --- a/src/game/game_0132a0.c +++ b/src/game/game_0132a0.c @@ -7,7 +7,7 @@ #include "game/game_013260.h" #include "game/game_131060.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" // Mismatch because the lui %hi instructions are swapped //void func0f013260(void) diff --git a/src/game/game_013550.c b/src/game/game_013550.c index 4072b5743..6735a212c 100644 --- a/src/game/game_013550.c +++ b/src/game/game_013550.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_013ee0.c b/src/game/game_013ee0.c index d893cef34..d610cffc3 100644 --- a/src/game/game_013ee0.c +++ b/src/game/game_013ee0.c @@ -8,9 +8,9 @@ #include "game/game_157db0.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_121e0.h" -#include "library/library_233c0.h" +#include "lib/lib_04790.h" +#include "lib/lib_121e0.h" +#include "lib/lib_233c0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0147d0.c b/src/game/game_0147d0.c index 8481f19b9..7ad274c77 100644 --- a/src/game/game_0147d0.c +++ b/src/game/game_0147d0.c @@ -11,10 +11,10 @@ #include "game/game_187770.h" #include "game/game_197600.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0150a0.c b/src/game/game_0150a0.c index 846fcb6dc..932b180ae 100644 --- a/src/game/game_0150a0.c +++ b/src/game/game_0150a0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_0e9d0.h" -#include "library/library_317f0.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_317f0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_015280.c b/src/game/game_015280.c index 0fc12d6f4..78c2bca6b 100644 --- a/src/game/game_015280.c +++ b/src/game/game_015280.c @@ -6,7 +6,7 @@ #include "game/data/data_020df0.h" #include "game/game_0601b0.h" #include "gvars/gvars.h" -#include "library/library_09660.h" +#include "lib/lib_09660.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 68e3ef4c1..935bf719a 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -7,14 +7,14 @@ #include "game/game_015470.h" #include "game/game_01afc0.h" #include "gvars/gvars.h" -#include "library/library_03fb0.h" -#include "library/library_04790.h" -#include "library/library_04840.h" -#include "library/library_04a80.h" -#include "library/library_09660.h" -#include "library/library_0d0a0.h" -#include "library/library_317f0.h" -#include "library/library_4b480.h" +#include "lib/lib_03fb0.h" +#include "lib/lib_04790.h" +#include "lib/lib_04840.h" +#include "lib/lib_04a80.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_317f0.h" +#include "lib/lib_4b480.h" #include "types.h" const u32 var7f1a83b0[] = {0x459c4000}; diff --git a/src/game/game_016100.c b/src/game/game_016100.c index 78106c1ef..085a122df 100644 --- a/src/game/game_016100.c +++ b/src/game/game_016100.c @@ -21,17 +21,17 @@ #include "game/game_1a3340.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "library/library_04320.h" -#include "library/library_04790.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_13900.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_317f0.h" -#include "library/library_4a5e0.h" +#include "lib/lib_04320.h" +#include "lib/lib_04790.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_13900.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_317f0.h" +#include "lib/lib_4a5e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_01afc0.c b/src/game/game_01afc0.c index eac7ba6e6..4d25d7584 100644 --- a/src/game/game_01afc0.c +++ b/src/game/game_01afc0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_4b480.h" +#include "lib/lib_09660.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index b820fb8ee..6133d8000 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -11,8 +11,8 @@ #include "game/game_127910.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_13130.h" -#include "library/library_13900.h" +#include "lib/lib_13130.h" +#include "lib/lib_13900.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 17138218c..a9b05cfdb 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -24,10 +24,10 @@ #include "game/game_19aa80.h" #include "game/game_19c990.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_13900.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_13900.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_01d9f0.c b/src/game/game_01d9f0.c index fe8e9d013..b32c51b0f 100644 --- a/src/game/game_01d9f0.c +++ b/src/game/game_01d9f0.c @@ -6,10 +6,10 @@ #include "game/data/data_020df0.h" #include "game/game_01d9f0.h" #include "gvars/gvars.h" -#include "library/library_0e9d0.h" -#include "library/library_12dc0.h" -#include "library/library_16110.h" -#include "library/library_317f0.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_16110.h" +#include "lib/lib_317f0.h" #include "types.h" const u32 var7f1a8660[] = {0x3e8e38e4}; diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index 0567b970a..34dca8329 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -37,15 +37,15 @@ #include "game/game_1999b0.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" const char var7f1a8690[] = "chr/chr.c"; diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index 2e20e0d4e..b01cbf7f5 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -17,11 +17,11 @@ #include "game/game_1a3340.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" #include "types.h" const u32 var7f1a8990[] = {0x7f02ce04}; diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index e9134a060..98d98d8a5 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -29,16 +29,16 @@ #include "game/game_19c990.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_0e9d0.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" -#include "library/library_317f0.h" -#include "library/library_481e0.h" -#include "library/library_48830.h" -#include "library/library_4a360.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" +#include "lib/lib_317f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48830.h" +#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1a9e20[] = {0x7f0607b4}; diff --git a/src/game/game_066310.c b/src/game/game_066310.c index e973883ca..ba93af7a7 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -58,24 +58,24 @@ #include "game/pad.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_04a80.h" -#include "library/library_09660.h" -#include "library/library_0d0a0.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" -#include "library/library_317f0.h" -#include "library/library_4a360.h" -#include "library/library_4a5e0.h" -#include "library/library_4b480.h" -#include "library/library_4e270.h" +#include "lib/lib_04790.h" +#include "lib/lib_04a80.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" +#include "lib/lib_317f0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4a5e0.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4e270.h" #include "types.h" const char var7f1aa1c0[] = "propobj.c"; diff --git a/src/game/game_092610.c b/src/game/game_092610.c index fd2e7d70c..be0a07ab3 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -24,18 +24,18 @@ #include "game/lang.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_0d0a0.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_317f0.h" -#include "library/library_481e0.h" -#include "library/library_48830.h" -#include "library/library_49a90.h" -#include "library/library_4a360.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_317f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48830.h" +#include "lib/lib_49a90.h" +#include "lib/lib_4a360.h" #include "types.h" const char var7f1ab400[] = "Propsnd : USING TIME 60\n"; diff --git a/src/game/game_096360.c b/src/game/game_096360.c index 92044b8c0..9a2f15156 100644 --- a/src/game/game_096360.c +++ b/src/game/game_096360.c @@ -10,9 +10,9 @@ #include "game/game_0b3350.h" #include "game/game_19c990.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" #include "types.h" // Too much stack usage and unknown functions to decompile this accurately // at the moment. diff --git a/src/game/game_096700.c b/src/game/game_096700.c index 15441dd99..16584e8a9 100644 --- a/src/game/game_096700.c +++ b/src/game/game_096700.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_096750.c b/src/game/game_096750.c index 0cac37820..e187f5324 100644 --- a/src/game/game_096750.c +++ b/src/game/game_096750.c @@ -6,7 +6,7 @@ #include "game/data/data_020df0.h" #include "game/game_0969d0.h" #include "gvars/gvars.h" -#include "library/library_4a360.h" +#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1ab830[] = {0x40490fdb}; diff --git a/src/game/game_096ca0.c b/src/game/game_096ca0.c index 513780a7d..4c9e194c9 100644 --- a/src/game/game_096ca0.c +++ b/src/game/game_096ca0.c @@ -7,8 +7,8 @@ #include "game/game_0969d0.h" #include "game/game_096ca0.h" #include "gvars/gvars.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 1f66faa1c..67d71973c 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -40,22 +40,22 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_04a80.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_13900.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" -#include "library/library_317f0.h" -#include "library/library_481e0.h" -#include "library/library_48830.h" -#include "library/library_4a360.h" +#include "lib/lib_04790.h" +#include "lib/lib_04a80.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_13900.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" +#include "lib/lib_317f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48830.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index 885383f92..42f3956b7 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -12,14 +12,14 @@ #include "game/game_0c33f0.h" #include "game/game_166e40.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_0d520.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_04790.h" +#include "lib/lib_0d520.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" const u32 var7f1acc10[] = {0x73703100}; diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index 669005f12..5db9bb24d 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -17,7 +17,7 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_13130.h" +#include "lib/lib_13130.h" #include "types.h" const u32 var7f1acdd0[] = {0x3dcccccd}; diff --git a/src/game/game_0b2150.c b/src/game/game_0b2150.c index 069b216d7..85b655f97 100644 --- a/src/game/game_0b2150.c +++ b/src/game/game_0b2150.c @@ -6,7 +6,7 @@ #include "game/data/data_020df0.h" #include "game/game_0b2150.h" #include "gvars/gvars.h" -#include "library/library_09660.h" +#include "lib/lib_09660.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index c18257787..608d998b6 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -6,8 +6,8 @@ #include "game/data/data_020df0.h" #include "game/game_0b28d0.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" -#include "library/library_1a500.h" +#include "lib/lib_121e0.h" +#include "lib/lib_1a500.h" #include "types.h" const u32 var7f1ad140[] = {0x42e52ee0}; diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index ac51446c4..0f332617d 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -10,8 +10,8 @@ #include "game/game_157db0.h" #include "game/game_16e810.h" #include "gvars/gvars.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index cd3d1fd38..2a14510d9 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -51,21 +51,21 @@ #include "game/pad.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_04320.h" -#include "library/library_04840.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13900.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" -#include "library/library_317f0.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_04320.h" +#include "lib/lib_04840.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13900.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" +#include "lib/lib_317f0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0c3620.c b/src/game/game_0c3620.c index 9b6da9a48..c03d77777 100644 --- a/src/game/game_0c3620.c +++ b/src/game/game_0c3620.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_317f0.h" +#include "lib/lib_317f0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0c37d0.c b/src/game/game_0c37d0.c index 11fc2e6f6..4c6e1c619 100644 --- a/src/game/game_0c37d0.c +++ b/src/game/game_0c37d0.c @@ -20,13 +20,13 @@ #include "game/game_11ecf0.h" #include "game/game_127910.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_0e9d0.h" -#include "library/library_12dc0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" +#include "lib/lib_04790.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1ad780[] = {0xb8d1b717}; diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c index 2abd5218f..d0fc2db86 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/game_0c79f0.c @@ -31,15 +31,15 @@ #include "game/game_187770.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_09660.h" -#include "library/library_0e9d0.h" -#include "library/library_12dc0.h" -#include "library/library_13900.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" +#include "lib/lib_04790.h" +#include "lib/lib_09660.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13900.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" #include "types.h" const char var7f1ad860[] = "bondmove.c"; diff --git a/src/game/game_0cf150.c b/src/game/game_0cf150.c index 9c775cecb..d52e2a590 100644 --- a/src/game/game_0cf150.c +++ b/src/game/game_0cf150.c @@ -19,14 +19,14 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_13130.h" -#include "library/library_13900.h" -#include "library/library_16110.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" +#include "lib/lib_04790.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_13130.h" +#include "lib/lib_13900.h" +#include "lib/lib_16110.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1ada80[] = {0xc6ea6000}; diff --git a/src/game/game_0d1fe0.c b/src/game/game_0d1fe0.c index e2dae4c61..b012b4b27 100644 --- a/src/game/game_0d1fe0.c +++ b/src/game/game_0d1fe0.c @@ -18,12 +18,12 @@ #include "game/game_167ae0.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_13900.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" +#include "lib/lib_04790.h" +#include "lib/lib_13900.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" #include "types.h" const char var7f1adb10[] = "bondbike.c"; diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index a704f93cd..838f62d1b 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -9,13 +9,13 @@ #include "game/game_166e40.h" #include "game/game_176d70.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_13130.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_4b480.h" -#include "library/library_4fe20.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_13130.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4fe20.h" #include "types.h" const u32 var7f1adba0[] = {0x74786d75}; diff --git a/src/game/game_0d5a90.c b/src/game/game_0d5a90.c index 137e06f22..01e413975 100644 --- a/src/game/game_0d5a90.c +++ b/src/game/game_0d5a90.c @@ -9,8 +9,8 @@ #include "game/game_1531a0.h" #include "game/game_166e40.h" #include "gvars/gvars.h" -#include "library/library_0d520.h" -#include "library/library_4b480.h" +#include "lib/lib_0d520.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index 24ec351a1..28ad9062a 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -17,9 +17,9 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 1598332ed..30b872b3c 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -26,17 +26,17 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" -#include "library/library_4a5e0.h" -#include "library/library_4b480.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4a5e0.h" +#include "lib/lib_4b480.h" #include "types.h" const char var7f1ade80[] = "%s%s%4.2fX"; diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index d814181fa..0d90130d5 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -33,20 +33,20 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_13900.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_317f0.h" -#include "library/library_481e0.h" -#include "library/library_48830.h" -#include "library/library_4b480.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_13900.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_317f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48830.h" +#include "lib/lib_4b480.h" #include "types.h" const u32 var7f1b2120[] = {0xffffff00}; diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index 40f52c944..d15653fbd 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -22,11 +22,11 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_13130.h" -#include "library/library_16110.h" -#include "library/library_4b480.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_13130.h" +#include "lib/lib_16110.h" +#include "lib/lib_4b480.h" #include "types.h" const u32 var7f1b2b20[] = {0x00010603}; diff --git a/src/game/game_102240.c b/src/game/game_102240.c index a216a6a35..4836bf035 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -26,11 +26,11 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_13130.h" -#include "library/library_13900.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_13130.h" +#include "lib/lib_13900.h" #include "types.h" const char var7f1b2cf0[] = "%s\n"; diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 0d23790a4..69cd751c9 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -16,10 +16,10 @@ #include "game/game_187770.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_126b0.h" -#include "library/library_13130.h" -#include "library/library_13900.h" +#include "lib/lib_09660.h" +#include "lib/lib_126b0.h" +#include "lib/lib_13130.h" +#include "lib/lib_13900.h" #include "types.h" const char var7f1b2f00[] = "%s-"; diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 8b07f1271..c71eb4336 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -30,14 +30,14 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0bfb0.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_126b0.h" -#include "library/library_13130.h" -#include "library/library_13900.h" -#include "library/library_4b170.h" +#include "lib/lib_09660.h" +#include "lib/lib_0bfb0.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_126b0.h" +#include "lib/lib_13130.h" +#include "lib/lib_13900.h" +#include "lib/lib_4b170.h" #include "types.h" const char var7f1b3860[] = "%s: %s\n"; diff --git a/src/game/game_111600.c b/src/game/game_111600.c index 80c8941c2..6e511483a 100644 --- a/src/game/game_111600.c +++ b/src/game/game_111600.c @@ -11,7 +11,7 @@ #include "game/game_19c990.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "library/library_0d520.h" +#include "lib/lib_0d520.h" #include "types.h" void currentPlayerClearInventory(void) diff --git a/src/game/game_113220.c b/src/game/game_113220.c index a1ce76f62..1d6ace2bd 100644 --- a/src/game/game_113220.c +++ b/src/game/game_113220.c @@ -9,10 +9,10 @@ #include "game/game_0c79f0.h" #include "game/game_113220.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_114240.c b/src/game/game_114240.c index f805cddc4..cf3f006f8 100644 --- a/src/game/game_114240.c +++ b/src/game/game_114240.c @@ -9,10 +9,10 @@ #include "game/game_157db0.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" -#include "library/library_4ae00.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4ae00.h" #include "types.h" const char var7f1b3a80[] = "padhalllv.c"; diff --git a/src/game/game_1165d0.c b/src/game/game_1165d0.c index 6d789ec32..b42ecf3e9 100644 --- a/src/game/game_1165d0.c +++ b/src/game/game_1165d0.c @@ -11,27 +11,27 @@ #include "game/game_148b80.h" #include "game/game_176d70.h" #include "gvars/gvars.h" -#include "library/library_06100.h" -#include "library/library_06330.h" -#include "library/library_06440.h" -#include "library/library_06550.h" -#include "library/library_0d520.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_13900.h" -#include "library/library_481e0.h" -#include "library/library_4a5e0.h" -#include "library/library_4cc10.h" -#include "library/library_4ce60.h" -#include "library/library_4d000.h" -#include "library/library_4d480.h" -#include "library/library_4d6f0.h" -#include "library/library_4f5e0.h" -#include "library/library_50130.h" -#include "library/library_50480.h" -#include "library/library_50a00.h" -#include "library/library_513b0.h" +#include "lib/lib_06100.h" +#include "lib/lib_06330.h" +#include "lib/lib_06440.h" +#include "lib/lib_06550.h" +#include "lib/lib_0d520.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_13900.h" +#include "lib/lib_481e0.h" +#include "lib/lib_4a5e0.h" +#include "lib/lib_4cc10.h" +#include "lib/lib_4ce60.h" +#include "lib/lib_4d000.h" +#include "lib/lib_4d480.h" +#include "lib/lib_4d6f0.h" +#include "lib/lib_4f5e0.h" +#include "lib/lib_50130.h" +#include "lib/lib_50480.h" +#include "lib/lib_50a00.h" +#include "lib/lib_513b0.h" #include "types.h" const u32 var7f1b3a90[] = {0x002a2a2a}; diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 173c574c6..babb7dd8f 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -12,11 +12,11 @@ #include "game/game_165670.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" -#include "library/library_50090.h" +#include "lib/lib_09660.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" +#include "lib/lib_50090.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_127910.c b/src/game/game_127910.c index 216388e8b..f3e5990b2 100644 --- a/src/game/game_127910.c +++ b/src/game/game_127910.c @@ -10,8 +10,8 @@ #include "game/game_0b63b0.h" #include "game/game_127910.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_128f30.c b/src/game/game_128f30.c index 1cf8bb3c8..223dc3e92 100644 --- a/src/game/game_128f30.c +++ b/src/game/game_128f30.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" +#include "lib/lib_12dc0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_129210.c b/src/game/game_129210.c index 962348e82..66a3709d6 100644 --- a/src/game/game_129210.c +++ b/src/game/game_129210.c @@ -9,9 +9,9 @@ #include "game/game_066310.h" #include "game/game_129210.h" #include "gvars/gvars.h" -#include "library/library_126b0.h" -#include "library/library_12dc0.h" -#include "library/library_1a500.h" +#include "lib/lib_126b0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_1a500.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 8c9bb08a3..b68b6eaf3 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -20,13 +20,13 @@ #include "game/game_176d70.h" #include "game/game_187770.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_12dc0.h" -#include "library/library_16110.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_16110.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" const char var7f1b5570[] = "ecol"; diff --git a/src/game/game_12d3f0.c b/src/game/game_12d3f0.c index dbc38212c..b20c56ead 100644 --- a/src/game/game_12d3f0.c +++ b/src/game/game_12d3f0.c @@ -13,10 +13,10 @@ #include "game/game_1668e0.h" #include "game/game_166e40.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_12f6c0.c b/src/game/game_12f6c0.c index ebda03475..e709d1583 100644 --- a/src/game/game_12f6c0.c +++ b/src/game/game_12f6c0.c @@ -10,11 +10,11 @@ #include "game/game_12f6c0.h" #include "game/game_166e40.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_09660.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_131060.c b/src/game/game_131060.c index 210cbe9d4..f6fba9508 100644 --- a/src/game/game_131060.c +++ b/src/game/game_131060.c @@ -22,19 +22,19 @@ #include "game/game_16cfa0.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13900.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_317f0.h" -#include "library/library_481e0.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_04790.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13900.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_317f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 49c0e1400..7c9e7ee48 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -14,10 +14,10 @@ #include "game/game_165670.h" #include "game/game_1668e0.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" +#include "lib/lib_09660.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_13e0e0.c b/src/game/game_13e0e0.c index af291b8e1..1dabbd99b 100644 --- a/src/game/game_13e0e0.c +++ b/src/game/game_13e0e0.c @@ -21,15 +21,15 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_13900.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_13900.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_148b80.c b/src/game/game_148b80.c index e6490ff05..f2bd2dfdf 100644 --- a/src/game/game_148b80.c +++ b/src/game/game_148b80.c @@ -16,17 +16,17 @@ #include "game/game_176d70.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "library/library_04a80.h" -#include "library/library_0d520.h" -#include "library/library_121e0.h" -#include "library/library_126b0.h" -#include "library/library_12dc0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_481e0.h" -#include "library/library_4a360.h" -#include "library/library_4a5e0.h" -#include "library/library_4ae00.h" +#include "lib/lib_04a80.h" +#include "lib/lib_0d520.h" +#include "lib/lib_121e0.h" +#include "lib/lib_126b0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_481e0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4a5e0.h" +#include "lib/lib_4ae00.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_150820.c b/src/game/game_150820.c index 3aecabece..a5b906062 100644 --- a/src/game/game_150820.c +++ b/src/game/game_150820.c @@ -11,11 +11,11 @@ #include "game/game_150820.h" #include "game/game_166e40.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" const u32 var7f1b7370[] = {0x3dcccccd}; diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 5bc6b309c..11b3ff82c 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -10,12 +10,12 @@ #include "game/game_166e40.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d0a0.h" -#include "library/library_0d520.h" -#include "library/library_121e0.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_0d520.h" +#include "lib/lib_121e0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 025d22c68..74cec2afd 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -28,20 +28,20 @@ #include "game/game_167ae0.h" #include "game/game_16e810.h" #include "gvars/gvars.h" -#include "library/library_074f0.h" -#include "library/library_09660.h" -#include "library/library_0d0a0.h" -#include "library/library_0d520.h" -#include "library/library_121e0.h" -#include "library/library_126b0.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_2f490.h" -#include "library/library_4a360.h" -#include "library/library_4b170.h" -#include "library/library_4b480.h" -#include "library/library_4e530.h" +#include "lib/lib_074f0.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_0d520.h" +#include "lib/lib_121e0.h" +#include "lib/lib_126b0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_2f490.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4e530.h" #include "types.h" const char var7f1b7420[] = "Checking Convex Room %d"; diff --git a/src/game/game_165670.c b/src/game/game_165670.c index 849e93d43..a0fc75912 100644 --- a/src/game/game_165670.c +++ b/src/game/game_165670.c @@ -8,7 +8,7 @@ #include "game/game_157db0.h" #include "game/game_165670.h" #include "gvars/gvars.h" -#include "library/library_09660.h" +#include "lib/lib_09660.h" #include "types.h" const u32 var7f1b76e0[] = {0x3a83126f}; diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index 355891ed6..524dc34a1 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -6,7 +6,7 @@ #include "game/data/data_020df0.h" #include "game/game_1668e0.h" #include "gvars/gvars.h" -#include "library/library_159b0.h" +#include "lib/lib_159b0.h" #include "types.h" const char var7f1b76f0[] = "-mgfx"; diff --git a/src/game/game_166e40.c b/src/game/game_166e40.c index f27855a02..7ded6e727 100644 --- a/src/game/game_166e40.c +++ b/src/game/game_166e40.c @@ -7,11 +7,11 @@ #include "game/game_166e40.h" #include "game/game_175f50.h" #include "gvars/gvars.h" -#include "library/library_074f0.h" -#include "library/library_0d0a0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" +#include "lib/lib_074f0.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index d5b00f469..b29ce5a30 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -89,18 +89,18 @@ #include "game/game_19c990.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "library/library_06440.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_11420.h" -#include "library/library_12dc0.h" -#include "library/library_13900.h" -#include "library/library_16110.h" -#include "library/library_233c0.h" -#include "library/library_317f0.h" -#include "library/library_4a360.h" -#include "library/library_4e530.h" +#include "lib/lib_06440.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_11420.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13900.h" +#include "lib/lib_16110.h" +#include "lib/lib_233c0.h" +#include "lib/lib_317f0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4e530.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_16ce10.c b/src/game/game_16ce10.c index a00596bb8..4a540d786 100644 --- a/src/game/game_16ce10.c +++ b/src/game/game_16ce10.c @@ -6,7 +6,7 @@ #include "game/data/data_020df0.h" #include "game/game_16ce10.h" #include "gvars/gvars.h" -#include "library/library_481e0.h" +#include "lib/lib_481e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index af8a6d182..17d8ec91c 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -9,8 +9,8 @@ #include "game/game_16cfa0.h" #include "game/game_176080.h" #include "gvars/gvars.h" -#include "library/library_0e9d0.h" -#include "library/library_11420.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_11420.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_16e810.c b/src/game/game_16e810.c index 76084d890..17bff8ae3 100644 --- a/src/game/game_16e810.c +++ b/src/game/game_16e810.c @@ -8,14 +8,14 @@ #include "game/game_131060.h" #include "game/game_16e810.h" #include "gvars/gvars.h" -#include "library/library_074f0.h" -#include "library/library_0d0a0.h" -#include "library/library_0d520.h" -#include "library/library_121e0.h" -#include "library/library_48120.h" -#include "library/library_4b170.h" -#include "library/library_4b480.h" -#include "library/library_4e470.h" +#include "lib/lib_074f0.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_0d520.h" +#include "lib/lib_121e0.h" +#include "lib/lib_48120.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4e470.h" #include "types.h" const u32 var7f1b7a50[] = {0x7f17004c}; diff --git a/src/game/game_175f90.c b/src/game/game_175f90.c index c22c0aca2..3cf375159 100644 --- a/src/game/game_175f90.c +++ b/src/game/game_175f90.c @@ -7,7 +7,7 @@ #include "game/game_166e40.h" #include "game/game_175f90.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" void func0f175f90(void) diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 48ee3fdc3..801253499 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -9,8 +9,8 @@ #include "game/game_187770.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_121e0.h" +#include "lib/lib_09660.h" +#include "lib/lib_121e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index 67fa05e06..abd66b391 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -6,8 +6,8 @@ #include "game/data/data_020df0.h" #include "game/game_176d70.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" -#include "library/library_4a360.h" +#include "lib/lib_121e0.h" +#include "lib/lib_4a360.h" #include "types.h" const char var7f1b7cb0[] = "UM_Make : In\n"; diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index 3af8f50c9..46d467092 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -18,8 +18,8 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_0d520.h" -#include "library/library_13130.h" +#include "lib/lib_0d520.h" +#include "lib/lib_13130.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_179060.c b/src/game/game_179060.c index 282bfc748..39ecc5dce 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -33,15 +33,15 @@ #include "game/pad.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" +#include "lib/lib_09660.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" #include "types.h" s32 menuhandlerMpDropOut(u32 operation, struct menu_item *item, s32 *value) { diff --git a/src/game/game_187770.c b/src/game/game_187770.c index db351040a..9cb5ffdf6 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -29,13 +29,13 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_16110.h" -#include "library/library_317f0.h" -#include "library/library_4a360.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_16110.h" +#include "lib/lib_317f0.h" +#include "lib/lib_4a360.h" #include "types.h" const char var7f1b8a00[] = "||||||||||||| Starting game... players %d\n"; diff --git a/src/game/game_190260.c b/src/game/game_190260.c index 0819d7b8b..af6515856 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -27,10 +27,10 @@ #include "game/lang.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" #include "types.h" bool func0f190260(struct chrdata *chr) diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 80e56ce43..042bf8ea3 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -18,7 +18,7 @@ #include "game/game_197600.h" #include "game/game_1999b0.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" +#include "lib/lib_12dc0.h" #include "types.h" const u32 var7f1b8fd0[] = {0x48742400}; diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index cf8730f73..796660e2e 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -16,10 +16,10 @@ #include "game/game_1999b0.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_233c0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_233c0.h" #include "types.h" const u32 var7f1b90a0[] = {0x3d4ccccd}; diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index 3d97813c4..6e03e1245 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -17,8 +17,8 @@ #include "game/lang.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_0d0a0.h" -#include "library/library_12dc0.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_12dc0.h" #include "types.h" /** diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 05d67c107..d72bd1563 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -29,16 +29,16 @@ #include "game/lang.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d0a0.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1b9210[] = {0x7f19caa8}; diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 82aefb7fc..f0879642a 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -22,10 +22,10 @@ #include "game/lang.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_09660.h" -#include "library/library_0d520.h" -#include "library/library_13130.h" -#include "library/library_1a500.h" +#include "lib/lib_09660.h" +#include "lib/lib_0d520.h" +#include "lib/lib_13130.h" +#include "lib/lib_1a500.h" #include "types.h" const char var7f1b97d0[] = "\n"; diff --git a/src/game/lang.c b/src/game/lang.c index b25af246b..e2e420a57 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -7,7 +7,7 @@ #include "game/game_166e40.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "library/library_0d0a0.h" +#include "lib/lib_0d0a0.h" #include "types.h" u32 langGetLangBankIndexFromStagenum(s32 stagenum) diff --git a/src/game/pad.c b/src/game/pad.c index 5ef966b5b..3309ab10e 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -6,7 +6,7 @@ #include "game/data/data_020df0.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "library/library_4a360.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/include/library/library_03050.h b/src/include/lib/lib_03050.h similarity index 74% rename from src/include/library/library_03050.h rename to src/include/lib/lib_03050.h index eaa2affee..dca344e15 100644 --- a/src/include/library/library_03050.h +++ b/src/include/lib/lib_03050.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_03050_H -#define _IN_LIBRARY_LIBRARY_03050_H +#ifndef _IN_LIB_LIB_03050_H +#define _IN_LIB_LIB_03050_H #include #include "types.h" diff --git a/src/include/library/library_034f0.h b/src/include/lib/lib_034f0.h similarity index 72% rename from src/include/library/library_034f0.h rename to src/include/lib/lib_034f0.h index c74adcd1d..1bec6381a 100644 --- a/src/include/library/library_034f0.h +++ b/src/include/lib/lib_034f0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_034F0_H -#define _IN_LIBRARY_LIBRARY_034F0_H +#ifndef _IN_LIB_LIB_034F0_H +#define _IN_LIB_LIB_034F0_H #include #include "types.h" diff --git a/src/include/library/library_03ee0.h b/src/include/lib/lib_03ee0.h similarity index 50% rename from src/include/library/library_03ee0.h rename to src/include/lib/lib_03ee0.h index 7b46e36b7..1ea76a739 100644 --- a/src/include/library/library_03ee0.h +++ b/src/include/lib/lib_03ee0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_03EE0_H -#define _IN_LIBRARY_LIBRARY_03EE0_H +#ifndef _IN_LIB_LIB_03EE0_H +#define _IN_LIB_LIB_03EE0_H #include #include "types.h" diff --git a/src/include/library/library_03fb0.h b/src/include/lib/lib_03fb0.h similarity index 57% rename from src/include/library/library_03fb0.h rename to src/include/lib/lib_03fb0.h index 1586d1c59..94a01c06f 100644 --- a/src/include/library/library_03fb0.h +++ b/src/include/lib/lib_03fb0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_03FB0_H -#define _IN_LIBRARY_LIBRARY_03FB0_H +#ifndef _IN_LIB_LIB_03FB0_H +#define _IN_LIB_LIB_03FB0_H #include #include "types.h" diff --git a/src/include/library/library_04320.h b/src/include/lib/lib_04320.h similarity index 57% rename from src/include/library/library_04320.h rename to src/include/lib/lib_04320.h index ce2ab0bad..8afd185b0 100644 --- a/src/include/library/library_04320.h +++ b/src/include/lib/lib_04320.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_04320_H -#define _IN_LIBRARY_LIBRARY_04320_H +#ifndef _IN_LIB_LIB_04320_H +#define _IN_LIB_LIB_04320_H #include #include "types.h" diff --git a/src/include/library/library_04790.h b/src/include/lib/lib_04790.h similarity index 55% rename from src/include/library/library_04790.h rename to src/include/lib/lib_04790.h index bc80c272e..a34798936 100644 --- a/src/include/library/library_04790.h +++ b/src/include/lib/lib_04790.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_04790_H -#define _IN_LIBRARY_LIBRARY_04790_H +#ifndef _IN_LIB_LIB_04790_H +#define _IN_LIB_LIB_04790_H #include #include "types.h" diff --git a/src/include/library/library_04840.h b/src/include/lib/lib_04840.h similarity index 57% rename from src/include/library/library_04840.h rename to src/include/lib/lib_04840.h index eff19d50b..b7e1dbc06 100644 --- a/src/include/library/library_04840.h +++ b/src/include/lib/lib_04840.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_04840_H -#define _IN_LIBRARY_LIBRARY_04840_H +#ifndef _IN_LIB_LIB_04840_H +#define _IN_LIB_LIB_04840_H #include #include "types.h" diff --git a/src/include/library/library_04a80.h b/src/include/lib/lib_04a80.h similarity index 84% rename from src/include/library/library_04a80.h rename to src/include/lib/lib_04a80.h index 0d619437b..fdad08a33 100644 --- a/src/include/library/library_04a80.h +++ b/src/include/lib/lib_04a80.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_04A80_H -#define _IN_LIBRARY_LIBRARY_04A80_H +#ifndef _IN_LIB_LIB_04A80_H +#define _IN_LIB_LIB_04A80_H #include #include "types.h" diff --git a/src/include/library/library_05e40.h b/src/include/lib/lib_05e40.h similarity index 62% rename from src/include/library/library_05e40.h rename to src/include/lib/lib_05e40.h index 52d7b76dd..b472bc15f 100644 --- a/src/include/library/library_05e40.h +++ b/src/include/lib/lib_05e40.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_05E40_H -#define _IN_LIBRARY_LIBRARY_05E40_H +#ifndef _IN_LIB_LIB_05E40_H +#define _IN_LIB_LIB_05E40_H #include #include "types.h" diff --git a/src/include/library/library_06100.h b/src/include/lib/lib_06100.h similarity index 50% rename from src/include/library/library_06100.h rename to src/include/lib/lib_06100.h index 02a200116..cde600e12 100644 --- a/src/include/library/library_06100.h +++ b/src/include/lib/lib_06100.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_06100_H -#define _IN_LIBRARY_LIBRARY_06100_H +#ifndef _IN_LIB_LIB_06100_H +#define _IN_LIB_LIB_06100_H #include #include "types.h" diff --git a/src/include/library/library_06330.h b/src/include/lib/lib_06330.h similarity index 50% rename from src/include/library/library_06330.h rename to src/include/lib/lib_06330.h index cb98dd31e..d747eb5b6 100644 --- a/src/include/library/library_06330.h +++ b/src/include/lib/lib_06330.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_06330_H -#define _IN_LIBRARY_LIBRARY_06330_H +#ifndef _IN_LIB_LIB_06330_H +#define _IN_LIB_LIB_06330_H #include #include "types.h" diff --git a/src/include/library/library_06440.h b/src/include/lib/lib_06440.h similarity index 50% rename from src/include/library/library_06440.h rename to src/include/lib/lib_06440.h index 31e39e3dc..f255606c8 100644 --- a/src/include/library/library_06440.h +++ b/src/include/lib/lib_06440.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_06440_H -#define _IN_LIBRARY_LIBRARY_06440_H +#ifndef _IN_LIB_LIB_06440_H +#define _IN_LIB_LIB_06440_H #include #include "types.h" diff --git a/src/include/library/library_06550.h b/src/include/lib/lib_06550.h similarity index 66% rename from src/include/library/library_06550.h rename to src/include/lib/lib_06550.h index b574e2b0c..5f17605ff 100644 --- a/src/include/library/library_06550.h +++ b/src/include/lib/lib_06550.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_06550_H -#define _IN_LIBRARY_LIBRARY_06550_H +#ifndef _IN_LIB_LIB_06550_H +#define _IN_LIB_LIB_06550_H #include #include "types.h" diff --git a/src/include/library/library_070d0.h b/src/include/lib/lib_070d0.h similarity index 50% rename from src/include/library/library_070d0.h rename to src/include/lib/lib_070d0.h index 3fb9fc1bd..36ea260f5 100644 --- a/src/include/library/library_070d0.h +++ b/src/include/lib/lib_070d0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_070D0_H -#define _IN_LIBRARY_LIBRARY_070D0_H +#ifndef _IN_LIB_LIB_070D0_H +#define _IN_LIB_LIB_070D0_H #include #include "types.h" diff --git a/src/include/library/library_074f0.h b/src/include/lib/lib_074f0.h similarity index 81% rename from src/include/library/library_074f0.h rename to src/include/lib/lib_074f0.h index 07b7ac0c0..eae82890e 100644 --- a/src/include/library/library_074f0.h +++ b/src/include/lib/lib_074f0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_074F0_H -#define _IN_LIBRARY_LIBRARY_074F0_H +#ifndef _IN_LIB_LIB_074F0_H +#define _IN_LIB_LIB_074F0_H #include #include "types.h" diff --git a/src/include/library/library_08a20.h b/src/include/lib/lib_08a20.h similarity index 75% rename from src/include/library/library_08a20.h rename to src/include/lib/lib_08a20.h index e33d29ff3..6415686df 100644 --- a/src/include/library/library_08a20.h +++ b/src/include/lib/lib_08a20.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_08A20_H -#define _IN_LIBRARY_LIBRARY_08A20_H +#ifndef _IN_LIB_LIB_08A20_H +#define _IN_LIB_LIB_08A20_H #include #include "types.h" diff --git a/src/include/library/library_09660.h b/src/include/lib/lib_09660.h similarity index 94% rename from src/include/library/library_09660.h rename to src/include/lib/lib_09660.h index e8c3aa5d9..66691441d 100644 --- a/src/include/library/library_09660.h +++ b/src/include/lib/lib_09660.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_09660_H -#define _IN_LIBRARY_LIBRARY_09660_H +#ifndef _IN_LIB_LIB_09660_H +#define _IN_LIB_LIB_09660_H #include #include "types.h" diff --git a/src/include/library/library_0bfb0.h b/src/include/lib/lib_0bfb0.h similarity index 57% rename from src/include/library/library_0bfb0.h rename to src/include/lib/lib_0bfb0.h index 29fc2016d..20e198832 100644 --- a/src/include/library/library_0bfb0.h +++ b/src/include/lib/lib_0bfb0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_0BFB0_H -#define _IN_LIBRARY_LIBRARY_0BFB0_H +#ifndef _IN_LIB_LIB_0BFB0_H +#define _IN_LIB_LIB_0BFB0_H #include #include "types.h" diff --git a/src/include/library/library_0c000.h b/src/include/lib/lib_0c000.h similarity index 85% rename from src/include/library/library_0c000.h rename to src/include/lib/lib_0c000.h index 1228fa4a2..57453f196 100644 --- a/src/include/library/library_0c000.h +++ b/src/include/lib/lib_0c000.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_0C000_H -#define _IN_LIBRARY_LIBRARY_0C000_H +#ifndef _IN_LIB_LIB_0C000_H +#define _IN_LIB_LIB_0C000_H #include #include "types.h" diff --git a/src/include/library/library_0d0a0.h b/src/include/lib/lib_0d0a0.h similarity index 80% rename from src/include/library/library_0d0a0.h rename to src/include/lib/lib_0d0a0.h index 87dde3ae9..68667c101 100644 --- a/src/include/library/library_0d0a0.h +++ b/src/include/lib/lib_0d0a0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_0D0A0_H -#define _IN_LIBRARY_LIBRARY_0D0A0_H +#ifndef _IN_LIB_LIB_0D0A0_H +#define _IN_LIB_LIB_0D0A0_H #include #include "types.h" diff --git a/src/include/library/library_0d520.h b/src/include/lib/lib_0d520.h similarity index 80% rename from src/include/library/library_0d520.h rename to src/include/lib/lib_0d520.h index b86cccf91..55014f799 100644 --- a/src/include/library/library_0d520.h +++ b/src/include/lib/lib_0d520.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_0D520_H -#define _IN_LIBRARY_LIBRARY_0D520_H +#ifndef _IN_LIB_LIB_0D520_H +#define _IN_LIB_LIB_0D520_H #include #include "types.h" diff --git a/src/include/library/library_0e9d0.h b/src/include/lib/lib_0e9d0.h similarity index 93% rename from src/include/library/library_0e9d0.h rename to src/include/lib/lib_0e9d0.h index 06966d235..e2e622f43 100644 --- a/src/include/library/library_0e9d0.h +++ b/src/include/lib/lib_0e9d0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_0E9D0_H -#define _IN_LIBRARY_LIBRARY_0E9D0_H +#ifndef _IN_LIB_LIB_0E9D0_H +#define _IN_LIB_LIB_0E9D0_H #include #include "types.h" diff --git a/src/include/library/library_11420.h b/src/include/lib/lib_11420.h similarity index 75% rename from src/include/library/library_11420.h rename to src/include/lib/lib_11420.h index 226fe945f..d4fc7e4bf 100644 --- a/src/include/library/library_11420.h +++ b/src/include/lib/lib_11420.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_11420_H -#define _IN_LIBRARY_LIBRARY_11420_H +#ifndef _IN_LIB_LIB_11420_H +#define _IN_LIB_LIB_11420_H #include #include "types.h" diff --git a/src/include/library/library_121e0.h b/src/include/lib/lib_121e0.h similarity index 84% rename from src/include/library/library_121e0.h rename to src/include/lib/lib_121e0.h index 5259df60e..9cf069846 100644 --- a/src/include/library/library_121e0.h +++ b/src/include/lib/lib_121e0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_121E0_H -#define _IN_LIBRARY_LIBRARY_121E0_H +#ifndef _IN_LIB_LIB_121E0_H +#define _IN_LIB_LIB_121E0_H #include #include "types.h" diff --git a/src/include/library/library_126b0.h b/src/include/lib/lib_126b0.h similarity index 84% rename from src/include/library/library_126b0.h rename to src/include/lib/lib_126b0.h index 64663e6b0..0dba81b0a 100644 --- a/src/include/library/library_126b0.h +++ b/src/include/lib/lib_126b0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_126B0_H -#define _IN_LIBRARY_LIBRARY_126B0_H +#ifndef _IN_LIB_LIB_126B0_H +#define _IN_LIB_LIB_126B0_H #include #include "types.h" diff --git a/src/include/library/library_12dc0.h b/src/include/lib/lib_12dc0.h similarity index 76% rename from src/include/library/library_12dc0.h rename to src/include/lib/lib_12dc0.h index 7dd00bfe0..4bd42b3f0 100644 --- a/src/include/library/library_12dc0.h +++ b/src/include/lib/lib_12dc0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_12DC0_H -#define _IN_LIBRARY_LIBRARY_12DC0_H +#ifndef _IN_LIB_LIB_12DC0_H +#define _IN_LIB_LIB_12DC0_H #include #include "types.h" diff --git a/src/include/library/library_13130.h b/src/include/lib/lib_13130.h similarity index 84% rename from src/include/library/library_13130.h rename to src/include/lib/lib_13130.h index ed1059f7b..cfe7dd7d0 100644 --- a/src/include/library/library_13130.h +++ b/src/include/lib/lib_13130.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_13130_H -#define _IN_LIBRARY_LIBRARY_13130_H +#ifndef _IN_LIB_LIB_13130_H +#define _IN_LIB_LIB_13130_H #include #include "types.h" diff --git a/src/include/library/library_13710.h b/src/include/lib/lib_13710.h similarity index 50% rename from src/include/library/library_13710.h rename to src/include/lib/lib_13710.h index 73113e3b6..7a91f6b88 100644 --- a/src/include/library/library_13710.h +++ b/src/include/lib/lib_13710.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_13710_H -#define _IN_LIBRARY_LIBRARY_13710_H +#ifndef _IN_LIB_LIB_13710_H +#define _IN_LIB_LIB_13710_H #include #include "types.h" diff --git a/src/include/library/library_13750.h b/src/include/lib/lib_13750.h similarity index 57% rename from src/include/library/library_13750.h rename to src/include/lib/lib_13750.h index 5dba7a122..5f8304679 100644 --- a/src/include/library/library_13750.h +++ b/src/include/lib/lib_13750.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_13750_H -#define _IN_LIBRARY_LIBRARY_13750_H +#ifndef _IN_LIB_LIB_13750_H +#define _IN_LIB_LIB_13750_H #include #include "types.h" diff --git a/src/include/library/library_13790.h b/src/include/lib/lib_13790.h similarity index 57% rename from src/include/library/library_13790.h rename to src/include/lib/lib_13790.h index 2126f606f..2b5d68ea4 100644 --- a/src/include/library/library_13790.h +++ b/src/include/lib/lib_13790.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_13790_H -#define _IN_LIBRARY_LIBRARY_13790_H +#ifndef _IN_LIB_LIB_13790_H +#define _IN_LIB_LIB_13790_H #include #include "types.h" diff --git a/src/include/lib/lib_13820.h b/src/include/lib/lib_13820.h new file mode 100644 index 000000000..4c11d6184 --- /dev/null +++ b/src/include/lib/lib_13820.h @@ -0,0 +1,6 @@ +#ifndef _IN_LIB_LIB_13820_H +#define _IN_LIB_LIB_13820_H +#include +#include "types.h" + +#endif diff --git a/src/include/library/library_13900.h b/src/include/lib/lib_13900.h similarity index 93% rename from src/include/library/library_13900.h rename to src/include/lib/lib_13900.h index c18d00b9b..d8ed1994a 100644 --- a/src/include/library/library_13900.h +++ b/src/include/lib/lib_13900.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_13900_H -#define _IN_LIBRARY_LIBRARY_13900_H +#ifndef _IN_LIB_LIB_13900_H +#define _IN_LIB_LIB_13900_H #include #include "types.h" diff --git a/src/include/library/library_15860.h b/src/include/lib/lib_15860.h similarity index 52% rename from src/include/library/library_15860.h rename to src/include/lib/lib_15860.h index e0f2b1af7..45031bc6e 100644 --- a/src/include/library/library_15860.h +++ b/src/include/lib/lib_15860.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_15860_H -#define _IN_LIBRARY_LIBRARY_15860_H +#ifndef _IN_LIB_LIB_15860_H +#define _IN_LIB_LIB_15860_H #include #include "types.h" diff --git a/src/include/library/library_159b0.h b/src/include/lib/lib_159b0.h similarity index 90% rename from src/include/library/library_159b0.h rename to src/include/lib/lib_159b0.h index 3b7fa8dd8..4f13f80b5 100644 --- a/src/include/library/library_159b0.h +++ b/src/include/lib/lib_159b0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_159B0_H -#define _IN_LIBRARY_LIBRARY_159B0_H +#ifndef _IN_LIB_LIB_159B0_H +#define _IN_LIB_LIB_159B0_H #include #include "types.h" diff --git a/src/include/library/library_16110.h b/src/include/lib/lib_16110.h similarity index 95% rename from src/include/library/library_16110.h rename to src/include/lib/lib_16110.h index e0c32d526..ac8c212be 100644 --- a/src/include/library/library_16110.h +++ b/src/include/lib/lib_16110.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_16110_H -#define _IN_LIBRARY_LIBRARY_16110_H +#ifndef _IN_LIB_LIB_16110_H +#define _IN_LIB_LIB_16110_H #include #include "types.h" diff --git a/src/include/library/library_1a500.h b/src/include/lib/lib_1a500.h similarity index 97% rename from src/include/library/library_1a500.h rename to src/include/lib/lib_1a500.h index 0211b93e3..9396c5ea4 100644 --- a/src/include/library/library_1a500.h +++ b/src/include/lib/lib_1a500.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_1A500_H -#define _IN_LIBRARY_LIBRARY_1A500_H +#ifndef _IN_LIB_LIB_1A500_H +#define _IN_LIB_LIB_1A500_H #include #include "types.h" diff --git a/src/include/library/library_233c0.h b/src/include/lib/lib_233c0.h similarity index 98% rename from src/include/library/library_233c0.h rename to src/include/lib/lib_233c0.h index d20ded01b..cc7088667 100644 --- a/src/include/library/library_233c0.h +++ b/src/include/lib/lib_233c0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_233C0_H -#define _IN_LIBRARY_LIBRARY_233C0_H +#ifndef _IN_LIB_LIB_233C0_H +#define _IN_LIB_LIB_233C0_H #include #include "types.h" diff --git a/src/include/library/library_2f490.h b/src/include/lib/lib_2f490.h similarity index 66% rename from src/include/library/library_2f490.h rename to src/include/lib/lib_2f490.h index f8060cb63..7e7b8bd25 100644 --- a/src/include/library/library_2f490.h +++ b/src/include/lib/lib_2f490.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_2F490_H -#define _IN_LIBRARY_LIBRARY_2F490_H +#ifndef _IN_LIB_LIB_2F490_H +#define _IN_LIB_LIB_2F490_H #include #include "types.h" diff --git a/src/include/library/library_2fa00.h b/src/include/lib/lib_2fa00.h similarity index 62% rename from src/include/library/library_2fa00.h rename to src/include/lib/lib_2fa00.h index a2f6e3631..ac54dccb7 100644 --- a/src/include/library/library_2fa00.h +++ b/src/include/lib/lib_2fa00.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_2FA00_H -#define _IN_LIBRARY_LIBRARY_2FA00_H +#ifndef _IN_LIB_LIB_2FA00_H +#define _IN_LIB_LIB_2FA00_H #include #include "types.h" diff --git a/src/include/library/library_2faf0.h b/src/include/lib/lib_2faf0.h similarity index 57% rename from src/include/library/library_2faf0.h rename to src/include/lib/lib_2faf0.h index 415eaaf17..a4f322b50 100644 --- a/src/include/library/library_2faf0.h +++ b/src/include/lib/lib_2faf0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_2FAF0_H -#define _IN_LIBRARY_LIBRARY_2FAF0_H +#ifndef _IN_LIB_LIB_2FAF0_H +#define _IN_LIB_LIB_2FAF0_H #include #include "types.h" diff --git a/src/include/library/library_2fba0.h b/src/include/lib/lib_2fba0.h similarity index 57% rename from src/include/library/library_2fba0.h rename to src/include/lib/lib_2fba0.h index b1ed9185b..a11fb5d24 100644 --- a/src/include/library/library_2fba0.h +++ b/src/include/lib/lib_2fba0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_2FBA0_H -#define _IN_LIBRARY_LIBRARY_2FBA0_H +#ifndef _IN_LIB_LIB_2FBA0_H +#define _IN_LIB_LIB_2FBA0_H #include #include "types.h" diff --git a/src/include/library/library_2fc60.h b/src/include/lib/lib_2fc60.h similarity index 75% rename from src/include/library/library_2fc60.h rename to src/include/lib/lib_2fc60.h index c495d311f..a5471fdb8 100644 --- a/src/include/library/library_2fc60.h +++ b/src/include/lib/lib_2fc60.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_2FC60_H -#define _IN_LIBRARY_LIBRARY_2FC60_H +#ifndef _IN_LIB_LIB_2FC60_H +#define _IN_LIB_LIB_2FC60_H #include #include "types.h" diff --git a/src/include/library/library_30ce0.h b/src/include/lib/lib_30ce0.h similarity index 81% rename from src/include/library/library_30ce0.h rename to src/include/lib/lib_30ce0.h index 9d0ae3fdb..f885d23b7 100644 --- a/src/include/library/library_30ce0.h +++ b/src/include/lib/lib_30ce0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_30CE0_H -#define _IN_LIBRARY_LIBRARY_30CE0_H +#ifndef _IN_LIB_LIB_30CE0_H +#define _IN_LIB_LIB_30CE0_H #include #include "types.h" diff --git a/src/include/library/library_317f0.h b/src/include/lib/lib_317f0.h similarity index 92% rename from src/include/library/library_317f0.h rename to src/include/lib/lib_317f0.h index e544bf803..4bc206043 100644 --- a/src/include/library/library_317f0.h +++ b/src/include/lib/lib_317f0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_317F0_H -#define _IN_LIBRARY_LIBRARY_317F0_H +#ifndef _IN_LIB_LIB_317F0_H +#define _IN_LIB_LIB_317F0_H #include #include "types.h" diff --git a/src/include/library/library_37650.h b/src/include/lib/lib_37650.h similarity index 72% rename from src/include/library/library_37650.h rename to src/include/lib/lib_37650.h index 9db9dea0b..0a68adfb6 100644 --- a/src/include/library/library_37650.h +++ b/src/include/lib/lib_37650.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_37650_H -#define _IN_LIBRARY_LIBRARY_37650_H +#ifndef _IN_LIB_LIB_37650_H +#define _IN_LIB_LIB_37650_H #include #include "types.h" diff --git a/src/include/library/library_37b00.h b/src/include/lib/lib_37b00.h similarity index 82% rename from src/include/library/library_37b00.h rename to src/include/lib/lib_37b00.h index 9efc776ab..5adfa1925 100644 --- a/src/include/library/library_37b00.h +++ b/src/include/lib/lib_37b00.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_37B00_H -#define _IN_LIBRARY_LIBRARY_37B00_H +#ifndef _IN_LIB_LIB_37B00_H +#define _IN_LIB_LIB_37B00_H #include #include "types.h" diff --git a/src/include/library/library_38d10.h b/src/include/lib/lib_38d10.h similarity index 50% rename from src/include/library/library_38d10.h rename to src/include/lib/lib_38d10.h index c15d14c92..340620dbc 100644 --- a/src/include/library/library_38d10.h +++ b/src/include/lib/lib_38d10.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_38D10_H -#define _IN_LIBRARY_LIBRARY_38D10_H +#ifndef _IN_LIB_LIB_38D10_H +#define _IN_LIB_LIB_38D10_H #include #include "types.h" diff --git a/src/include/library/library_38d30.h b/src/include/lib/lib_38d30.h similarity index 75% rename from src/include/library/library_38d30.h rename to src/include/lib/lib_38d30.h index 410368991..13b527dca 100644 --- a/src/include/library/library_38d30.h +++ b/src/include/lib/lib_38d30.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_38D30_H -#define _IN_LIBRARY_LIBRARY_38D30_H +#ifndef _IN_LIB_LIB_38D30_H +#define _IN_LIB_LIB_38D30_H #include #include "types.h" diff --git a/src/include/library/library_39c80.h b/src/include/lib/lib_39c80.h similarity index 62% rename from src/include/library/library_39c80.h rename to src/include/lib/lib_39c80.h index a617560de..22b26fb5b 100644 --- a/src/include/library/library_39c80.h +++ b/src/include/lib/lib_39c80.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_39C80_H -#define _IN_LIBRARY_LIBRARY_39C80_H +#ifndef _IN_LIB_LIB_39C80_H +#define _IN_LIB_LIB_39C80_H #include #include "types.h" diff --git a/src/include/library/library_39f70.h b/src/include/lib/lib_39f70.h similarity index 50% rename from src/include/library/library_39f70.h rename to src/include/lib/lib_39f70.h index 9cab6e839..430c087f9 100644 --- a/src/include/library/library_39f70.h +++ b/src/include/lib/lib_39f70.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_39F70_H -#define _IN_LIBRARY_LIBRARY_39F70_H +#ifndef _IN_LIB_LIB_39F70_H +#define _IN_LIB_LIB_39F70_H #include #include "types.h" diff --git a/src/include/library/library_39fc0.h b/src/include/lib/lib_39fc0.h similarity index 50% rename from src/include/library/library_39fc0.h rename to src/include/lib/lib_39fc0.h index 72a234c29..1ec1b3d5b 100644 --- a/src/include/library/library_39fc0.h +++ b/src/include/lib/lib_39fc0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_39FC0_H -#define _IN_LIBRARY_LIBRARY_39FC0_H +#ifndef _IN_LIB_LIB_39FC0_H +#define _IN_LIB_LIB_39FC0_H #include #include "types.h" diff --git a/src/include/library/library_39fe0.h b/src/include/lib/lib_39fe0.h similarity index 57% rename from src/include/library/library_39fe0.h rename to src/include/lib/lib_39fe0.h index cf518978e..41316e153 100644 --- a/src/include/library/library_39fe0.h +++ b/src/include/lib/lib_39fe0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_39FE0_H -#define _IN_LIBRARY_LIBRARY_39FE0_H +#ifndef _IN_LIB_LIB_39FE0_H +#define _IN_LIB_LIB_39FE0_H #include #include "types.h" diff --git a/src/include/library/library_3a100.h b/src/include/lib/lib_3a100.h similarity index 83% rename from src/include/library/library_3a100.h rename to src/include/lib/lib_3a100.h index e43818e73..0d57e6a27 100644 --- a/src/include/library/library_3a100.h +++ b/src/include/lib/lib_3a100.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_3A100_H -#define _IN_LIBRARY_LIBRARY_3A100_H +#ifndef _IN_LIB_LIB_3A100_H +#define _IN_LIB_LIB_3A100_H #include #include "types.h" diff --git a/src/include/library/library_3c430.h b/src/include/lib/lib_3c430.h similarity index 50% rename from src/include/library/library_3c430.h rename to src/include/lib/lib_3c430.h index c2f2456fe..26a8ea324 100644 --- a/src/include/library/library_3c430.h +++ b/src/include/lib/lib_3c430.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_3C430_H -#define _IN_LIBRARY_LIBRARY_3C430_H +#ifndef _IN_LIB_LIB_3C430_H +#define _IN_LIB_LIB_3C430_H #include #include "types.h" diff --git a/src/include/library/library_3c4d0.h b/src/include/lib/lib_3c4d0.h similarity index 76% rename from src/include/library/library_3c4d0.h rename to src/include/lib/lib_3c4d0.h index b51707bbb..855e51016 100644 --- a/src/include/library/library_3c4d0.h +++ b/src/include/lib/lib_3c4d0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_3C4D0_H -#define _IN_LIBRARY_LIBRARY_3C4D0_H +#ifndef _IN_LIB_LIB_3C4D0_H +#define _IN_LIB_LIB_3C4D0_H #include #include "types.h" diff --git a/src/include/library/library_3ccf0.h b/src/include/lib/lib_3ccf0.h similarity index 50% rename from src/include/library/library_3ccf0.h rename to src/include/lib/lib_3ccf0.h index f7cbe7653..1c77de016 100644 --- a/src/include/library/library_3ccf0.h +++ b/src/include/lib/lib_3ccf0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_3CCF0_H -#define _IN_LIBRARY_LIBRARY_3CCF0_H +#ifndef _IN_LIB_LIB_3CCF0_H +#define _IN_LIB_LIB_3CCF0_H #include #include "types.h" diff --git a/src/include/library/library_3cdc0.h b/src/include/lib/lib_3cdc0.h similarity index 50% rename from src/include/library/library_3cdc0.h rename to src/include/lib/lib_3cdc0.h index cf9e29bb1..d3720b3b9 100644 --- a/src/include/library/library_3cdc0.h +++ b/src/include/lib/lib_3cdc0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_3CDC0_H -#define _IN_LIBRARY_LIBRARY_3CDC0_H +#ifndef _IN_LIB_LIB_3CDC0_H +#define _IN_LIB_LIB_3CDC0_H #include #include "types.h" diff --git a/src/include/library/library_3cef0.h b/src/include/lib/lib_3cef0.h similarity index 70% rename from src/include/library/library_3cef0.h rename to src/include/lib/lib_3cef0.h index 8091d47f2..1eefe0b78 100644 --- a/src/include/library/library_3cef0.h +++ b/src/include/lib/lib_3cef0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_3CEF0_H -#define _IN_LIBRARY_LIBRARY_3CEF0_H +#ifndef _IN_LIB_LIB_3CEF0_H +#define _IN_LIB_LIB_3CEF0_H #include #include "types.h" diff --git a/src/include/library/library_3d280.h b/src/include/lib/lib_3d280.h similarity index 85% rename from src/include/library/library_3d280.h rename to src/include/lib/lib_3d280.h index b5ded9f47..72eb72e1f 100644 --- a/src/include/library/library_3d280.h +++ b/src/include/lib/lib_3d280.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_3D280_H -#define _IN_LIBRARY_LIBRARY_3D280_H +#ifndef _IN_LIB_LIB_3D280_H +#define _IN_LIB_LIB_3D280_H #include #include "types.h" diff --git a/src/include/library/library_3e3e0.h b/src/include/lib/lib_3e3e0.h similarity index 72% rename from src/include/library/library_3e3e0.h rename to src/include/lib/lib_3e3e0.h index ca0f2a55a..61bcaf15f 100644 --- a/src/include/library/library_3e3e0.h +++ b/src/include/lib/lib_3e3e0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_3E3E0_H -#define _IN_LIBRARY_LIBRARY_3E3E0_H +#ifndef _IN_LIB_LIB_3E3E0_H +#define _IN_LIB_LIB_3E3E0_H #include #include "types.h" diff --git a/src/include/library/library_3e730.h b/src/include/lib/lib_3e730.h similarity index 84% rename from src/include/library/library_3e730.h rename to src/include/lib/lib_3e730.h index d34bf0f14..a8e206d84 100644 --- a/src/include/library/library_3e730.h +++ b/src/include/lib/lib_3e730.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_3E730_H -#define _IN_LIBRARY_LIBRARY_3E730_H +#ifndef _IN_LIB_LIB_3E730_H +#define _IN_LIB_LIB_3E730_H #include #include "types.h" diff --git a/src/include/library/library_43dd0.h b/src/include/lib/lib_43dd0.h similarity index 72% rename from src/include/library/library_43dd0.h rename to src/include/lib/lib_43dd0.h index 92ce84d40..83df3d841 100644 --- a/src/include/library/library_43dd0.h +++ b/src/include/lib/lib_43dd0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_43DD0_H -#define _IN_LIBRARY_LIBRARY_43DD0_H +#ifndef _IN_LIB_LIB_43DD0_H +#define _IN_LIB_LIB_43DD0_H #include #include "types.h" diff --git a/src/include/library/library_446d0.h b/src/include/lib/lib_446d0.h similarity index 50% rename from src/include/library/library_446d0.h rename to src/include/lib/lib_446d0.h index d009d30ac..8d91c49da 100644 --- a/src/include/library/library_446d0.h +++ b/src/include/lib/lib_446d0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_446D0_H -#define _IN_LIBRARY_LIBRARY_446D0_H +#ifndef _IN_LIB_LIB_446D0_H +#define _IN_LIB_LIB_446D0_H #include #include "types.h" diff --git a/src/include/library/library_44bc0.h b/src/include/lib/lib_44bc0.h similarity index 57% rename from src/include/library/library_44bc0.h rename to src/include/lib/lib_44bc0.h index 14d35d9f9..f46f6f6a0 100644 --- a/src/include/library/library_44bc0.h +++ b/src/include/lib/lib_44bc0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_44BC0_H -#define _IN_LIBRARY_LIBRARY_44BC0_H +#ifndef _IN_LIB_LIB_44BC0_H +#define _IN_LIB_LIB_44BC0_H #include #include "types.h" diff --git a/src/include/library/library_44f60.h b/src/include/lib/lib_44f60.h similarity index 70% rename from src/include/library/library_44f60.h rename to src/include/lib/lib_44f60.h index d24d44ea1..b99080d24 100644 --- a/src/include/library/library_44f60.h +++ b/src/include/lib/lib_44f60.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_44F60_H -#define _IN_LIBRARY_LIBRARY_44F60_H +#ifndef _IN_LIB_LIB_44F60_H +#define _IN_LIB_LIB_44F60_H #include #include "types.h" diff --git a/src/include/library/library_45ed0.h b/src/include/lib/lib_45ed0.h similarity index 50% rename from src/include/library/library_45ed0.h rename to src/include/lib/lib_45ed0.h index 8cb938e5b..10662add9 100644 --- a/src/include/library/library_45ed0.h +++ b/src/include/lib/lib_45ed0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_45ED0_H -#define _IN_LIBRARY_LIBRARY_45ED0_H +#ifndef _IN_LIB_LIB_45ED0_H +#define _IN_LIB_LIB_45ED0_H #include #include "types.h" diff --git a/src/include/library/library_461c0.h b/src/include/lib/lib_461c0.h similarity index 70% rename from src/include/library/library_461c0.h rename to src/include/lib/lib_461c0.h index 5412432b8..978e80b8d 100644 --- a/src/include/library/library_461c0.h +++ b/src/include/lib/lib_461c0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_461C0_H -#define _IN_LIBRARY_LIBRARY_461C0_H +#ifndef _IN_LIB_LIB_461C0_H +#define _IN_LIB_LIB_461C0_H #include #include "types.h" diff --git a/src/include/library/library_46650.h b/src/include/lib/lib_46650.h similarity index 50% rename from src/include/library/library_46650.h rename to src/include/lib/lib_46650.h index 2e93448f5..aef397e9b 100644 --- a/src/include/library/library_46650.h +++ b/src/include/lib/lib_46650.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_46650_H -#define _IN_LIBRARY_LIBRARY_46650_H +#ifndef _IN_LIB_LIB_46650_H +#define _IN_LIB_LIB_46650_H #include #include "types.h" diff --git a/src/include/library/library_47550.h b/src/include/lib/lib_47550.h similarity index 50% rename from src/include/library/library_47550.h rename to src/include/lib/lib_47550.h index 3ae2a8d8c..93b07a434 100644 --- a/src/include/library/library_47550.h +++ b/src/include/lib/lib_47550.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_47550_H -#define _IN_LIBRARY_LIBRARY_47550_H +#ifndef _IN_LIB_LIB_47550_H +#define _IN_LIB_LIB_47550_H #include #include "types.h" diff --git a/src/include/library/library_47a90.h b/src/include/lib/lib_47a90.h similarity index 50% rename from src/include/library/library_47a90.h rename to src/include/lib/lib_47a90.h index 037359011..fb2f9daa9 100644 --- a/src/include/library/library_47a90.h +++ b/src/include/lib/lib_47a90.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_47A90_H -#define _IN_LIBRARY_LIBRARY_47A90_H +#ifndef _IN_LIB_LIB_47A90_H +#define _IN_LIB_LIB_47A90_H #include #include "types.h" diff --git a/src/include/library/library_47d20.h b/src/include/lib/lib_47d20.h similarity index 57% rename from src/include/library/library_47d20.h rename to src/include/lib/lib_47d20.h index ad95ac458..fb4c0254b 100644 --- a/src/include/library/library_47d20.h +++ b/src/include/lib/lib_47d20.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_47D20_H -#define _IN_LIBRARY_LIBRARY_47D20_H +#ifndef _IN_LIB_LIB_47D20_H +#define _IN_LIB_LIB_47D20_H #include #include "types.h" diff --git a/src/include/library/library_48120.h b/src/include/lib/lib_48120.h similarity index 50% rename from src/include/library/library_48120.h rename to src/include/lib/lib_48120.h index 8c056ee2c..15fe18a75 100644 --- a/src/include/library/library_48120.h +++ b/src/include/lib/lib_48120.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48120_H -#define _IN_LIBRARY_LIBRARY_48120_H +#ifndef _IN_LIB_LIB_48120_H +#define _IN_LIB_LIB_48120_H #include #include "types.h" diff --git a/src/include/library/library_48150.h b/src/include/lib/lib_48150.h similarity index 50% rename from src/include/library/library_48150.h rename to src/include/lib/lib_48150.h index 35149a77a..fe39bab1c 100644 --- a/src/include/library/library_48150.h +++ b/src/include/lib/lib_48150.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48150_H -#define _IN_LIBRARY_LIBRARY_48150_H +#ifndef _IN_LIB_LIB_48150_H +#define _IN_LIB_LIB_48150_H #include #include "types.h" diff --git a/src/include/library/library_481d0.h b/src/include/lib/lib_481d0.h similarity index 50% rename from src/include/library/library_481d0.h rename to src/include/lib/lib_481d0.h index 5ebb2e9ce..1f521222b 100644 --- a/src/include/library/library_481d0.h +++ b/src/include/lib/lib_481d0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_481D0_H -#define _IN_LIBRARY_LIBRARY_481D0_H +#ifndef _IN_LIB_LIB_481D0_H +#define _IN_LIB_LIB_481D0_H #include #include "types.h" diff --git a/src/include/library/library_481e0.h b/src/include/lib/lib_481e0.h similarity index 76% rename from src/include/library/library_481e0.h rename to src/include/lib/lib_481e0.h index a345b5f0e..cad7ab9f6 100644 --- a/src/include/library/library_481e0.h +++ b/src/include/lib/lib_481e0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_481E0_H -#define _IN_LIBRARY_LIBRARY_481E0_H +#ifndef _IN_LIB_LIB_481E0_H +#define _IN_LIB_LIB_481E0_H #include #include "types.h" diff --git a/src/include/library/library_48520.h b/src/include/lib/lib_48520.h similarity index 50% rename from src/include/library/library_48520.h rename to src/include/lib/lib_48520.h index f062b99b6..292f9e3a5 100644 --- a/src/include/library/library_48520.h +++ b/src/include/lib/lib_48520.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48520_H -#define _IN_LIBRARY_LIBRARY_48520_H +#ifndef _IN_LIB_LIB_48520_H +#define _IN_LIB_LIB_48520_H #include #include "types.h" diff --git a/src/include/library/library_485e0.h b/src/include/lib/lib_485e0.h similarity index 50% rename from src/include/library/library_485e0.h rename to src/include/lib/lib_485e0.h index f9129af79..5f6b70ab9 100644 --- a/src/include/library/library_485e0.h +++ b/src/include/lib/lib_485e0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_485E0_H -#define _IN_LIBRARY_LIBRARY_485E0_H +#ifndef _IN_LIB_LIB_485E0_H +#define _IN_LIB_LIB_485E0_H #include #include "types.h" diff --git a/src/include/library/library_48650.h b/src/include/lib/lib_48650.h similarity index 57% rename from src/include/library/library_48650.h rename to src/include/lib/lib_48650.h index 478dfa7d1..ace1632a8 100644 --- a/src/include/library/library_48650.h +++ b/src/include/lib/lib_48650.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48650_H -#define _IN_LIBRARY_LIBRARY_48650_H +#ifndef _IN_LIB_LIB_48650_H +#define _IN_LIB_LIB_48650_H #include #include "types.h" diff --git a/src/include/library/library_48830.h b/src/include/lib/lib_48830.h similarity index 67% rename from src/include/library/library_48830.h rename to src/include/lib/lib_48830.h index d67450f7f..7bda6f6f5 100644 --- a/src/include/library/library_48830.h +++ b/src/include/lib/lib_48830.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48830_H -#define _IN_LIBRARY_LIBRARY_48830_H +#ifndef _IN_LIB_LIB_48830_H +#define _IN_LIB_LIB_48830_H #include #include "types.h" diff --git a/src/include/library/library_488e0.h b/src/include/lib/lib_488e0.h similarity index 57% rename from src/include/library/library_488e0.h rename to src/include/lib/lib_488e0.h index b87a0e9ab..7ad57838e 100644 --- a/src/include/library/library_488e0.h +++ b/src/include/lib/lib_488e0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_488E0_H -#define _IN_LIBRARY_LIBRARY_488E0_H +#ifndef _IN_LIB_LIB_488E0_H +#define _IN_LIB_LIB_488E0_H #include #include "types.h" diff --git a/src/include/library/library_48b20.h b/src/include/lib/lib_48b20.h similarity index 50% rename from src/include/library/library_48b20.h rename to src/include/lib/lib_48b20.h index 7d421b79d..ff65e47fa 100644 --- a/src/include/library/library_48b20.h +++ b/src/include/lib/lib_48b20.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48B20_H -#define _IN_LIBRARY_LIBRARY_48B20_H +#ifndef _IN_LIB_LIB_48B20_H +#define _IN_LIB_LIB_48B20_H #include #include "types.h" diff --git a/src/include/library/library_48c00.h b/src/include/lib/lib_48c00.h similarity index 57% rename from src/include/library/library_48c00.h rename to src/include/lib/lib_48c00.h index 72654fafe..2b89fe29b 100644 --- a/src/include/library/library_48c00.h +++ b/src/include/lib/lib_48c00.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48C00_H -#define _IN_LIBRARY_LIBRARY_48C00_H +#ifndef _IN_LIB_LIB_48C00_H +#define _IN_LIB_LIB_48C00_H #include #include "types.h" diff --git a/src/include/library/library_48cd0.h b/src/include/lib/lib_48cd0.h similarity index 62% rename from src/include/library/library_48cd0.h rename to src/include/lib/lib_48cd0.h index 854a98704..4ec213e79 100644 --- a/src/include/library/library_48cd0.h +++ b/src/include/lib/lib_48cd0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48CD0_H -#define _IN_LIBRARY_LIBRARY_48CD0_H +#ifndef _IN_LIB_LIB_48CD0_H +#define _IN_LIB_LIB_48CD0_H #include #include "types.h" diff --git a/src/include/library/library_48dc0.h b/src/include/lib/lib_48dc0.h similarity index 50% rename from src/include/library/library_48dc0.h rename to src/include/lib/lib_48dc0.h index 1892e24f1..6fa8e7965 100644 --- a/src/include/library/library_48dc0.h +++ b/src/include/lib/lib_48dc0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48DC0_H -#define _IN_LIBRARY_LIBRARY_48DC0_H +#ifndef _IN_LIB_LIB_48DC0_H +#define _IN_LIB_LIB_48DC0_H #include #include "types.h" diff --git a/src/include/library/library_48ef0.h b/src/include/lib/lib_48ef0.h similarity index 50% rename from src/include/library/library_48ef0.h rename to src/include/lib/lib_48ef0.h index 11cd5c8dd..6a0b74573 100644 --- a/src/include/library/library_48ef0.h +++ b/src/include/lib/lib_48ef0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48EF0_H -#define _IN_LIBRARY_LIBRARY_48EF0_H +#ifndef _IN_LIB_LIB_48EF0_H +#define _IN_LIB_LIB_48EF0_H #include #include "types.h" diff --git a/src/include/library/library_48f50.h b/src/include/lib/lib_48f50.h similarity index 50% rename from src/include/library/library_48f50.h rename to src/include/lib/lib_48f50.h index 2d7a5c143..b685d4f73 100644 --- a/src/include/library/library_48f50.h +++ b/src/include/lib/lib_48f50.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_48F50_H -#define _IN_LIBRARY_LIBRARY_48F50_H +#ifndef _IN_LIB_LIB_48F50_H +#define _IN_LIB_LIB_48F50_H #include #include "types.h" diff --git a/src/include/library/library_490b0.h b/src/include/lib/lib_490b0.h similarity index 62% rename from src/include/library/library_490b0.h rename to src/include/lib/lib_490b0.h index b0b7abb10..3eee795be 100644 --- a/src/include/library/library_490b0.h +++ b/src/include/lib/lib_490b0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_490B0_H -#define _IN_LIBRARY_LIBRARY_490B0_H +#ifndef _IN_LIB_LIB_490B0_H +#define _IN_LIB_LIB_490B0_H #include #include "types.h" diff --git a/src/include/library/library_491b0.h b/src/include/lib/lib_491b0.h similarity index 72% rename from src/include/library/library_491b0.h rename to src/include/lib/lib_491b0.h index a22c1377b..8066f764b 100644 --- a/src/include/library/library_491b0.h +++ b/src/include/lib/lib_491b0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_491B0_H -#define _IN_LIBRARY_LIBRARY_491B0_H +#ifndef _IN_LIB_LIB_491B0_H +#define _IN_LIB_LIB_491B0_H #include #include "types.h" diff --git a/src/include/library/library_49640.h b/src/include/lib/lib_49640.h similarity index 50% rename from src/include/library/library_49640.h rename to src/include/lib/lib_49640.h index efccd1df7..645d568f9 100644 --- a/src/include/library/library_49640.h +++ b/src/include/lib/lib_49640.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_49640_H -#define _IN_LIBRARY_LIBRARY_49640_H +#ifndef _IN_LIB_LIB_49640_H +#define _IN_LIB_LIB_49640_H #include #include "types.h" diff --git a/src/include/library/library_49780.h b/src/include/lib/lib_49780.h similarity index 57% rename from src/include/library/library_49780.h rename to src/include/lib/lib_49780.h index 63533983c..8afce6b8a 100644 --- a/src/include/library/library_49780.h +++ b/src/include/lib/lib_49780.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_49780_H -#define _IN_LIBRARY_LIBRARY_49780_H +#ifndef _IN_LIB_LIB_49780_H +#define _IN_LIB_LIB_49780_H #include #include "types.h" diff --git a/src/include/library/library_49a90.h b/src/include/lib/lib_49a90.h similarity index 62% rename from src/include/library/library_49a90.h rename to src/include/lib/lib_49a90.h index 09b607dfd..16db42c95 100644 --- a/src/include/library/library_49a90.h +++ b/src/include/lib/lib_49a90.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_49A90_H -#define _IN_LIBRARY_LIBRARY_49A90_H +#ifndef _IN_LIB_LIB_49A90_H +#define _IN_LIB_LIB_49A90_H #include #include "types.h" diff --git a/src/include/library/library_49c20.h b/src/include/lib/lib_49c20.h similarity index 62% rename from src/include/library/library_49c20.h rename to src/include/lib/lib_49c20.h index 772212c60..ffc18ba59 100644 --- a/src/include/library/library_49c20.h +++ b/src/include/lib/lib_49c20.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_49C20_H -#define _IN_LIBRARY_LIBRARY_49C20_H +#ifndef _IN_LIB_LIB_49C20_H +#define _IN_LIB_LIB_49C20_H #include #include "types.h" diff --git a/src/include/library/library_4a360.h b/src/include/lib/lib_4a360.h similarity index 62% rename from src/include/library/library_4a360.h rename to src/include/lib/lib_4a360.h index e90cce553..cf87d6396 100644 --- a/src/include/library/library_4a360.h +++ b/src/include/lib/lib_4a360.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4A360_H -#define _IN_LIBRARY_LIBRARY_4A360_H +#ifndef _IN_LIB_LIB_4A360_H +#define _IN_LIB_LIB_4A360_H #include #include "types.h" diff --git a/src/include/library/library_4a5e0.h b/src/include/lib/lib_4a5e0.h similarity index 61% rename from src/include/library/library_4a5e0.h rename to src/include/lib/lib_4a5e0.h index f2ca41b9a..08f573672 100644 --- a/src/include/library/library_4a5e0.h +++ b/src/include/lib/lib_4a5e0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4A5E0_H -#define _IN_LIBRARY_LIBRARY_4A5E0_H +#ifndef _IN_LIB_LIB_4A5E0_H +#define _IN_LIB_LIB_4A5E0_H #include #include "types.h" diff --git a/src/include/library/library_4a680.h b/src/include/lib/lib_4a680.h similarity index 57% rename from src/include/library/library_4a680.h rename to src/include/lib/lib_4a680.h index b2f0951ab..bffcdf178 100644 --- a/src/include/library/library_4a680.h +++ b/src/include/lib/lib_4a680.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4A680_H -#define _IN_LIBRARY_LIBRARY_4A680_H +#ifndef _IN_LIB_LIB_4A680_H +#define _IN_LIB_LIB_4A680_H #include #include "types.h" diff --git a/src/include/library/library_4a810.h b/src/include/lib/lib_4a810.h similarity index 66% rename from src/include/library/library_4a810.h rename to src/include/lib/lib_4a810.h index 8ed5ca792..832b8720c 100644 --- a/src/include/library/library_4a810.h +++ b/src/include/lib/lib_4a810.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4A810_H -#define _IN_LIBRARY_LIBRARY_4A810_H +#ifndef _IN_LIB_LIB_4A810_H +#define _IN_LIB_LIB_4A810_H #include #include "types.h" diff --git a/src/include/library/library_4a980.h b/src/include/lib/lib_4a980.h similarity index 62% rename from src/include/library/library_4a980.h rename to src/include/lib/lib_4a980.h index 5eaa40adb..d7c4009ab 100644 --- a/src/include/library/library_4a980.h +++ b/src/include/lib/lib_4a980.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4A980_H -#define _IN_LIBRARY_LIBRARY_4A980_H +#ifndef _IN_LIB_LIB_4A980_H +#define _IN_LIB_LIB_4A980_H #include #include "types.h" diff --git a/src/include/library/library_4acc0.h b/src/include/lib/lib_4acc0.h similarity index 57% rename from src/include/library/library_4acc0.h rename to src/include/lib/lib_4acc0.h index 0b3595e98..bfb1a7ede 100644 --- a/src/include/library/library_4acc0.h +++ b/src/include/lib/lib_4acc0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4ACC0_H -#define _IN_LIBRARY_LIBRARY_4ACC0_H +#ifndef _IN_LIB_LIB_4ACC0_H +#define _IN_LIB_LIB_4ACC0_H #include #include "types.h" diff --git a/src/include/library/library_4ace0.h b/src/include/lib/lib_4ace0.h similarity index 50% rename from src/include/library/library_4ace0.h rename to src/include/lib/lib_4ace0.h index d9dea0217..c44e6313b 100644 --- a/src/include/library/library_4ace0.h +++ b/src/include/lib/lib_4ace0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4ACE0_H -#define _IN_LIBRARY_LIBRARY_4ACE0_H +#ifndef _IN_LIB_LIB_4ACE0_H +#define _IN_LIB_LIB_4ACE0_H #include #include "types.h" diff --git a/src/include/library/library_4ad30.h b/src/include/lib/lib_4ad30.h similarity index 50% rename from src/include/library/library_4ad30.h rename to src/include/lib/lib_4ad30.h index 521625acb..f2355ba5d 100644 --- a/src/include/library/library_4ad30.h +++ b/src/include/lib/lib_4ad30.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4AD30_H -#define _IN_LIBRARY_LIBRARY_4AD30_H +#ifndef _IN_LIB_LIB_4AD30_H +#define _IN_LIB_LIB_4AD30_H #include #include "types.h" diff --git a/src/include/library/library_4ad80.h b/src/include/lib/lib_4ad80.h similarity index 50% rename from src/include/library/library_4ad80.h rename to src/include/lib/lib_4ad80.h index 6ddf7043f..72a0491b9 100644 --- a/src/include/library/library_4ad80.h +++ b/src/include/lib/lib_4ad80.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4AD80_H -#define _IN_LIBRARY_LIBRARY_4AD80_H +#ifndef _IN_LIB_LIB_4AD80_H +#define _IN_LIB_LIB_4AD80_H #include #include "types.h" diff --git a/src/include/library/library_4ae00.h b/src/include/lib/lib_4ae00.h similarity index 75% rename from src/include/library/library_4ae00.h rename to src/include/lib/lib_4ae00.h index 4ced7d6b0..aff9efb48 100644 --- a/src/include/library/library_4ae00.h +++ b/src/include/lib/lib_4ae00.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4AE00_H -#define _IN_LIBRARY_LIBRARY_4AE00_H +#ifndef _IN_LIB_LIB_4AE00_H +#define _IN_LIB_LIB_4AE00_H #include #include "types.h" diff --git a/src/include/library/library_4b160.h b/src/include/lib/lib_4b160.h similarity index 50% rename from src/include/library/library_4b160.h rename to src/include/lib/lib_4b160.h index 28459f49c..e289540b2 100644 --- a/src/include/library/library_4b160.h +++ b/src/include/lib/lib_4b160.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4B160_H -#define _IN_LIBRARY_LIBRARY_4B160_H +#ifndef _IN_LIB_LIB_4B160_H +#define _IN_LIB_LIB_4B160_H #include #include "types.h" diff --git a/src/include/library/library_4b170.h b/src/include/lib/lib_4b170.h similarity index 50% rename from src/include/library/library_4b170.h rename to src/include/lib/lib_4b170.h index 984c6ddd8..6187ea474 100644 --- a/src/include/library/library_4b170.h +++ b/src/include/lib/lib_4b170.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4B170_H -#define _IN_LIBRARY_LIBRARY_4B170_H +#ifndef _IN_LIB_LIB_4B170_H +#define _IN_LIB_LIB_4B170_H #include #include "types.h" diff --git a/src/include/library/library_4b480.h b/src/include/lib/lib_4b480.h similarity index 50% rename from src/include/library/library_4b480.h rename to src/include/lib/lib_4b480.h index bbfaaa572..819b3ade8 100644 --- a/src/include/library/library_4b480.h +++ b/src/include/lib/lib_4b480.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4B480_H -#define _IN_LIBRARY_LIBRARY_4B480_H +#ifndef _IN_LIB_LIB_4B480_H +#define _IN_LIB_LIB_4B480_H #include #include "types.h" diff --git a/src/include/library/library_4b500.h b/src/include/lib/lib_4b500.h similarity index 57% rename from src/include/library/library_4b500.h rename to src/include/lib/lib_4b500.h index fe68cd556..2c9fc8042 100644 --- a/src/include/library/library_4b500.h +++ b/src/include/lib/lib_4b500.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4B500_H -#define _IN_LIBRARY_LIBRARY_4B500_H +#ifndef _IN_LIB_LIB_4B500_H +#define _IN_LIB_LIB_4B500_H #include #include "types.h" diff --git a/src/include/library/library_4b550.h b/src/include/lib/lib_4b550.h similarity index 50% rename from src/include/library/library_4b550.h rename to src/include/lib/lib_4b550.h index 92dd9042b..95d953145 100644 --- a/src/include/library/library_4b550.h +++ b/src/include/lib/lib_4b550.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4B550_H -#define _IN_LIBRARY_LIBRARY_4B550_H +#ifndef _IN_LIB_LIB_4B550_H +#define _IN_LIB_LIB_4B550_H #include #include "types.h" diff --git a/src/include/library/library_4b5e0.h b/src/include/lib/lib_4b5e0.h similarity index 62% rename from src/include/library/library_4b5e0.h rename to src/include/lib/lib_4b5e0.h index d0d29a487..29836e37f 100644 --- a/src/include/library/library_4b5e0.h +++ b/src/include/lib/lib_4b5e0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4B5E0_H -#define _IN_LIBRARY_LIBRARY_4B5E0_H +#ifndef _IN_LIB_LIB_4B5E0_H +#define _IN_LIB_LIB_4B5E0_H #include #include "types.h" diff --git a/src/include/library/library_4ba90.h b/src/include/lib/lib_4ba90.h similarity index 72% rename from src/include/library/library_4ba90.h rename to src/include/lib/lib_4ba90.h index 65739080d..2ed4ee9d0 100644 --- a/src/include/library/library_4ba90.h +++ b/src/include/lib/lib_4ba90.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4BA90_H -#define _IN_LIBRARY_LIBRARY_4BA90_H +#ifndef _IN_LIB_LIB_4BA90_H +#define _IN_LIB_LIB_4BA90_H #include #include "types.h" diff --git a/src/include/library/library_4c090.h b/src/include/lib/lib_4c090.h similarity index 75% rename from src/include/library/library_4c090.h rename to src/include/lib/lib_4c090.h index c52691417..dc160d9b3 100644 --- a/src/include/library/library_4c090.h +++ b/src/include/lib/lib_4c090.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4C090_H -#define _IN_LIBRARY_LIBRARY_4C090_H +#ifndef _IN_LIB_LIB_4C090_H +#define _IN_LIB_LIB_4C090_H #include #include "types.h" diff --git a/src/include/library/library_4cc10.h b/src/include/lib/lib_4cc10.h similarity index 50% rename from src/include/library/library_4cc10.h rename to src/include/lib/lib_4cc10.h index 5931744f6..a64ca53db 100644 --- a/src/include/library/library_4cc10.h +++ b/src/include/lib/lib_4cc10.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4CC10_H -#define _IN_LIBRARY_LIBRARY_4CC10_H +#ifndef _IN_LIB_LIB_4CC10_H +#define _IN_LIB_LIB_4CC10_H #include #include "types.h" diff --git a/src/include/library/library_4cde0.h b/src/include/lib/lib_4cde0.h similarity index 50% rename from src/include/library/library_4cde0.h rename to src/include/lib/lib_4cde0.h index 466a0fb0a..606ca729a 100644 --- a/src/include/library/library_4cde0.h +++ b/src/include/lib/lib_4cde0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4CDE0_H -#define _IN_LIBRARY_LIBRARY_4CDE0_H +#ifndef _IN_LIB_LIB_4CDE0_H +#define _IN_LIB_LIB_4CDE0_H #include #include "types.h" diff --git a/src/include/library/library_4ce60.h b/src/include/lib/lib_4ce60.h similarity index 50% rename from src/include/library/library_4ce60.h rename to src/include/lib/lib_4ce60.h index 86a3f94ae..f8379fbae 100644 --- a/src/include/library/library_4ce60.h +++ b/src/include/lib/lib_4ce60.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4CE60_H -#define _IN_LIBRARY_LIBRARY_4CE60_H +#ifndef _IN_LIB_LIB_4CE60_H +#define _IN_LIB_LIB_4CE60_H #include #include "types.h" diff --git a/src/include/library/library_4d000.h b/src/include/lib/lib_4d000.h similarity index 57% rename from src/include/library/library_4d000.h rename to src/include/lib/lib_4d000.h index 489850e63..b4430a053 100644 --- a/src/include/library/library_4d000.h +++ b/src/include/lib/lib_4d000.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4D000_H -#define _IN_LIBRARY_LIBRARY_4D000_H +#ifndef _IN_LIB_LIB_4D000_H +#define _IN_LIB_LIB_4D000_H #include #include "types.h" diff --git a/src/include/library/library_4d480.h b/src/include/lib/lib_4d480.h similarity index 57% rename from src/include/library/library_4d480.h rename to src/include/lib/lib_4d480.h index a3b5343ea..02189d83a 100644 --- a/src/include/library/library_4d480.h +++ b/src/include/lib/lib_4d480.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4D480_H -#define _IN_LIBRARY_LIBRARY_4D480_H +#ifndef _IN_LIB_LIB_4D480_H +#define _IN_LIB_LIB_4D480_H #include #include "types.h" diff --git a/src/include/library/library_4d6f0.h b/src/include/lib/lib_4d6f0.h similarity index 70% rename from src/include/library/library_4d6f0.h rename to src/include/lib/lib_4d6f0.h index 82f0d2400..ce4132a54 100644 --- a/src/include/library/library_4d6f0.h +++ b/src/include/lib/lib_4d6f0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4D6F0_H -#define _IN_LIBRARY_LIBRARY_4D6F0_H +#ifndef _IN_LIB_LIB_4D6F0_H +#define _IN_LIB_LIB_4D6F0_H #include #include "types.h" diff --git a/src/include/library/library_4e270.h b/src/include/lib/lib_4e270.h similarity index 50% rename from src/include/library/library_4e270.h rename to src/include/lib/lib_4e270.h index 20ed48013..d7c1c1244 100644 --- a/src/include/library/library_4e270.h +++ b/src/include/lib/lib_4e270.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4E270_H -#define _IN_LIBRARY_LIBRARY_4E270_H +#ifndef _IN_LIB_LIB_4E270_H +#define _IN_LIB_LIB_4E270_H #include #include "types.h" diff --git a/src/include/library/library_4e3c0.h b/src/include/lib/lib_4e3c0.h similarity index 50% rename from src/include/library/library_4e3c0.h rename to src/include/lib/lib_4e3c0.h index 8533da4bd..2d2a9be76 100644 --- a/src/include/library/library_4e3c0.h +++ b/src/include/lib/lib_4e3c0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4E3C0_H -#define _IN_LIBRARY_LIBRARY_4E3C0_H +#ifndef _IN_LIB_LIB_4E3C0_H +#define _IN_LIB_LIB_4E3C0_H #include #include "types.h" diff --git a/src/include/library/library_4e470.h b/src/include/lib/lib_4e470.h similarity index 57% rename from src/include/library/library_4e470.h rename to src/include/lib/lib_4e470.h index ce64ccc0a..c4adce5ae 100644 --- a/src/include/library/library_4e470.h +++ b/src/include/lib/lib_4e470.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4E470_H -#define _IN_LIBRARY_LIBRARY_4E470_H +#ifndef _IN_LIB_LIB_4E470_H +#define _IN_LIB_LIB_4E470_H #include #include "types.h" diff --git a/src/include/library/library_4e530.h b/src/include/lib/lib_4e530.h similarity index 62% rename from src/include/library/library_4e530.h rename to src/include/lib/lib_4e530.h index ac794a16c..cf3bac9fa 100644 --- a/src/include/library/library_4e530.h +++ b/src/include/lib/lib_4e530.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4E530_H -#define _IN_LIBRARY_LIBRARY_4E530_H +#ifndef _IN_LIB_LIB_4E530_H +#define _IN_LIB_LIB_4E530_H #include #include "types.h" diff --git a/src/include/library/library_4e690.h b/src/include/lib/lib_4e690.h similarity index 57% rename from src/include/library/library_4e690.h rename to src/include/lib/lib_4e690.h index 44fdd4691..ce7ac8c0a 100644 --- a/src/include/library/library_4e690.h +++ b/src/include/lib/lib_4e690.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4E690_H -#define _IN_LIBRARY_LIBRARY_4E690_H +#ifndef _IN_LIB_LIB_4E690_H +#define _IN_LIB_LIB_4E690_H #include #include "types.h" diff --git a/src/include/library/library_4f350.h b/src/include/lib/lib_4f350.h similarity index 57% rename from src/include/library/library_4f350.h rename to src/include/lib/lib_4f350.h index 01e4069b1..537fdb5e1 100644 --- a/src/include/library/library_4f350.h +++ b/src/include/lib/lib_4f350.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4F350_H -#define _IN_LIBRARY_LIBRARY_4F350_H +#ifndef _IN_LIB_LIB_4F350_H +#define _IN_LIB_LIB_4F350_H #include #include "types.h" diff --git a/src/include/library/library_4f400.h b/src/include/lib/lib_4f400.h similarity index 62% rename from src/include/library/library_4f400.h rename to src/include/lib/lib_4f400.h index c9223408a..3fbbd72e5 100644 --- a/src/include/library/library_4f400.h +++ b/src/include/lib/lib_4f400.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4F400_H -#define _IN_LIBRARY_LIBRARY_4F400_H +#ifndef _IN_LIB_LIB_4F400_H +#define _IN_LIB_LIB_4F400_H #include #include "types.h" diff --git a/src/include/library/library_4f5e0.h b/src/include/lib/lib_4f5e0.h similarity index 75% rename from src/include/library/library_4f5e0.h rename to src/include/lib/lib_4f5e0.h index d94288446..ee24278d9 100644 --- a/src/include/library/library_4f5e0.h +++ b/src/include/lib/lib_4f5e0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4F5E0_H -#define _IN_LIBRARY_LIBRARY_4F5E0_H +#ifndef _IN_LIB_LIB_4F5E0_H +#define _IN_LIB_LIB_4F5E0_H #include #include "types.h" diff --git a/src/include/library/library_4fe20.h b/src/include/lib/lib_4fe20.h similarity index 50% rename from src/include/library/library_4fe20.h rename to src/include/lib/lib_4fe20.h index b799b35c4..3b2c4c4c8 100644 --- a/src/include/library/library_4fe20.h +++ b/src/include/lib/lib_4fe20.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4FE20_H -#define _IN_LIBRARY_LIBRARY_4FE20_H +#ifndef _IN_LIB_LIB_4FE20_H +#define _IN_LIB_LIB_4FE20_H #include #include "types.h" diff --git a/src/include/library/library_4fff0.h b/src/include/lib/lib_4fff0.h similarity index 50% rename from src/include/library/library_4fff0.h rename to src/include/lib/lib_4fff0.h index 1019e6adc..d795f199f 100644 --- a/src/include/library/library_4fff0.h +++ b/src/include/lib/lib_4fff0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_4FFF0_H -#define _IN_LIBRARY_LIBRARY_4FFF0_H +#ifndef _IN_LIB_LIB_4FFF0_H +#define _IN_LIB_LIB_4FFF0_H #include #include "types.h" diff --git a/src/include/library/library_50090.h b/src/include/lib/lib_50090.h similarity index 64% rename from src/include/library/library_50090.h rename to src/include/lib/lib_50090.h index 3a06e2f41..964b54b66 100644 --- a/src/include/library/library_50090.h +++ b/src/include/lib/lib_50090.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_50090_H -#define _IN_LIBRARY_LIBRARY_50090_H +#ifndef _IN_LIB_LIB_50090_H +#define _IN_LIB_LIB_50090_H #include #include "types.h" diff --git a/src/include/library/library_50130.h b/src/include/lib/lib_50130.h similarity index 66% rename from src/include/library/library_50130.h rename to src/include/lib/lib_50130.h index a24fae16f..0e24752bf 100644 --- a/src/include/library/library_50130.h +++ b/src/include/lib/lib_50130.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_50130_H -#define _IN_LIBRARY_LIBRARY_50130_H +#ifndef _IN_LIB_LIB_50130_H +#define _IN_LIB_LIB_50130_H #include #include "types.h" diff --git a/src/include/library/library_50480.h b/src/include/lib/lib_50480.h similarity index 62% rename from src/include/library/library_50480.h rename to src/include/lib/lib_50480.h index 44cdb4544..1daa5c1fb 100644 --- a/src/include/library/library_50480.h +++ b/src/include/lib/lib_50480.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_50480_H -#define _IN_LIBRARY_LIBRARY_50480_H +#ifndef _IN_LIB_LIB_50480_H +#define _IN_LIB_LIB_50480_H #include #include "types.h" diff --git a/src/include/library/library_50a00.h b/src/include/lib/lib_50a00.h similarity index 62% rename from src/include/library/library_50a00.h rename to src/include/lib/lib_50a00.h index 526d54d05..ebb482410 100644 --- a/src/include/library/library_50a00.h +++ b/src/include/lib/lib_50a00.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_50A00_H -#define _IN_LIBRARY_LIBRARY_50A00_H +#ifndef _IN_LIB_LIB_50A00_H +#define _IN_LIB_LIB_50A00_H #include #include "types.h" diff --git a/src/include/lib/lib_50f20.h b/src/include/lib/lib_50f20.h new file mode 100644 index 000000000..32044c14c --- /dev/null +++ b/src/include/lib/lib_50f20.h @@ -0,0 +1,8 @@ +#ifndef _IN_LIB_LIB_50F20_H +#define _IN_LIB_LIB_50F20_H +#include +#include "types.h" + +u32 func50f20(void); + +#endif diff --git a/src/include/library/library_513b0.h b/src/include/lib/lib_513b0.h similarity index 57% rename from src/include/library/library_513b0.h rename to src/include/lib/lib_513b0.h index ed0d2da32..4010e65e5 100644 --- a/src/include/library/library_513b0.h +++ b/src/include/lib/lib_513b0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_513B0_H -#define _IN_LIBRARY_LIBRARY_513B0_H +#ifndef _IN_LIB_LIB_513B0_H +#define _IN_LIB_LIB_513B0_H #include #include "types.h" diff --git a/src/include/library/library_51880.h b/src/include/lib/lib_51880.h similarity index 50% rename from src/include/library/library_51880.h rename to src/include/lib/lib_51880.h index 98ef4a4ba..cf156c4f1 100644 --- a/src/include/library/library_51880.h +++ b/src/include/lib/lib_51880.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_51880_H -#define _IN_LIBRARY_LIBRARY_51880_H +#ifndef _IN_LIB_LIB_51880_H +#define _IN_LIB_LIB_51880_H #include #include "types.h" diff --git a/src/include/library/library_51890.h b/src/include/lib/lib_51890.h similarity index 57% rename from src/include/library/library_51890.h rename to src/include/lib/lib_51890.h index 3cface433..8e7461764 100644 --- a/src/include/library/library_51890.h +++ b/src/include/lib/lib_51890.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_51890_H -#define _IN_LIBRARY_LIBRARY_51890_H +#ifndef _IN_LIB_LIB_51890_H +#define _IN_LIB_LIB_51890_H #include #include "types.h" diff --git a/src/include/library/library_51900.h b/src/include/lib/lib_51900.h similarity index 50% rename from src/include/library/library_51900.h rename to src/include/lib/lib_51900.h index 308704788..8724f9600 100644 --- a/src/include/library/library_51900.h +++ b/src/include/lib/lib_51900.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_51900_H -#define _IN_LIBRARY_LIBRARY_51900_H +#ifndef _IN_LIB_LIB_51900_H +#define _IN_LIB_LIB_51900_H #include #include "types.h" diff --git a/src/include/library/library_51a60.h b/src/include/lib/lib_51a60.h similarity index 57% rename from src/include/library/library_51a60.h rename to src/include/lib/lib_51a60.h index ed5e2efa5..3e24becec 100644 --- a/src/include/library/library_51a60.h +++ b/src/include/lib/lib_51a60.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_51A60_H -#define _IN_LIBRARY_LIBRARY_51A60_H +#ifndef _IN_LIB_LIB_51A60_H +#define _IN_LIB_LIB_51A60_H #include #include "types.h" diff --git a/src/include/library/library_51c10.h b/src/include/lib/lib_51c10.h similarity index 50% rename from src/include/library/library_51c10.h rename to src/include/lib/lib_51c10.h index dfe0aa665..e4dcfc6d2 100644 --- a/src/include/library/library_51c10.h +++ b/src/include/lib/lib_51c10.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_51C10_H -#define _IN_LIBRARY_LIBRARY_51C10_H +#ifndef _IN_LIB_LIB_51C10_H +#define _IN_LIB_LIB_51C10_H #include #include "types.h" diff --git a/src/include/library/library_51c60.h b/src/include/lib/lib_51c60.h similarity index 57% rename from src/include/library/library_51c60.h rename to src/include/lib/lib_51c60.h index 569329277..8392d96b7 100644 --- a/src/include/library/library_51c60.h +++ b/src/include/lib/lib_51c60.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_51C60_H -#define _IN_LIBRARY_LIBRARY_51C60_H +#ifndef _IN_LIB_LIB_51C60_H +#define _IN_LIB_LIB_51C60_H #include #include "types.h" diff --git a/src/include/library/library_51d50.h b/src/include/lib/lib_51d50.h similarity index 57% rename from src/include/library/library_51d50.h rename to src/include/lib/lib_51d50.h index c03658c9b..019051f98 100644 --- a/src/include/library/library_51d50.h +++ b/src/include/lib/lib_51d50.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_51D50_H -#define _IN_LIBRARY_LIBRARY_51D50_H +#ifndef _IN_LIB_LIB_51D50_H +#define _IN_LIB_LIB_51D50_H #include #include "types.h" diff --git a/src/include/library/library_51ec0.h b/src/include/lib/lib_51ec0.h similarity index 62% rename from src/include/library/library_51ec0.h rename to src/include/lib/lib_51ec0.h index 29cd288f9..61f4015ee 100644 --- a/src/include/library/library_51ec0.h +++ b/src/include/lib/lib_51ec0.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_51EC0_H -#define _IN_LIBRARY_LIBRARY_51EC0_H +#ifndef _IN_LIB_LIB_51EC0_H +#define _IN_LIB_LIB_51EC0_H #include #include "types.h" diff --git a/src/include/library/library_52070.h b/src/include/lib/lib_52070.h similarity index 57% rename from src/include/library/library_52070.h rename to src/include/lib/lib_52070.h index be24e679b..f8ac23c87 100644 --- a/src/include/library/library_52070.h +++ b/src/include/lib/lib_52070.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_52070_H -#define _IN_LIBRARY_LIBRARY_52070_H +#ifndef _IN_LIB_LIB_52070_H +#define _IN_LIB_LIB_52070_H #include #include "types.h" diff --git a/src/include/library/library_52360.h b/src/include/lib/lib_52360.h similarity index 50% rename from src/include/library/library_52360.h rename to src/include/lib/lib_52360.h index b31e5ef33..e21ebb0c6 100644 --- a/src/include/library/library_52360.h +++ b/src/include/lib/lib_52360.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIBRARY_LIBRARY_52360_H -#define _IN_LIBRARY_LIBRARY_52360_H +#ifndef _IN_LIB_LIB_52360_H +#define _IN_LIB_LIB_52360_H #include #include "types.h" diff --git a/src/include/library/library_13820.h b/src/include/library/library_13820.h deleted file mode 100644 index 2e40d500c..000000000 --- a/src/include/library/library_13820.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _IN_LIBRARY_LIBRARY_13820_H -#define _IN_LIBRARY_LIBRARY_13820_H -#include -#include "types.h" - -#endif diff --git a/src/include/library/library_50f20.h b/src/include/library/library_50f20.h deleted file mode 100644 index 5a3c8d7a2..000000000 --- a/src/include/library/library_50f20.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_LIBRARY_LIBRARY_50F20_H -#define _IN_LIBRARY_LIBRARY_50F20_H -#include -#include "types.h" - -u32 func50f20(void); - -#endif diff --git a/src/library/library_03050.c b/src/lib/lib_03050.c similarity index 97% rename from src/library/library_03050.c rename to src/lib/lib_03050.c index db8049bac..89cc2549f 100644 --- a/src/library/library_03050.c +++ b/src/lib/lib_03050.c @@ -5,17 +5,17 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_03050.h" -#include "library/library_03ee0.h" -#include "library/library_481e0.h" -#include "library/library_48520.h" -#include "library/library_48650.h" -#include "library/library_48830.h" -#include "library/library_488e0.h" -#include "library/library_491b0.h" -#include "library/library_49640.h" -#include "library/library_49780.h" -#include "library/library_49a90.h" +#include "lib/lib_03050.h" +#include "lib/lib_03ee0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48520.h" +#include "lib/lib_48650.h" +#include "lib/lib_48830.h" +#include "lib/lib_488e0.h" +#include "lib/lib_491b0.h" +#include "lib/lib_49640.h" +#include "lib/lib_49780.h" +#include "lib/lib_49a90.h" #include "types.h" const u32 var70052430[] = {0x70002d68}; diff --git a/src/library/library_034f0.c b/src/lib/lib_034f0.c similarity index 99% rename from src/library/library_034f0.c rename to src/lib/lib_034f0.c index 0e6dcb8ba..17478d4f7 100644 --- a/src/library/library_034f0.c +++ b/src/lib/lib_034f0.c @@ -6,8 +6,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_034f0.h" -#include "library/library_49c20.h" +#include "lib/lib_034f0.h" +#include "lib/lib_49c20.h" #include "types.h" const u32 var70052450[] = {0x00141818}; diff --git a/src/library/library_03ee0.c b/src/lib/lib_03ee0.c similarity index 98% rename from src/library/library_03ee0.c rename to src/lib/lib_03ee0.c index ec24d554b..7d59dd4c8 100644 --- a/src/library/library_03ee0.c +++ b/src/lib/lib_03ee0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_491b0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_03fb0.c b/src/lib/lib_03fb0.c similarity index 99% rename from src/library/library_03fb0.c rename to src/lib/lib_03fb0.c index 9228b1466..8ea12400f 100644 --- a/src/library/library_03fb0.c +++ b/src/lib/lib_03fb0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_03fb0.h" -#include "library/library_4a360.h" +#include "lib/lib_03fb0.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_04320.c b/src/lib/lib_04320.c similarity index 99% rename from src/library/library_04320.c rename to src/lib/lib_04320.c index b3ce1f901..73144db06 100644 --- a/src/library/library_04320.c +++ b/src/lib/lib_04320.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_04320.h" -#include "library/library_4a360.h" +#include "lib/lib_04320.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_04790.c b/src/lib/lib_04790.c similarity index 87% rename from src/library/library_04790.c rename to src/lib/lib_04790.c index 95cf40b3e..76f4f2d54 100644 --- a/src/library/library_04790.c +++ b/src/lib/lib_04790.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_4a360.h" +#include "lib/lib_04790.h" +#include "lib/lib_4a360.h" #include "types.h" void scaleTo1(f32 *x, f32 *y, f32 *z) diff --git a/src/library/library_04840.c b/src/lib/lib_04840.c similarity index 98% rename from src/library/library_04840.c rename to src/lib/lib_04840.c index 78205aea6..063ca92de 100644 --- a/src/library/library_04840.c +++ b/src/lib/lib_04840.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_04840.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" +#include "lib/lib_04840.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" #include "types.h" const u32 var700524b0[] = {0x3c8efa35}; diff --git a/src/library/library_04a80.c b/src/lib/lib_04a80.c similarity index 99% rename from src/library/library_04a80.c rename to src/lib/lib_04a80.c index fac93575b..557a4e570 100644 --- a/src/library/library_04a80.c +++ b/src/lib/lib_04a80.c @@ -6,22 +6,22 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_04a80.h" -#include "library/library_16110.h" -#include "library/library_48150.h" -#include "library/library_481e0.h" -#include "library/library_48650.h" -#include "library/library_4a360.h" -#include "library/library_4a5e0.h" -#include "library/library_4a680.h" -#include "library/library_4a810.h" -#include "library/library_4acc0.h" -#include "library/library_4ace0.h" -#include "library/library_4ad30.h" -#include "library/library_4ad80.h" -#include "library/library_4ae00.h" -#include "library/library_4b160.h" +#include "lib/lib_04790.h" +#include "lib/lib_04a80.h" +#include "lib/lib_16110.h" +#include "lib/lib_48150.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4a5e0.h" +#include "lib/lib_4a680.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4acc0.h" +#include "lib/lib_4ace0.h" +#include "lib/lib_4ad30.h" +#include "lib/lib_4ad80.h" +#include "lib/lib_4ae00.h" +#include "lib/lib_4b160.h" #include "types.h" const u32 var700524c0[] = {0x3c8efa35}; diff --git a/src/library/library_05e40.c b/src/lib/lib_05e40.c similarity index 97% rename from src/library/library_05e40.c rename to src/lib/lib_05e40.c index 9f38ec67e..18d1f1174 100644 --- a/src/library/library_05e40.c +++ b/src/lib/lib_05e40.c @@ -5,13 +5,13 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_05e40.h" -#include "library/library_4ad80.h" -#include "library/library_4b170.h" -#include "library/library_4b480.h" -#include "library/library_4b500.h" -#include "library/library_4b550.h" -#include "library/library_4b5e0.h" +#include "lib/lib_05e40.h" +#include "lib/lib_4ad80.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4b500.h" +#include "lib/lib_4b550.h" +#include "lib/lib_4b5e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_06100.c b/src/lib/lib_06100.c similarity index 97% rename from src/library/library_06100.c rename to src/lib/lib_06100.c index 0adb4a77a..a31eb5859 100644 --- a/src/library/library_06100.c +++ b/src/lib/lib_06100.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_481e0.h" -#include "library/library_48650.h" -#include "library/library_48b20.h" -#include "library/library_4b5e0.h" -#include "library/library_4ba90.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_48b20.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4ba90.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_06330.c b/src/lib/lib_06330.c similarity index 95% rename from src/library/library_06330.c rename to src/lib/lib_06330.c index 5da117837..5bcc02599 100644 --- a/src/library/library_06330.c +++ b/src/lib/lib_06330.c @@ -5,10 +5,10 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_06100.h" -#include "library/library_48650.h" -#include "library/library_48b20.h" -#include "library/library_4b5e0.h" +#include "lib/lib_06100.h" +#include "lib/lib_48650.h" +#include "lib/lib_48b20.h" +#include "lib/lib_4b5e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_06440.c b/src/lib/lib_06440.c similarity index 96% rename from src/library/library_06440.c rename to src/lib/lib_06440.c index f08513880..d24dd907e 100644 --- a/src/library/library_06440.c +++ b/src/lib/lib_06440.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_48650.h" -#include "library/library_48b20.h" -#include "library/library_4ba90.h" +#include "lib/lib_48650.h" +#include "lib/lib_48b20.h" +#include "lib/lib_4ba90.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_06550.c b/src/lib/lib_06550.c similarity index 98% rename from src/library/library_06550.c rename to src/lib/lib_06550.c index 07ed9a681..fe0b9ede8 100644 --- a/src/library/library_06550.c +++ b/src/lib/lib_06550.c @@ -5,18 +5,18 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_06550.h" -#include "library/library_4a810.h" -#include "library/library_4b170.h" -#include "library/library_4b5e0.h" -#include "library/library_4ba90.h" -#include "library/library_4c090.h" -#include "library/library_4cc10.h" -#include "library/library_4cde0.h" -#include "library/library_4ce60.h" -#include "library/library_4d000.h" -#include "library/library_4d480.h" -#include "library/library_4d6f0.h" +#include "lib/lib_06550.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4ba90.h" +#include "lib/lib_4c090.h" +#include "lib/lib_4cc10.h" +#include "lib/lib_4cde0.h" +#include "lib/lib_4ce60.h" +#include "lib/lib_4d000.h" +#include "lib/lib_4d480.h" +#include "lib/lib_4d6f0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_070d0.c b/src/lib/lib_070d0.c similarity index 98% rename from src/library/library_070d0.c rename to src/lib/lib_070d0.c index d970ef1cc..59171f6a7 100644 --- a/src/library/library_070d0.c +++ b/src/lib/lib_070d0.c @@ -6,11 +6,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_074f0.h" -#include "library/library_0d0a0.h" -#include "library/library_48150.h" -#include "library/library_4b480.h" -#include "library/library_4d6f0.h" +#include "lib/lib_074f0.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_48150.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4d6f0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_074f0.c b/src/lib/lib_074f0.c similarity index 99% rename from src/library/library_074f0.c rename to src/lib/lib_074f0.c index e016c43b5..0629a0294 100644 --- a/src/library/library_074f0.c +++ b/src/lib/lib_074f0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_074f0.h" -#include "library/library_2fa00.h" +#include "lib/lib_074f0.h" +#include "lib/lib_2fa00.h" #include "types.h" const u32 var70052530[] = {0x00000001}; diff --git a/src/library/library_08a20.c b/src/lib/lib_08a20.c similarity index 98% rename from src/library/library_08a20.c rename to src/lib/lib_08a20.c index 985c6f779..653cf03ee 100644 --- a/src/library/library_08a20.c +++ b/src/lib/lib_08a20.c @@ -6,21 +6,21 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_03ee0.h" -#include "library/library_08a20.h" -#include "library/library_09660.h" -#include "library/library_2faf0.h" -#include "library/library_2fba0.h" -#include "library/library_2fc60.h" -#include "library/library_30ce0.h" -#include "library/library_481e0.h" -#include "library/library_48650.h" -#include "library/library_490b0.h" -#include "library/library_4ae00.h" -#include "library/library_4b480.h" -#include "library/library_4e270.h" -#include "library/library_4e3c0.h" -#include "library/library_4e470.h" +#include "lib/lib_03ee0.h" +#include "lib/lib_08a20.h" +#include "lib/lib_09660.h" +#include "lib/lib_2faf0.h" +#include "lib/lib_2fba0.h" +#include "lib/lib_2fc60.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_490b0.h" +#include "lib/lib_4ae00.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4e270.h" +#include "lib/lib_4e3c0.h" +#include "lib/lib_4e470.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_09660.c b/src/lib/lib_09660.c similarity index 99% rename from src/library/library_09660.c rename to src/lib/lib_09660.c index f1ee0a756..6e54d6633 100644 --- a/src/library/library_09660.c +++ b/src/lib/lib_09660.c @@ -10,23 +10,23 @@ #include "game/game_176080.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "library/library_04840.h" -#include "library/library_09660.h" -#include "library/library_121e0.h" -#include "library/library_159b0.h" -#include "library/library_2faf0.h" -#include "library/library_30ce0.h" -#include "library/library_481e0.h" -#include "library/library_48650.h" -#include "library/library_48cd0.h" -#include "library/library_48dc0.h" -#include "library/library_48ef0.h" -#include "library/library_48f50.h" -#include "library/library_4a360.h" -#include "library/library_4b170.h" -#include "library/library_4b480.h" -#include "library/library_4e470.h" -#include "library/library_4e530.h" +#include "lib/lib_04840.h" +#include "lib/lib_09660.h" +#include "lib/lib_121e0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_2faf0.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_48cd0.h" +#include "lib/lib_48dc0.h" +#include "lib/lib_48ef0.h" +#include "lib/lib_48f50.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4e470.h" +#include "lib/lib_4e530.h" #include "types.h" const u32 var700526d0[] = {0x01400140}; diff --git a/src/library/library_0bfb0.c b/src/lib/lib_0bfb0.c similarity index 98% rename from src/library/library_0bfb0.c rename to src/lib/lib_0bfb0.c index 7820bd8e9..810f5d94e 100644 --- a/src/library/library_0bfb0.c +++ b/src/lib/lib_0bfb0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_0c000.h" -#include "library/library_2fa00.h" +#include "lib/lib_0c000.h" +#include "lib/lib_2fa00.h" #include "types.h" const char var700526e0[] = "ASSERTION : %s, %d: (\"%s\")\n"; diff --git a/src/library/library_0c000.c b/src/lib/lib_0c000.c similarity index 99% rename from src/library/library_0c000.c rename to src/lib/lib_0c000.c index f721d9f89..9b4aa56da 100644 --- a/src/library/library_0c000.c +++ b/src/lib/lib_0c000.c @@ -5,14 +5,14 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_03ee0.h" -#include "library/library_09660.h" -#include "library/library_0c000.h" -#include "library/library_2fa00.h" -#include "library/library_481e0.h" -#include "library/library_48520.h" -#include "library/library_48650.h" -#include "library/library_4e530.h" +#include "lib/lib_03ee0.h" +#include "lib/lib_09660.h" +#include "lib/lib_0c000.h" +#include "lib/lib_2fa00.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48520.h" +#include "lib/lib_48650.h" +#include "lib/lib_4e530.h" #include "types.h" const char var700529b0[] = "Bad tid\n"; diff --git a/src/library/library_0d0a0.c b/src/lib/lib_0d0a0.c similarity index 98% rename from src/library/library_0d0a0.c rename to src/lib/lib_0d0a0.c index 886c9f564..583157869 100644 --- a/src/library/library_0d0a0.c +++ b/src/lib/lib_0d0a0.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_0d0a0.h" -#include "library/library_481e0.h" -#include "library/library_48650.h" -#include "library/library_4e470.h" -#include "library/library_4e530.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_4e470.h" +#include "lib/lib_4e530.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_0d520.c b/src/lib/lib_0d520.c similarity index 98% rename from src/library/library_0d520.c rename to src/lib/lib_0d520.c index a2a82b85c..01498f8ea 100644 --- a/src/library/library_0d520.c +++ b/src/lib/lib_0d520.c @@ -43,31 +43,31 @@ #include "game/game_187770.h" #include "game/game_1a78b0.h" #include "gvars/gvars.h" -#include "library/library_03050.h" -#include "library/library_070d0.h" -#include "library/library_074f0.h" -#include "library/library_08a20.h" -#include "library/library_09660.h" -#include "library/library_0bfb0.h" -#include "library/library_0c000.h" -#include "library/library_0d0a0.h" -#include "library/library_0d520.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_126b0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_13750.h" -#include "library/library_13790.h" -#include "library/library_13900.h" -#include "library/library_15860.h" -#include "library/library_233c0.h" -#include "library/library_2f490.h" -#include "library/library_2fa00.h" -#include "library/library_481e0.h" -#include "library/library_48650.h" -#include "library/library_48b20.h" -#include "library/library_4b480.h" +#include "lib/lib_03050.h" +#include "lib/lib_070d0.h" +#include "lib/lib_074f0.h" +#include "lib/lib_08a20.h" +#include "lib/lib_09660.h" +#include "lib/lib_0bfb0.h" +#include "lib/lib_0c000.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_0d520.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_126b0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_13750.h" +#include "lib/lib_13790.h" +#include "lib/lib_13900.h" +#include "lib/lib_15860.h" +#include "lib/lib_233c0.h" +#include "lib/lib_2f490.h" +#include "lib/lib_2fa00.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_48b20.h" +#include "lib/lib_4b480.h" #include "types.h" const char var70052ca0[] = "-ml0 -me0 -mgfx120 -mvtx98 -ma400"; diff --git a/src/library/library_0e9d0.c b/src/lib/lib_0e9d0.c similarity index 99% rename from src/library/library_0e9d0.c rename to src/lib/lib_0e9d0.c index 66f3989b7..0bdaef7a4 100644 --- a/src/library/library_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -8,23 +8,23 @@ #include "game/game_167ae0.h" #include "game/game_16cfa0.h" #include "gvars/gvars.h" -#include "library/library_074f0.h" -#include "library/library_08a20.h" -#include "library/library_0d0a0.h" -#include "library/library_0e9d0.h" -#include "library/library_121e0.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_2faf0.h" -#include "library/library_2fc60.h" -#include "library/library_317f0.h" -#include "library/library_37650.h" -#include "library/library_37b00.h" -#include "library/library_38d10.h" -#include "library/library_38d30.h" -#include "library/library_39c80.h" -#include "library/library_481e0.h" -#include "library/library_48830.h" +#include "lib/lib_074f0.h" +#include "lib/lib_08a20.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_2faf0.h" +#include "lib/lib_2fc60.h" +#include "lib/lib_317f0.h" +#include "lib/lib_37650.h" +#include "lib/lib_37b00.h" +#include "lib/lib_38d10.h" +#include "lib/lib_38d30.h" +#include "lib/lib_39c80.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48830.h" #include "types.h" const char var70053b20[] = "RUSSES SOUND GUARD STRING"; diff --git a/src/library/library_11420.c b/src/lib/lib_11420.c similarity index 99% rename from src/library/library_11420.c rename to src/lib/lib_11420.c index f31efbc7a..566db9480 100644 --- a/src/library/library_11420.c +++ b/src/lib/lib_11420.c @@ -7,11 +7,11 @@ #include "game/game_16cfa0.h" #include "game/game_176080.h" #include "gvars/gvars.h" -#include "library/library_0e9d0.h" -#include "library/library_11420.h" -#include "library/library_38d10.h" -#include "library/library_39c80.h" -#include "library/library_39f70.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_11420.h" +#include "lib/lib_38d10.h" +#include "lib/lib_39c80.h" +#include "lib/lib_39f70.h" #include "types.h" const u32 var70053ca0[] = {0x00000000}; diff --git a/src/library/library_121e0.c b/src/lib/lib_121e0.c similarity index 99% rename from src/library/library_121e0.c rename to src/lib/lib_121e0.c index 76f3c7c50..ced0d3bb5 100644 --- a/src/library/library_121e0.c +++ b/src/lib/lib_121e0.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" +#include "lib/lib_121e0.h" #include "types.h" void func000121e0(void) diff --git a/src/library/library_126b0.c b/src/lib/lib_126b0.c similarity index 99% rename from src/library/library_126b0.c rename to src/lib/lib_126b0.c index e39931707..701d20c5a 100644 --- a/src/library/library_126b0.c +++ b/src/lib/lib_126b0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_126b0.h" +#include "lib/lib_126b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_12dc0.c b/src/lib/lib_12dc0.c similarity index 98% rename from src/library/library_12dc0.c rename to src/lib/lib_12dc0.c index 4a22f5a8e..b0841ab68 100644 --- a/src/library/library_12dc0.c +++ b/src/lib/lib_12dc0.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" -#include "library/library_13130.h" -#include "library/library_2fa00.h" -#include "library/library_4a5e0.h" -#include "library/library_4e530.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_13130.h" +#include "lib/lib_2fa00.h" +#include "lib/lib_4a5e0.h" +#include "lib/lib_4e530.h" #include "types.h" const u32 var70053ff0[] = {0x00000000}; diff --git a/src/library/library_13130.c b/src/lib/lib_13130.c similarity index 99% rename from src/library/library_13130.c rename to src/lib/lib_13130.c index 044b9e66c..0a2834c88 100644 --- a/src/library/library_13130.c +++ b/src/lib/lib_13130.c @@ -5,10 +5,10 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_0bfb0.h" -#include "library/library_13130.h" -#include "library/library_4a5e0.h" -#include "library/library_4e690.h" +#include "lib/lib_0bfb0.h" +#include "lib/lib_13130.h" +#include "lib/lib_4a5e0.h" +#include "lib/lib_4e690.h" #include "types.h" const char var70054010[] = "s1"; diff --git a/src/library/library_13710.c b/src/lib/lib_13710.c similarity index 81% rename from src/library/library_13710.c rename to src/lib/lib_13710.c index b48059f4e..747b5564d 100644 --- a/src/library/library_13710.c +++ b/src/lib/lib_13710.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_03050.h" -#include "library/library_13710.h" +#include "lib/lib_03050.h" +#include "lib/lib_13710.h" #include "types.h" void func00013710(void) diff --git a/src/library/library_13750.c b/src/lib/lib_13750.c similarity index 83% rename from src/library/library_13750.c rename to src/lib/lib_13750.c index 870795a57..b0fe18105 100644 --- a/src/library/library_13750.c +++ b/src/lib/lib_13750.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_13750.h" -#include "library/library_481e0.h" +#include "lib/lib_13750.h" +#include "lib/lib_481e0.h" #include "types.h" void func00013750(void) diff --git a/src/library/library_13790.c b/src/lib/lib_13790.c similarity index 96% rename from src/library/library_13790.c rename to src/lib/lib_13790.c index e44b2b8c9..42dc02f37 100644 --- a/src/library/library_13790.c +++ b/src/lib/lib_13790.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_13790.h" +#include "lib/lib_13790.h" #include "types.h" void func00013790(void) diff --git a/src/library/library_13820.c b/src/lib/lib_13820.c similarity index 98% rename from src/library/library_13820.c rename to src/lib/lib_13820.c index e7aa1b35f..b89e494c8 100644 --- a/src/library/library_13820.c +++ b/src/lib/lib_13820.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4ae00.h" +#include "lib/lib_4ae00.h" #include "types.h" const char var70054030[] = "0123456789abcdefghijklmnopqrstuvwxyz"; diff --git a/src/library/library_13900.c b/src/lib/lib_13900.c similarity index 99% rename from src/library/library_13900.c rename to src/lib/lib_13900.c index a272dfde6..1a37ccdc8 100644 --- a/src/library/library_13900.c +++ b/src/lib/lib_13900.c @@ -6,17 +6,17 @@ #include "game/data/data_020df0.h" #include "game/game_1165d0.h" #include "gvars/gvars.h" -#include "library/library_04a80.h" -#include "library/library_0d520.h" -#include "library/library_13900.h" -#include "library/library_481e0.h" -#include "library/library_48520.h" -#include "library/library_48650.h" -#include "library/library_488e0.h" -#include "library/library_4a980.h" -#include "library/library_4f350.h" -#include "library/library_4f400.h" -#include "library/library_4f5e0.h" +#include "lib/lib_04a80.h" +#include "lib/lib_0d520.h" +#include "lib/lib_13900.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48520.h" +#include "lib/lib_48650.h" +#include "lib/lib_488e0.h" +#include "lib/lib_4a980.h" +#include "lib/lib_4f350.h" +#include "lib/lib_4f400.h" +#include "lib/lib_4f5e0.h" #include "types.h" const char var70054080[] = "joyReset\n"; diff --git a/src/library/library_15860.c b/src/lib/lib_15860.c similarity index 98% rename from src/library/library_15860.c rename to src/lib/lib_15860.c index 7df5b4d86..5079fc341 100644 --- a/src/library/library_15860.c +++ b/src/lib/lib_15860.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_15860.h" +#include "lib/lib_15860.h" #include "types.h" void initGlobalVariables(void) diff --git a/src/library/library_159b0.c b/src/lib/lib_159b0.c similarity index 99% rename from src/library/library_159b0.c rename to src/lib/lib_159b0.c index 2a238573a..7d5f95832 100644 --- a/src/library/library_159b0.c +++ b/src/lib/lib_159b0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_48650.h" -#include "library/library_488e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_488e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_16110.c b/src/lib/lib_16110.c similarity index 99% rename from src/library/library_16110.c rename to src/lib/lib_16110.c index 3abf08a26..2319bba40 100644 --- a/src/library/library_16110.c +++ b/src/lib/lib_16110.c @@ -8,11 +8,11 @@ #include "game/game_096750.h" #include "game/game_114240.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_4a360.h" -#include "library/library_4f5e0.h" +#include "lib/lib_04790.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4f5e0.h" #include "types.h" const u32 var70054200[] = {0x42652ee0}; diff --git a/src/library/library_1a500.c b/src/lib/lib_1a500.c similarity index 99% rename from src/library/library_1a500.c rename to src/lib/lib_1a500.c index 2d64781a7..5ba9aa368 100644 --- a/src/library/library_1a500.c +++ b/src/lib/lib_1a500.c @@ -13,14 +13,14 @@ #include "game/game_157db0.h" #include "game/game_166e40.h" #include "gvars/gvars.h" -#include "library/library_12dc0.h" -#include "library/library_159b0.h" -#include "library/library_16110.h" -#include "library/library_1a500.h" -#include "library/library_233c0.h" -#include "library/library_4a360.h" -#include "library/library_4b480.h" -#include "library/library_4f5e0.h" +#include "lib/lib_12dc0.h" +#include "lib/lib_159b0.h" +#include "lib/lib_16110.h" +#include "lib/lib_1a500.h" +#include "lib/lib_233c0.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4f5e0.h" #include "types.h" const u32 var70054280[] = {0x7001aa58}; diff --git a/src/library/library_233c0.c b/src/lib/lib_233c0.c similarity index 99% rename from src/library/library_233c0.c rename to src/lib/lib_233c0.c index 99b45cb89..08a9cece2 100644 --- a/src/library/library_233c0.c +++ b/src/lib/lib_233c0.c @@ -8,16 +8,16 @@ #include "game/game_1531a0.h" #include "game/game_157db0.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_04a80.h" -#include "library/library_0d0a0.h" -#include "library/library_121e0.h" -#include "library/library_16110.h" -#include "library/library_233c0.h" -#include "library/library_2f490.h" -#include "library/library_4a360.h" -#include "library/library_4ae00.h" -#include "library/library_4b170.h" +#include "lib/lib_04790.h" +#include "lib/lib_04a80.h" +#include "lib/lib_0d0a0.h" +#include "lib/lib_121e0.h" +#include "lib/lib_16110.h" +#include "lib/lib_233c0.h" +#include "lib/lib_2f490.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4ae00.h" +#include "lib/lib_4b170.h" #include "types.h" const u32 var70054690[] = {0x3a83126f}; diff --git a/src/library/library_2f490.c b/src/lib/lib_2f490.c similarity index 99% rename from src/library/library_2f490.c rename to src/lib/lib_2f490.c index 92cb44414..b3f976811 100644 --- a/src/library/library_2f490.c +++ b/src/lib/lib_2f490.c @@ -6,8 +6,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_121e0.h" -#include "library/library_48120.h" +#include "lib/lib_121e0.h" +#include "lib/lib_48120.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_2fa00.c b/src/lib/lib_2fa00.c similarity index 97% rename from src/library/library_2fa00.c rename to src/lib/lib_2fa00.c index 985b81ae2..9045a3f07 100644 --- a/src/library/library_2fa00.c +++ b/src/lib/lib_2fa00.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_0c000.h" -#include "library/library_4e690.h" +#include "lib/lib_0c000.h" +#include "lib/lib_4e690.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_2faf0.c b/src/lib/lib_2faf0.c similarity index 100% rename from src/library/library_2faf0.c rename to src/lib/lib_2faf0.c diff --git a/src/library/library_2fba0.c b/src/lib/lib_2fba0.c similarity index 97% rename from src/library/library_2fba0.c rename to src/lib/lib_2fba0.c index faaadcf52..7fa39ad1d 100644 --- a/src/library/library_2fba0.c +++ b/src/lib/lib_2fba0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_30ce0.h" -#include "library/library_39fc0.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_39fc0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_2fc60.c b/src/lib/lib_2fc60.c similarity index 99% rename from src/library/library_2fc60.c rename to src/lib/lib_2fc60.c index f6a6758c0..3ed815b79 100644 --- a/src/library/library_2fc60.c +++ b/src/lib/lib_2fc60.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_16110.h" -#include "library/library_2fc60.h" -#include "library/library_39fe0.h" +#include "lib/lib_16110.h" +#include "lib/lib_2fc60.h" +#include "lib/lib_39fe0.h" #include "types.h" const u32 var700546b0[] = {0x3f83f794}; diff --git a/src/library/library_30ce0.c b/src/lib/lib_30ce0.c similarity index 99% rename from src/library/library_30ce0.c rename to src/lib/lib_30ce0.c index fa7a9feb9..42881aeaa 100644 --- a/src/library/library_30ce0.c +++ b/src/lib/lib_30ce0.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_2faf0.h" -#include "library/library_30ce0.h" -#include "library/library_39fe0.h" -#include "library/library_3a100.h" -#include "library/library_3c430.h" +#include "lib/lib_2faf0.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_39fe0.h" +#include "lib/lib_3a100.h" +#include "lib/lib_3c430.h" #include "types.h" const u32 var70054730[] = {0x49742400}; diff --git a/src/library/library_317f0.c b/src/lib/lib_317f0.c similarity index 99% rename from src/library/library_317f0.c rename to src/lib/lib_317f0.c index 45ece92c5..1c77db5bf 100644 --- a/src/library/library_317f0.c +++ b/src/lib/lib_317f0.c @@ -5,24 +5,24 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_0e9d0.h" -#include "library/library_2faf0.h" -#include "library/library_2fc60.h" -#include "library/library_30ce0.h" -#include "library/library_317f0.h" -#include "library/library_38d30.h" -#include "library/library_39c80.h" -#include "library/library_39fe0.h" -#include "library/library_3a100.h" -#include "library/library_3c4d0.h" -#include "library/library_3ccf0.h" -#include "library/library_3cdc0.h" -#include "library/library_3cef0.h" -#include "library/library_3d280.h" -#include "library/library_3e3e0.h" -#include "library/library_3e730.h" -#include "library/library_48650.h" -#include "library/library_488e0.h" +#include "lib/lib_0e9d0.h" +#include "lib/lib_2faf0.h" +#include "lib/lib_2fc60.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_317f0.h" +#include "lib/lib_38d30.h" +#include "lib/lib_39c80.h" +#include "lib/lib_39fe0.h" +#include "lib/lib_3a100.h" +#include "lib/lib_3c4d0.h" +#include "lib/lib_3ccf0.h" +#include "lib/lib_3cdc0.h" +#include "lib/lib_3cef0.h" +#include "lib/lib_3d280.h" +#include "lib/lib_3e3e0.h" +#include "lib/lib_3e730.h" +#include "lib/lib_48650.h" +#include "lib/lib_488e0.h" #include "types.h" const u32 var70054740[] = {0x70031ce0}; diff --git a/src/library/library_37650.c b/src/lib/lib_37650.c similarity index 99% rename from src/library/library_37650.c rename to src/lib/lib_37650.c index 99ccfbd75..53f9095ec 100644 --- a/src/library/library_37650.c +++ b/src/lib/lib_37650.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_37650.h" -#include "library/library_3c4d0.h" +#include "lib/lib_37650.h" +#include "lib/lib_3c4d0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_37b00.c b/src/lib/lib_37b00.c similarity index 99% rename from src/library/library_37b00.c rename to src/lib/lib_37b00.c index 1430116b5..b4c6e4401 100644 --- a/src/library/library_37b00.c +++ b/src/lib/lib_37b00.c @@ -5,13 +5,13 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_2faf0.h" -#include "library/library_37b00.h" -#include "library/library_3e730.h" -#include "library/library_43dd0.h" -#include "library/library_4ae00.h" -#include "library/library_4b170.h" -#include "library/library_4b480.h" +#include "lib/lib_2faf0.h" +#include "lib/lib_37b00.h" +#include "lib/lib_3e730.h" +#include "lib/lib_43dd0.h" +#include "lib/lib_4ae00.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_38d10.c b/src/lib/lib_38d10.c similarity index 100% rename from src/library/library_38d10.c rename to src/lib/lib_38d10.c diff --git a/src/library/library_38d30.c b/src/lib/lib_38d30.c similarity index 99% rename from src/library/library_38d30.c rename to src/lib/lib_38d30.c index e70aaf6a2..ebe7786bc 100644 --- a/src/library/library_38d30.c +++ b/src/lib/lib_38d30.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_38d30.h" -#include "library/library_3c4d0.h" +#include "lib/lib_38d30.h" +#include "lib/lib_3c4d0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_39c80.c b/src/lib/lib_39c80.c similarity index 99% rename from src/library/library_39c80.c rename to src/lib/lib_39c80.c index 2c7a2a1a2..76d4f6b18 100644 --- a/src/library/library_39c80.c +++ b/src/lib/lib_39c80.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_3c4d0.h" -#include "library/library_43dd0.h" +#include "lib/lib_3c4d0.h" +#include "lib/lib_43dd0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_39f70.c b/src/lib/lib_39f70.c similarity index 97% rename from src/library/library_39f70.c rename to src/lib/lib_39f70.c index 8584f6c1e..719b07793 100644 --- a/src/library/library_39f70.c +++ b/src/lib/lib_39f70.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_3c4d0.h" +#include "lib/lib_3c4d0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_39fc0.c b/src/lib/lib_39fc0.c similarity index 100% rename from src/library/library_39fc0.c rename to src/lib/lib_39fc0.c diff --git a/src/library/library_39fe0.c b/src/lib/lib_39fe0.c similarity index 99% rename from src/library/library_39fe0.c rename to src/lib/lib_39fe0.c index f681506a3..707cb2d40 100644 --- a/src/library/library_39fe0.c +++ b/src/lib/lib_39fe0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_3a100.h" +#include "lib/lib_3a100.h" #include "types.h" const u32 var70054a80[] = {0x3f8012ef}; diff --git a/src/library/library_3a100.c b/src/lib/lib_3a100.c similarity index 99% rename from src/library/library_3a100.c rename to src/lib/lib_3a100.c index 5829dca56..6a3876e85 100644 --- a/src/library/library_3a100.c +++ b/src/lib/lib_3a100.c @@ -6,10 +6,10 @@ #include "game/data/data_020df0.h" #include "game/game_096750.h" #include "gvars/gvars.h" -#include "library/library_2faf0.h" -#include "library/library_3a100.h" -#include "library/library_446d0.h" -#include "library/library_4b480.h" +#include "lib/lib_2faf0.h" +#include "lib/lib_3a100.h" +#include "lib/lib_446d0.h" +#include "lib/lib_4b480.h" #include "types.h" const u32 var70054a90[] = {0x3fb50481}; diff --git a/src/library/library_3c430.c b/src/lib/lib_3c430.c similarity index 98% rename from src/library/library_3c430.c rename to src/lib/lib_3c430.c index 3e7e13b4e..55e988fb5 100644 --- a/src/library/library_3c430.c +++ b/src/lib/lib_3c430.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_44bc0.h" +#include "lib/lib_44bc0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_3c4d0.c b/src/lib/lib_3c4d0.c similarity index 99% rename from src/library/library_3c4d0.c rename to src/lib/lib_3c4d0.c index a6531bbe4..a6393fd4b 100644 --- a/src/library/library_3c4d0.c +++ b/src/lib/lib_3c4d0.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_30ce0.h" -#include "library/library_3c4d0.h" -#include "library/library_3e730.h" -#include "library/library_48650.h" -#include "library/library_4b170.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_3c4d0.h" +#include "lib/lib_3e730.h" +#include "lib/lib_48650.h" +#include "lib/lib_4b170.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_3ccf0.c b/src/lib/lib_3ccf0.c similarity index 97% rename from src/library/library_3ccf0.c rename to src/lib/lib_3ccf0.c index ca1b546fc..e722c07b9 100644 --- a/src/library/library_3ccf0.c +++ b/src/lib/lib_3ccf0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_30ce0.h" -#include "library/library_3e730.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_3e730.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_3cdc0.c b/src/lib/lib_3cdc0.c similarity index 98% rename from src/library/library_3cdc0.c rename to src/lib/lib_3cdc0.c index 37aa4a838..1324af2d1 100644 --- a/src/library/library_3cdc0.c +++ b/src/lib/lib_3cdc0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_30ce0.h" -#include "library/library_3e730.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_3e730.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_3cef0.c b/src/lib/lib_3cef0.c similarity index 99% rename from src/library/library_3cef0.c rename to src/lib/lib_3cef0.c index 6235a5a70..b7e10c3af 100644 --- a/src/library/library_3cef0.c +++ b/src/lib/lib_3cef0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_30ce0.h" -#include "library/library_3e730.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_3e730.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_3d280.c b/src/lib/lib_3d280.c similarity index 99% rename from src/library/library_3d280.c rename to src/lib/lib_3d280.c index 0b6167d30..9ac6705ab 100644 --- a/src/library/library_3d280.c +++ b/src/lib/lib_3d280.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_30ce0.h" -#include "library/library_3c4d0.h" -#include "library/library_3ccf0.h" -#include "library/library_3d280.h" -#include "library/library_44bc0.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_3c4d0.h" +#include "lib/lib_3ccf0.h" +#include "lib/lib_3d280.h" +#include "lib/lib_44bc0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_3e3e0.c b/src/lib/lib_3e3e0.c similarity index 98% rename from src/library/library_3e3e0.c rename to src/lib/lib_3e3e0.c index 428cf43c0..cdd93908f 100644 --- a/src/library/library_3e3e0.c +++ b/src/lib/lib_3e3e0.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_30ce0.h" -#include "library/library_3a100.h" -#include "library/library_3e730.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_3a100.h" +#include "lib/lib_3e730.h" #include "types.h" const u32 var70054ae0[] = {0x3dcccccd}; diff --git a/src/library/library_3e730.c b/src/lib/lib_3e730.c similarity index 99% rename from src/library/library_3e730.c rename to src/lib/lib_3e730.c index 4243a64b7..3be2fddb7 100644 --- a/src/library/library_3e730.c +++ b/src/lib/lib_3e730.c @@ -5,18 +5,18 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_16110.h" -#include "library/library_30ce0.h" -#include "library/library_3e730.h" -#include "library/library_43dd0.h" -#include "library/library_44f60.h" -#include "library/library_45ed0.h" -#include "library/library_461c0.h" -#include "library/library_46650.h" -#include "library/library_47550.h" -#include "library/library_4ae00.h" -#include "library/library_4b170.h" -#include "library/library_4b480.h" +#include "lib/lib_16110.h" +#include "lib/lib_30ce0.h" +#include "lib/lib_3e730.h" +#include "lib/lib_43dd0.h" +#include "lib/lib_44f60.h" +#include "lib/lib_45ed0.h" +#include "lib/lib_461c0.h" +#include "lib/lib_46650.h" +#include "lib/lib_47550.h" +#include "lib/lib_4ae00.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b480.h" #include "types.h" const u32 var70054af0[] = {0x7003eff8}; diff --git a/src/library/library_43dd0.c b/src/lib/lib_43dd0.c similarity index 99% rename from src/library/library_43dd0.c rename to src/lib/lib_43dd0.c index 17878454e..b25379489 100644 --- a/src/library/library_43dd0.c +++ b/src/lib/lib_43dd0.c @@ -5,12 +5,12 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_3c4d0.h" -#include "library/library_3e730.h" -#include "library/library_43dd0.h" -#include "library/library_461c0.h" -#include "library/library_4ae00.h" -#include "library/library_4b170.h" +#include "lib/lib_3c4d0.h" +#include "lib/lib_3e730.h" +#include "lib/lib_43dd0.h" +#include "lib/lib_461c0.h" +#include "lib/lib_4ae00.h" +#include "lib/lib_4b170.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_446d0.c b/src/lib/lib_446d0.c similarity index 99% rename from src/library/library_446d0.c rename to src/lib/lib_446d0.c index 2cdc1c3b0..81ec9b06a 100644 --- a/src/library/library_446d0.c +++ b/src/lib/lib_446d0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_3e730.h" -#include "library/library_4a360.h" +#include "lib/lib_3e730.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_44bc0.c b/src/lib/lib_44bc0.c similarity index 99% rename from src/library/library_44bc0.c rename to src/lib/lib_44bc0.c index 77bfcb349..a2d07a020 100644 --- a/src/library/library_44bc0.c +++ b/src/lib/lib_44bc0.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_37b00.h" -#include "library/library_3a100.h" -#include "library/library_4b480.h" +#include "lib/lib_37b00.h" +#include "lib/lib_3a100.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_44f60.c b/src/lib/lib_44f60.c similarity index 99% rename from src/library/library_44f60.c rename to src/lib/lib_44f60.c index 9dc4176a9..d72bd1b9d 100644 --- a/src/library/library_44f60.c +++ b/src/lib/lib_44f60.c @@ -5,12 +5,12 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_3a100.h" -#include "library/library_44f60.h" -#include "library/library_47a90.h" -#include "library/library_4a360.h" -#include "library/library_4b170.h" -#include "library/library_4b480.h" +#include "lib/lib_3a100.h" +#include "lib/lib_44f60.h" +#include "lib/lib_47a90.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_45ed0.c b/src/lib/lib_45ed0.c similarity index 99% rename from src/library/library_45ed0.c rename to src/lib/lib_45ed0.c index dd368d3be..a2e9912d8 100644 --- a/src/library/library_45ed0.c +++ b/src/lib/lib_45ed0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_47d20.h" +#include "lib/lib_47d20.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_461c0.c b/src/lib/lib_461c0.c similarity index 99% rename from src/library/library_461c0.c rename to src/lib/lib_461c0.c index 2b4f8bcb2..1a1f980e7 100644 --- a/src/library/library_461c0.c +++ b/src/lib/lib_461c0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_461c0.h" +#include "lib/lib_461c0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_46650.c b/src/lib/lib_46650.c similarity index 100% rename from src/library/library_46650.c rename to src/lib/lib_46650.c diff --git a/src/library/library_47550.c b/src/lib/lib_47550.c similarity index 100% rename from src/library/library_47550.c rename to src/lib/lib_47550.c diff --git a/src/library/library_47a90.c b/src/lib/lib_47a90.c similarity index 99% rename from src/library/library_47a90.c rename to src/lib/lib_47a90.c index fe26ff0fb..028c57cbe 100644 --- a/src/library/library_47a90.c +++ b/src/lib/lib_47a90.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_44f60.h" -#include "library/library_4b480.h" +#include "lib/lib_44f60.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_47d20.c b/src/lib/lib_47d20.c similarity index 100% rename from src/library/library_47d20.c rename to src/lib/lib_47d20.c diff --git a/src/library/library_48120.c b/src/lib/lib_48120.c similarity index 100% rename from src/library/library_48120.c rename to src/lib/lib_48120.c diff --git a/src/library/library_48150.c b/src/lib/lib_48150.c similarity index 100% rename from src/library/library_48150.c rename to src/lib/lib_48150.c diff --git a/src/library/library_481d0.c b/src/lib/lib_481d0.c similarity index 100% rename from src/library/library_481d0.c rename to src/lib/lib_481d0.c diff --git a/src/library/library_481e0.c b/src/lib/lib_481e0.c similarity index 98% rename from src/library/library_481e0.c rename to src/lib/lib_481e0.c index 6e9e36094..60dc8a36f 100644 --- a/src/library/library_481e0.c +++ b/src/lib/lib_481e0.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_034f0.h" -#include "library/library_491b0.h" -#include "library/library_49c20.h" +#include "lib/lib_034f0.h" +#include "lib/lib_491b0.h" +#include "lib/lib_49c20.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48520.c b/src/lib/lib_48520.c similarity index 97% rename from src/library/library_48520.c rename to src/lib/lib_48520.c index 60a081ba5..9d0a8d660 100644 --- a/src/library/library_48520.c +++ b/src/lib/lib_48520.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_488e0.h" -#include "library/library_491b0.h" +#include "lib/lib_488e0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_485e0.c b/src/lib/lib_485e0.c similarity index 97% rename from src/library/library_485e0.c rename to src/lib/lib_485e0.c index 6112bc833..cfd37efaf 100644 --- a/src/library/library_485e0.c +++ b/src/lib/lib_485e0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_491b0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48650.c b/src/lib/lib_48650.c similarity index 98% rename from src/library/library_48650.c rename to src/lib/lib_48650.c index eecc5376a..ad75989f1 100644 --- a/src/library/library_48650.c +++ b/src/lib/lib_48650.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_034f0.h" -#include "library/library_481e0.h" -#include "library/library_491b0.h" +#include "lib/lib_034f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48830.c b/src/lib/lib_48830.c similarity index 98% rename from src/library/library_48830.c rename to src/lib/lib_48830.c index 07946e0eb..ad3599d05 100644 --- a/src/library/library_48830.c +++ b/src/lib/lib_48830.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_491b0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_488e0.c b/src/lib/lib_488e0.c similarity index 97% rename from src/library/library_488e0.c rename to src/lib/lib_488e0.c index 810803259..5d9aaa06d 100644 --- a/src/library/library_488e0.c +++ b/src/lib/lib_488e0.c @@ -5,10 +5,10 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_034f0.h" -#include "library/library_481e0.h" -#include "library/library_491b0.h" -#include "library/library_51880.h" +#include "lib/lib_034f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_491b0.h" +#include "lib/lib_51880.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48b20.c b/src/lib/lib_48b20.c similarity index 98% rename from src/library/library_48b20.c rename to src/lib/lib_48b20.c index 48d856701..73ff28511 100644 --- a/src/library/library_48b20.c +++ b/src/lib/lib_48b20.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_491b0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48c00.c b/src/lib/lib_48c00.c similarity index 98% rename from src/library/library_48c00.c rename to src/lib/lib_48c00.c index b5c863fa9..b6c829b22 100644 --- a/src/library/library_48c00.c +++ b/src/lib/lib_48c00.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_51890.h" +#include "lib/lib_51890.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48cd0.c b/src/lib/lib_48cd0.c similarity index 98% rename from src/library/library_48cd0.c rename to src/lib/lib_48cd0.c index 2da45e462..0de4784d8 100644 --- a/src/library/library_48cd0.c +++ b/src/lib/lib_48cd0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_491b0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48dc0.c b/src/lib/lib_48dc0.c similarity index 99% rename from src/library/library_48dc0.c rename to src/lib/lib_48dc0.c index 9eb96b37b..54280866f 100644 --- a/src/library/library_48dc0.c +++ b/src/lib/lib_48dc0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_491b0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48ef0.c b/src/lib/lib_48ef0.c similarity index 97% rename from src/library/library_48ef0.c rename to src/lib/lib_48ef0.c index 6975065e5..fce2a4c21 100644 --- a/src/library/library_48ef0.c +++ b/src/lib/lib_48ef0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_491b0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_48f50.c b/src/lib/lib_48f50.c similarity index 99% rename from src/library/library_48f50.c rename to src/lib/lib_48f50.c index 245816c7a..cbf66d528 100644 --- a/src/library/library_48f50.c +++ b/src/lib/lib_48f50.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_491b0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_490b0.c b/src/lib/lib_490b0.c similarity index 96% rename from src/library/library_490b0.c rename to src/lib/lib_490b0.c index 9c3321d25..dde6629d8 100644 --- a/src/library/library_490b0.c +++ b/src/lib/lib_490b0.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_481e0.h" -#include "library/library_491b0.h" -#include "library/library_4b500.h" +#include "lib/lib_481e0.h" +#include "lib/lib_491b0.h" +#include "lib/lib_4b500.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_491b0.c b/src/lib/lib_491b0.c similarity index 98% rename from src/library/library_491b0.c rename to src/lib/lib_491b0.c index b0b0a690c..abe2ca97f 100644 --- a/src/library/library_491b0.c +++ b/src/lib/lib_491b0.c @@ -5,10 +5,10 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_481e0.h" -#include "library/library_488e0.h" -#include "library/library_491b0.h" -#include "library/library_51880.h" +#include "lib/lib_481e0.h" +#include "lib/lib_488e0.h" +#include "lib/lib_491b0.h" +#include "lib/lib_51880.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_49640.c b/src/lib/lib_49640.c similarity index 98% rename from src/library/library_49640.c rename to src/lib/lib_49640.c index cdd68824b..9b6b6a668 100644 --- a/src/library/library_49640.c +++ b/src/lib/lib_49640.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_49780.h" -#include "library/library_4ae00.h" +#include "lib/lib_49780.h" +#include "lib/lib_4ae00.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_49780.c b/src/lib/lib_49780.c similarity index 99% rename from src/library/library_49780.c rename to src/lib/lib_49780.c index 41e3544de..2a5bb7acb 100644 --- a/src/library/library_49780.c +++ b/src/lib/lib_49780.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4b480.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_49a90.c b/src/lib/lib_49a90.c similarity index 96% rename from src/library/library_49a90.c rename to src/lib/lib_49a90.c index 72e578125..d02243cfd 100644 --- a/src/library/library_49a90.c +++ b/src/lib/lib_49a90.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_481e0.h" -#include "library/library_48650.h" -#include "library/library_488e0.h" -#include "library/library_49a90.h" -#include "library/library_4b480.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_488e0.h" +#include "lib/lib_49a90.h" +#include "lib/lib_4b480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_49c20.c b/src/lib/lib_49c20.c similarity index 98% rename from src/library/library_49c20.c rename to src/lib/lib_49c20.c index f68205c94..f756cbef3 100644 --- a/src/library/library_49c20.c +++ b/src/lib/lib_49c20.c @@ -5,16 +5,16 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_034f0.h" -#include "library/library_48650.h" -#include "library/library_488e0.h" -#include "library/library_491b0.h" -#include "library/library_49c20.h" -#include "library/library_4b480.h" -#include "library/library_51890.h" -#include "library/library_51900.h" -#include "library/library_51a60.h" -#include "library/library_51c10.h" +#include "lib/lib_034f0.h" +#include "lib/lib_48650.h" +#include "lib/lib_488e0.h" +#include "lib/lib_491b0.h" +#include "lib/lib_49c20.h" +#include "lib/lib_4b480.h" +#include "lib/lib_51890.h" +#include "lib/lib_51900.h" +#include "lib/lib_51a60.h" +#include "lib/lib_51c10.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4a360.c b/src/lib/lib_4a360.c similarity index 99% rename from src/library/library_4a360.c rename to src/lib/lib_4a360.c index 23be87ad4..2adcf90ae 100644 --- a/src/library/library_4a360.c +++ b/src/lib/lib_4a360.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4a360.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4a5e0.c b/src/lib/lib_4a5e0.c similarity index 100% rename from src/library/library_4a5e0.c rename to src/lib/lib_4a5e0.c diff --git a/src/library/library_4a680.c b/src/lib/lib_4a680.c similarity index 99% rename from src/library/library_4a680.c rename to src/lib/lib_4a680.c index a3d11dace..8ecfbe7f9 100644 --- a/src/library/library_4a680.c +++ b/src/lib/lib_4a680.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4ae00.h" +#include "lib/lib_4ae00.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4a810.c b/src/lib/lib_4a810.c similarity index 94% rename from src/library/library_4a810.c rename to src/lib/lib_4a810.c index efb2c8c2c..e63f7fbdc 100644 --- a/src/library/library_4a810.c +++ b/src/lib/lib_4a810.c @@ -5,13 +5,13 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_481e0.h" -#include "library/library_48650.h" -#include "library/library_488e0.h" -#include "library/library_4a810.h" -#include "library/library_4ad80.h" -#include "library/library_4b480.h" -#include "library/library_4e470.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_488e0.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4ad80.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4e470.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4a980.c b/src/lib/lib_4a980.c similarity index 97% rename from src/library/library_4a980.c rename to src/lib/lib_4a980.c index 289901203..c62d01210 100644 --- a/src/library/library_4a980.c +++ b/src/lib/lib_4a980.c @@ -5,12 +5,12 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_481e0.h" -#include "library/library_48650.h" -#include "library/library_48b20.h" -#include "library/library_490b0.h" -#include "library/library_4a810.h" -#include "library/library_4a980.h" +#include "lib/lib_481e0.h" +#include "lib/lib_48650.h" +#include "lib/lib_48b20.h" +#include "lib/lib_490b0.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4a980.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4acc0.c b/src/lib/lib_4acc0.c similarity index 100% rename from src/library/library_4acc0.c rename to src/lib/lib_4acc0.c diff --git a/src/library/library_4ace0.c b/src/lib/lib_4ace0.c similarity index 97% rename from src/library/library_4ace0.c rename to src/lib/lib_4ace0.c index 76997546e..fc91eb204 100644 --- a/src/library/library_4ace0.c +++ b/src/lib/lib_4ace0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_51c60.h" +#include "lib/lib_51c60.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4ad30.c b/src/lib/lib_4ad30.c similarity index 97% rename from src/library/library_4ad30.c rename to src/lib/lib_4ad30.c index c1f716092..f15f6cb8b 100644 --- a/src/library/library_4ad30.c +++ b/src/lib/lib_4ad30.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_51c60.h" +#include "lib/lib_51c60.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4ad80.c b/src/lib/lib_4ad80.c similarity index 100% rename from src/library/library_4ad80.c rename to src/lib/lib_4ad80.c diff --git a/src/library/library_4ae00.c b/src/lib/lib_4ae00.c similarity index 100% rename from src/library/library_4ae00.c rename to src/lib/lib_4ae00.c diff --git a/src/library/library_4b160.c b/src/lib/lib_4b160.c similarity index 100% rename from src/library/library_4b160.c rename to src/lib/lib_4b160.c diff --git a/src/library/library_4b170.c b/src/lib/lib_4b170.c similarity index 100% rename from src/library/library_4b170.c rename to src/lib/lib_4b170.c diff --git a/src/library/library_4b480.c b/src/lib/lib_4b480.c similarity index 97% rename from src/library/library_4b480.c rename to src/lib/lib_4b480.c index cf51f4675..d1a3e4e5c 100644 --- a/src/library/library_4b480.c +++ b/src/lib/lib_4b480.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_51c60.h" +#include "lib/lib_51c60.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4b500.c b/src/lib/lib_4b500.c similarity index 100% rename from src/library/library_4b500.c rename to src/lib/lib_4b500.c diff --git a/src/library/library_4b550.c b/src/lib/lib_4b550.c similarity index 96% rename from src/library/library_4b550.c rename to src/lib/lib_4b550.c index 717c2adf2..ffbed6f26 100644 --- a/src/library/library_4b550.c +++ b/src/lib/lib_4b550.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4b480.h" -#include "library/library_4b5e0.h" +#include "lib/lib_4b480.h" +#include "lib/lib_4b5e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4b5e0.c b/src/lib/lib_4b5e0.c similarity index 98% rename from src/library/library_4b5e0.c rename to src/lib/lib_4b5e0.c index e3680ff6e..64fae329b 100644 --- a/src/library/library_4b5e0.c +++ b/src/lib/lib_4b5e0.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_48650.h" -#include "library/library_4a810.h" -#include "library/library_4b170.h" -#include "library/library_4ba90.h" -#include "library/library_51d50.h" +#include "lib/lib_48650.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4ba90.h" +#include "lib/lib_51d50.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4ba90.c b/src/lib/lib_4ba90.c similarity index 99% rename from src/library/library_4ba90.c rename to src/lib/lib_4ba90.c index 35a9fa8fb..3fe278884 100644 --- a/src/library/library_4ba90.c +++ b/src/lib/lib_4ba90.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_48650.h" -#include "library/library_4a810.h" -#include "library/library_4ba90.h" +#include "lib/lib_48650.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4ba90.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4c090.c b/src/lib/lib_4c090.c similarity index 99% rename from src/library/library_4c090.c rename to src/lib/lib_4c090.c index b2f582aa1..361c5b65b 100644 --- a/src/library/library_4c090.c +++ b/src/lib/lib_4c090.c @@ -5,12 +5,12 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_481e0.h" -#include "library/library_4b170.h" -#include "library/library_4b5e0.h" -#include "library/library_4c090.h" -#include "library/library_4cde0.h" -#include "library/library_4d6f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4c090.h" +#include "lib/lib_4cde0.h" +#include "lib/lib_4d6f0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4cc10.c b/src/lib/lib_4cc10.c similarity index 98% rename from src/library/library_4cc10.c rename to src/lib/lib_4cc10.c index 1aaa6f627..0045d07df 100644 --- a/src/library/library_4cc10.c +++ b/src/lib/lib_4cc10.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4b5e0.h" -#include "library/library_4ba90.h" -#include "library/library_4c090.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4ba90.h" +#include "lib/lib_4c090.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4cde0.c b/src/lib/lib_4cde0.c similarity index 97% rename from src/library/library_4cde0.c rename to src/lib/lib_4cde0.c index 36888fcb3..84cbc3fe8 100644 --- a/src/library/library_4cde0.c +++ b/src/lib/lib_4cde0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4b5e0.h" +#include "lib/lib_4b5e0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4ce60.c b/src/lib/lib_4ce60.c similarity index 99% rename from src/library/library_4ce60.c rename to src/lib/lib_4ce60.c index f3d790acc..325b8df96 100644 --- a/src/library/library_4ce60.c +++ b/src/lib/lib_4ce60.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4c090.h" +#include "lib/lib_4c090.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4d000.c b/src/lib/lib_4d000.c similarity index 98% rename from src/library/library_4d000.c rename to src/lib/lib_4d000.c index 02020d74a..cd899ca44 100644 --- a/src/library/library_4d000.c +++ b/src/lib/lib_4d000.c @@ -5,12 +5,12 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4b170.h" -#include "library/library_4b5e0.h" -#include "library/library_4c090.h" -#include "library/library_4cc10.h" -#include "library/library_4ce60.h" -#include "library/library_4d000.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4c090.h" +#include "lib/lib_4cc10.h" +#include "lib/lib_4ce60.h" +#include "lib/lib_4d000.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4d480.c b/src/lib/lib_4d480.c similarity index 97% rename from src/library/library_4d480.c rename to src/lib/lib_4d480.c index 0014246ef..9e5cc3db6 100644 --- a/src/library/library_4d480.c +++ b/src/lib/lib_4d480.c @@ -5,12 +5,12 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4ae00.h" -#include "library/library_4b5e0.h" -#include "library/library_4c090.h" -#include "library/library_4cc10.h" -#include "library/library_4cde0.h" -#include "library/library_4d480.h" +#include "lib/lib_4ae00.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4c090.h" +#include "lib/lib_4cc10.h" +#include "lib/lib_4cde0.h" +#include "lib/lib_4d480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4d6f0.c b/src/lib/lib_4d6f0.c similarity index 99% rename from src/library/library_4d6f0.c rename to src/lib/lib_4d6f0.c index f457beb9f..acc267415 100644 --- a/src/library/library_4d6f0.c +++ b/src/lib/lib_4d6f0.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4ae00.h" -#include "library/library_4b5e0.h" -#include "library/library_4c090.h" -#include "library/library_4cde0.h" -#include "library/library_4d6f0.h" +#include "lib/lib_4ae00.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4c090.h" +#include "lib/lib_4cde0.h" +#include "lib/lib_4d6f0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4e270.c b/src/lib/lib_4e270.c similarity index 100% rename from src/library/library_4e270.c rename to src/lib/lib_4e270.c diff --git a/src/library/library_4e3c0.c b/src/lib/lib_4e3c0.c similarity index 96% rename from src/library/library_4e3c0.c rename to src/lib/lib_4e3c0.c index df659fc3f..bdd394302 100644 --- a/src/library/library_4e3c0.c +++ b/src/lib/lib_4e3c0.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4b480.h" -#include "library/library_51ec0.h" +#include "lib/lib_4b480.h" +#include "lib/lib_51ec0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4e470.c b/src/lib/lib_4e470.c similarity index 100% rename from src/library/library_4e470.c rename to src/lib/lib_4e470.c diff --git a/src/library/library_4e530.c b/src/lib/lib_4e530.c similarity index 96% rename from src/library/library_4e530.c rename to src/lib/lib_4e530.c index 97eadbdac..f81b601f8 100644 --- a/src/library/library_4e530.c +++ b/src/lib/lib_4e530.c @@ -5,10 +5,10 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_488e0.h" -#include "library/library_49a90.h" -#include "library/library_51ec0.h" -#include "library/library_52070.h" +#include "lib/lib_488e0.h" +#include "lib/lib_49a90.h" +#include "lib/lib_51ec0.h" +#include "lib/lib_52070.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4e690.c b/src/lib/lib_4e690.c similarity index 99% rename from src/library/library_4e690.c rename to src/lib/lib_4e690.c index 6f027506a..a807a246b 100644 --- a/src/library/library_4e690.c +++ b/src/lib/lib_4e690.c @@ -5,10 +5,10 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_04a80.h" -#include "library/library_4a5e0.h" -#include "library/library_4e690.h" -#include "library/library_52070.h" +#include "lib/lib_04a80.h" +#include "lib/lib_4a5e0.h" +#include "lib/lib_4e690.h" +#include "lib/lib_52070.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4f350.c b/src/lib/lib_4f350.c similarity index 95% rename from src/library/library_4f350.c rename to src/lib/lib_4f350.c index aa12e7493..0fb781094 100644 --- a/src/library/library_4f350.c +++ b/src/lib/lib_4f350.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_48650.h" -#include "library/library_4a810.h" -#include "library/library_4a980.h" +#include "lib/lib_48650.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4a980.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4f400.c b/src/lib/lib_4f400.c similarity index 98% rename from src/library/library_4f400.c rename to src/lib/lib_4f400.c index 3fd3a3b6b..c6e239038 100644 --- a/src/library/library_4f400.c +++ b/src/lib/lib_4f400.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_48650.h" -#include "library/library_4a810.h" -#include "library/library_4f400.h" +#include "lib/lib_48650.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4f400.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4f5e0.c b/src/lib/lib_4f5e0.c similarity index 98% rename from src/library/library_4f5e0.c rename to src/lib/lib_4f5e0.c index 08cf2231b..5405bfa77 100644 --- a/src/library/library_4f5e0.c +++ b/src/lib/lib_4f5e0.c @@ -5,15 +5,15 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_04790.h" -#include "library/library_16110.h" -#include "library/library_48650.h" -#include "library/library_4a360.h" -#include "library/library_4a810.h" -#include "library/library_4b5e0.h" -#include "library/library_4cde0.h" -#include "library/library_4f5e0.h" -#include "library/library_51d50.h" +#include "lib/lib_04790.h" +#include "lib/lib_16110.h" +#include "lib/lib_48650.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4cde0.h" +#include "lib/lib_4f5e0.h" +#include "lib/lib_51d50.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4fe20.c b/src/lib/lib_4fe20.c similarity index 98% rename from src/library/library_4fe20.c rename to src/lib/lib_4fe20.c index 6711fcb39..84948849f 100644 --- a/src/library/library_4fe20.c +++ b/src/lib/lib_4fe20.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4a360.h" -#include "library/library_4fe20.h" +#include "lib/lib_4a360.h" +#include "lib/lib_4fe20.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_4fff0.c b/src/lib/lib_4fff0.c similarity index 98% rename from src/library/library_4fff0.c rename to src/lib/lib_4fff0.c index e552c3d9a..8e8f990be 100644 --- a/src/library/library_4fff0.c +++ b/src/lib/lib_4fff0.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4a360.h" +#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_50090.c b/src/lib/lib_50090.c similarity index 96% rename from src/library/library_50090.c rename to src/lib/lib_50090.c index 58a3cb2da..d84dec41e 100644 --- a/src/library/library_50090.c +++ b/src/lib/lib_50090.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4a360.h" -#include "library/library_50090.h" +#include "lib/lib_4a360.h" +#include "lib/lib_50090.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_50130.c b/src/lib/lib_50130.c similarity index 98% rename from src/library/library_50130.c rename to src/lib/lib_50130.c index 50a85a5f1..4a8060316 100644 --- a/src/library/library_50130.c +++ b/src/lib/lib_50130.c @@ -5,10 +5,10 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_48650.h" -#include "library/library_4a810.h" -#include "library/library_4ba90.h" -#include "library/library_50130.h" +#include "lib/lib_48650.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4ba90.h" +#include "lib/lib_50130.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_50480.c b/src/lib/lib_50480.c similarity index 98% rename from src/library/library_50480.c rename to src/lib/lib_50480.c index c0c902179..c50e08cb5 100644 --- a/src/library/library_50480.c +++ b/src/lib/lib_50480.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4b5e0.h" -#include "library/library_4ba90.h" -#include "library/library_4c090.h" -#include "library/library_4cde0.h" -#include "library/library_50480.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4ba90.h" +#include "lib/lib_4c090.h" +#include "lib/lib_4cde0.h" +#include "lib/lib_50480.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_50a00.c b/src/lib/lib_50a00.c similarity index 97% rename from src/library/library_50a00.c rename to src/lib/lib_50a00.c index 173f381d7..7c5cc4d57 100644 --- a/src/library/library_50a00.c +++ b/src/lib/lib_50a00.c @@ -5,16 +5,16 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_06100.h" -#include "library/library_06330.h" -#include "library/library_4b170.h" -#include "library/library_4b5e0.h" -#include "library/library_4ba90.h" -#include "library/library_4c090.h" -#include "library/library_4cde0.h" -#include "library/library_4d6f0.h" -#include "library/library_50a00.h" -#include "library/library_513b0.h" +#include "lib/lib_06100.h" +#include "lib/lib_06330.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4ba90.h" +#include "lib/lib_4c090.h" +#include "lib/lib_4cde0.h" +#include "lib/lib_4d6f0.h" +#include "lib/lib_50a00.h" +#include "lib/lib_513b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_50f20.c b/src/lib/lib_50f20.c similarity index 98% rename from src/library/library_50f20.c rename to src/lib/lib_50f20.c index d8a42121b..4889f3f58 100644 --- a/src/library/library_50f20.c +++ b/src/lib/lib_50f20.c @@ -5,11 +5,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_06330.h" -#include "library/library_4ae00.h" -#include "library/library_4d6f0.h" -#include "library/library_50a00.h" -#include "library/library_513b0.h" +#include "lib/lib_06330.h" +#include "lib/lib_4ae00.h" +#include "lib/lib_4d6f0.h" +#include "lib/lib_50a00.h" +#include "lib/lib_513b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_513b0.c b/src/lib/lib_513b0.c similarity index 97% rename from src/library/library_513b0.c rename to src/lib/lib_513b0.c index 5bb7d6bd2..54290c279 100644 --- a/src/library/library_513b0.c +++ b/src/lib/lib_513b0.c @@ -5,15 +5,15 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4a810.h" -#include "library/library_4b170.h" -#include "library/library_4b5e0.h" -#include "library/library_4ba90.h" -#include "library/library_4c090.h" -#include "library/library_4cde0.h" -#include "library/library_4d6f0.h" -#include "library/library_513b0.h" -#include "library/library_52360.h" +#include "lib/lib_4a810.h" +#include "lib/lib_4b170.h" +#include "lib/lib_4b5e0.h" +#include "lib/lib_4ba90.h" +#include "lib/lib_4c090.h" +#include "lib/lib_4cde0.h" +#include "lib/lib_4d6f0.h" +#include "lib/lib_513b0.h" +#include "lib/lib_52360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_51880.c b/src/lib/lib_51880.c similarity index 100% rename from src/library/library_51880.c rename to src/lib/lib_51880.c diff --git a/src/library/library_51890.c b/src/lib/lib_51890.c similarity index 97% rename from src/library/library_51890.c rename to src/lib/lib_51890.c index 5392cbace..c3970bcf7 100644 --- a/src/library/library_51890.c +++ b/src/lib/lib_51890.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_491b0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_51900.c b/src/lib/lib_51900.c similarity index 100% rename from src/library/library_51900.c rename to src/lib/lib_51900.c diff --git a/src/library/library_51a60.c b/src/lib/lib_51a60.c similarity index 99% rename from src/library/library_51a60.c rename to src/lib/lib_51a60.c index 194d6f324..ba5075a97 100644 --- a/src/library/library_51a60.c +++ b/src/lib/lib_51a60.c @@ -5,7 +5,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_491b0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_51c10.c b/src/lib/lib_51c10.c similarity index 94% rename from src/library/library_51c10.c rename to src/lib/lib_51c10.c index fa3f16023..bc420dbe4 100644 --- a/src/library/library_51c10.c +++ b/src/lib/lib_51c10.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_034f0.h" -#include "library/library_491b0.h" +#include "lib/lib_034f0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_51c60.c b/src/lib/lib_51c60.c similarity index 100% rename from src/library/library_51c60.c rename to src/lib/lib_51c60.c diff --git a/src/library/library_51d50.c b/src/lib/lib_51d50.c similarity index 100% rename from src/library/library_51d50.c rename to src/lib/lib_51d50.c diff --git a/src/library/library_51ec0.c b/src/lib/lib_51ec0.c similarity index 97% rename from src/library/library_51ec0.c rename to src/lib/lib_51ec0.c index 27c58b65c..eb965f1c4 100644 --- a/src/library/library_51ec0.c +++ b/src/lib/lib_51ec0.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_034f0.h" -#include "library/library_481e0.h" -#include "library/library_491b0.h" +#include "lib/lib_034f0.h" +#include "lib/lib_481e0.h" +#include "lib/lib_491b0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_52070.c b/src/lib/lib_52070.c similarity index 98% rename from src/library/library_52070.c rename to src/lib/lib_52070.c index e019c6c69..e42c758e5 100644 --- a/src/library/library_52070.c +++ b/src/lib/lib_52070.c @@ -5,9 +5,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_4a5e0.h" -#include "library/library_4a680.h" -#include "library/library_4ae00.h" +#include "lib/lib_4a5e0.h" +#include "lib/lib_4a680.h" +#include "lib/lib_4ae00.h" #include "types.h" GLOBAL_ASM( diff --git a/src/library/library_52360.c b/src/lib/lib_52360.c similarity index 97% rename from src/library/library_52360.c rename to src/lib/lib_52360.c index 2bfad8276..769d1c0cf 100644 --- a/src/library/library_52360.c +++ b/src/lib/lib_52360.c @@ -5,8 +5,8 @@ #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" #include "gvars/gvars.h" -#include "library/library_06100.h" -#include "library/library_4b5e0.h" +#include "lib/lib_06100.h" +#include "lib/lib_4b5e0.h" #include "types.h" GLOBAL_ASM( diff --git a/tools/buildrom b/tools/buildrom index 1dfde18a3..f0c3728b4 100755 --- a/tools/buildrom +++ b/tools/buildrom @@ -13,13 +13,13 @@ def main(): # by the ROM; they are likely a side effect of Rare's linker copying things # around in the ROM. write_binary(fd, 0x2ea1c, get_boot()) - write_binary(fd, 0x30a6c, get_library()[:0x8df0]) + write_binary(fd, 0x30a6c, get_lib()[:0x8df0]) write_binary(fd, 0x157120, get_unknown()) write_binary(fd, 0, get_header()) write_binary(fd, 0x40, get_rspboot()) write_binary(fd, 0x1000, get_boot()) - write_binary(fd, 0x3050, get_library()) + write_binary(fd, 0x3050, get_lib()) write_binary(fd, 0x39850, get_gamedata()) write_binary(fd, 0x4e850, get_inflate()) write_binary(fd, 0x4fc40, get_gamezips()) @@ -61,8 +61,8 @@ def get_rspboot(): def get_boot(): return getfilecontents('build/ntsc-final/ucode/boot.bin') -def get_library(): - return zip('build/ntsc-final/ucode/library.bin') +def get_lib(): + return zip('build/ntsc-final/ucode/lib.bin') def get_gamedata(): return zip('build/ntsc-final/ucode/gamedata.bin') diff --git a/tools/extract b/tools/extract index 1d99095c7..1a1cecb6f 100755 --- a/tools/extract +++ b/tools/extract @@ -172,7 +172,7 @@ class Extractor: def extract_ucodes(self): self.write('ucode/rspboot.bin', self.rom[0x40:0x1000]) self.write('ucode/boot.bin', self.rom[0x1000:0x3050]) - self.write('ucode/library.bin', self.decompress(self.rom[0x3050:])) + self.write('ucode/lib.bin', self.decompress(self.rom[0x3050:])) self.write('ucode/inflate.bin', self.rom[0x4e850:0x4fc40]) self.extract_ucode_game()