From f600aff71140b34e4b3c210ef27ec1b9704a6f45 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 17 Jun 2020 03:42:10 -0400 Subject: [PATCH] Rename rom_81520A8 --- include/{rom_81520A8.h => oam_util.h} | 6 +++--- ld_script.txt | 2 +- src/hall_of_fame.c | 2 +- src/{rom_81520A8.c => oam_util.c} | 2 +- sym_ewram.txt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename include/{rom_81520A8.h => oam_util.h} (88%) rename src/{rom_81520A8.c => oam_util.c} (99%) diff --git a/include/rom_81520A8.h b/include/oam_util.h similarity index 88% rename from include/rom_81520A8.h rename to include/oam_util.h index 9ad299197..24e166c93 100644 --- a/include/rom_81520A8.h +++ b/include/oam_util.h @@ -1,5 +1,5 @@ -#ifndef GUARD_ROM_81520A8_H -#define GUARD_ROM_81520A8_H +#ifndef GUARD_OAM_UTIL_H +#define GUARD_OAM_UTIL_H struct OamUtil { @@ -30,4 +30,4 @@ u8 OamUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue); u8 OamUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 animNum, u8 priority); u8 OamUtil_Remove(u8 id); -#endif // GUARD_ROM_81520A8_H +#endif // GUARD_OAM_UTIL_H diff --git a/ld_script.txt b/ld_script.txt index 74d9f6ae6..d22c4a0ce 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -237,7 +237,7 @@ SECTIONS { src/cable_car.o(.text); src/math_util.o(.text); src/roulette_util.o(.text); - src/rom_81520A8.o(.text); + src/oam_util.o(.text); src/save.o(.text); src/mystery_event_script.o(.text); src/field_effect_helpers.o(.text); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index fa70ae478..30b170d8e 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -33,7 +33,7 @@ #include "fldeff_misc.h" #include "trainer_pokemon_sprites.h" #include "data.h" -#include "rom_81520A8.h" +#include "oam_util.h" #include "constants/rgb.h" #define HALL_OF_FAME_MAX_TEAMS 50 diff --git a/src/rom_81520A8.c b/src/oam_util.c similarity index 99% rename from src/rom_81520A8.c rename to src/oam_util.c index 2c37d7d48..bd1801a7d 100644 --- a/src/rom_81520A8.c +++ b/src/oam_util.c @@ -1,5 +1,5 @@ #include "global.h" -#include "rom_81520A8.h" +#include "oam_util.h" #include "malloc.h" #include "main.h" #include "digit_obj_util.h" diff --git a/sym_ewram.txt b/sym_ewram.txt index d00f7953c..58fb0648e 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -103,7 +103,7 @@ .include "src/battle_transition.o" .include "src/battle_message.o" .include "src/cable_car.o" - .include "src/rom_81520A8.o" + .include "src/oam_util.o" .include "src/save.o" .include "src/mystery_event_script.o" .include "src/move_relearner.o"