ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename contest_link_80FC4F4, 80F57C4, and 81D9DE4

Browse Source
This commit is contained in:
GriffinR 2020-06-18 18:01:32 -04:00
parent 24569583e4
commit d2a760afdb
10 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/contest_link_80FC4F4.h → include/contest_link.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_CONTEST_LINK_80FC4F4_H #ifndef GUARD_CONTEST_LINK_H
#define GUARD_CONTEST_LINK_80FC4F4_H #define GUARD_CONTEST_LINK_H
void sub_80FCC88(u8); void sub_80FCC88(u8);
void sub_80FCC88(u8); void sub_80FCC88(u8);
@ -10,4 +10,4 @@ void sub_80FC804(u8);
void sub_80FCE48(u8); void sub_80FCE48(u8);
void sub_80FC894(u8); void sub_80FC894(u8);
#endif //GUARD_CONTEST_LINK_80FC4F4_H #endif //GUARD_CONTEST_LINK_H

6
include/contest_link_80F57C4.h → include/contest_util.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_CONTEST_LINK_80F57C4_H #ifndef GUARD_CONTEST_UTIL_H
#define GUARD_CONTEST_LINK_80F57C4_H #define GUARD_CONTEST_UTIL_H
void BufferContestantTrainerName(void); void BufferContestantTrainerName(void);
void BufferContestantMonNickname(void); void BufferContestantMonNickname(void);
@ -9,4 +9,4 @@ void ShowContestResults(void);
void ContestLinkTransfer(u8); void ContestLinkTransfer(u8);
void sub_80FC998(u8 taskId); void sub_80FC998(u8 taskId);
#endif // GUARD_CONTEST_LINK_80F57C4_H #endif // GUARD_CONTEST_UTIL_H

10
ld_script.txt
View File

@ -168,7 +168,7 @@ SECTIONS {
src/record_mixing.o(.text); src/record_mixing.o(.text);
src/secret_base.o(.text); src/secret_base.o(.text);
src/tv.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/script_pokemon_util_80F87D8.o(.text);
src/field_poison.o(.text); src/field_poison.o(.text);
src/pokemon_size_record.o(.text); src/pokemon_size_record.o(.text);
@ -176,7 +176,7 @@ SECTIONS {
src/field_special_scene.o(.text); src/field_special_scene.o(.text);
src/rotating_gate.o(.text); src/rotating_gate.o(.text);
src/safari_zone.o(.text); src/safari_zone.o(.text);
src/contest_link_80FC4F4.o(.text); src/contest_link.o(.text);
src/item_use.o(.text); src/item_use.o(.text);
src/battle_anim_effects_1.o(.text); src/battle_anim_effects_1.o(.text);
src/battle_anim_effects_2.o(.text); src/battle_anim_effects_2.o(.text);
@ -328,7 +328,7 @@ SECTIONS {
src/trainer_hill.o(.text); src/trainer_hill.o(.text);
src/rayquaza_scene.o(.text); src/rayquaza_scene.o(.text);
src/walda_phrase.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/gym_leader_rematch.o(.text);
src/unk_transition.o(.text); src/unk_transition.o(.text);
src/international_string_util.o(.text); src/international_string_util.o(.text);
@ -542,13 +542,13 @@ SECTIONS {
src/record_mixing.o(.rodata); src/record_mixing.o(.rodata);
src/secret_base.o(.rodata); src/secret_base.o(.rodata);
src/tv.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/script_pokemon_util_80F87D8.o(.rodata);
src/pokemon_size_record.o(.rodata) src/pokemon_size_record.o(.rodata)
src/fldeff_misc.o(.rodata); src/fldeff_misc.o(.rodata);
src/field_special_scene.o(.rodata); src/field_special_scene.o(.rodata);
src/rotating_gate.o(.rodata); src/rotating_gate.o(.rodata);
src/contest_link_80FC4F4.o(.rodata); src/contest_link.o(.rodata);
src/item_use.o(.rodata); src/item_use.o(.rodata);
src/battle_anim_effects_1.o(.rodata); src/battle_anim_effects_1.o(.rodata);
src/battle_anim_effects_2.o(.rodata); src/battle_anim_effects_2.o(.rodata);

4
src/contest.c
View File

@ -31,14 +31,14 @@
#include "tv.h" #include "tv.h"
#include "scanline_effect.h" #include "scanline_effect.h"
#include "util.h" #include "util.h"
#include "contest_link_80F57C4.h" #include "contest_util.h"
#include "dma3.h" #include "dma3.h"
#include "battle_message.h" #include "battle_message.h"
#include "event_scripts.h" #include "event_scripts.h"
#include "event_data.h" #include "event_data.h"
#include "strings.h" #include "strings.h"
#include "contest_effect.h" #include "contest_effect.h"
#include "contest_link_80FC4F4.h" #include "contest_link.h"
#include "script_pokemon_util_80F87D8.h" #include "script_pokemon_util_80F87D8.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "data.h" #include "data.h"

1
src/contest_link_80FC4F4.c → src/contest_link.c
View File

@ -6,6 +6,7 @@
#include "pokemon.h" #include "pokemon.h"
#include "random.h" #include "random.h"
#include "task.h" #include "task.h"
#include "contest_link.h"
#include "constants/flags.h" #include "constants/flags.h"
static void sub_80FC5C0(u8); static void sub_80FC5C0(u8);

0
src/contest_link_81D9DE4.c → src/contest_link_util.c
View File

4
src/contest_link_80F57C4.c → src/contest_util.c
View File

@ -4,8 +4,8 @@
#include "battle_gfx_sfx_util.h" #include "battle_gfx_sfx_util.h"
#include "bg.h" #include "bg.h"
#include "contest.h" #include "contest.h"
#include "contest_link_80F57C4.h" #include "contest_util.h"
#include "contest_link_80FC4F4.h" #include "contest_link.h"
#include "data.h" #include "data.h"
#include "decompress.h" #include "decompress.h"
#include "dma3.h" #include "dma3.h"

2
src/scrcmd.c
View File

@ -5,7 +5,7 @@
#include "clock.h" #include "clock.h"
#include "coins.h" #include "coins.h"
#include "contest.h" #include "contest.h"
#include "contest_link_80F57C4.h" #include "contest_util.h"
#include "contest_painting.h" #include "contest_painting.h"
#include "data.h" #include "data.h"
#include "decoration.h" #include "decoration.h"

2
src/script_pokemon_util_80F87D8.c
View File

@ -3,7 +3,7 @@
#include "battle_gfx_sfx_util.h" #include "battle_gfx_sfx_util.h"
#include "berry.h" #include "berry.h"
#include "contest.h" #include "contest.h"
#include "contest_link_80F57C4.h" #include "contest_util.h"
#include "contest_painting.h" #include "contest_painting.h"
#include "data.h" #include "data.h"
#include "daycare.h" #include "daycare.h"

2
sym_ewram.txt
View File

@ -74,7 +74,7 @@
.include "src/record_mixing.o" .include "src/record_mixing.o"
.include "src/secret_base.o" .include "src/secret_base.o"
.include "src/tv.o" .include "src/tv.o"
.include "src/contest_link_80F57C4.o" .include "src/contest_util.o"
.include "src/rotating_gate.o" .include "src/rotating_gate.o"
.include "src/safari_zone.o" .include "src/safari_zone.o"
.include "src/item_use.o" .include "src/item_use.o"