summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFontbane <fontbane@gmail.com>2019-04-04 19:28:37 -0400
committerhuderlem <huderlem@gmail.com>2019-04-04 19:34:35 -0500
commit9e74409bb2032e25d431dda116462759e5b51fe0 (patch)
treeddec37d138b0c3281a32b7dca27754a7ae2966a9 /src
parent8b88ef3e01ea2e574b8326fd46dfc1fc5af575e0 (diff)
Fix labels, label more scripts
Diffstat (limited to 'src')
-rw-r--r--src/data/bard_music/pokemon.h2
-rw-r--r--src/easy_chat.c2
-rwxr-xr-xsrc/item_use.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h
index 693005360..112a5870b 100644
--- a/src/data/bard_music/pokemon.h
+++ b/src/data/bard_music/pokemon.h
@@ -2,7 +2,7 @@
#define GUARD_DATA_BARD_MUSIC_POKEMON_H
#include "constants/species.h"
-const u16 gUnknown_085F5490 = NUM_SPECIES;
+const u16 gNumSpeciesNames = NUM_SPECIES;
const struct BardSound gBardSounds_Pokemon[][6] = {
{
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 1cb7b0fe8..4388592f7 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -4882,7 +4882,7 @@ bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord)
{
case EC_GROUP_POKEMON:
case EC_GROUP_POKEMON_2:
- numWordsInGroup = gUnknown_085F5490;
+ numWordsInGroup = gNumSpeciesNames;
break;
case EC_GROUP_MOVE_1:
case EC_GROUP_MOVE_2:
diff --git a/src/item_use.c b/src/item_use.c
index 7947964ca..159ece398 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -42,8 +42,8 @@
#include "constants/vars.h"
#include "event_obj_lock.h"
-extern u8 Route102_EventScript_274482[];
-extern u8 Route102_EventScript_2744C0[];
+extern u8 BerryTree_EventScript_274482[];
+extern u8 BerryTree_EventScript_2744C0[];
extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[];
void SetUpItemUseCallback(u8 taskId);
@@ -669,7 +669,7 @@ void sub_80FDD74(u8 taskId)
{
RemoveBagItem(gSpecialVar_ItemId, 1);
ScriptContext2_Enable();
- ScriptContext1_SetupScript(Route102_EventScript_274482);
+ ScriptContext1_SetupScript(BerryTree_EventScript_274482);
DestroyTask(taskId);
}
@@ -694,7 +694,7 @@ void ItemUseOutOfBattle_WailmerPail(u8 taskId)
void sub_80FDE08(u8 taskId)
{
ScriptContext2_Enable();
- ScriptContext1_SetupScript(Route102_EventScript_2744C0);
+ ScriptContext1_SetupScript(BerryTree_EventScript_2744C0);
DestroyTask(taskId);
}