dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize Event Object to Object Event

Browse Source
This commit is contained in:
GriffinR
2019-11-20 22:55:44 -05:00
parent 215bb31d67
commit ec3e86f1d2
606 changed files with 10080 additions and 10080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/berry.c
View File

@@ -995,9 +995,9 @@ struct BerryTree *GetBerryTreeInfo(u8 id)
return &gSaveBlock1Ptr->berryTrees[id];
}
bool32 EventObjectInteractionWaterBerryTree(void)
bool32 ObjectEventInteractionWaterBerryTree(void)
{
struct BerryTree *tree = GetBerryTreeInfo(EventObjectGetBerryTreeId(gSelectedEventObject));
struct BerryTree *tree = GetBerryTreeInfo(ObjectEventGetBerryTreeId(gSelectedObjectEvent));
switch (tree->stage)
{
@@ -1021,8 +1021,8 @@ bool32 EventObjectInteractionWaterBerryTree(void)
bool8 IsPlayerFacingEmptyBerryTreePatch(void)
{
if (GetEventObjectScriptPointerPlayerFacing() == BerryTreeScript
&& GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == BERRY_STAGE_NO_BERRY)
if (GetObjectEventScriptPointerPlayerFacing() == BerryTreeScript
&& GetStageByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent)) == BERRY_STAGE_NO_BERRY)
return TRUE;
else
return FALSE;
@@ -1030,10 +1030,10 @@ bool8 IsPlayerFacingEmptyBerryTreePatch(void)
bool8 TryToWaterBerryTree(void)
{
if (GetEventObjectScriptPointerPlayerFacing() != BerryTreeScript)
if (GetObjectEventScriptPointerPlayerFacing() != BerryTreeScript)
return FALSE;
else
return EventObjectInteractionWaterBerryTree();
return ObjectEventInteractionWaterBerryTree();
}
void ClearBerryTrees(void)
@@ -1242,7 +1242,7 @@ static u16 GetStageDurationByBerryType(u8 berry)
return GetBerryInfo(berry)->stageDuration * 60;
}
void EventObjectInteractionGetBerryTreeData(void)
void ObjectEventInteractionGetBerryTreeData(void)
{
u8 id;
u8 berry;
@@ -1250,7 +1250,7 @@ void EventObjectInteractionGetBerryTreeData(void)
u8 group;
u8 num;
id = EventObjectGetBerryTreeId(gSelectedEventObject);
id = ObjectEventGetBerryTreeId(gSelectedObjectEvent);
berry = GetBerryTypeByBerryTreeId(id);
ResetBerryTreeSparkleFlag(id);
localId = gSpecialVar_LastTalked;
@@ -1265,15 +1265,15 @@ void EventObjectInteractionGetBerryTreeData(void)
GetBerryCountStringByBerryType(berry, gStringVar1, gSpecialVar_0x8006);
}
void EventObjectInteractionGetBerryName(void)
void ObjectEventInteractionGetBerryName(void)
{
u8 berryType = GetBerryTypeByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject));
u8 berryType = GetBerryTypeByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent));
GetBerryNameByBerryType(berryType, gStringVar1);
}
void EventObjectInteractionGetBerryCountString(void)
void ObjectEventInteractionGetBerryCountString(void)
{
u8 treeId = EventObjectGetBerryTreeId(gSelectedEventObject);
u8 treeId = ObjectEventGetBerryTreeId(gSelectedObjectEvent);
u8 berry = GetBerryTypeByBerryTreeId(treeId);
u8 count = GetBerryCountByBerryTreeId(treeId);
GetBerryCountStringByBerryType(berry, gStringVar1, count);
@@ -1284,25 +1284,25 @@ void Bag_ChooseBerry(void)
SetMainCallback2(CB2_ChooseBerry);
}
void EventObjectInteractionPlantBerryTree(void)
void ObjectEventInteractionPlantBerryTree(void)
{
u8 berry = ItemIdToBerryType(gSpecialVar_ItemId);
PlantBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject), berry, 1, TRUE);
EventObjectInteractionGetBerryTreeData();
PlantBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent), berry, 1, TRUE);
ObjectEventInteractionGetBerryTreeData();
}
void EventObjectInteractionPickBerryTree(void)
void ObjectEventInteractionPickBerryTree(void)
{
u8 id = EventObjectGetBerryTreeId(gSelectedEventObject);
u8 id = ObjectEventGetBerryTreeId(gSelectedObjectEvent);
u8 berry = GetBerryTypeByBerryTreeId(id);
gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id));
}
void EventObjectInteractionRemoveBerryTree(void)
void ObjectEventInteractionRemoveBerryTree(void)
{
RemoveBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject));
RemoveBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent));
sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
}
@@ -1328,12 +1328,12 @@ void ResetBerryTreeSparkleFlags(void)
bottom = top + 8;
for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
{
if (gEventObjects[i].active && gEventObjects[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH)
if (gObjectEvents[i].active && gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH)
{
cam_left = gEventObjects[i].currentCoords.x;
cam_top = gEventObjects[i].currentCoords.y;
cam_left = gObjectEvents[i].currentCoords.x;
cam_top = gObjectEvents[i].currentCoords.y;
if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom)
ResetBerryTreeSparkleFlag(gEventObjects[i].trainerRange_berryTreeId);
ResetBerryTreeSparkleFlag(gObjectEvents[i].trainerRange_berryTreeId);
}
}
}