From 615d670a0feebe0e78f0b676fcdcadf6471d9739 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 29 Jan 2021 23:29:37 +1000 Subject: [PATCH] Rename known lib files --- Makefile | 16 +++--- ld/libfiles.inc | 52 +++++++++---------- src/boot/entry.c | 6 --- src/boot/init.c | 6 --- src/boot/sched.c | 7 +-- src/game/activemenu/tick.c | 2 +- src/game/bondbike.c | 3 -- src/game/bondeyespy.c | 3 -- src/game/bondgrab.c | 2 - src/game/bondhead.c | 2 +- src/game/bondmove.c | 2 - src/game/bondview.c | 2 - src/game/bondwalk.c | 3 -- src/game/camdraw.c | 4 -- src/game/chr/chr.c | 3 +- src/game/chr/chraction.c | 6 +-- src/game/chr/chrai.c | 1 - src/game/chr/chraicommands.c | 4 +- src/game/core.c | 3 +- src/game/credits.c | 1 - src/game/dlights.c | 1 - src/game/explosions/explosions.c | 1 - src/game/game_000090.c | 1 - src/game/game_000880.c | 1 - src/game/game_005fd0.c | 1 - src/game/game_006bd0.c | 2 - src/game/game_00c490.c | 3 +- src/game/game_0125a0.c | 2 +- src/game/game_013ee0.c | 1 - src/game/game_0147d0.c | 1 - src/game/game_015470.c | 4 -- src/game/game_01b0a0.c | 1 - src/game/game_01bea0.c | 1 - src/game/game_02cde0.c | 1 - src/game/game_0601b0.c | 2 - src/game/game_091e10.c | 1 - src/game/game_092610.c | 1 - src/game/game_096700.c | 1 - src/game/game_096750.c | 1 - src/game/game_096ca0.c | 1 - src/game/game_097ba0.c | 5 -- src/game/game_0abe70.c | 3 -- src/game/game_0b28d0.c | 1 - src/game/game_0b3350.c | 1 - src/game/game_0b63b0.c | 5 -- src/game/game_0b69d0.c | 7 +-- src/game/game_0d4690.c | 1 - src/game/game_0dcdb0.c | 2 - src/game/game_0f09f0.c | 2 - src/game/game_102240.c | 1 - src/game/game_107fb0.c | 1 - src/game/game_11f000.c | 2 - src/game/game_129210.c | 1 - src/game/game_13c510.c | 1 - src/game/game_150820.c | 1 - src/game/game_1531a0.c | 1 - src/game/game_157db0.c | 1 - src/game/game_16e810.c | 2 - src/game/game_190260.c | 2 +- src/game/game_1a7560.c | 1 - src/game/gamefile.c | 1 - src/game/mplayer/options.c | 1 - src/game/mplayer/scenarios.c | 1 - src/game/pad.c | 1 - src/game/padhalllv.c | 1 - src/game/pak/pak.c | 3 +- src/game/propobj.c | 9 +--- src/game/radar.c | 1 - src/game/sky.c | 2 - src/game/smoke/smoke.c | 1 - src/game/sparks/sparks.c | 1 - src/game/splat.c | 2 +- src/game/title.c | 7 +-- src/game/training/menus.c | 1 - src/game/training/training.c | 1 - src/game/utils.c | 1 - src/game/wallhit.c | 1 - src/game/weather/weather.c | 1 - src/include/PR/os_misc.h | 8 +++ src/include/lib/{lib_08a20.h => audiomgr.h} | 4 +- src/include/lib/{lib_13900.h => controller.h} | 4 +- src/include/lib/gvars.h | 8 +++ src/include/lib/lib_03fb0.h | 14 ----- src/include/lib/lib_04320.h | 6 --- src/include/lib/lib_04790.h | 8 --- src/include/lib/lib_04840.h | 6 --- src/include/lib/lib_04a80.h | 35 ------------- src/include/lib/lib_05e40.h | 6 --- src/include/lib/lib_15860.h | 8 --- src/include/lib/lib_16110.h | 2 - src/include/lib/lib_48120.h | 6 --- src/include/lib/lib_481d0.h | 8 --- src/include/lib/lib_49780.h | 8 --- src/include/lib/lib_4a360.h | 8 --- src/include/lib/lib_4a5e0.h | 10 ---- src/include/lib/lib_4e270.h | 8 --- src/include/lib/lib_4e3c0.h | 6 --- src/include/lib/lib_4e470.h | 8 --- src/include/lib/lib_4e690.h | 9 ---- src/include/lib/lib_4fe20.h | 6 --- src/include/lib/lib_50090.h | 6 --- src/include/lib/{lib_1a500.h => model.h} | 4 +- src/lib/{lib_08a20.c => audiomgr.c} | 6 +-- src/lib/{lib_13900.c => controller.c} | 3 +- src/lib/{lib_15860.c => gvars.c} | 3 +- src/lib/lib_04790.c | 29 ----------- src/lib/lib_09660.c | 3 -- src/lib/lib_0d0a0.c | 1 - src/lib/lib_0e9d0.c | 1 - src/lib/lib_12dc0.c | 1 - src/lib/lib_13130.c | 2 - src/lib/lib_16110.c | 2 - src/lib/lib_233c0.c | 3 -- src/lib/lib_2f490.c | 1 - src/lib/lib_2fa00.c | 1 - src/lib/lib_446d0.c | 1 - src/lib/lib_44f60.c | 1 - src/lib/lib_481d0.c | 19 ------- src/lib/lib_49780.c | 19 ------- src/lib/lib_4b500.c | 6 --- src/lib/lib_4f5e0.c | 2 - src/lib/lib_4fff0.c | 1 - src/lib/main.c | 7 +-- src/lib/{lib_1a500.c => model.c} | 3 +- src/lib/{lib_4fe20.c => ultra/gu/frustum.c} | 0 src/lib/{lib_03fb0.c => ultra/gu/lookat.c} | 12 ----- src/lib/{lib_04320.c => ultra/gu/lookatref.c} | 12 ----- src/lib/{lib_4a360.c => ultra/gu/mtxutil.c} | 0 src/lib/ultra/gu/normalize.c | 17 ++++++ .../{lib_04840.c => ultra/gu/perspective.c} | 13 ----- src/lib/{lib_04a80.c => ultra/gu/rotate.c} | 0 src/lib/{lib_50090.c => ultra/gu/scale.c} | 0 src/lib/ultra/gu/sqrtf.c | 11 ---- src/lib/{lib_4e470.c => ultra/io/aigetlen.c} | 0 src/lib/{lib_4e270.c => ultra/io/aisetfreq.c} | 14 +---- .../{lib_4e3c0.c => ultra/io/aisetnextbuf.c} | 13 +---- src/lib/{lib_05e40.c => ultra/io/sptask.c} | 12 ----- src/lib/ultra/io/vigetcurrcontext.c | 9 ++++ src/lib/ultra/io/vimgr.c | 4 +- src/lib/{ => ultra/libc}/bzero.c | 10 ---- src/lib/{ => ultra}/libc/ldiv.c | 0 src/lib/{ => ultra}/libc/ll.c | 0 src/lib/{ => ultra}/libc/llcvt.c | 0 src/lib/{lib_4a5e0.c => ultra/libc/string.c} | 13 +---- src/lib/{ => ultra}/libc/xldtob.c | 47 ++++++++++------- src/lib/{lib_4e690.c => ultra/libc/xprintf.c} | 15 +----- src/lib/ultra/os/getfpccsr.c | 9 ++++ .../os/writebackdcacheall.c} | 12 +---- 148 files changed, 152 insertions(+), 615 deletions(-) rename src/include/lib/{lib_08a20.h => audiomgr.h} (77%) rename src/include/lib/{lib_13900.h => controller.h} (96%) create mode 100644 src/include/lib/gvars.h delete mode 100644 src/include/lib/lib_03fb0.h delete mode 100644 src/include/lib/lib_04320.h delete mode 100644 src/include/lib/lib_04790.h delete mode 100644 src/include/lib/lib_04840.h delete mode 100644 src/include/lib/lib_04a80.h delete mode 100644 src/include/lib/lib_05e40.h delete mode 100644 src/include/lib/lib_15860.h delete mode 100644 src/include/lib/lib_48120.h delete mode 100644 src/include/lib/lib_481d0.h delete mode 100644 src/include/lib/lib_49780.h delete mode 100644 src/include/lib/lib_4a360.h delete mode 100644 src/include/lib/lib_4a5e0.h delete mode 100644 src/include/lib/lib_4e270.h delete mode 100644 src/include/lib/lib_4e3c0.h delete mode 100644 src/include/lib/lib_4e470.h delete mode 100644 src/include/lib/lib_4e690.h delete mode 100644 src/include/lib/lib_4fe20.h delete mode 100644 src/include/lib/lib_50090.h rename src/include/lib/{lib_1a500.h => model.h} (98%) rename src/lib/{lib_08a20.c => audiomgr.c} (99%) rename src/lib/{lib_13900.c => controller.c} (99%) rename src/lib/{lib_15860.c => gvars.c} (97%) delete mode 100644 src/lib/lib_04790.c delete mode 100644 src/lib/lib_481d0.c delete mode 100644 src/lib/lib_49780.c delete mode 100644 src/lib/lib_4b500.c rename src/lib/{lib_1a500.c => model.c} (99%) rename src/lib/{lib_4fe20.c => ultra/gu/frustum.c} (100%) rename src/lib/{lib_03fb0.c => ultra/gu/lookat.c} (82%) rename src/lib/{lib_04320.c => ultra/gu/lookatref.c} (86%) rename src/lib/{lib_4a360.c => ultra/gu/mtxutil.c} (100%) create mode 100644 src/lib/ultra/gu/normalize.c rename src/lib/{lib_04840.c => ultra/gu/perspective.c} (70%) rename src/lib/{lib_04a80.c => ultra/gu/rotate.c} (100%) rename src/lib/{lib_50090.c => ultra/gu/scale.c} (100%) rename src/lib/{lib_4e470.c => ultra/io/aigetlen.c} (100%) rename src/lib/{lib_4e270.c => ultra/io/aisetfreq.c} (91%) rename src/lib/{lib_4e3c0.c => ultra/io/aisetnextbuf.c} (85%) rename src/lib/{lib_05e40.c => ultra/io/sptask.c} (92%) create mode 100644 src/lib/ultra/io/vigetcurrcontext.c rename src/lib/{ => ultra/libc}/bzero.c (85%) rename src/lib/{ => ultra}/libc/ldiv.c (100%) rename src/lib/{ => ultra}/libc/ll.c (100%) rename src/lib/{ => ultra}/libc/llcvt.c (100%) rename src/lib/{lib_4a5e0.c => ultra/libc/string.c} (84%) rename src/lib/{ => ultra}/libc/xldtob.c (96%) rename src/lib/{lib_4e690.c => ultra/libc/xprintf.c} (98%) create mode 100644 src/lib/ultra/os/getfpccsr.c rename src/lib/{lib_48120.c => ultra/os/writebackdcacheall.c} (63%) diff --git a/Makefile b/Makefile index ed3e24d9f..13268eb2a 100644 --- a/Makefile +++ b/Makefile @@ -61,14 +61,14 @@ MIPSISET := -mips2 -32 OPT_LVL := -O2 LOOPUNROLL := -Wo,-loopunroll,0 -$(B_DIR)/lib/lib_4a360.o: LOOPUNROLL := -$(B_DIR)/lib/lib_4fe20.o: LOOPUNROLL := +$(B_DIR)/lib/ultra/gu/mtxutil.o: LOOPUNROLL := +$(B_DIR)/lib/ultra/gu/frustum.o: LOOPUNROLL := -$(B_DIR)/lib/libc/ll.o: MIPSISET := -mips3 -o32 -$(B_DIR)/lib/libc/llcvt.o: MIPSISET := -mips3 -o32 +$(B_DIR)/lib/ultra/libc/ll.o: MIPSISET := -mips3 -o32 +$(B_DIR)/lib/ultra/libc/llcvt.o: MIPSISET := -mips3 -o32 -$(B_DIR)/lib/libc/ll.o: OPT_LVL := -O1 -$(B_DIR)/lib/libc/llcvt.o: OPT_LVL := -O1 +$(B_DIR)/lib/ultra/libc/ll.o: OPT_LVL := -O1 +$(B_DIR)/lib/ultra/libc/llcvt.o: OPT_LVL := -O1 $(B_DIR)/lib/ultra/io/dpctr.o: OPT_LVL := -O1 $(B_DIR)/lib/ultra/io/pigetcmdq.o: OPT_LVL := -O1 $(B_DIR)/lib/ultra/io/sp.o: OPT_LVL := -O1 @@ -386,13 +386,13 @@ $(B_DIR)/boot/%.o: src/boot/%.c /usr/bin/env python3 tools/asmpreproc/asm-processor.py -O2 $< | $(IDOCC) -c $(CFLAGS) tools/asmpreproc/include-stdin.c -o $@ $(OPT_LVL) /usr/bin/env python3 tools/asmpreproc/asm-processor.py -O2 $< --post-process $@ --assembler "$(TOOLCHAIN)-as -march=vr4300 -mabi=32" --asm-prelude tools/asmpreproc/prelude.s -$(B_DIR)/lib/libc/llcvt.o: src/lib/libc/llcvt.c +$(B_DIR)/lib/ultra/libc/llcvt.o: src/lib/ultra/libc/llcvt.c @mkdir -p $(dir $@) /usr/bin/env python3 tools/asmpreproc/asm-processor.py -O2 $< | $(IDOCC) -c $(CFLAGS) tools/asmpreproc/include-stdin.c -o $@ $(OPT_LVL) /usr/bin/env python3 tools/asmpreproc/asm-processor.py -O2 $< --post-process $@ --assembler "$(TOOLCHAIN)-as -march=vr4300 -mabi=32" --asm-prelude tools/asmpreproc/prelude.s tools/patchmips3 $@ || rm $@ -$(B_DIR)/lib/libc/ll.o: src/lib/libc/ll.c +$(B_DIR)/lib/ultra/libc/ll.o: src/lib/ultra/libc/ll.c @mkdir -p $(dir $@) $(IDOCC) -c $(CFLAGS) $< -o $@ $(OPT_LVL) tools/patchmips3 $@ || rm $@ diff --git a/ld/libfiles.inc b/ld/libfiles.inc index 426e1e2d9..fe385fb81 100644 --- a/ld/libfiles.inc +++ b/ld/libfiles.inc @@ -5,24 +5,24 @@ build/ROMID/lib/lib_034d0.o (section); \ build/ROMID/lib/ultra/os/exceptasm.o (section); \ build/ROMID/lib/ultra/os/createthread.o (section); \ - build/ROMID/lib/lib_03fb0.o (section); \ - build/ROMID/lib/lib_04320.o (section); \ - build/ROMID/lib/lib_04790.o (section); \ - build/ROMID/lib/lib_04840.o (section); \ - build/ROMID/lib/lib_04a80.o (section); \ - build/ROMID/lib/libc/xldtob.o (section); \ + build/ROMID/lib/ultra/gu/lookat.o (section); \ + build/ROMID/lib/ultra/gu/lookatref.o (section); \ + build/ROMID/lib/ultra/gu/normalize.o (section); \ + build/ROMID/lib/ultra/gu/perspective.o (section); \ + build/ROMID/lib/ultra/gu/rotate.o (section); \ + build/ROMID/lib/ultra/libc/xldtob.o (section); \ build/ROMID/lib/ultra/io/pfsisplug.o (section); \ - build/ROMID/lib/libc/llcvt.o (section); \ + build/ROMID/lib/ultra/libc/llcvt.o (section); \ build/ROMID/lib/ultra/os/initialize.o (section); \ build/ROMID/lib/lib_05dc0.o (section); \ - build/ROMID/lib/lib_05e40.o (section); \ + build/ROMID/lib/ultra/io/sptask.o (section); \ build/ROMID/lib/lib_06100.o (section); \ build/ROMID/lib/lib_06330.o (section); \ build/ROMID/lib/ultra/io/conteeplongwrite.o (section); \ build/ROMID/lib/lib_06550.o (section); \ build/ROMID/lib/lib_070d0.o (section); \ build/ROMID/lib/lib_074f0.o (section); \ - build/ROMID/lib/lib_08a20.o (section); \ + build/ROMID/lib/audiomgr.o (section); \ build/ROMID/lib/lib_09660.o (section); \ build/ROMID/lib/lib_0bfb0.o (section); \ build/ROMID/lib/lib_0c000.o (section); \ @@ -38,12 +38,12 @@ build/ROMID/lib/lib_13750.o (section); \ build/ROMID/lib/lib_13790.o (section); \ build/ROMID/lib/lib_13820.o (section); \ - build/ROMID/lib/lib_13900.o (section); \ + build/ROMID/lib/controller.o (section); \ build/ROMID/lib/lib_15850.o (section); \ - build/ROMID/lib/lib_15860.o (section); \ + build/ROMID/lib/gvars.o (section); \ build/ROMID/lib/lib_159b0.o (section); \ build/ROMID/lib/lib_16110.o (section); \ - build/ROMID/lib/lib_1a500.o (section); \ + build/ROMID/lib/model.o (section); \ build/ROMID/lib/lib_233c0.o (section); \ build/ROMID/lib/lib_2f490.o (section); \ build/ROMID/lib/lib_2fa00.o (section); \ @@ -80,9 +80,9 @@ build/ROMID/lib/lib_47550.o (section); \ build/ROMID/lib/lib_47a90.o (section); \ build/ROMID/lib/lib_47d20.o (section); \ - build/ROMID/lib/lib_48120.o (section); \ + build/ROMID/lib/ultra/os/writebackdcacheall.o (section); \ build/ROMID/lib/ultra/os/invalicache.o (section); \ - build/ROMID/lib/lib_481d0.o (section); \ + build/ROMID/lib/ultra/os/getfpccsr.o (section); \ build/ROMID/lib/ultra/os/setfpccsr.o (section); \ build/ROMID/lib/ultra/os/startthread.o (section); \ build/ROMID/lib/ultra/os/createmesgqueue.o (section); \ @@ -110,7 +110,7 @@ build/ROMID/lib/ultra/os/timerintr.o (section); \ build/ROMID/lib/ultra/os/interrupt.o (section); \ build/ROMID/lib/ultra/io/vi.o (section); \ - build/ROMID/lib/lib_49780.o (section); \ + build/ROMID/lib/ultra/io/vigetcurrcontext.o (section); \ build/ROMID/lib/ultra/io/viswapcontext.o (section); \ build/ROMID/lib/ultra/io/piacs.o (section); \ build/ROMID/lib/ultra/io/pirawdma.o (section); \ @@ -118,10 +118,10 @@ build/ROMID/lib/ultra/io/devmgr.o (section); \ build/ROMID/lib/ultra/os/thread.o (section); \ build/ROMID/lib/ultra/os/destroythread.o (section); \ - build/ROMID/lib/lib_4a360.o (section); \ + build/ROMID/lib/ultra/gu/mtxutil.o (section); \ build/ROMID/lib/ultra/gu/sqrtf.o (section); \ - build/ROMID/lib/lib_4a5e0.o (section); \ - build/ROMID/lib/libc/ldiv.o (section); \ + build/ROMID/lib/ultra/libc/string.o (section); \ + build/ROMID/lib/ultra/libc/ldiv.o (section); \ build/ROMID/lib/ultra/io/siacs.o (section); \ build/ROMID/lib/ultra/io/sirawdma.o (section); \ build/ROMID/lib/ultra/io/controller.o (section); \ @@ -130,8 +130,8 @@ build/ROMID/lib/ultra/io/sirawread.o (section); \ build/ROMID/lib/ultra/io/sirawwrite.o (section); \ build/ROMID/lib/ultra/os/writebackdcache.o (section); \ - build/ROMID/lib/libc/ll.o (section); \ - build/ROMID/lib/bzero.o (section); \ + build/ROMID/lib/ultra/libc/ll.o (section); \ + build/ROMID/lib/ultra/libc/bzero.o (section); \ build/ROMID/lib/ultra/os/getcause.o (section); \ build/ROMID/lib/lib_4b170.o (section); \ build/ROMID/lib/ultra/os/virtualtophysical.o (section); \ @@ -151,20 +151,20 @@ build/ROMID/lib/lib_4d480.o (section); \ build/ROMID/lib/lib_4d6f0.o (section); \ build/ROMID/lib/ultra/os/maptlb.o (section); \ - build/ROMID/lib/lib_4e270.o (section); \ - build/ROMID/lib/lib_4e3c0.o (section); \ - build/ROMID/lib/lib_4e470.o (section); \ + build/ROMID/lib/ultra/io/aisetfreq.o (section); \ + build/ROMID/lib/ultra/io/aisetnextbuf.o (section); \ + build/ROMID/lib/ultra/io/aigetlen.o (section); \ build/ROMID/lib/ultra/os/invaldcache.o (section); \ build/ROMID/lib/ultra/io/pidma.o (section); \ build/ROMID/lib/lib_4e640.o (section); \ build/ROMID/lib/ultra/io/piread.o (section); \ - build/ROMID/lib/lib_4e690.o (section); \ + build/ROMID/lib/ultra/libc/xprintf.o (section); \ build/ROMID/lib/ultra/io/contquery.o (section); \ build/ROMID/lib/ultra/io/contreaddata.o (section); \ build/ROMID/lib/lib_4f5e0.o (section); \ - build/ROMID/lib/lib_4fe20.o (section); \ + build/ROMID/lib/ultra/gu/frustum.o (section); \ build/ROMID/lib/lib_4fff0.o (section); \ - build/ROMID/lib/lib_50090.o (section); \ + build/ROMID/lib/ultra/gu/scale.o (section); \ build/ROMID/lib/ultra/io/conteepprobe.o (section); \ build/ROMID/lib/ultra/io/conteepread.o (section); \ build/ROMID/lib/ultra/io/conteeplongread.o (section); \ diff --git a/src/boot/entry.c b/src/boot/entry.c index f55e3b343..32eaa283a 100644 --- a/src/boot/entry.c +++ b/src/boot/entry.c @@ -10,10 +10,7 @@ #include "game/data/data_02da90.h" #include "game/game_0e0770.h" #include "gvars/gvars.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/main.h" @@ -21,11 +18,8 @@ #include "lib/lib_12dc0.h" #include "lib/lib_13710.h" #include "lib/lib_13750.h" -#include "lib/lib_13900.h" #include "lib/lib_2fa00.h" -#include "lib/lib_48120.h" #include "lib/lib_48150.h" -#include "lib/lib_481d0.h" #include "lib/lib_48cd0.h" #include "lib/lib_48dc0.h" #include "lib/lib_48ef0.h" diff --git a/src/boot/init.c b/src/boot/init.c index 56077d266..7007e3920 100644 --- a/src/boot/init.c +++ b/src/boot/init.c @@ -13,10 +13,7 @@ #include "game/data/data_02da90.h" #include "game/game_0e0770.h" #include "gvars/gvars.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/main.h" @@ -24,11 +21,8 @@ #include "lib/lib_12dc0.h" #include "lib/lib_13710.h" #include "lib/lib_13750.h" -#include "lib/lib_13900.h" #include "lib/lib_2fa00.h" -#include "lib/lib_48120.h" #include "lib/lib_48150.h" -#include "lib/lib_481d0.h" #include "lib/lib_48cd0.h" #include "lib/lib_48dc0.h" #include "lib/lib_48ef0.h" diff --git a/src/boot/sched.c b/src/boot/sched.c index 9e1a202b8..3bdae002a 100644 --- a/src/boot/sched.c +++ b/src/boot/sched.c @@ -11,10 +11,8 @@ #include "game/data/data_02da90.h" #include "game/game_0e0770.h" #include "gvars/gvars.h" -#include "lib/lib_04a80.h" -#include "lib/lib_05e40.h" +#include "lib/audiomgr.h" #include "lib/lib_074f0.h" -#include "lib/lib_08a20.h" #include "lib/lib_09660.h" #include "lib/lib_0c000.h" #include "lib/main.h" @@ -22,11 +20,8 @@ #include "lib/lib_12dc0.h" #include "lib/lib_13710.h" #include "lib/lib_13750.h" -#include "lib/lib_13900.h" #include "lib/lib_2fa00.h" -#include "lib/lib_48120.h" #include "lib/lib_48150.h" -#include "lib/lib_481d0.h" #include "lib/lib_48cd0.h" #include "lib/lib_48dc0.h" #include "lib/lib_48ef0.h" diff --git a/src/game/activemenu/tick.c b/src/game/activemenu/tick.c index 0ce507e9c..2f60695fb 100644 --- a/src/game/activemenu/tick.c +++ b/src/game/activemenu/tick.c @@ -15,8 +15,8 @@ #include "game/game_127910.h" #include "game/pdoptions.h" #include "gvars/gvars.h" +#include "lib/controller.h" #include "lib/lib_13130.h" -#include "lib/lib_13900.h" #include "types.h" void amTick(void) diff --git a/src/game/bondbike.c b/src/game/bondbike.c index b3cc5bed2..3ca9ab4f3 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -23,12 +23,9 @@ #include "game/pdoptions.h" #include "game/propobj.h" #include "gvars/gvars.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" void bbikeInit(void) diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 0c68a8b48..350f5ee0e 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -22,14 +22,11 @@ #include "game/pdoptions.h" #include "game/propobj.h" #include "gvars/gvars.h" -#include "lib/lib_04790.h" #include "lib/main.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" u8 var80070ec0 = 0; diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 0b4de2240..6c72be8d8 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -19,11 +19,9 @@ #include "game/bondhead.h" #include "game/propobj.h" #include "gvars/gvars.h" -#include "lib/lib_04790.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 var7f1ad940[] = "bondgrab.c"; diff --git a/src/game/bondhead.c b/src/game/bondhead.c index f338a647c..2fce746fc 100644 --- a/src/game/bondhead.c +++ b/src/game/bondhead.c @@ -13,8 +13,8 @@ #include "gvars/gvars.h" #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" -#include "lib/lib_1a500.h" #include "lib/lib_233c0.h" +#include "lib/model.h" #include "types.h" struct var80075c00 var80075c00[] = { diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 8eb90e269..4bb82a17e 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -35,11 +35,9 @@ #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/bondview.c b/src/game/bondview.c index 62de8ed59..656527b41 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -22,9 +22,7 @@ #include "lib/main.h" #include "lib/lib_12dc0.h" #include "lib/lib_13130.h" -#include "lib/lib_13900.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" #include "gbiex.h" diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index affbbac75..c33a4734a 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -24,13 +24,10 @@ #include "game/game_127910.h" #include "game/propobj.h" #include "gvars/gvars.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" void bwalkInit(void) diff --git a/src/game/camdraw.c b/src/game/camdraw.c index c4639c23e..8a45c53bd 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -17,15 +17,11 @@ #include "game/splat.h" #include "game/utils.h" #include "gvars/gvars.h" -#include "lib/lib_04a80.h" #include "lib/main.h" #include "lib/memory.h" #include "lib/lib_126b0.h" #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" -#include "lib/lib_1a500.h" -#include "lib/lib_4a360.h" -#include "lib/lib_4a5e0.h" #include "lib/libc/ll.h" #include "types.h" diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index e18fba1a6..42b9b8d67 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -44,12 +44,11 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/main.h" +#include "lib/model.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 var7f1a8690[] = "chr/chr.c"; diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 62c9c7873..595edbb19 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -45,17 +45,13 @@ #include "game/wallhit.h" #include "game/mpstats.h" #include "gvars/gvars.h" -#include "lib/lib_04790.h" -#include "lib/lib_04a80.h" #include "lib/main.h" +#include "lib/model.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 cdbbf3e14..559d2ac78 100644 --- a/src/game/chr/chrai.c +++ b/src/game/chr/chrai.c @@ -14,7 +14,6 @@ #include "gvars/gvars.h" #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" -#include "lib/lib_1a500.h" #include "types.h" bool (*g_CommandPointers[])(void) = { diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 912433c35..51fdf8882 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -47,15 +47,13 @@ #include "game/propobj.h" #include "game/mpstats.h" #include "gvars/gvars.h" -#include "lib/lib_04790.h" -#include "lib/lib_04a80.h" #include "lib/main.h" +#include "lib/model.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/libc/ll.h" diff --git a/src/game/core.c b/src/game/core.c index e8774fea5..0a3762092 100644 --- a/src/game/core.c +++ b/src/game/core.c @@ -103,17 +103,16 @@ #include "game/utils.h" #include "game/wallhit.h" #include "gvars/gvars.h" +#include "lib/controller.h" #include "lib/lib_06440.h" #include "lib/lib_09660.h" #include "lib/main.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 "types.h" const char var7f1b7730[] = "fr: %d\n"; diff --git a/src/game/credits.c b/src/game/credits.c index dc418fcc0..c24af4ff0 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -26,7 +26,6 @@ #include "lib/main.h" #include "lib/memory.h" #include "lib/lib_12dc0.h" -#include "lib/lib_13900.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" #include "types.h" diff --git a/src/game/dlights.c b/src/game/dlights.c index 89e5c1528..6903478ea 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -29,7 +29,6 @@ #include "lib/lib_16110.h" #include "lib/lib_2f490.h" #include "lib/lib_317f0.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/explosions/explosions.c b/src/game/explosions/explosions.c index 3b80809f1..c5275ad63 100644 --- a/src/game/explosions/explosions.c +++ b/src/game/explosions/explosions.c @@ -30,7 +30,6 @@ #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" #include "lib/lib_233c0.h" -#include "lib/lib_4a360.h" #include "types.h" const char var7f1b5230[] = "VTXSTORE : vtxfixrefs -> Start - p1=%x, p2=%x\n"; diff --git a/src/game/game_000090.c b/src/game/game_000090.c index 607c58d27..29acd1a51 100644 --- a/src/game/game_000090.c +++ b/src/game/game_000090.c @@ -11,7 +11,6 @@ #include "game/game_000130.h" #include "game/chr/chr.h" #include "gvars/gvars.h" -#include "lib/lib_1a500.h" #include "types.h" void func0f000090(void) diff --git a/src/game/game_000880.c b/src/game/game_000880.c index bcc745d8a..c7627cb4b 100644 --- a/src/game/game_000880.c +++ b/src/game/game_000880.c @@ -9,7 +9,6 @@ #include "game/data/data_02da90.h" #include "game/game_000880.h" #include "gvars/gvars.h" -#include "lib/lib_50090.h" #include "types.h" void func0f000880(void) diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index 03ef29428..a46a772b5 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -13,7 +13,6 @@ #include "gvars/gvars.h" #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" -#include "lib/lib_1a500.h" #include "types.h" bool func0f005fd0(s32 arg0) diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index c370ba8f2..db788812a 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -20,14 +20,12 @@ #include "game/game_157db0.h" #include "game/game_166e40.h" #include "gvars/gvars.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_317f0.h" -#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1a7e80[] = {0x00000092}; diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index bc095f623..02df17d6d 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -38,12 +38,11 @@ #include "game/propobj.h" #include "gvars/gvars.h" #include "lib/memory.h" +#include "lib/model.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" struct monitorscreen var80061a80 = { diff --git a/src/game/game_0125a0.c b/src/game/game_0125a0.c index 6ee4ac2c9..1d6ba1bc8 100644 --- a/src/game/game_0125a0.c +++ b/src/game/game_0125a0.c @@ -14,8 +14,8 @@ #include "game/pad.h" #include "gvars/gvars.h" #include "lib/lib_159b0.h" -#include "lib/lib_1a500.h" #include "lib/lib_233c0.h" +#include "lib/model.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_013ee0.c b/src/game/game_013ee0.c index 8a8c2eb2b..565b651bb 100644 --- a/src/game/game_013ee0.c +++ b/src/game/game_013ee0.c @@ -11,7 +11,6 @@ #include "game/game_157db0.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "lib/lib_04790.h" #include "lib/memory.h" #include "lib/lib_233c0.h" #include "types.h" diff --git a/src/game/game_0147d0.c b/src/game/game_0147d0.c index bd6f57082..e79c403dd 100644 --- a/src/game/game_0147d0.c +++ b/src/game/game_0147d0.c @@ -17,7 +17,6 @@ #include "lib/memory.h" #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" -#include "lib/lib_1a500.h" #include "types.h" void func0f0147d0(void) diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 5f09e7d3b..f1e5da159 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -10,10 +10,6 @@ #include "game/game_015470.h" #include "game/game_01afc0.h" #include "gvars/gvars.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" diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index e6ba023ef..422fc32c7 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -15,7 +15,6 @@ #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_13130.h" -#include "lib/lib_13900.h" #include "types.h" f32 pdmodeGetReaction(void) diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 6aaddef1a..5b82c1d5a 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -31,7 +31,6 @@ #include "lib/lib_09660.h" #include "lib/main.h" #include "lib/lib_0e9d0.h" -#include "lib/lib_13900.h" #include "types.h" const char var7f1a85b0[] = "lvup: %d\n"; diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index deccc0dde..38deb8872 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -24,7 +24,6 @@ #include "lib/lib_126b0.h" #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" -#include "lib/lib_1a500.h" #include "lib/lib_233c0.h" #include "types.h" diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 527d39daf..737dbfcbb 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -38,10 +38,8 @@ #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_4a360.h" #include "types.h" f32 var80069880 = 1; diff --git a/src/game/game_091e10.c b/src/game/game_091e10.c index 01255d6ce..a5d107639 100644 --- a/src/game/game_091e10.c +++ b/src/game/game_091e10.c @@ -14,7 +14,6 @@ #include "game/game_1a7560.h" #include "game/propobj.h" #include "gvars/gvars.h" -#include "lib/lib_1a500.h" #include "types.h" u32 setupGetCommandLength(u32 *cmd) diff --git a/src/game/game_092610.c b/src/game/game_092610.c index 60538a057..b20442e55 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -21,7 +21,6 @@ #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" #include "lib/lib_317f0.h" -#include "lib/lib_4a360.h" #include "types.h" const char var7f1ab400[] = "Propsnd : USING TIME 60\n"; diff --git a/src/game/game_096700.c b/src/game/game_096700.c index 1f4dde55b..6dcf6b278 100644 --- a/src/game/game_096700.c +++ b/src/game/game_096700.c @@ -9,7 +9,6 @@ #include "game/data/data_02da90.h" #include "gvars/gvars.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" f32 func0f096700(f32 value) diff --git a/src/game/game_096750.c b/src/game/game_096750.c index 2e6e2e40b..9ebb97be7 100644 --- a/src/game/game_096750.c +++ b/src/game/game_096750.c @@ -9,7 +9,6 @@ #include "game/data/data_02da90.h" #include "game/game_0969d0.h" #include "gvars/gvars.h" -#include "lib/lib_4a360.h" #include "types.h" f32 func0f096750(f32 x, f32 z) diff --git a/src/game/game_096ca0.c b/src/game/game_096ca0.c index a9aae2c1c..89bad0137 100644 --- a/src/game/game_096ca0.c +++ b/src/game/game_096ca0.c @@ -11,7 +11,6 @@ #include "game/game_096ca0.h" #include "gvars/gvars.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1ab870[] = {0x3c23d70a}; diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index d0506c62c..86d3078a0 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -44,20 +44,15 @@ #include "game/pdoptions.h" #include "game/propobj.h" #include "gvars/gvars.h" -#include "lib/lib_04790.h" -#include "lib/lib_04a80.h" #include "lib/lib_09660.h" #include "lib/main.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_4a360.h" #include "types.h" u32 var80070090 = 0x96969600; diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index e387497f5..3cf5e0d15 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -15,13 +15,10 @@ #include "game/game_0c33f0.h" #include "game/game_166e40.h" #include "gvars/gvars.h" -#include "lib/lib_04790.h" #include "lib/main.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 "types.h" const u32 var7f1acc10[] = {0x73703100}; diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index 29a900b18..f36698046 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -10,7 +10,6 @@ #include "game/game_0b28d0.h" #include "gvars/gvars.h" #include "lib/memory.h" -#include "lib/lib_1a500.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 5cb1353dd..afeb4bc96 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -15,7 +15,6 @@ #include "game/game_173a00.h" #include "gvars/gvars.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" s32 func0f0b3350(s32 value) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 50f6d8936..0499f64dc 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -57,20 +57,15 @@ #include "game/propobj.h" #include "game/splat.h" #include "gvars/gvars.h" -#include "lib/lib_04320.h" -#include "lib/lib_04840.h" #include "lib/lib_09660.h" #include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/memory.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 "types.h" const char var7f1ad160[] = "ACOUSTIC -> Allocating %d bytes for %d portal AV structures\n"; diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c index ae2021aa8..c8f092418 100644 --- a/src/game/game_0b69d0.c +++ b/src/game/game_0b69d0.c @@ -58,20 +58,17 @@ #include "game/splat.h" #include "game/mpstats.h" #include "gvars/gvars.h" -#include "lib/lib_04320.h" -#include "lib/lib_04840.h" +#include "lib/controller.h" #include "lib/lib_09660.h" #include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/memory.h" +#include "lib/model.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 "types.h" const char var7f1ad420[] = "Gunmem: 0x%08x\n"; diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index 7c7bd0ff9..498a8a11b 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -17,7 +17,6 @@ #include "lib/lib_13130.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" -#include "lib/lib_4fe20.h" #include "types.h" const u32 var7f1adba0[] = {0x74786d75}; diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 54a72c0b7..9ba0bb760 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -26,8 +26,6 @@ #include "lib/memory.h" #include "lib/lib_13130.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" -#include "lib/lib_4a5e0.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 a9f7b3532..769b7e399 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -44,10 +44,8 @@ #include "lib/memory.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 "types.h" diff --git a/src/game/game_102240.c b/src/game/game_102240.c index db1c707d8..72fded63a 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -37,7 +37,6 @@ #include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/lib_13130.h" -#include "lib/lib_13900.h" #include "types.h" char *menuTextCurrentStageName(struct menuitem *item) diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 56d50ce35..c34563a13 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -21,7 +21,6 @@ #include "lib/lib_09660.h" #include "lib/lib_126b0.h" #include "lib/lib_13130.h" -#include "lib/lib_13900.h" #include "types.h" char *filemgrGetDeviceName(s32 index) diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 8ca1dedd2..07242fd33 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -18,8 +18,6 @@ #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_129210.c b/src/game/game_129210.c index b2e1c1f16..f360f2358 100644 --- a/src/game/game_129210.c +++ b/src/game/game_129210.c @@ -14,7 +14,6 @@ #include "gvars/gvars.h" #include "lib/lib_126b0.h" #include "lib/lib_12dc0.h" -#include "lib/lib_1a500.h" #include "types.h" /** diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index d8a597ec1..b851ff30c 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -21,7 +21,6 @@ #include "lib/lib_09660.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1b5990[] = {0x4effffff}; diff --git a/src/game/game_150820.c b/src/game/game_150820.c index 746f3b687..2d9e9bd46 100644 --- a/src/game/game_150820.c +++ b/src/game/game_150820.c @@ -17,7 +17,6 @@ #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1b7370[] = {0x3dcccccd}; diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index b3fd297c1..11305dbe2 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -18,7 +18,6 @@ #include "lib/lib_0d0a0.h" #include "lib/main.h" #include "lib/memory.h" -#include "lib/lib_4a360.h" #include "types.h" const char var7f1b73b0[] = "burncol"; diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 9a12bf9c6..adff26eeb 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -43,7 +43,6 @@ #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 "types.h" diff --git a/src/game/game_16e810.c b/src/game/game_16e810.c index 0b06c0f72..5d9b9c431 100644 --- a/src/game/game_16e810.c +++ b/src/game/game_16e810.c @@ -14,9 +14,7 @@ #include "lib/lib_0d0a0.h" #include "lib/main.h" #include "lib/memory.h" -#include "lib/lib_48120.h" #include "lib/lib_4b170.h" -#include "lib/lib_4e470.h" #include "types.h" void func0f16e810(u32 arg0) diff --git a/src/game/game_190260.c b/src/game/game_190260.c index 917a66203..0a136b286 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -32,9 +32,9 @@ #include "game/propobj.h" #include "game/splat.h" #include "gvars/gvars.h" +#include "lib/model.h" #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" -#include "lib/lib_1a500.h" #include "lib/lib_233c0.h" #include "types.h" diff --git a/src/game/game_1a7560.c b/src/game/game_1a7560.c index 103ecb7e7..d58ffd93d 100644 --- a/src/game/game_1a7560.c +++ b/src/game/game_1a7560.c @@ -29,7 +29,6 @@ #include "lib/lib_09660.h" #include "lib/main.h" #include "lib/lib_13130.h" -#include "lib/lib_1a500.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/gamefile.c b/src/game/gamefile.c index 7261de3b8..88a66ff9d 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -25,7 +25,6 @@ #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" diff --git a/src/game/mplayer/options.c b/src/game/mplayer/options.c index 7574b38b0..fc06cdb38 100644 --- a/src/game/mplayer/options.c +++ b/src/game/mplayer/options.c @@ -41,7 +41,6 @@ #include "lib/lib_159b0.h" #include "lib/lib_16110.h" #include "lib/lib_233c0.h" -#include "lib/lib_4a360.h" #include "types.h" s32 menuhandlerMpOpenOptions(u32 operation, struct menuitem *item, union handlerdata *data) diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index 1b38ab1d6..ef6dd7e00 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -41,7 +41,6 @@ #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 var7f1b8440[] = "CaptureTheBriefcaseAddBankPad -> Adding New Pad %d - Pad Id = %d-> Saving Pad\n"; diff --git a/src/game/pad.c b/src/game/pad.c index 3075a0e70..6f9eed9cd 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -9,7 +9,6 @@ #include "game/data/data_02da90.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/game/padhalllv.c b/src/game/padhalllv.c index 24131eda1..e6f04481c 100644 --- a/src/game/padhalllv.c +++ b/src/game/padhalllv.c @@ -14,7 +14,6 @@ #include "gvars/gvars.h" #include "lib/lib_12dc0.h" #include "lib/lib_233c0.h" -#include "lib/lib_4a360.h" #include "lib/libc/ll.h" #include "types.h" diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index b4cd3769d..a4e1555b8 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -14,6 +14,7 @@ #include "game/pak/pak.h" #include "game/utils.h" #include "gvars/gvars.h" +#include "lib/controller.h" #include "lib/lib_06100.h" #include "lib/lib_06330.h" #include "lib/lib_06440.h" @@ -22,8 +23,6 @@ #include "lib/memory.h" #include "lib/lib_12dc0.h" #include "lib/lib_13130.h" -#include "lib/lib_13900.h" -#include "lib/lib_4a5e0.h" #include "lib/lib_4cc10.h" #include "lib/lib_4ce60.h" #include "lib/lib_4d000.h" diff --git a/src/game/propobj.c b/src/game/propobj.c index 1a5a7a50f..2cc05544a 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -65,23 +65,18 @@ #include "game/propobj.h" #include "game/wallhit.h" #include "gvars/gvars.h" -#include "lib/lib_04790.h" -#include "lib/lib_04a80.h" #include "lib/lib_09660.h" #include "lib/lib_0d0a0.h" #include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/memory.h" +#include "lib/model.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_4e270.h" #include "types.h" const char var7f1a9f60[] = "debugdoors"; @@ -34971,7 +34966,7 @@ glabel func0f084cf0 /* f084e14: 03284821 */ addu $t1,$t9,$t0 /* f084e18: 50490004 */ beql $v0,$t1,.L0f084e2c /* f084e1c: 8e2a0040 */ lw $t2,0x40($s1) -/* f084e20: 0c01389c */ jal func0004e270 +/* f084e20: 0c01389c */ jal osAiSetFrequency /* f084e24: 34843880 */ ori $a0,$a0,0x3880 /* f084e28: 8e2a0040 */ lw $t2,0x40($s1) .L0f084e2c: diff --git a/src/game/radar.c b/src/game/radar.c index 30a08252e..f6dd94371 100644 --- a/src/game/radar.c +++ b/src/game/radar.c @@ -20,7 +20,6 @@ #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" extern bool g_RadarYIndicatorsEnabled; diff --git a/src/game/sky.c b/src/game/sky.c index 73c69c8fd..da11d2c57 100644 --- a/src/game/sky.c +++ b/src/game/sky.c @@ -12,13 +12,11 @@ #include "game/sky.h" #include "game/game_1531a0.h" #include "gvars/gvars.h" -#include "lib/lib_04790.h" #include "lib/lib_09660.h" #include "lib/memory.h" #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" u32 var8007f120 = 0x00000000; diff --git a/src/game/smoke/smoke.c b/src/game/smoke/smoke.c index 84f6cb421..fa0406132 100644 --- a/src/game/smoke/smoke.c +++ b/src/game/smoke/smoke.c @@ -18,7 +18,6 @@ #include "gvars/gvars.h" #include "lib/lib_12dc0.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1b55d0[] = {0x46ea6000}; diff --git a/src/game/sparks/sparks.c b/src/game/sparks/sparks.c index bc319f16b..d410e9a96 100644 --- a/src/game/sparks/sparks.c +++ b/src/game/sparks/sparks.c @@ -16,7 +16,6 @@ #include "lib/lib_09660.h" #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" -#include "lib/lib_4a360.h" #include "types.h" const u32 var7f1b5600[] = {0xb8d1b717}; diff --git a/src/game/splat.c b/src/game/splat.c index 32b7c8ef1..16e6a9789 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -14,10 +14,10 @@ #include "game/utils.h" #include "game/wallhit.h" #include "gvars/gvars.h" +#include "lib/model.h" #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" -#include "lib/lib_1a500.h" #include "types.h" void splatTick(struct prop *prop) diff --git a/src/game/title.c b/src/game/title.c index 35e1dfcb0..6594b4272 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -25,17 +25,14 @@ #include "game/lang.h" #include "game/propobj.h" #include "gvars/gvars.h" -#include "lib/lib_04320.h" -#include "lib/lib_04790.h" +#include "lib/controller.h" #include "lib/lib_09660.h" #include "lib/main.h" +#include "lib/model.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" s16 var800624a0 = 480; diff --git a/src/game/training/menus.c b/src/game/training/menus.c index fdae5d5d3..f8cee1e64 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -30,7 +30,6 @@ #include "lib/lib_09660.h" #include "lib/main.h" #include "lib/lib_13130.h" -#include "lib/lib_1a500.h" #include "types.h" s32 frDetailsOkMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) diff --git a/src/game/training/training.c b/src/game/training/training.c index 4b64d5b69..fa1100023 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -43,7 +43,6 @@ #include "lib/lib_13130.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" #define FRSCRIPTINDEX_WEAPONS 0x00 diff --git a/src/game/utils.c b/src/game/utils.c index e52bfa450..5ad08294e 100644 --- a/src/game/utils.c +++ b/src/game/utils.c @@ -11,7 +11,6 @@ #include "game/utils.h" #include "gvars/gvars.h" #include "lib/memory.h" -#include "lib/lib_4a360.h" #include "types.h" const char var7f1b7cb0[] = "UM_Make : In\n"; diff --git a/src/game/wallhit.c b/src/game/wallhit.c index b83f54935..feab20c65 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -22,7 +22,6 @@ #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "types.h" const char var7f1b5a10[] = "WallHit_MakeSpaceRoom : ERROR - Couldn't find any space in room %d\n"; diff --git a/src/game/weather/weather.c b/src/game/weather/weather.c index 1dc7f9090..480997131 100644 --- a/src/game/weather/weather.c +++ b/src/game/weather/weather.c @@ -22,7 +22,6 @@ #include "lib/lib_159b0.h" #include "lib/lib_16110.h" #include "lib/lib_317f0.h" -#include "lib/lib_4a360.h" #include "types.h" struct weatherdata *g_WeatherData = NULL; diff --git a/src/include/PR/os_misc.h b/src/include/PR/os_misc.h index fecc4e742..ee4f96ccd 100644 --- a/src/include/PR/os_misc.h +++ b/src/include/PR/os_misc.h @@ -8,4 +8,12 @@ u32 osGetCount(void); u32 osVirtualToPhysical(void *); +f32 cosf(f32 arg0); +f32 sinf(f32 arg0); +f32 sqrtf(f32 arg0); + +void *memcpy(void *, const void *, size_t); +u32 strlen(char *str); +u32 strchr(void); + #endif diff --git a/src/include/lib/lib_08a20.h b/src/include/lib/audiomgr.h similarity index 77% rename from src/include/lib/lib_08a20.h rename to src/include/lib/audiomgr.h index 3913ddbb3..45f6d3062 100644 --- a/src/include/lib/lib_08a20.h +++ b/src/include/lib/audiomgr.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIB_LIB_08A20_H -#define _IN_LIB_LIB_08A20_H +#ifndef _IN_LIB_AUDIOMGR_H +#define _IN_LIB_AUDIOMGR_H #include #include "types.h" diff --git a/src/include/lib/lib_13900.h b/src/include/lib/controller.h similarity index 96% rename from src/include/lib/lib_13900.h rename to src/include/lib/controller.h index 11b544803..4cfafaabd 100644 --- a/src/include/lib/lib_13900.h +++ b/src/include/lib/controller.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIB_LIB_13900_H -#define _IN_LIB_LIB_13900_H +#ifndef _IN_LIB_CONTROLLER_H +#define _IN_LIB_CONTROLLER_H #include #include "types.h" diff --git a/src/include/lib/gvars.h b/src/include/lib/gvars.h new file mode 100644 index 000000000..15eba58ab --- /dev/null +++ b/src/include/lib/gvars.h @@ -0,0 +1,8 @@ +#ifndef _IN_LIB_GVARS_H +#define _IN_LIB_GVARS_H +#include +#include "types.h" + +void gvarsInit(void); + +#endif diff --git a/src/include/lib/lib_03fb0.h b/src/include/lib/lib_03fb0.h deleted file mode 100644 index 5534a98b0..000000000 --- a/src/include/lib/lib_03fb0.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _IN_LIB_LIB_03FB0_H -#define _IN_LIB_LIB_03FB0_H -#include -#include "types.h" - -void guLookAtF(float mf[4][4], float xEye, float yEye, float zEye, - float xAt, float yAt, float zAt, - float xUp, float yUp, float zUp); - -void guLookAt(Mtx *m, float xEye, float yEye, float zEye, - float xAt, float yAt, float zAt, - float xUp, float yUp, float zUp); - -#endif diff --git a/src/include/lib/lib_04320.h b/src/include/lib/lib_04320.h deleted file mode 100644 index 43700d6ce..000000000 --- a/src/include/lib/lib_04320.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _IN_LIB_LIB_04320_H -#define _IN_LIB_LIB_04320_H -#include -#include "types.h" - -#endif diff --git a/src/include/lib/lib_04790.h b/src/include/lib/lib_04790.h deleted file mode 100644 index b7eda3e3a..000000000 --- a/src/include/lib/lib_04790.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_LIB_LIB_04790_H -#define _IN_LIB_LIB_04790_H -#include -#include "types.h" - -void guNormalize(f32 *x, f32 *y, f32 *z); - -#endif diff --git a/src/include/lib/lib_04840.h b/src/include/lib/lib_04840.h deleted file mode 100644 index 7b010a21c..000000000 --- a/src/include/lib/lib_04840.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _IN_LIB_LIB_04840_H -#define _IN_LIB_LIB_04840_H -#include -#include "types.h" - -#endif diff --git a/src/include/lib/lib_04a80.h b/src/include/lib/lib_04a80.h deleted file mode 100644 index 94002a4e6..000000000 --- a/src/include/lib/lib_04a80.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _IN_LIB_LIB_04A80_H -#define _IN_LIB_LIB_04A80_H -#include -#include "types.h" - -typedef struct { - union { - /* 00 */ long long s64; - double f64; - } value; - /* 08 */ char *buff; - /* 0c */ int n0; - /* 10 */ int num_leading_zeros; - /* 14 */ int part2_len; - /* 18 */ int num_mid_zeros; - /* 1c */ int part3_len; - /* 20 */ int num_trailing_zeros; - /* 24 */ int precision; - /* 28 */ int width; - /* 2c */ unsigned int size; - /* 30 */ unsigned int flags; - /* 34 */ char length; -} printf_struct; - -#define FLAGS_SPACE 1 -#define FLAGS_PLUS 2 -#define FLAGS_MINUS 4 -#define FLAGS_HASH 8 -#define FLAGS_ZERO 16 - -u32 _Ldtob(void); -short _Ldunscale(short *pex, printf_struct *px); -void _Genld(printf_struct *px, char code, char *p, short nsig, short xexp); - -#endif diff --git a/src/include/lib/lib_05e40.h b/src/include/lib/lib_05e40.h deleted file mode 100644 index d0e69b397..000000000 --- a/src/include/lib/lib_05e40.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _IN_LIB_LIB_05E40_H -#define _IN_LIB_LIB_05E40_H -#include -#include "types.h" - -#endif diff --git a/src/include/lib/lib_15860.h b/src/include/lib/lib_15860.h deleted file mode 100644 index 45031bc6e..000000000 --- a/src/include/lib/lib_15860.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_LIB_LIB_15860_H -#define _IN_LIB_LIB_15860_H -#include -#include "types.h" - -void initGlobalVariables(void); - -#endif diff --git a/src/include/lib/lib_16110.h b/src/include/lib/lib_16110.h index 8e343e204..979603bac 100644 --- a/src/include/lib/lib_16110.h +++ b/src/include/lib/lib_16110.h @@ -57,7 +57,5 @@ u32 func0001a110(void); u32 func0001a1c0(void); u32 func0001a25c(void); u32 func0001a2dc(void); -f32 cosf(f32 arg0); -f32 sinf(f32 arg0); #endif diff --git a/src/include/lib/lib_48120.h b/src/include/lib/lib_48120.h deleted file mode 100644 index 7f58ec540..000000000 --- a/src/include/lib/lib_48120.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _IN_LIB_LIB_48120_H -#define _IN_LIB_LIB_48120_H -#include -#include "types.h" - -#endif diff --git a/src/include/lib/lib_481d0.h b/src/include/lib/lib_481d0.h deleted file mode 100644 index acf412294..000000000 --- a/src/include/lib/lib_481d0.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_LIB_LIB_481D0_H -#define _IN_LIB_LIB_481D0_H -#include -#include "types.h" - -u32 __osGetFpcCsr(void); - -#endif diff --git a/src/include/lib/lib_49780.h b/src/include/lib/lib_49780.h deleted file mode 100644 index 37662b188..000000000 --- a/src/include/lib/lib_49780.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_LIB_LIB_49780_H -#define _IN_LIB_LIB_49780_H -#include -#include "types.h" - -u32 func00049780(void); - -#endif diff --git a/src/include/lib/lib_4a360.h b/src/include/lib/lib_4a360.h deleted file mode 100644 index 76b9491fe..000000000 --- a/src/include/lib/lib_4a360.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_LIB_LIB_4A360_H -#define _IN_LIB_LIB_4A360_H -#include -#include "types.h" - -f32 sqrtf(f32 value); - -#endif diff --git a/src/include/lib/lib_4a5e0.h b/src/include/lib/lib_4a5e0.h deleted file mode 100644 index e3ac4034c..000000000 --- a/src/include/lib/lib_4a5e0.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _IN_LIB_LIB_4A5E0_H -#define _IN_LIB_LIB_4A5E0_H -#include -#include "types.h" - -void *memcpy(void *, const void *, size_t); -u32 strlen(char *str); -u32 strchr(void); - -#endif diff --git a/src/include/lib/lib_4e270.h b/src/include/lib/lib_4e270.h deleted file mode 100644 index d7c1c1244..000000000 --- a/src/include/lib/lib_4e270.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_LIB_LIB_4E270_H -#define _IN_LIB_LIB_4E270_H -#include -#include "types.h" - -u32 func0004e270(void); - -#endif diff --git a/src/include/lib/lib_4e3c0.h b/src/include/lib/lib_4e3c0.h deleted file mode 100644 index b16efad8a..000000000 --- a/src/include/lib/lib_4e3c0.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _IN_LIB_LIB_4E3C0_H -#define _IN_LIB_LIB_4E3C0_H -#include -#include "types.h" - -#endif diff --git a/src/include/lib/lib_4e470.h b/src/include/lib/lib_4e470.h deleted file mode 100644 index 3ac9c23d8..000000000 --- a/src/include/lib/lib_4e470.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_LIB_LIB_4E470_H -#define _IN_LIB_LIB_4E470_H -#include -#include "types.h" - -u32 osAiGetLength(void); - -#endif diff --git a/src/include/lib/lib_4e690.h b/src/include/lib/lib_4e690.h deleted file mode 100644 index 315a552da..000000000 --- a/src/include/lib/lib_4e690.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _IN_LIB_LIB_4E690_H -#define _IN_LIB_LIB_4E690_H -#include -#include "types.h" - -u32 func0004e690(void); -u32 _Printf(void); - -#endif diff --git a/src/include/lib/lib_4fe20.h b/src/include/lib/lib_4fe20.h deleted file mode 100644 index 113930cef..000000000 --- a/src/include/lib/lib_4fe20.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _IN_LIB_LIB_4FE20_H -#define _IN_LIB_LIB_4FE20_H -#include -#include "types.h" - -#endif diff --git a/src/include/lib/lib_50090.h b/src/include/lib/lib_50090.h deleted file mode 100644 index 7685d83ff..000000000 --- a/src/include/lib/lib_50090.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _IN_LIB_LIB_50090_H -#define _IN_LIB_LIB_50090_H -#include -#include "types.h" - -#endif diff --git a/src/include/lib/lib_1a500.h b/src/include/lib/model.h similarity index 98% rename from src/include/lib/lib_1a500.h rename to src/include/lib/model.h index e4ff8b6d3..faa8f5f4f 100644 --- a/src/include/lib/lib_1a500.h +++ b/src/include/lib/model.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIB_LIB_1A500_H -#define _IN_LIB_LIB_1A500_H +#ifndef _IN_LIB_MODEL_H +#define _IN_LIB_MODEL_H #include #include "types.h" diff --git a/src/lib/lib_08a20.c b/src/lib/audiomgr.c similarity index 99% rename from src/lib/lib_08a20.c rename to src/lib/audiomgr.c index 5955d6aaf..3aaed25d8 100644 --- a/src/lib/lib_08a20.c +++ b/src/lib/audiomgr.c @@ -10,7 +10,6 @@ #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" #include "gvars/gvars.h" -#include "lib/lib_08a20.h" #include "lib/lib_09660.h" #include "lib/lib_2faf0.h" #include "lib/lib_2fba0.h" @@ -18,9 +17,6 @@ #include "lib/lib_30ce0.h" #include "lib/lib_490b0.h" #include "lib/libc/ll.h" -#include "lib/lib_4e270.h" -#include "lib/lib_4e3c0.h" -#include "lib/lib_4e470.h" #include "types.h" u32 var8005cf90 = 0x00000000; @@ -396,7 +392,7 @@ glabel amgrCreate /* 8a60: afb20024 */ sw $s2,0x24($sp) /* 8a64: afb10020 */ sw $s1,0x20($sp) /* 8a68: afb0001c */ sw $s0,0x1c($sp) -/* 8a6c: 0c01389c */ jal func0004e270 +/* 8a6c: 0c01389c */ jal osAiSetFrequency /* 8a70: 24045604 */ addiu $a0,$zero,0x5604 /* 8a74: 44822000 */ mtc1 $v0,$f4 /* 8a78: 3c0141f0 */ lui $at,0x41f0 diff --git a/src/lib/lib_13900.c b/src/lib/controller.c similarity index 99% rename from src/lib/lib_13900.c rename to src/lib/controller.c index e37e80f94..6582a3d4f 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/controller.c @@ -9,9 +9,8 @@ #include "game/data/data_02da90.h" #include "game/pak/pak.h" #include "gvars/gvars.h" -#include "lib/lib_04a80.h" #include "lib/main.h" -#include "lib/lib_13900.h" +#include "lib/controller.h" #include "lib/lib_4f5e0.h" #include "types.h" diff --git a/src/lib/lib_15860.c b/src/lib/gvars.c similarity index 97% rename from src/lib/lib_15860.c rename to src/lib/gvars.c index 3946daecd..5a1a63d44 100644 --- a/src/lib/lib_15860.c +++ b/src/lib/gvars.c @@ -8,10 +8,9 @@ #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" #include "gvars/gvars.h" -#include "lib/lib_15860.h" #include "types.h" -void initGlobalVariables(void) +void gvarsInit(void) { g_Vars.diffframe60f = 1; g_Vars.lvframe60 = 0; diff --git a/src/lib/lib_04790.c b/src/lib/lib_04790.c deleted file mode 100644 index 7b0033733..000000000 --- a/src/lib/lib_04790.c +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "lib/lib_04790.h" -#include "lib/lib_4a360.h" -#include "types.h" - -void guNormalize(f32 *x, f32 *y, f32 *z) -{ - f32 hyp = sqrtf(*x * *x + *y * *y + *z * *z); - - if (hyp > 0.0f) { - f32 hyp2 = 1.0f / hyp; - *x = *x * hyp2; - *y = *y * hyp2; - *z = *z * hyp2; - } else { - *x = 0.0f; - *y = 0.0f; - *z = 1.0f; - } -} diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 15e9b509b..1676c51ab 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -13,7 +13,6 @@ #include "game/game_176080.h" #include "game/pdoptions.h" #include "gvars/gvars.h" -#include "lib/lib_04840.h" #include "lib/lib_09660.h" #include "lib/memory.h" #include "lib/lib_159b0.h" @@ -23,9 +22,7 @@ #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_4e470.h" #include "types.h" const u32 var700526d0[] = {0x01400140}; diff --git a/src/lib/lib_0d0a0.c b/src/lib/lib_0d0a0.c index f82a53b13..e631cce56 100644 --- a/src/lib/lib_0d0a0.c +++ b/src/lib/lib_0d0a0.c @@ -9,7 +9,6 @@ #include "game/data/data_02da90.h" #include "gvars/gvars.h" #include "lib/lib_0d0a0.h" -#include "lib/lib_4e470.h" #include "types.h" u8 var8005d9a0 = 0; diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c index d390df6ee..8cc285019 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -12,7 +12,6 @@ #include "game/music.h" #include "gvars/gvars.h" #include "lib/lib_074f0.h" -#include "lib/lib_08a20.h" #include "lib/lib_0d0a0.h" #include "lib/lib_0e9d0.h" #include "lib/memory.h" diff --git a/src/lib/lib_12dc0.c b/src/lib/lib_12dc0.c index 3a82c1295..d52cc4345 100644 --- a/src/lib/lib_12dc0.c +++ b/src/lib/lib_12dc0.c @@ -11,7 +11,6 @@ #include "lib/lib_12dc0.h" #include "lib/lib_13130.h" #include "lib/lib_2fa00.h" -#include "lib/lib_4a5e0.h" #include "types.h" const u32 var70053ff0[] = {0x00000000}; diff --git a/src/lib/lib_13130.c b/src/lib/lib_13130.c index 1e02a38db..2aa46cc13 100644 --- a/src/lib/lib_13130.c +++ b/src/lib/lib_13130.c @@ -10,8 +10,6 @@ #include "gvars/gvars.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/lib/lib_16110.c b/src/lib/lib_16110.c index 8ff0a3921..fb044270c 100644 --- a/src/lib/lib_16110.c +++ b/src/lib/lib_16110.c @@ -11,10 +11,8 @@ #include "game/game_096750.h" #include "game/padhalllv.h" #include "gvars/gvars.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" diff --git a/src/lib/lib_233c0.c b/src/lib/lib_233c0.c index bdf73876b..607bba660 100644 --- a/src/lib/lib_233c0.c +++ b/src/lib/lib_233c0.c @@ -11,14 +11,11 @@ #include "game/game_1531a0.h" #include "game/game_157db0.h" #include "gvars/gvars.h" -#include "lib/lib_04790.h" -#include "lib/lib_04a80.h" #include "lib/lib_0d0a0.h" #include "lib/memory.h" #include "lib/lib_16110.h" #include "lib/lib_233c0.h" #include "lib/lib_2f490.h" -#include "lib/lib_4a360.h" #include "lib/libc/ll.h" #include "lib/lib_4b170.h" #include "types.h" diff --git a/src/lib/lib_2f490.c b/src/lib/lib_2f490.c index d8f14f07e..02074879d 100644 --- a/src/lib/lib_2f490.c +++ b/src/lib/lib_2f490.c @@ -9,7 +9,6 @@ #include "game/data/data_02da90.h" #include "gvars/gvars.h" #include "lib/memory.h" -#include "lib/lib_48120.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_2fa00.c b/src/lib/lib_2fa00.c index 8ba8c2744..5be94bab6 100644 --- a/src/lib/lib_2fa00.c +++ b/src/lib/lib_2fa00.c @@ -9,7 +9,6 @@ #include "game/data/data_02da90.h" #include "gvars/gvars.h" #include "lib/lib_0c000.h" -#include "lib/lib_4e690.h" #include "types.h" void rmonproc() diff --git a/src/lib/lib_446d0.c b/src/lib/lib_446d0.c index eab20dda6..f6682869e 100644 --- a/src/lib/lib_446d0.c +++ b/src/lib/lib_446d0.c @@ -9,7 +9,6 @@ #include "game/data/data_02da90.h" #include "gvars/gvars.h" #include "lib/lib_3e730.h" -#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_44f60.c b/src/lib/lib_44f60.c index ce72e1ea8..b90f433c7 100644 --- a/src/lib/lib_44f60.c +++ b/src/lib/lib_44f60.c @@ -11,7 +11,6 @@ #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 "types.h" diff --git a/src/lib/lib_481d0.c b/src/lib/lib_481d0.c deleted file mode 100644 index 0ea98e811..000000000 --- a/src/lib/lib_481d0.c +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "types.h" - -GLOBAL_ASM( -glabel __osGetFpcCsr -/* 481d0: 4442f800 */ cfc1 $v0,$31 -/* 481d4: 03e00008 */ jr $ra -/* 481d8: 00000000 */ nop -/* 481dc: 00000000 */ nop -); \ No newline at end of file diff --git a/src/lib/lib_49780.c b/src/lib/lib_49780.c deleted file mode 100644 index 9ef4d09cf..000000000 --- a/src/lib/lib_49780.c +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "types.h" - -GLOBAL_ASM( -glabel func00049780 -/* 49780: 3c028006 */ lui $v0,%hi(__osViCurr) -/* 49784: 03e00008 */ jr $ra -/* 49788: 8c420910 */ lw $v0,%lo(__osViCurr)($v0) -/* 4978c: 00000000 */ nop -); diff --git a/src/lib/lib_4b500.c b/src/lib/lib_4b500.c deleted file mode 100644 index f0e2380e8..000000000 --- a/src/lib/lib_4b500.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "libultra_internal.h" - -void __osSpSetStatus(u32 data) -{ - IO_WRITE(SP_STATUS_REG, data); -} diff --git a/src/lib/lib_4f5e0.c b/src/lib/lib_4f5e0.c index 989307151..a1105fc49 100644 --- a/src/lib/lib_4f5e0.c +++ b/src/lib/lib_4f5e0.c @@ -8,9 +8,7 @@ #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" #include "gvars/gvars.h" -#include "lib/lib_04790.h" #include "lib/lib_16110.h" -#include "lib/lib_4a360.h" #include "lib/lib_4cde0.h" #include "lib/lib_4f5e0.h" #include "lib/lib_51d50.h" diff --git a/src/lib/lib_4fff0.c b/src/lib/lib_4fff0.c index 23eb22b96..872145c52 100644 --- a/src/lib/lib_4fff0.c +++ b/src/lib/lib_4fff0.c @@ -8,7 +8,6 @@ #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" #include "gvars/gvars.h" -#include "lib/lib_4a360.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/main.c b/src/lib/main.c index f963370d7..c97849f7c 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -49,7 +49,6 @@ #include "gvars/gvars.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" @@ -62,8 +61,6 @@ #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" @@ -208,7 +205,7 @@ glabel mainInit /* d534: 00000000 */ nop /* d538: 0c002288 */ jal amgrAllocateStack /* d53c: 00000000 */ nop -/* d540: 0c005618 */ jal initGlobalVariables +/* d540: 0c005618 */ jal gvarsInit /* d544: 00000000 */ nop /* d548: 0c004878 */ jal func000121e0 /* d54c: 00000000 */ nop @@ -623,7 +620,7 @@ const char var70053aa0[] = " -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400"; // faultCreateThread(); // func0000d0a0(); // amgrAllocateStack(); -// initGlobalVariables(); +// gvarsInit(); // func000121e0(); // func00012a0c(); // func00013758(); diff --git a/src/lib/lib_1a500.c b/src/lib/model.c similarity index 99% rename from src/lib/lib_1a500.c rename to src/lib/model.c index 846cdc713..2267efaf9 100644 --- a/src/lib/lib_1a500.c +++ b/src/lib/model.c @@ -19,10 +19,9 @@ #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_4f5e0.h" +#include "lib/model.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_4fe20.c b/src/lib/ultra/gu/frustum.c similarity index 100% rename from src/lib/lib_4fe20.c rename to src/lib/ultra/gu/frustum.c diff --git a/src/lib/lib_03fb0.c b/src/lib/ultra/gu/lookat.c similarity index 82% rename from src/lib/lib_03fb0.c rename to src/lib/ultra/gu/lookat.c index 9adc5d76d..3c9407e6c 100644 --- a/src/lib/lib_03fb0.c +++ b/src/lib/ultra/gu/lookat.c @@ -1,16 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "lib/lib_03fb0.h" -#include "lib/lib_4a360.h" -#include "types.h" void guLookAtF(float mf[4][4], float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, diff --git a/src/lib/lib_04320.c b/src/lib/ultra/gu/lookatref.c similarity index 86% rename from src/lib/lib_04320.c rename to src/lib/ultra/gu/lookatref.c index 4eb7b79e8..1fba50ffe 100644 --- a/src/lib/lib_04320.c +++ b/src/lib/ultra/gu/lookatref.c @@ -1,16 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "lib/lib_04320.h" -#include "lib/lib_4a360.h" -#include "types.h" void guLookAtReflectF(float mf[4][4], LookAt *l, float xEye, float yEye, float zEye, diff --git a/src/lib/lib_4a360.c b/src/lib/ultra/gu/mtxutil.c similarity index 100% rename from src/lib/lib_4a360.c rename to src/lib/ultra/gu/mtxutil.c diff --git a/src/lib/ultra/gu/normalize.c b/src/lib/ultra/gu/normalize.c new file mode 100644 index 000000000..6901dca67 --- /dev/null +++ b/src/lib/ultra/gu/normalize.c @@ -0,0 +1,17 @@ +#include + +void guNormalize(f32 *x, f32 *y, f32 *z) +{ + f32 hyp = sqrtf(*x * *x + *y * *y + *z * *z); + + if (hyp > 0.0f) { + f32 hyp2 = 1.0f / hyp; + *x = *x * hyp2; + *y = *y * hyp2; + *z = *z * hyp2; + } else { + *x = 0.0f; + *y = 0.0f; + *z = 1.0f; + } +} diff --git a/src/lib/lib_04840.c b/src/lib/ultra/gu/perspective.c similarity index 70% rename from src/lib/lib_04840.c rename to src/lib/ultra/gu/perspective.c index dad997c88..9b4035fca 100644 --- a/src/lib/lib_04840.c +++ b/src/lib/ultra/gu/perspective.c @@ -1,17 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "lib/lib_04840.h" -#include "lib/lib_16110.h" -#include "lib/lib_4a360.h" -#include "types.h" void guPerspectiveF(float mf[4][4], u16 *perspNorm, float fovy, float aspect, float near, float far, float scale) { diff --git a/src/lib/lib_04a80.c b/src/lib/ultra/gu/rotate.c similarity index 100% rename from src/lib/lib_04a80.c rename to src/lib/ultra/gu/rotate.c diff --git a/src/lib/lib_50090.c b/src/lib/ultra/gu/scale.c similarity index 100% rename from src/lib/lib_50090.c rename to src/lib/ultra/gu/scale.c diff --git a/src/lib/ultra/gu/sqrtf.c b/src/lib/ultra/gu/sqrtf.c index c7c0542d5..76809b3f7 100644 --- a/src/lib/ultra/gu/sqrtf.c +++ b/src/lib/ultra/gu/sqrtf.c @@ -1,15 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "lib/lib_4a360.h" -#include "types.h" GLOBAL_ASM( glabel sqrtf diff --git a/src/lib/lib_4e470.c b/src/lib/ultra/io/aigetlen.c similarity index 100% rename from src/lib/lib_4e470.c rename to src/lib/ultra/io/aigetlen.c diff --git a/src/lib/lib_4e270.c b/src/lib/ultra/io/aisetfreq.c similarity index 91% rename from src/lib/lib_4e270.c rename to src/lib/ultra/io/aisetfreq.c index f75b166e3..75c8fe71c 100644 --- a/src/lib/lib_4e270.c +++ b/src/lib/ultra/io/aisetfreq.c @@ -1,17 +1,7 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "types.h" GLOBAL_ASM( -glabel func0004e270 +glabel osAiSetFrequency /* 4e270: 3c058006 */ lui $a1,%hi(osViClock) /* 4e274: 24a5cf68 */ addiu $a1,$a1,%lo(osViClock) /* 4e278: 8cae0000 */ lw $t6,0x0($a1) @@ -104,4 +94,4 @@ glabel func0004e270 /* 4e3b4: 00000000 */ nop /* 4e3b8: 00000000 */ nop /* 4e3bc: 00000000 */ nop -); \ No newline at end of file +); diff --git a/src/lib/lib_4e3c0.c b/src/lib/ultra/io/aisetnextbuf.c similarity index 85% rename from src/lib/lib_4e3c0.c rename to src/lib/ultra/io/aisetnextbuf.c index 00da8e8bd..7d1cea38f 100644 --- a/src/lib/lib_4e3c0.c +++ b/src/lib/ultra/io/aisetnextbuf.c @@ -1,15 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "lib/lib_51ec0.h" -#include "types.h" GLOBAL_ASM( glabel osAiSetNextBuffer @@ -62,4 +51,4 @@ glabel osAiSetNextBuffer /* 4e464: 00000000 */ nop /* 4e468: 00000000 */ nop /* 4e46c: 00000000 */ nop -); \ No newline at end of file +); diff --git a/src/lib/lib_05e40.c b/src/lib/ultra/io/sptask.c similarity index 92% rename from src/lib/lib_05e40.c rename to src/lib/ultra/io/sptask.c index 9f281ea07..1c3d10e43 100644 --- a/src/lib/lib_05e40.c +++ b/src/lib/ultra/io/sptask.c @@ -1,16 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "lib/lib_05e40.h" -#include "lib/lib_4b170.h" -#include "types.h" #include "libultra_internal.h" OSTask *_VirtualToPhysicalTask(OSTask *intp); diff --git a/src/lib/ultra/io/vigetcurrcontext.c b/src/lib/ultra/io/vigetcurrcontext.c new file mode 100644 index 000000000..fe2d7a5f3 --- /dev/null +++ b/src/lib/ultra/io/vigetcurrcontext.c @@ -0,0 +1,9 @@ +#include + +GLOBAL_ASM( +glabel __osViGetCurrentContext +/* 49780: 3c028006 */ lui $v0,%hi(__osViCurr) +/* 49784: 03e00008 */ jr $ra +/* 49788: 8c420910 */ lw $v0,%lo(__osViCurr)($v0) +/* 4978c: 00000000 */ nop +); diff --git a/src/lib/ultra/io/vimgr.c b/src/lib/ultra/io/vimgr.c index 5e6c4e725..d6c4b9ea6 100644 --- a/src/lib/ultra/io/vimgr.c +++ b/src/lib/ultra/io/vimgr.c @@ -115,7 +115,7 @@ glabel viMgrMain /* 31f0: afb2001c */ sw $s2,0x1c($sp) /* 31f4: afb10018 */ sw $s1,0x18($sp) /* 31f8: afb00014 */ sw $s0,0x14($sp) -/* 31fc: 0c0125e0 */ jal func00049780 +/* 31fc: 0c0125e0 */ jal __osViGetCurrentContext /* 3200: afa00044 */ sw $zero,0x44($sp) /* 3204: 94430002 */ lhu $v1,0x2($v0) /* 3208: 3c018009 */ lui $at,%hi(var80090290) @@ -158,7 +158,7 @@ glabel viMgrMain /* 328c: 306fffff */ andi $t7,$v1,0xffff /* 3290: 15e0000e */ bnez $t7,.L000032cc /* 3294: a42f0290 */ sh $t7,%lo(var80090290)($at) -/* 3298: 0c0125e0 */ jal func00049780 +/* 3298: 0c0125e0 */ jal __osViGetCurrentContext /* 329c: 00000000 */ nop /* 32a0: 8c580010 */ lw $t8,0x10($v0) /* 32a4: 00408025 */ or $s0,$v0,$zero diff --git a/src/lib/bzero.c b/src/lib/ultra/libc/bzero.c similarity index 85% rename from src/lib/bzero.c rename to src/lib/ultra/libc/bzero.c index e21231d25..51464e75e 100644 --- a/src/lib/bzero.c +++ b/src/lib/ultra/libc/bzero.c @@ -1,14 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "types.h" GLOBAL_ASM( glabel bzero diff --git a/src/lib/libc/ldiv.c b/src/lib/ultra/libc/ldiv.c similarity index 100% rename from src/lib/libc/ldiv.c rename to src/lib/ultra/libc/ldiv.c diff --git a/src/lib/libc/ll.c b/src/lib/ultra/libc/ll.c similarity index 100% rename from src/lib/libc/ll.c rename to src/lib/ultra/libc/ll.c diff --git a/src/lib/libc/llcvt.c b/src/lib/ultra/libc/llcvt.c similarity index 100% rename from src/lib/libc/llcvt.c rename to src/lib/ultra/libc/llcvt.c diff --git a/src/lib/lib_4a5e0.c b/src/lib/ultra/libc/string.c similarity index 84% rename from src/lib/lib_4a5e0.c rename to src/lib/ultra/libc/string.c index 438a68ed1..7d71d61ab 100644 --- a/src/lib/lib_4a5e0.c +++ b/src/lib/ultra/libc/string.c @@ -1,14 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "types.h" GLOBAL_ASM( glabel memcpy @@ -43,7 +33,6 @@ glabel strlen /* 4a630: 00641023 */ subu $v0,$v1,$a0 ); -// func0004a634 GLOBAL_ASM( glabel strchr /* 4a634: 90830000 */ lbu $v1,0x0($a0) @@ -68,4 +57,4 @@ glabel strchr /* 4a674: 00000000 */ nop /* 4a678: 00000000 */ nop /* 4a67c: 00000000 */ nop -); \ No newline at end of file +); diff --git a/src/lib/libc/xldtob.c b/src/lib/ultra/libc/xldtob.c similarity index 96% rename from src/lib/libc/xldtob.c rename to src/lib/ultra/libc/xldtob.c index 0b3d19538..4c907810c 100644 --- a/src/lib/libc/xldtob.c +++ b/src/lib/ultra/libc/xldtob.c @@ -1,22 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "lib/lib_04790.h" -#include "lib/lib_04a80.h" -#include "lib/lib_16110.h" -#include "lib/lib_48150.h" -#include "lib/lib_4a360.h" -#include "lib/lib_4a5e0.h" -#include "lib/libc/ldiv.h" -#include "lib/libc/ll.h" -#include "types.h" /* float properties */ #define _D0 0 @@ -46,6 +28,35 @@ #define _D2 2 #define _D3 3 +typedef struct { + union { + /* 00 */ long long s64; + double f64; + } value; + /* 08 */ char *buff; + /* 0c */ int n0; + /* 10 */ int num_leading_zeros; + /* 14 */ int part2_len; + /* 18 */ int num_mid_zeros; + /* 1c */ int part3_len; + /* 20 */ int num_trailing_zeros; + /* 24 */ int precision; + /* 28 */ int width; + /* 2c */ unsigned int size; + /* 30 */ unsigned int flags; + /* 34 */ char length; +} printf_struct; + +#define FLAGS_SPACE 1 +#define FLAGS_PLUS 2 +#define FLAGS_MINUS 4 +#define FLAGS_HASH 8 +#define FLAGS_ZERO 16 + +u32 _Ldtob(void); +short _Ldunscale(short *pex, printf_struct *px); +void _Genld(printf_struct *px, char code, char *p, short nsig, short xexp); + const u32 var700524d0[] = {0x40240000}; const u32 var700524d4[] = {0x00000000}; const u32 var700524d8[] = {0x40590000}; diff --git a/src/lib/lib_4e690.c b/src/lib/ultra/libc/xprintf.c similarity index 98% rename from src/lib/lib_4e690.c rename to src/lib/ultra/libc/xprintf.c index 884fea566..34b31f908 100644 --- a/src/lib/lib_4e690.c +++ b/src/lib/ultra/libc/xprintf.c @@ -1,17 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "lib/lib_04a80.h" -#include "lib/lib_4a5e0.h" -#include "lib/lib_4e690.h" -#include "types.h" GLOBAL_ASM( glabel func0004e690 @@ -936,4 +923,4 @@ glabel _Printf /* 4f344: 27bd00d8 */ addiu $sp,$sp,0xd8 /* 4f348: 00000000 */ nop /* 4f34c: 00000000 */ nop -); \ No newline at end of file +); diff --git a/src/lib/ultra/os/getfpccsr.c b/src/lib/ultra/os/getfpccsr.c new file mode 100644 index 000000000..9ebaed384 --- /dev/null +++ b/src/lib/ultra/os/getfpccsr.c @@ -0,0 +1,9 @@ +#include + +GLOBAL_ASM( +glabel __osGetFpcCsr +/* 481d0: 4442f800 */ cfc1 $v0,$31 +/* 481d4: 03e00008 */ jr $ra +/* 481d8: 00000000 */ nop +/* 481dc: 00000000 */ nop +); diff --git a/src/lib/lib_48120.c b/src/lib/ultra/os/writebackdcacheall.c similarity index 63% rename from src/lib/lib_48120.c rename to src/lib/ultra/os/writebackdcacheall.c index 8d4e85f9b..ef0553d5a 100644 --- a/src/lib/lib_48120.c +++ b/src/lib/ultra/os/writebackdcacheall.c @@ -1,14 +1,4 @@ #include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "types.h" GLOBAL_ASM( glabel osWritebackDCacheAll @@ -25,4 +15,4 @@ glabel osWritebackDCacheAll /* 48144: 00000000 */ nop /* 48148: 00000000 */ nop /* 4814c: 00000000 */ nop -); \ No newline at end of file +);