From eeddf16ad9b2ecf233171492acbcfa0f5279f8e4 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Feb 2021 12:00:44 +1000 Subject: [PATCH] Rename lib_0d0a0.c to dma.c --- ld/libfiles.inc | 2 +- src/game/file.c | 2 +- src/game/game_00b190.c | 2 +- src/game/game_015470.c | 2 +- src/game/game_1531a0.c | 2 +- src/game/game_19aa80.c | 2 +- src/game/gfxmemory.c | 2 +- src/game/lang.c | 2 +- src/game/objectives/objectives.c | 2 +- src/game/propobj.c | 2 +- src/game/room.c | 2 +- src/game/texture.c | 2 +- src/game/training/training.c | 2 +- src/include/lib/{lib_0d0a0.h => dma.h} | 6 ++---- src/lib/{lib_0d0a0.c => dma.c} | 2 +- src/lib/lib_070d0.c | 2 +- src/lib/lib_0e9d0.c | 2 +- src/lib/lib_233c0.c | 2 +- src/lib/main.c | 2 +- 19 files changed, 20 insertions(+), 22 deletions(-) rename src/include/lib/{lib_0d0a0.h => dma.h} (77%) rename src/lib/{lib_0d0a0.c => dma.c} (99%) diff --git a/ld/libfiles.inc b/ld/libfiles.inc index f5afba663..137876fdc 100644 --- a/ld/libfiles.inc +++ b/ld/libfiles.inc @@ -26,7 +26,7 @@ build/ROMID/lib/lib_09660.o (section); \ build/ROMID/lib/lib_0bfb0.o (section); \ build/ROMID/lib/lib_0c000.o (section); \ - build/ROMID/lib/lib_0d0a0.o (section); \ + build/ROMID/lib/dma.o (section); \ build/ROMID/lib/main.o (section); \ build/ROMID/lib/lib_0e9d0.o (section); \ build/ROMID/lib/lib_11420.o (section); \ diff --git a/src/game/file.c b/src/game/file.c index dd89a6295..e0fa08637 100644 --- a/src/game/file.c +++ b/src/game/file.c @@ -11,7 +11,7 @@ #include "game/stubs/game_175f50.h" #include "gvars/gvars.h" #include "lib/lib_074f0.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/memory.h" #include "lib/rng.h" #include "types.h" diff --git a/src/game/game_00b190.c b/src/game/game_00b190.c index d9f32472b..0d17cfe6f 100644 --- a/src/game/game_00b190.c +++ b/src/game/game_00b190.c @@ -8,7 +8,7 @@ #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" #include "gvars/gvars.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/memory.h" #include "types.h" diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 8cecfe215..b544238fa 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -11,7 +11,7 @@ #include "game/game_01afc0.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/lib_317f0.h" #include "types.h" diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 1e86567a4..02131f921 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -15,7 +15,7 @@ #include "game/lang.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/main.h" #include "lib/memory.h" #include "types.h" diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index 26f8a9661..140c688e4 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -21,7 +21,7 @@ #include "game/mplayer/mplayer.h" #include "game/pad.h" #include "gvars/gvars.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/rng.h" #include "types.h" diff --git a/src/game/gfxmemory.c b/src/game/gfxmemory.c index 7070b3dc9..6a07c1f75 100644 --- a/src/game/gfxmemory.c +++ b/src/game/gfxmemory.c @@ -11,7 +11,7 @@ #include "game/stubs/game_175f50.h" #include "gvars/gvars.h" #include "lib/lib_074f0.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/memory.h" #include "lib/rng.h" #include "types.h" diff --git a/src/game/lang.c b/src/game/lang.c index e02f1cd9c..ad211ff5b 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -11,7 +11,7 @@ #include "game/file.h" #include "game/lang.h" #include "gvars/gvars.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "types.h" u32 langGetLangBankIndexFromStagenum(s32 stagenum) diff --git a/src/game/objectives/objectives.c b/src/game/objectives/objectives.c index d6a69664b..a38777c3f 100644 --- a/src/game/objectives/objectives.c +++ b/src/game/objectives/objectives.c @@ -21,7 +21,7 @@ #include "game/lang.h" #include "game/propobj.h" #include "gvars/gvars.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/memory.h" #include "lib/rng.h" #include "lib/lib_159b0.h" diff --git a/src/game/propobj.c b/src/game/propobj.c index aa9e23e05..febc32a00 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -65,7 +65,7 @@ #include "game/wallhit.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/memory.h" diff --git a/src/game/room.c b/src/game/room.c index ec3d8d0c8..70769b6e8 100644 --- a/src/game/room.c +++ b/src/game/room.c @@ -35,7 +35,7 @@ #include "gvars/gvars.h" #include "lib/lib_074f0.h" #include "lib/lib_09660.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/main.h" #include "lib/memory.h" #include "lib/lib_126b0.h" diff --git a/src/game/texture.c b/src/game/texture.c index ad287bcee..3a7e3c3fc 100644 --- a/src/game/texture.c +++ b/src/game/texture.c @@ -11,7 +11,7 @@ #include "game/texture.h" #include "gvars/gvars.h" #include "lib/lib_074f0.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/main.h" #include "lib/memory.h" #include "lib/lib_4b170.h" diff --git a/src/game/training/training.c b/src/game/training/training.c index be62aa5c1..afded37f3 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -34,7 +34,7 @@ #include "game/wallhit.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/memory.h" diff --git a/src/include/lib/lib_0d0a0.h b/src/include/lib/dma.h similarity index 77% rename from src/include/lib/lib_0d0a0.h rename to src/include/lib/dma.h index 6f19b9fc2..7701aa9fa 100644 --- a/src/include/lib/lib_0d0a0.h +++ b/src/include/lib/dma.h @@ -1,12 +1,10 @@ -#ifndef _IN_LIB_LIB_0D0A0_H -#define _IN_LIB_LIB_0D0A0_H +#ifndef _IN_LIB_DMA_H +#define _IN_LIB_DMA_H #include #include "types.h" void dmaInit(void); void dmaStart(void *memaddr, u32 romaddr, u32 len, bool priority); -u32 xorDeadbeef(u32 value); -u32 xorDeadbabe(u32 value); void dmaCheckPiracy(void *memaddr, u32 len); void dmaWait(void); void dmaExec(void *memaddr, void *romaddr, u32 len); diff --git a/src/lib/lib_0d0a0.c b/src/lib/dma.c similarity index 99% rename from src/lib/lib_0d0a0.c rename to src/lib/dma.c index e7e9280f7..efae607d2 100644 --- a/src/lib/lib_0d0a0.c +++ b/src/lib/dma.c @@ -8,7 +8,7 @@ #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" #include "gvars/gvars.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "types.h" u8 g_LoadState = 0; diff --git a/src/lib/lib_070d0.c b/src/lib/lib_070d0.c index 2b3deb868..c4a4ea8f1 100644 --- a/src/lib/lib_070d0.c +++ b/src/lib/lib_070d0.c @@ -10,7 +10,7 @@ #include "game/data/data_02da90.h" #include "gvars/gvars.h" #include "lib/lib_074f0.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/lib_48150.h" #include "lib/lib_4d6f0.h" #include "types.h" diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c index cf5d33211..4a2c6b73f 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -12,7 +12,7 @@ #include "game/music.h" #include "gvars/gvars.h" #include "lib/lib_074f0.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/lib_0e9d0.h" #include "lib/memory.h" #include "lib/rng.h" diff --git a/src/lib/lib_233c0.c b/src/lib/lib_233c0.c index 0b9311afd..a7da7da3c 100644 --- a/src/lib/lib_233c0.c +++ b/src/lib/lib_233c0.c @@ -11,7 +11,7 @@ #include "game/game_1531a0.h" #include "game/room.h" #include "gvars/gvars.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/memory.h" #include "lib/lib_16110.h" #include "lib/lib_233c0.h" diff --git a/src/lib/main.c b/src/lib/main.c index 6bb6f8daa..cf747c8b0 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -53,7 +53,7 @@ #include "lib/lib_09660.h" #include "lib/lib_0bfb0.h" #include "lib/lib_0c000.h" -#include "lib/lib_0d0a0.h" +#include "lib/dma.h" #include "lib/main.h" #include "lib/lib_0e9d0.h" #include "lib/memory.h"