diff --git a/ld/libfiles.inc b/ld/libfiles.inc index f68c04f5c..121a9ef67 100644 --- a/ld/libfiles.inc +++ b/ld/libfiles.inc @@ -26,7 +26,7 @@ build/ROMID/lib/lib_0bfb0.o (section); \ build/ROMID/lib/lib_0c000.o (section); \ build/ROMID/lib/lib_0d0a0.o (section); \ - build/ROMID/lib/lib_0d520.o (section); \ + build/ROMID/lib/main.o (section); \ build/ROMID/lib/lib_0e9d0.o (section); \ build/ROMID/lib/lib_11420.o (section); \ build/ROMID/lib/lib_121e0.o (section); \ diff --git a/src/boot/boot.c b/src/boot/boot.c index e81441f58..eeb571c68 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -17,7 +17,7 @@ #include "lib/lib_08a20.h" #include "lib/lib_09660.h" #include "lib/lib_0c000.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_12dc0.h" #include "lib/lib_13710.h" diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index c436ea849..79ae249ba 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -23,7 +23,7 @@ #include "game/propobj.h" #include "gvars/gvars.h" #include "lib/lib_04790.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_13130.h" #include "lib/lib_13900.h" diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 8ecdb95cb..478ef987a 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -18,7 +18,7 @@ #include "game/utils.h" #include "gvars/gvars.h" #include "lib/lib_04a80.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_121e0.h" #include "lib/lib_126b0.h" #include "lib/lib_12dc0.h" diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index d42628dd9..1cd723dc3 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -42,7 +42,7 @@ #include "game/wallhit.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 53710053b..f4d24b823 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -46,7 +46,7 @@ #include "gvars/gvars.h" #include "lib/lib_04790.h" #include "lib/lib_04a80.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_12dc0.h" #include "lib/lib_13900.h" diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 2a74897f0..d757c6cda 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -48,7 +48,7 @@ #include "gvars/gvars.h" #include "lib/lib_04790.h" #include "lib/lib_04a80.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_11420.h" #include "lib/lib_12dc0.h" diff --git a/src/game/data/data_000000.c b/src/game/data/data_000000.c index 66646f3e7..cf28f58c5 100644 --- a/src/game/data/data_000000.c +++ b/src/game/data/data_000000.c @@ -7,7 +7,7 @@ #include "game/data/data_000000.h" #include "game/data/data_00e460.h" #include "lib/lib_0c000.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_3e730.h" #include "gvars/gvars.h" #include "stagesetup.h" diff --git a/src/game/data/data_003dc0.c b/src/game/data/data_003dc0.c index 71a92e1f5..a0e30b72d 100644 --- a/src/game/data/data_003dc0.c +++ b/src/game/data/data_003dc0.c @@ -7,7 +7,7 @@ #include "game/data/data_000000.h" #include "game/data/data_00e460.h" #include "lib/lib_0c000.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_3e730.h" #include "gvars/gvars.h" #include "stagesetup.h" diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 8a3cd8be7..e070d6d68 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -30,7 +30,7 @@ #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_13130.h" #include "types.h" diff --git a/src/game/explosion.c b/src/game/explosion.c index 25bbe196a..595c16b11 100644 --- a/src/game/explosion.c +++ b/src/game/explosion.c @@ -25,7 +25,7 @@ #include "game/wallhit.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" #include "lib/lib_233c0.h" diff --git a/src/game/game_0109d0.c b/src/game/game_0109d0.c index 8c6c032e5..ad11734fb 100644 --- a/src/game/game_0109d0.c +++ b/src/game/game_0109d0.c @@ -9,7 +9,7 @@ #include "game/data/data_02da90.h" #include "game/data/inventory.h" #include "gvars/gvars.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index feb8a9a90..09f11e517 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -29,7 +29,7 @@ #include "game/mplayer.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_13900.h" #include "types.h" diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 7d782e081..0e8b8f8ae 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -47,7 +47,7 @@ #include "lib/lib_04790.h" #include "lib/lib_04a80.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_12dc0.h" #include "lib/lib_13130.h" diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index 97ff9bf2d..de7e4c4ac 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -16,7 +16,7 @@ #include "game/game_166e40.h" #include "gvars/gvars.h" #include "lib/lib_04790.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index f65e0e16c..452773ee5 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -59,7 +59,7 @@ #include "lib/lib_04320.h" #include "lib/lib_04840.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_121e0.h" #include "lib/lib_12dc0.h" diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index 2d34a2cde..05db6268d 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -13,7 +13,7 @@ #include "game/utils.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_13130.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" diff --git a/src/game/game_0d5a90.c b/src/game/game_0d5a90.c index f0f91ebe3..8c57476e3 100644 --- a/src/game/game_0d5a90.c +++ b/src/game/game_0d5a90.c @@ -12,7 +12,7 @@ #include "game/game_1531a0.h" #include "game/game_166e40.h" #include "gvars/gvars.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "types.h" const char var7f1adbf0[] = "radmax"; diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index f56de336f..1f8a73f4d 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -21,7 +21,7 @@ #include "game/propobj.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "types.h" diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index 879aa9d79..680e956fd 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -17,7 +17,7 @@ #include "game/utils.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 73b95720e..8ac7f2d69 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -24,7 +24,7 @@ #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_13130.h" #include "types.h" diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 184c95be1..18b9b4b15 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -40,7 +40,7 @@ #include "game/propobj.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_121e0.h" #include "lib/lib_12dc0.h" diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index 09c824ba5..5910ad6a3 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -27,7 +27,7 @@ #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_13130.h" #include "lib/lib_16110.h" #include "types.h" diff --git a/src/game/game_102240.c b/src/game/game_102240.c index b45584c96..f46df0222 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -34,7 +34,7 @@ #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_13130.h" #include "lib/lib_13900.h" diff --git a/src/game/game_111600.c b/src/game/game_111600.c index b32586d33..af9d1e0fd 100644 --- a/src/game/game_111600.c +++ b/src/game/game_111600.c @@ -14,7 +14,7 @@ #include "game/training.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "types.h" void currentPlayerClearInventory(void) diff --git a/src/game/game_1371b0.c b/src/game/game_1371b0.c index 0133a8056..0903f8cd3 100644 --- a/src/game/game_1371b0.c +++ b/src/game/game_1371b0.c @@ -22,7 +22,7 @@ #include "game/lang.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_121e0.h" #include "lib/lib_12dc0.h" #include "lib/lib_13900.h" diff --git a/src/game/game_13b670.c b/src/game/game_13b670.c index aee370598..18aa7a6a1 100644 --- a/src/game/game_13b670.c +++ b/src/game/game_13b670.c @@ -10,7 +10,7 @@ #include "game/data/data_02da90.h" #include "game/game_13b670.h" #include "gvars/gvars.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_121e0.h" #include "lib/lib_16110.h" #include "types.h" diff --git a/src/game/game_141820.c b/src/game/game_141820.c index 23ecad4c3..199175eeb 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -19,7 +19,7 @@ #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_12dc0.h" #include "lib/lib_13130.h" #include "lib/lib_13900.h" diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 65c750c64..b5dfb525f 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -15,7 +15,7 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/lib_0d0a0.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_121e0.h" #include "lib/lib_4a360.h" #include "types.h" diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 3ca1d5ec7..c655349ee 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -36,7 +36,7 @@ #include "lib/lib_074f0.h" #include "lib/lib_09660.h" #include "lib/lib_0d0a0.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_121e0.h" #include "lib/lib_126b0.h" #include "lib/lib_12dc0.h" diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 6bc2d675d..7e8703d00 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -101,7 +101,7 @@ #include "gvars/gvars.h" #include "lib/lib_06440.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_11420.h" #include "lib/lib_12dc0.h" diff --git a/src/game/game_16e810.c b/src/game/game_16e810.c index fe9e47480..39da7dbcc 100644 --- a/src/game/game_16e810.c +++ b/src/game/game_16e810.c @@ -12,7 +12,7 @@ #include "gvars/gvars.h" #include "lib/lib_074f0.h" #include "lib/lib_0d0a0.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_121e0.h" #include "lib/lib_48120.h" #include "lib/lib_4b170.h" diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index 9f529315f..97ee0ff65 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -22,7 +22,7 @@ #include "game/mplayer.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_13130.h" #include "types.h" diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index bf0c1bf31..7f9ebb2c4 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -28,7 +28,7 @@ #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_13130.h" #include "lib/lib_1a500.h" #include "types.h" diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 8a6d8adae..c2525386e 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -28,7 +28,7 @@ #include "game/pak/pak.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_12dc0.h" #include "lib/lib_13130.h" #include "lib/lib_317f0.h" diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index edb86fd94..1c63a28f7 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -18,7 +18,7 @@ #include "lib/lib_06330.h" #include "lib/lib_06440.h" #include "lib/lib_06550.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_121e0.h" #include "lib/lib_12dc0.h" #include "lib/lib_13130.h" diff --git a/src/game/propobj.c b/src/game/propobj.c index d05016446..deca74603 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -68,7 +68,7 @@ #include "lib/lib_04a80.h" #include "lib/lib_09660.h" #include "lib/lib_0d0a0.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_121e0.h" #include "lib/lib_12dc0.h" diff --git a/src/game/title.c b/src/game/title.c index b95a463b6..cba565a2f 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -27,7 +27,7 @@ #include "lib/lib_04320.h" #include "lib/lib_04790.h" #include "lib/lib_09660.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_13900.h" #include "lib/lib_159b0.h" diff --git a/src/game/training.c b/src/game/training.c index bdd6352ba..8819cb93b 100644 --- a/src/game/training.c +++ b/src/game/training.c @@ -36,7 +36,7 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/lib_0d0a0.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_121e0.h" #include "lib/lib_12dc0.h" diff --git a/src/game/wallhit.c b/src/game/wallhit.c index e730ea515..9a1a56906 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -18,7 +18,7 @@ #include "game/utils.h" #include "game/wallhit.h" #include "gvars/gvars.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" diff --git a/src/game/weather.c b/src/game/weather.c index dd48cd851..328c8ee80 100644 --- a/src/game/weather.c +++ b/src/game/weather.c @@ -15,7 +15,7 @@ #include "game/game_166e40.h" #include "game/game_167ae0.h" #include "gvars/gvars.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_121e0.h" #include "lib/lib_12dc0.h" diff --git a/src/game/weathertick.c b/src/game/weathertick.c index 7e3a37776..b479a4f0e 100644 --- a/src/game/weathertick.c +++ b/src/game/weathertick.c @@ -9,7 +9,7 @@ #include "game/data/data_02da90.h" #include "game/weather.h" #include "gvars/gvars.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "types.h" void weatherTick(void) diff --git a/src/include/lib/lib_0d520.h b/src/include/lib/main.h similarity index 84% rename from src/include/lib/lib_0d520.h rename to src/include/lib/main.h index 0cfb1ea82..6a8b3e8ff 100644 --- a/src/include/lib/lib_0d520.h +++ b/src/include/lib/main.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIB_LIB_0D520_H -#define _IN_LIB_LIB_0D520_H +#ifndef _IN_LIB_MAIN_H +#define _IN_LIB_MAIN_H #include #include "types.h" diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c index 60f148868..98e3506b7 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/lib_13900.c @@ -10,7 +10,7 @@ #include "game/pak/pak.h" #include "gvars/gvars.h" #include "lib/lib_04a80.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_13900.h" #include "lib/lib_4f5e0.h" #include "types.h" diff --git a/src/lib/lib_0d520.c b/src/lib/main.c similarity index 99% rename from src/lib/lib_0d520.c rename to src/lib/main.c index 952f6a5de..73917499e 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/main.c @@ -54,7 +54,7 @@ #include "lib/lib_0bfb0.h" #include "lib/lib_0c000.h" #include "lib/lib_0d0a0.h" -#include "lib/lib_0d520.h" +#include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_121e0.h" #include "lib/lib_126b0.h"