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 23:12:51 -05:00
parent ec3e86f1d2
commit 82cb741d8b
611 changed files with 4984 additions and 4984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/battle_pyramid.c
View File

@@ -1064,7 +1064,7 @@ static void ShowPostBattleHintText(void)
case HINT_REMAINING_ITEMS:
for (i = 0; i < GetNumBattlePyramidObjectEvents(); i++)
{
if (events[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF)
if (events[i].graphicsId == OBJ_EVENT_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF)
textIndex++;
}
i = 1;
@@ -1617,9 +1617,9 @@ void LoadBattlePyramidFloorObjectEventScripts(void)
int i;
struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates;
for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++)
for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++)
{
if (events[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL)
if (events[i].graphicsId != OBJ_EVENT_GFX_ITEM_BALL)
events[i].script = BattlePyramid_TrainerBattle;
else
events[i].script = BattlePyramid_FindItemBall;
@@ -1853,9 +1853,9 @@ static bool8 TrySetPyramidObjectEventPositionAtCoords(u8 objType, u8 x, u8 y, u8
if (mapHeader->events->objectEvents[i].x != x || mapHeader->events->objectEvents[i].y != y)
continue;
if (objType != OBJ_TRAINERS || mapHeader->events->objectEvents[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL)
if (objType != OBJ_TRAINERS || mapHeader->events->objectEvents[i].graphicsId == OBJ_EVENT_GFX_ITEM_BALL)
{
if (objType != OBJ_ITEMS || mapHeader->events->objectEvents[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL)
if (objType != OBJ_ITEMS || mapHeader->events->objectEvents[i].graphicsId != OBJ_EVENT_GFX_ITEM_BALL)
continue;
}
@@ -1872,7 +1872,7 @@ static bool8 TrySetPyramidObjectEventPositionAtCoords(u8 objType, u8 x, u8 y, u8
floorEvents[objectEventId].x += (squareId % 4) * 8;
floorEvents[objectEventId].y += (squareId / 4) * 8;
floorEvents[objectEventId].localId = objectEventId + 1;
if (floorEvents[objectEventId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL)
if (floorEvents[objectEventId].graphicsId != OBJ_EVENT_GFX_ITEM_BALL)
{
i = GetUniqueTrainerId(objectEventId);
floorEvents[objectEventId].graphicsId = GetBattleFacilityTrainerGfxId(i);