diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_setup.c | 3 | ||||
| -rw-r--r-- | src/braille_puzzles.c | 1 | ||||
| -rw-r--r-- | src/decompress.c | 1 | ||||
| -rw-r--r-- | src/dewford_trend.c | 1 | ||||
| -rw-r--r-- | src/diploma.c | 1 | ||||
| -rw-r--r-- | src/field_effect.c | 1 | ||||
| -rw-r--r-- | src/field_poison.c | 1 | ||||
| -rw-r--r-- | src/fldeff_strength.c | 1 | ||||
| -rw-r--r-- | src/lottery_corner.c | 1 | ||||
| -rw-r--r-- | src/main_menu.c | 2 | ||||
| -rw-r--r-- | src/mystery_event_script.c | 1 | ||||
| -rw-r--r-- | src/party_menu.c | 1 | ||||
| -rw-r--r-- | src/pokemon_size_record.c | 1 | ||||
| -rw-r--r-- | src/pokemon_summary_screen.c | 3 | ||||
| -rw-r--r-- | src/safari_zone.c | 1 |
15 files changed, 11 insertions, 9 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 1c3e8e836..21fa6a16a 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -12,6 +12,7 @@ #include "songs.h" #include "sound.h" #include "task.h" +#include "text.h" #include "string_util.h" #include "rng.h" #include "event_data.h" @@ -117,8 +118,6 @@ extern struct TrainerBattleSpec gTrainerBattleSpecs_2[]; extern struct TrainerBattleSpec gTrainerBattleSpecs_3[]; extern struct TrainerBattleSpec gTrainerBattleSpecs_4[]; -extern u8 gStringVar4[]; - extern u8 gBattleTransitionTable_Wild[][2]; extern u8 gBattleTransitionTable_Trainer[][2]; diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 1493f1793..73bcfd909 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -11,6 +11,7 @@ #include "species.h" #include "task.h" #include "menu.h" +#include "text.h" extern u8 gPlayerPartyCount; extern u8 gUnknown_03005CE0; diff --git a/src/decompress.c b/src/decompress.c index 8f573fecb..014e8a76f 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -2,6 +2,7 @@ #include "decompress.h" #include "species.h" #include "asm.h" +#include "text.h" #define WRAM 0x02000000 diff --git a/src/dewford_trend.c b/src/dewford_trend.c index ffc98d488..2a73ff0ec 100644 --- a/src/dewford_trend.c +++ b/src/dewford_trend.c @@ -2,6 +2,7 @@ #include "asm.h" #include "link.h" #include "rng.h" +#include "text.h" #include "event_data.h" extern u8 unk_2000000[]; diff --git a/src/diploma.c b/src/diploma.c index 8fabe3a2f..852656467 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -13,7 +13,6 @@ extern u8 gDiplomaTiles[]; extern u8 gDiplomaTilemap[]; extern u8 gDiplomaPalettes[]; -extern u8 gStringVar1[]; extern u8 gOtherText_NationalDex[]; extern u8 gOtherText_HoennDex[]; extern u8 gOtherText_DiplomaCertificationGameFreak[]; diff --git a/src/field_effect.c b/src/field_effect.c index fe586fcb6..89c6c9b46 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2,6 +2,7 @@ #include "field_effect.h" #include "weather.h" #include "sprite.h" +#include "text.h" typedef bool8 (*FldEffCmd)(u8 **, u32 *); diff --git a/src/field_poison.c b/src/field_poison.c index 6a243c280..0e19833c5 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -5,6 +5,7 @@ #include "script.h" #include "string_util.h" #include "task.h" +#include "text.h" extern struct Pokemon gPlayerParty[6]; extern u16 gScriptResult; diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 4da04326a..03b928eb6 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -4,6 +4,7 @@ #include "pokemon.h" #include "script.h" #include "task.h" +#include "text.h" static void sub_811AA18(void); static void sub_811AA38(void); diff --git a/src/lottery_corner.c b/src/lottery_corner.c index c18aeef48..bfe5998c0 100644 --- a/src/lottery_corner.c +++ b/src/lottery_corner.c @@ -4,6 +4,7 @@ #include "string_util.h" #include "event_data.h" #include "species.h" +#include "text.h" #include "items.h" extern u16 gScriptResult; diff --git a/src/main_menu.c b/src/main_menu.c index 7adbda096..63b1e9b99 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -71,8 +71,6 @@ extern const u8 gSystemText_NewPara[]; extern u8 gSpriteAffineAnimTable_81E79AC[]; -extern u8 gStringVar4[]; - extern u8 unk_2000000[]; //Task data diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index 4aa3784d7..515a0722f 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -1,6 +1,7 @@ #include "global.h" #include "script.h" #include "string_util.h" +#include "text.h" #ifdef SAPPHIRE #define UNK_MASK 0x100 diff --git a/src/party_menu.c b/src/party_menu.c index ce1b0f32a..723f66e85 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -29,7 +29,6 @@ struct Unk201B260 { extern struct Unk201B260 unk_201B260; extern struct Unk201C000 unk_201C000; -extern u8 gStringVar1[]; extern u8 gUnknown_0202E8F4; extern u8 gUnknown_0202E8F6; diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 6cf3411a9..aef796825 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -2,6 +2,7 @@ #include "pokemon_size_record.h" #include "string_util.h" #include "species.h" +#include "text.h" #include "event_data.h" extern u16 SpeciesToNationalPokedexNum(u16); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index b6b24b9d7..6e051f449 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -5,9 +5,6 @@ #include "string_util.h" #include "link.h" -extern u8 gStringVar1[]; -extern u8 gStringVar4[]; - extern struct Pokemon *unk_2018000; extern u8 *(gNatureNames[]); diff --git a/src/safari_zone.c b/src/safari_zone.c index 08bfbefbf..ee72d8e86 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -6,6 +6,7 @@ #include "main.h" #include "script.h" #include "string_util.h" +#include "text.h" #include "rom4.h" struct PokeblockFeeder |