diff --git a/include/contest_link_80FC4F4.h b/include/contest_link.h similarity index 61% rename from include/contest_link_80FC4F4.h rename to include/contest_link.h index a3f1187982..4344d55ad7 100644 --- a/include/contest_link_80FC4F4.h +++ b/include/contest_link.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONTEST_LINK_80FC4F4_H -#define GUARD_CONTEST_LINK_80FC4F4_H +#ifndef GUARD_CONTEST_LINK_H +#define GUARD_CONTEST_LINK_H void sub_80FCC88(u8); void sub_80FCC88(u8); @@ -10,4 +10,4 @@ void sub_80FC804(u8); void sub_80FCE48(u8); void sub_80FC894(u8); -#endif //GUARD_CONTEST_LINK_80FC4F4_H +#endif //GUARD_CONTEST_LINK_H diff --git a/include/contest_link_80F57C4.h b/include/contest_util.h similarity index 67% rename from include/contest_link_80F57C4.h rename to include/contest_util.h index 8bbc0f14bc..c0d8df031a 100644 --- a/include/contest_link_80F57C4.h +++ b/include/contest_util.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONTEST_LINK_80F57C4_H -#define GUARD_CONTEST_LINK_80F57C4_H +#ifndef GUARD_CONTEST_UTIL_H +#define GUARD_CONTEST_UTIL_H void BufferContestantTrainerName(void); void BufferContestantMonNickname(void); @@ -9,4 +9,4 @@ void ShowContestResults(void); void ContestLinkTransfer(u8); void sub_80FC998(u8 taskId); -#endif // GUARD_CONTEST_LINK_80F57C4_H +#endif // GUARD_CONTEST_UTIL_H diff --git a/ld_script.txt b/ld_script.txt index d22c4a0ce0..fb4d86300e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -168,7 +168,7 @@ SECTIONS { src/record_mixing.o(.text); src/secret_base.o(.text); src/tv.o(.text); - src/contest_link_80F57C4.o(.text); + src/contest_util.o(.text); src/script_pokemon_util_80F87D8.o(.text); src/field_poison.o(.text); src/pokemon_size_record.o(.text); @@ -176,7 +176,7 @@ SECTIONS { src/field_special_scene.o(.text); src/rotating_gate.o(.text); src/safari_zone.o(.text); - src/contest_link_80FC4F4.o(.text); + src/contest_link.o(.text); src/item_use.o(.text); src/battle_anim_effects_1.o(.text); src/battle_anim_effects_2.o(.text); @@ -328,7 +328,7 @@ SECTIONS { src/trainer_hill.o(.text); src/rayquaza_scene.o(.text); src/walda_phrase.o(.text); - src/contest_link_81D9DE4.o(.text); + src/contest_link_util.o(.text); src/gym_leader_rematch.o(.text); src/unk_transition.o(.text); src/international_string_util.o(.text); @@ -542,13 +542,13 @@ SECTIONS { src/record_mixing.o(.rodata); src/secret_base.o(.rodata); src/tv.o(.rodata); - src/contest_link_80F57C4.o(.rodata); + src/contest_util.o(.rodata); src/script_pokemon_util_80F87D8.o(.rodata); src/pokemon_size_record.o(.rodata) src/fldeff_misc.o(.rodata); src/field_special_scene.o(.rodata); src/rotating_gate.o(.rodata); - src/contest_link_80FC4F4.o(.rodata); + src/contest_link.o(.rodata); src/item_use.o(.rodata); src/battle_anim_effects_1.o(.rodata); src/battle_anim_effects_2.o(.rodata); diff --git a/src/contest.c b/src/contest.c index a43b876799..314ebb381a 100644 --- a/src/contest.c +++ b/src/contest.c @@ -31,14 +31,14 @@ #include "tv.h" #include "scanline_effect.h" #include "util.h" -#include "contest_link_80F57C4.h" +#include "contest_util.h" #include "dma3.h" #include "battle_message.h" #include "event_scripts.h" #include "event_data.h" #include "strings.h" #include "contest_effect.h" -#include "contest_link_80FC4F4.h" +#include "contest_link.h" #include "script_pokemon_util_80F87D8.h" #include "international_string_util.h" #include "data.h" diff --git a/src/contest_link_80FC4F4.c b/src/contest_link.c similarity index 99% rename from src/contest_link_80FC4F4.c rename to src/contest_link.c index e17f62485e..30ce9e3912 100644 --- a/src/contest_link_80FC4F4.c +++ b/src/contest_link.c @@ -6,6 +6,7 @@ #include "pokemon.h" #include "random.h" #include "task.h" +#include "contest_link.h" #include "constants/flags.h" static void sub_80FC5C0(u8); diff --git a/src/contest_link_81D9DE4.c b/src/contest_link_util.c similarity index 100% rename from src/contest_link_81D9DE4.c rename to src/contest_link_util.c diff --git a/src/contest_link_80F57C4.c b/src/contest_util.c similarity index 99% rename from src/contest_link_80F57C4.c rename to src/contest_util.c index 8434c3eac5..22074e1a1b 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_util.c @@ -4,8 +4,8 @@ #include "battle_gfx_sfx_util.h" #include "bg.h" #include "contest.h" -#include "contest_link_80F57C4.h" -#include "contest_link_80FC4F4.h" +#include "contest_util.h" +#include "contest_link.h" #include "data.h" #include "decompress.h" #include "dma3.h" diff --git a/src/scrcmd.c b/src/scrcmd.c index 9c00c3bc87..326d46a561 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -5,7 +5,7 @@ #include "clock.h" #include "coins.h" #include "contest.h" -#include "contest_link_80F57C4.h" +#include "contest_util.h" #include "contest_painting.h" #include "data.h" #include "decoration.h" diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 62b445a04f..a6ab1693b5 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -3,7 +3,7 @@ #include "battle_gfx_sfx_util.h" #include "berry.h" #include "contest.h" -#include "contest_link_80F57C4.h" +#include "contest_util.h" #include "contest_painting.h" #include "data.h" #include "daycare.h" diff --git a/sym_ewram.txt b/sym_ewram.txt index 58fb0648e8..e99d90a1d3 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -74,7 +74,7 @@ .include "src/record_mixing.o" .include "src/secret_base.o" .include "src/tv.o" - .include "src/contest_link_80F57C4.o" + .include "src/contest_util.o" .include "src/rotating_gate.o" .include "src/safari_zone.o" .include "src/item_use.o"