summaryrefslogtreecommitdiff
path: root/src/event_object_movement.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2019-03-23 09:39:46 -0500
committerMarcus Huderle <huderlem@gmail.com>2019-03-23 09:39:46 -0500
commit65391a1eb2979dc050dd4a98afea02bb0ef310ea (patch)
treee31a90d0966cec7e8713ead9ca8083d439c8d9b5 /src/event_object_movement.c
parenteb48cc2f7eefc1e56c2dcec21c38381b4534b897 (diff)
parentabe56579c107af58e6f3a43968ba2257ff358189 (diff)
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts: # src/use_pokeblock.c
Diffstat (limited to 'src/event_object_movement.c')
-rw-r--r--src/event_object_movement.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 6e1bae31e..30dffd8d7 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1,22 +1,22 @@
#include "global.h"
+#include "alloc.h"
+#include "battle_pyramid.h"
#include "berry.h"
#include "decoration.h"
#include "event_data.h"
#include "event_object_movement.h"
#include "event_scripts.h"
+#include "faraway_island.h"
#include "field_camera.h"
#include "field_effect.h"
#include "field_effect_helpers.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
-#include "alloc.h"
#include "mauville_old_man.h"
#include "metatile_behavior.h"
#include "overworld.h"
#include "palette.h"
-#include "pokenav.h"
#include "random.h"
-#include "rom_818CFC8.h"
#include "sprite.h"
#include "task.h"
#include "trainer_see.h"
@@ -1420,7 +1420,7 @@ u8 Unref_TryInitLocalEventObject(u8 localId)
{
if (InBattlePyramid())
{
- eventObjectCount = sub_81AAA40();
+ eventObjectCount = GetNumBattlePyramidEventObjects();
}
else if (InTrainerHill())
{
@@ -1746,7 +1746,7 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY)
if (InBattlePyramid())
{
- objectCount = sub_81AAA40();
+ objectCount = GetNumBattlePyramidEventObjects();
}
else if (InTrainerHill())
{