Stick to the new name

2024-12-05 21:00:55 -03:00
parent 720b2daecc
commit 29ef1cf9ad
16 changed files with 52 additions and 57 deletions
@@ -1327,7 +1327,7 @@ u8 Unref_TryInitLocalObjectEvent(u8 localId)

    if (gMapHeader.events != NULL)
    {
-        if (InBattlePyramid())
+        if (CurrentBattlePyramidLocation() != PYRAMID_LOCATION_NONE)
            objectEventCount = GetNumBattlePyramidObjectEvents();
        else if (InTrainerHill())
            objectEventCount = HILL_TRAINERS_PER_FLOOR;
@@ -1643,7 +1643,7 @@ void TrySpawnObjectEvents(s16 cameraX, s16 cameraY)
        s16 top = gSaveBlock1Ptr->pos.y;
        s16 bottom = gSaveBlock1Ptr->pos.y + MAP_OFFSET_H + 2;

-        if (InBattlePyramid())
+        if (CurrentBattlePyramidLocation() != PYRAMID_LOCATION_NONE)
            objectCount = GetNumBattlePyramidObjectEvents();
        else if (InTrainerHill())
            objectCount = HILL_TRAINERS_PER_FLOOR;