diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-09-13 00:03:22 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-09-13 00:03:22 -0500 |
| commit | 270bd98d41a19c516a4be95f522deb26cc4300a9 (patch) | |
| tree | dca3131793bf14acd85d6558f8195b0294870af6 /src/berry.c | |
| parent | 2c87516ca3efa260b96b92ededb24d75edfe49e8 (diff) | |
more labeling
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry.c b/src/berry.c index fa15672e7..d82eab2a6 100644 --- a/src/berry.c +++ b/src/berry.c @@ -974,7 +974,7 @@ const struct Berry gBerries[] = const struct BerryTree gBlankBerryTree = {0}; -extern u8 BerryTreeScript; +extern u8 S_BerryTree[]; extern u16 gScriptLastTalked; extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; @@ -1078,7 +1078,7 @@ bool32 FieldObjectInteractionWaterBerryTree(void) bool8 IsPlayerFacingPlantedBerryTree(void) { - if (GetFieldObjectScriptPointerForComparison() == &BerryTreeScript + if (GetFieldObjectScriptPointerForComparison() == S_BerryTree && GetStageByBerryTreeId(FieldObjectGetBerryTreeId(gSelectedMapObject)) == 0) return TRUE; else @@ -1087,7 +1087,7 @@ bool8 IsPlayerFacingPlantedBerryTree(void) bool8 TryToWaterBerryTree(void) { - if (GetFieldObjectScriptPointerForComparison() != &BerryTreeScript) + if (GetFieldObjectScriptPointerForComparison() != S_BerryTree) return FALSE; else return FieldObjectInteractionWaterBerryTree(); |