diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-25 10:56:55 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-25 10:56:55 -0500 |
| commit | a875d665b812b4aaa5cde21b5127262e04106755 (patch) | |
| tree | 4e597cbce3178a5434d62beaf2f812ad57b8b7ef /src/berry.c | |
| parent | 293dfc4823d6c984adc221b40be4e3705a3fa65b (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/berry.c b/src/berry.c index 98cf7d932..6d1fd17a1 100644 --- a/src/berry.c +++ b/src/berry.c @@ -14,7 +14,7 @@ extern void CB2_ChooseBerry(void); extern const u8* GetFieldObjectScriptPointerForComparison(void); extern bool8 sub_8092E9C(u8, u8, u8); -extern u16 gScriptItemId; +extern u16 gSpecialVar_ItemId; extern const u8 BerryTreeScript[]; @@ -1169,7 +1169,7 @@ void FieldObjectInteractionGetBerryTreeData(void) id = FieldObjectGetBerryTreeId(gSelectedMapObject); berry = GetBerryTypeByBerryTreeId(id); ResetBerryTreeSparkleFlag(id); - unk = gScriptLastTalked; + unk = gSpecialVar_LastTalked; num = gSaveBlock1Ptr->location.mapNum; group = gSaveBlock1Ptr->location.mapGroup; if (sub_8092E9C(unk, num, group)) @@ -1202,7 +1202,7 @@ void Bag_ChooseBerry(void) void FieldObjectInteractionPlantBerryTree(void) { - u8 berry = ItemIdToBerryType(gScriptItemId); + u8 berry = ItemIdToBerryType(gSpecialVar_ItemId); PlantBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject), berry, 1, TRUE); FieldObjectInteractionGetBerryTreeData(); @@ -1219,7 +1219,7 @@ void FieldObjectInteractionPickBerryTree(void) void FieldObjectInteractionRemoveBerryTree(void) { RemoveBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject)); - sub_8092EF0(gScriptLastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } u8 PlayerHasBerries(void) |