diff options
| author | Henny022p <info@henny022.de> | 2021-03-15 23:40:11 +0100 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2021-03-15 23:40:11 +0100 |
| commit | a563bfbc285a24be6b17a32364aa3236170acc60 (patch) | |
| tree | bdd4788e07b6f0dbeeb4fcc08a46aa1043ef6cd0 /src/object | |
| parent | a2cdfd6d8dd910aa402b7e6bdf32278ac9b80c50 (diff) | |
more cleanup
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/archway.c | 3 | ||||
| -rw-r--r-- | src/object/chestSpawner.c | 1 | ||||
| -rw-r--r-- | src/object/cloud.c | 2 | ||||
| -rw-r--r-- | src/object/floatingBlock.c | 1 | ||||
| -rw-r--r-- | src/object/minishSizedEntrance.c | 1 | ||||
| -rw-r--r-- | src/object/objectA.c | 1 | ||||
| -rw-r--r-- | src/object/pinwheel.c | 2 | ||||
| -rw-r--r-- | src/object/windTribeFlag.c | 1 |
8 files changed, 5 insertions, 7 deletions
diff --git a/src/object/archway.c b/src/object/archway.c index a33b7dd3..2f1124ca 100644 --- a/src/object/archway.c +++ b/src/object/archway.c @@ -1,7 +1,6 @@ #include "global.h" #include "entity.h" -#include "sprite.h" -#include "functions.h" +#include "game.h" void Archway(Entity* this) { u32 v1; diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c index 790d1251..3f7e6006 100644 --- a/src/object/chestSpawner.c +++ b/src/object/chestSpawner.c @@ -1,6 +1,5 @@ #include "global.h" #include "entity.h" -#include "flags.h" extern void sub_080842D8(Entity*); extern void sub_08078828(Entity*); diff --git a/src/object/cloud.c b/src/object/cloud.c index 45616754..0b7e7c0a 100644 --- a/src/object/cloud.c +++ b/src/object/cloud.c @@ -60,7 +60,7 @@ void sub_0809F5B0(Entity* this) { if (--this->actionDelay == 0) { SoundReq(115); SetGlobalFlag(KUMOTATSUMAKI); - LoadRoomEntityList(&gUnk_080DD750); + LoadRoomEntityList((EntityData*)&gUnk_080DD750); DeleteThisEntity(); } } diff --git a/src/object/floatingBlock.c b/src/object/floatingBlock.c index 661cec72..7e1ad599 100644 --- a/src/object/floatingBlock.c +++ b/src/object/floatingBlock.c @@ -1,6 +1,5 @@ #include "global.h" #include "entity.h" -#include "functions.h" void FloatingBlock(Entity* this) { if (this->action == 0) { diff --git a/src/object/minishSizedEntrance.c b/src/object/minishSizedEntrance.c index 804772b7..2f08f996 100644 --- a/src/object/minishSizedEntrance.c +++ b/src/object/minishSizedEntrance.c @@ -1,5 +1,6 @@ #include "global.h" #include "entity.h" +#include "game.h" #include "functions.h" extern void (*const gUnk_08122254[])(Entity*); diff --git a/src/object/objectA.c b/src/object/objectA.c index 3679e4bb..0e63b26f 100644 --- a/src/object/objectA.c +++ b/src/object/objectA.c @@ -2,6 +2,7 @@ #include "entity.h" #include "room.h" #include "flags.h" +#include "createObject.h" #include "functions.h" extern Hitbox gUnk_080FD170; diff --git a/src/object/pinwheel.c b/src/object/pinwheel.c index 7fcbb9a0..7de61338 100644 --- a/src/object/pinwheel.c +++ b/src/object/pinwheel.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "flags.h" -#include "functions.h" +#include "createObject.h" extern u32 ReadBit(u32*, u32); diff --git a/src/object/windTribeFlag.c b/src/object/windTribeFlag.c index 14f64fba..bc9d0fa3 100644 --- a/src/object/windTribeFlag.c +++ b/src/object/windTribeFlag.c @@ -1,7 +1,6 @@ #include "global.h" #include "entity.h" #include "random.h" -#include "functions.h" void WindTribeFlag(Entity* this) { if (this->action == 0) { |