From 01c9cefbf854bf1d001ff83594fec43c42b61a80 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 29 Aug 2020 22:37:48 +1000 Subject: [PATCH] Rename game_16cfa0.c to music.c --- ld/gamefiles.inc | 2 +- src/game/chr/chraicommands.c | 2 +- src/game/game_01bea0.c | 2 +- src/game/game_0b63b0.c | 2 +- src/game/game_0f09f0.c | 2 +- src/game/game_1371b0.c | 2 +- src/game/game_167ae0.c | 2 +- src/game/game_179060.c | 2 +- src/game/mplayer.c | 2 +- src/game/{game_16cfa0.c => music.c} | 2 +- src/game/pdoptions.c | 2 +- src/game/title.c | 2 +- src/include/game/{game_16cfa0.h => music.h} | 4 ++-- src/lib/lib_0d520.c | 2 +- src/lib/lib_0e9d0.c | 2 +- src/lib/lib_11420.c | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) rename src/game/{game_16cfa0.c => music.c} (99%) rename src/include/game/{game_16cfa0.h => music.h} (95%) diff --git a/ld/gamefiles.inc b/ld/gamefiles.inc index 3c0069548..1440f0e4d 100644 --- a/ld/gamefiles.inc +++ b/ld/gamefiles.inc @@ -155,7 +155,7 @@ build/ROMID/game/game_167ae0.o (section); \ build/ROMID/game/data/data_02a0e0.o (section); \ build/ROMID/game/timing.o (section); \ - build/ROMID/game/game_16cfa0.o (section); \ + build/ROMID/game/music.o (section); \ build/ROMID/game/lang.o (section); \ build/ROMID/game/game_16e810.o (section); \ build/ROMID/game/game_173a00.o (section); \ diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index dbd89b33d..e4e8d889e 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -38,7 +38,7 @@ #include "game/game_1655c0.h" #include "game/game_165670.h" #include "game/game_167ae0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/training.h" #include "game/gamefile.h" #include "game/lang.h" diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index ceda79e3c..4c5c050ea 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -20,7 +20,7 @@ #include "game/endscreen.h" #include "game/game_127910.h" #include "game/game_167ae0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/game_177e00.h" #include "game/game_179060.h" #include "game/game_19aa80.h" diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index ecb0383db..b21d652dd 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -42,7 +42,7 @@ #include "game/game_1668e0.h" #include "game/game_166e40.h" #include "game/game_167ae0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/game_16e810.h" #include "game/game_177e00.h" #include "game/game_17f930.h" diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index a54e1c6f6..4395ab139 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -26,7 +26,7 @@ #include "game/game_1531a0.h" #include "game/game_166e40.h" #include "game/game_167ae0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/game_16e810.h" #include "game/game_179060.h" #include "game/game_19aa80.h" diff --git a/src/game/game_1371b0.c b/src/game/game_1371b0.c index 7890f5db0..e87825fa0 100644 --- a/src/game/game_1371b0.c +++ b/src/game/game_1371b0.c @@ -18,7 +18,7 @@ #include "game/game_1531a0.h" #include "game/game_166e40.h" #include "game/game_167ae0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/lang.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 9be891e06..64a0f1a9f 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -83,7 +83,7 @@ #include "game/game_157db0.h" #include "game/game_165670.h" #include "game/game_167ae0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/game_16e810.h" #include "game/game_176080.h" #include "game/game_179060.h" diff --git a/src/game/game_179060.c b/src/game/game_179060.c index 80de93f3e..dcabd12ec 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -14,7 +14,7 @@ #include "game/game_0f09f0.h" #include "game/game_107fb0.h" #include "game/game_1531a0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/game_179060.h" #include "game/game_17f930.h" #include "game/game_19aa80.h" diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 427dd3829..03c3cd3e2 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -19,7 +19,7 @@ #include "game/game_127910.h" #include "game/game_1531a0.h" #include "game/game_167ae0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/game_179060.h" #include "game/game_17f930.h" #include "game/game_19aa80.h" diff --git a/src/game/game_16cfa0.c b/src/game/music.c similarity index 99% rename from src/game/game_16cfa0.c rename to src/game/music.c index dc1f87d45..e07ca753e 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/music.c @@ -10,7 +10,7 @@ #include "game/data/data_02da90.h" #include "game/game_0f09f0.h" #include "game/game_167ae0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/game_176080.h" #include "gvars/gvars.h" #include "lib/lib_0e9d0.h" diff --git a/src/game/pdoptions.c b/src/game/pdoptions.c index 8d74dada9..374f56acc 100644 --- a/src/game/pdoptions.c +++ b/src/game/pdoptions.c @@ -7,7 +7,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/pdoptions.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/title.c b/src/game/title.c index d7619105f..3dc864700 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -19,7 +19,7 @@ #include "game/game_1531a0.h" #include "game/game_166e40.h" #include "game/game_167ae0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/game_1a3340.h" #include "game/lang.h" #include "game/propobj.h" diff --git a/src/include/game/game_16cfa0.h b/src/include/game/music.h similarity index 95% rename from src/include/game/game_16cfa0.h rename to src/include/game/music.h index a896c69b9..fea19a753 100644 --- a/src/include/game/game_16cfa0.h +++ b/src/include/game/music.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_16CFA0_H -#define IN_GAME_GAME_16CFA0_H +#ifndef IN_GAME_MUSIC_H +#define IN_GAME_MUSIC_H #include #include "types.h" diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c index 72d819270..5c7726a8a 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/lib_0d520.c @@ -37,7 +37,7 @@ #include "game/game_166e40.h" #include "game/game_167ae0.h" #include "game/timing.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/game_175f50.h" #include "game/game_175f90.h" #include "game/game_176080.h" diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c index e65482ac9..fe5b0c827 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -9,7 +9,7 @@ #include "game/data/data_02da90.h" #include "game/game_166e40.h" #include "game/game_167ae0.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "gvars/gvars.h" #include "lib/lib_074f0.h" #include "lib/lib_08a20.h" diff --git a/src/lib/lib_11420.c b/src/lib/lib_11420.c index d3823aa7d..7001f6c1e 100644 --- a/src/lib/lib_11420.c +++ b/src/lib/lib_11420.c @@ -7,7 +7,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" -#include "game/game_16cfa0.h" +#include "game/music.h" #include "game/game_176080.h" #include "gvars/gvars.h" #include "lib/lib_0e9d0.h"