summaryrefslogtreecommitdiff
path: root/src/tv.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-05-29 17:53:42 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-05-29 17:53:42 -0500
commit5df6fa5c08a19fb89308f6131dceef721cc5a3d0 (patch)
tree5aaaa5828622b42023320e211cffd3dd4bb3feb8 /src/tv.c
parentaa8299821dca148ecfd5d6bfb77641043e01da5c (diff)
Unify 'map object' and 'field object' terms into 'event object'
Diffstat (limited to 'src/tv.c')
-rw-r--r--src/tv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tv.c b/src/tv.c
index 87cecbefc..234091d58 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -736,7 +736,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void)
return 0;
}
-void GabbyAndTySetScriptVarsToFieldObjectLocalIds(void)
+void GabbyAndTySetScriptVarsToEventObjectLocalIds(void)
{
switch (GabbyAndTyGetBattleNum())
{
@@ -2201,7 +2201,7 @@ void GetMomOrDadStringForTVMessage(void)
void sub_80BFD20(void)
{
VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0);
- RemoveFieldObjectByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+ RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
}
typedef union ewramStruct_02007000