diff options
| -rw-r--r-- | include/palette_util.h (renamed from include/roulette_util.h) | 6 | ||||
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | src/mirage_tower.c | 2 | ||||
| -rwxr-xr-x | src/palette_util.c (renamed from src/roulette_util.c) | 2 | ||||
| -rw-r--r-- | src/roulette.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/include/roulette_util.h b/include/palette_util.h index 2864ee464..46468c0a6 100644 --- a/include/roulette_util.h +++ b/include/palette_util.h @@ -1,5 +1,5 @@ -#ifndef GUARD_ROULETTE_UTIL_H -#define GUARD_ROULETTE_UTIL_H +#ifndef GUARD_PALETTE_UTIL_H +#define GUARD_PALETTE_UTIL_H struct PulseBlendSettings { @@ -80,4 +80,4 @@ u8 RouletteFlash_Add(struct RouletteFlashUtil *r0, u8 r1, const struct RouletteF void RouletteFlash_Stop(struct RouletteFlashUtil *r0, u16 r1); void RouletteFlash_Enable(struct RouletteFlashUtil *r0, u16 r1); -#endif // GUARD_ROULETTE_UTIL_H +#endif // GUARD_PALETTE_UTIL_H diff --git a/ld_script.txt b/ld_script.txt index f3e418c08..724f01328 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -237,7 +237,7 @@ SECTIONS { src/battle_message.o(.text); src/cable_car.o(.text); src/math_util.o(.text); - src/roulette_util.o(.text); + src/palette_util.o(.text); src/confetti_util.o(.text); src/save.o(.text); src/mystery_event_script.o(.text); diff --git a/src/mirage_tower.c b/src/mirage_tower.c index c1323c784..02cccf2a5 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -8,7 +8,7 @@ #include "gpu_regs.h" #include "menu.h" #include "random.h" -#include "roulette_util.h" +#include "palette_util.h" #include "script.h" #include "sound.h" #include "sprite.h" diff --git a/src/roulette_util.c b/src/palette_util.c index 15a0c5bba..5364ff6d9 100755 --- a/src/roulette_util.c +++ b/src/palette_util.c @@ -1,6 +1,6 @@ #include "global.h" #include "palette.h" -#include "roulette_util.h" +#include "palette_util.h" #include "util.h" // "RouletteFlash" is more accurately a general flashing/fading util diff --git a/src/roulette.c b/src/roulette.c index 0923ea2d3..b3e07233a 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -13,9 +13,9 @@ #include "menu_helpers.h" #include "overworld.h" #include "palette.h" +#include "palette_util.h" #include "random.h" #include "roulette.h" -#include "roulette_util.h" #include "rtc.h" #include "scanline_effect.h" #include "script.h" |