diff options
Diffstat (limited to 'src/enemy')
56 files changed, 57 insertions, 0 deletions
diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c index 7336487c..6ac2b964 100644 --- a/src/enemy/acroBandits.c +++ b/src/enemy/acroBandits.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "player.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/armos.c b/src/enemy/armos.c index 13b20c5b..04d6bdb7 100644 --- a/src/enemy/armos.c +++ b/src/enemy/armos.c @@ -15,6 +15,7 @@ #include "tiles.h" #include "room.h" #include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/ballChainSoldier.c b/src/enemy/ballChainSoldier.c index 2b28fa1e..908c7d2d 100644 --- a/src/enemy/ballChainSoldier.c +++ b/src/enemy/ballChainSoldier.c @@ -8,6 +8,7 @@ #include "entity.h" #include "room.h" #include "physics.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c index 00a907d9..9637abb6 100644 --- a/src/enemy/beetle.c +++ b/src/enemy/beetle.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "player.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/bowMoblin.c b/src/enemy/bowMoblin.c index d8319cc3..8bbc4b5c 100644 --- a/src/enemy/bowMoblin.c +++ b/src/enemy/bowMoblin.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "entity.h" #include "physics.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/businessScrubPrologue.c b/src/enemy/businessScrubPrologue.c index 99f4e03b..fdd9646f 100644 --- a/src/enemy/businessScrubPrologue.c +++ b/src/enemy/businessScrubPrologue.c @@ -11,6 +11,7 @@ #include "physics.h" #include "room.h" #include "player.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c index 2e12cfb4..534c8505 100644 --- a/src/enemy/cloudPiranha.c +++ b/src/enemy/cloudPiranha.c @@ -9,6 +9,7 @@ #include "room.h" #include "physics.h" #include "tiles.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/crow.c b/src/enemy/crow.c index 3d4231c5..2c51fb5d 100644 --- a/src/enemy/crow.c +++ b/src/enemy/crow.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "entity.h" #include "physics.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/cuccoAggr.c b/src/enemy/cuccoAggr.c index 220480c6..7a353788 100644 --- a/src/enemy/cuccoAggr.c +++ b/src/enemy/cuccoAggr.c @@ -9,6 +9,7 @@ #include "room.h" #include "player.h" #include "physics.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c index bbb8f98c..30332fcb 100644 --- a/src/enemy/cuccoChickAggr.c +++ b/src/enemy/cuccoChickAggr.c @@ -6,6 +6,7 @@ */ #include "enemy.h" #include "player.h" +#include "asm.h" void sub_08022A88(Entity*); void sub_08022AA4(Entity*); diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c index 5a5c528b..f174bae9 100644 --- a/src/enemy/darkNut.c +++ b/src/enemy/darkNut.c @@ -5,6 +5,7 @@ * @brief Dark Nut enemy */ #include "enemy.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/enemy4D.c b/src/enemy/enemy4D.c index 71ff8276..4e930e91 100644 --- a/src/enemy/enemy4D.c +++ b/src/enemy/enemy4D.c @@ -8,6 +8,7 @@ #include "entity.h" #include "room.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/enemy50.c b/src/enemy/enemy50.c index fdd4eb94..0ffd569a 100644 --- a/src/enemy/enemy50.c +++ b/src/enemy/enemy50.c @@ -9,6 +9,8 @@ #include "physics.h" #include "player.h" #include "room.h" +#include "script.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/enemy64.c b/src/enemy/enemy64.c index 50572ce1..5ebc2949 100644 --- a/src/enemy/enemy64.c +++ b/src/enemy/enemy64.c @@ -11,6 +11,7 @@ #include "tiles.h" #include "room.h" #include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c index 50d4d85e..07991c44 100644 --- a/src/enemy/eyegore.c +++ b/src/enemy/eyegore.c @@ -14,6 +14,7 @@ #include "effects.h" #include "room.h" #include "physics.h" +#include "player.h" #include "tiles.h" typedef struct { diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c index c7283f9b..fbb40c70 100644 --- a/src/enemy/fallingBoulder.c +++ b/src/enemy/fallingBoulder.c @@ -8,6 +8,7 @@ #include "room.h" #include "player.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c index 1d6b6b6d..848b2b04 100644 --- a/src/enemy/fireballGuy.c +++ b/src/enemy/fireballGuy.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "player.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/flyingPot.c b/src/enemy/flyingPot.c index beabb8c2..0c99cc7a 100644 --- a/src/enemy/flyingPot.c +++ b/src/enemy/flyingPot.c @@ -10,6 +10,7 @@ #include "player.h" #include "room.h" #include "tiles.h" +#include "asm.h" extern Hitbox gUnk_080FD34C; diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c index 6e05bdba..307fb7fa 100644 --- a/src/enemy/flyingSkull.c +++ b/src/enemy/flyingSkull.c @@ -13,6 +13,7 @@ #include "tiles.h" #include "room.h" #include "player.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/ghini.c b/src/enemy/ghini.c index f1b7877b..e0afd0fb 100644 --- a/src/enemy/ghini.c +++ b/src/enemy/ghini.c @@ -8,6 +8,7 @@ #include "enemy.h" #include "player.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/gyorgFemaleEye.c b/src/enemy/gyorgFemaleEye.c index 423be91d..1dc30c7c 100644 --- a/src/enemy/gyorgFemaleEye.c +++ b/src/enemy/gyorgFemaleEye.c @@ -9,6 +9,7 @@ #include "entity.h" #include "player.h" #include "room.h" +#include "asm.h" void GyorgFemaleEye_OnTick(GyorgFemaleEyeEntity*); void GyorgFemaleEye_OnCollision(GyorgFemaleEyeEntity*); diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c index beccd977..a4cfffeb 100644 --- a/src/enemy/gyorgMale.c +++ b/src/enemy/gyorgMale.c @@ -10,6 +10,7 @@ #include "fileselect.h" #include "physics.h" #include "player.h" +#include "asm.h" // todo: wrong types extern void sub_080A1D70(Entity*, u32); diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c index 8ca4ad09..ac7366da 100644 --- a/src/enemy/keaton.c +++ b/src/enemy/keaton.c @@ -6,6 +6,7 @@ */ #include "enemy.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/keese.c b/src/enemy/keese.c index 922ad17d..99517334 100644 --- a/src/enemy/keese.c +++ b/src/enemy/keese.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "physics.h" #include "player.h" +#include "asm.h" typedef struct { /* 0x00 */ Entity base; diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c index c0dba3db..f22d0fa1 100644 --- a/src/enemy/lakitu.c +++ b/src/enemy/lakitu.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "physics.h" #include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c index 119fc0dd..1ecff210 100644 --- a/src/enemy/madderpillar.c +++ b/src/enemy/madderpillar.c @@ -9,6 +9,7 @@ #include "effects.h" #include "room.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c index 152e21aa..60fc15e7 100644 --- a/src/enemy/mazaalBracelet.c +++ b/src/enemy/mazaalBracelet.c @@ -8,6 +8,7 @@ #include "hitbox.h" #include "object.h" #include "asm.h" +#include "script.h" #include "sound.h" #include "effects.h" #include "room.h" diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c index 5d2dd7a4..91191679 100644 --- a/src/enemy/mazaalMacro.c +++ b/src/enemy/mazaalMacro.c @@ -10,6 +10,7 @@ #include "tiles.h" #include "player.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c index c80f57dc..a0097211 100644 --- a/src/enemy/miniFireballGuy.c +++ b/src/enemy/miniFireballGuy.c @@ -6,6 +6,7 @@ */ #include "enemy.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c index 856651e6..0624494e 100644 --- a/src/enemy/miniSlime.c +++ b/src/enemy/miniSlime.c @@ -6,6 +6,7 @@ */ #include "enemy.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/moldorm.c b/src/enemy/moldorm.c index f53881dc..7c744db4 100644 --- a/src/enemy/moldorm.c +++ b/src/enemy/moldorm.c @@ -7,6 +7,7 @@ #include "collision.h" #include "enemy.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c index ac84d386..1282d029 100644 --- a/src/enemy/moldworm.c +++ b/src/enemy/moldworm.c @@ -10,6 +10,7 @@ #include "tiles.h" #include "room.h" #include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/mulldozer.c b/src/enemy/mulldozer.c index 9afd925a..d60a1c4f 100644 --- a/src/enemy/mulldozer.c +++ b/src/enemy/mulldozer.c @@ -6,6 +6,7 @@ */ #include "collision.h" #include "enemy.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c index bdf9c73f..ac13da58 100644 --- a/src/enemy/octorok.c +++ b/src/enemy/octorok.c @@ -6,6 +6,7 @@ */ #include "enemy.h" #include "physics.h" +#include "asm.h" void Octorok_Pause(Entity*); bool32 Octorok_FacesPlayer(Entity*); diff --git a/src/enemy/octorokGolden.c b/src/enemy/octorokGolden.c index 23b92aa5..8c31a460 100644 --- a/src/enemy/octorokGolden.c +++ b/src/enemy/octorokGolden.c @@ -9,6 +9,7 @@ #include "map.h" #include "player.h" #include "item.h" +#include "asm.h" void (*const OctorokGolden_Functions[])(Entity*); void (*const gUnk_080CF484[])(Entity*); diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c index a8404af9..d18a3553 100644 --- a/src/enemy/peahat.c +++ b/src/enemy/peahat.c @@ -6,6 +6,7 @@ */ #include "enemy.h" #include "physics.h" +#include "asm.h" #include "room.h" typedef struct { diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index e2a372a8..ab546efb 100644 --- a/src/enemy/rollobite.c +++ b/src/enemy/rollobite.c @@ -10,6 +10,7 @@ #include "player.h" #include "room.h" #include "tiles.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/rope.c b/src/enemy/rope.c index 74c77066..6ba4d764 100644 --- a/src/enemy/rope.c +++ b/src/enemy/rope.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "physics.h" #include "tiles.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/ropeGolden.c b/src/enemy/ropeGolden.c index 0e653b80..4b5051cf 100644 --- a/src/enemy/ropeGolden.c +++ b/src/enemy/ropeGolden.c @@ -9,6 +9,7 @@ #include "physics.h" #include "player.h" #include "item.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/scissorsBeetle.c b/src/enemy/scissorsBeetle.c index 72bb2f8a..f0eaa381 100644 --- a/src/enemy/scissorsBeetle.c +++ b/src/enemy/scissorsBeetle.c @@ -7,6 +7,7 @@ #include "collision.h" #include "enemy.h" #include "entity.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/slime.c b/src/enemy/slime.c index 536eec67..6e6be923 100644 --- a/src/enemy/slime.c +++ b/src/enemy/slime.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "physics.h" #include "room.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c index cd371ec4..5a95aa56 100644 --- a/src/enemy/sluggula.c +++ b/src/enemy/sluggula.c @@ -6,6 +6,7 @@ */ #include "enemy.h" #include "physics.h" +#include "asm.h" void sub_08023E10(Entity*); void sub_08023E54(Entity*); diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c index 0c287bbc..79f24419 100644 --- a/src/enemy/smallPesto.c +++ b/src/enemy/smallPesto.c @@ -6,6 +6,7 @@ */ #include "enemy.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c index 94b2085a..6563b7bd 100644 --- a/src/enemy/spikedBeetle.c +++ b/src/enemy/spikedBeetle.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "player.h" #include "physics.h" +#include "asm.h" extern u32 sub_0804A024(Entity*, u32, u32); diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c index 8c8c3435..c6ffc5ab 100644 --- a/src/enemy/spinyChuchu.c +++ b/src/enemy/spinyChuchu.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "hitbox.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c index 22cee8ce..ab0b46a1 100644 --- a/src/enemy/stalfos.c +++ b/src/enemy/stalfos.c @@ -10,6 +10,7 @@ #include "tiles.h" #include "room.h" #include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c index eccb633c..59b71c7b 100644 --- a/src/enemy/tektite.c +++ b/src/enemy/tektite.c @@ -6,6 +6,7 @@ */ #include "collision.h" #include "enemy.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c index 4e0d8862..570cc67c 100644 --- a/src/enemy/tektiteGolden.c +++ b/src/enemy/tektiteGolden.c @@ -7,6 +7,7 @@ #include "collision.h" #include "enemy.h" #include "item.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/torchTrap.c b/src/enemy/torchTrap.c index 0e86c296..f2e4dd2d 100644 --- a/src/enemy/torchTrap.c +++ b/src/enemy/torchTrap.c @@ -10,6 +10,7 @@ #include "player.h" #include "room.h" #include "tiles.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c index c4b4e475..f2f4829b 100644 --- a/src/enemy/vaatiEyesMacro.c +++ b/src/enemy/vaatiEyesMacro.c @@ -9,6 +9,7 @@ #include "player.h" #include "physics.h" #include "manager.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c index 0cf4f604..6e34e868 100644 --- a/src/enemy/vaatiProjectile.c +++ b/src/enemy/vaatiProjectile.c @@ -9,6 +9,7 @@ #include "tiles.h" #include "player.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c index b4135fec..d8b0fac9 100644 --- a/src/enemy/vaatiRebornEnemy.c +++ b/src/enemy/vaatiRebornEnemy.c @@ -9,6 +9,7 @@ #include "physics.h" #include "room.h" #include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c index 3fe49ccb..7f398d4f 100644 --- a/src/enemy/vaatiWrathEye.c +++ b/src/enemy/vaatiWrathEye.c @@ -7,6 +7,7 @@ #include "enemy/vaatiWrath.h" #include "room.h" #include "physics.h" +#include "asm.h" void sub_080485D8(Entity*); void sub_080485FC(Entity*); diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c index c111c740..922eb611 100644 --- a/src/enemy/wallMaster.c +++ b/src/enemy/wallMaster.c @@ -8,6 +8,7 @@ #include "enemy.h" #include "player.h" #include "screenTransitions.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c index 02d982b7..aa8a6d74 100644 --- a/src/enemy/wallMaster2.c +++ b/src/enemy/wallMaster2.c @@ -9,6 +9,7 @@ #include "physics.h" #include "screenTransitions.h" #include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/wizzrobeFire.c b/src/enemy/wizzrobeFire.c index 1699f9a1..a9dfb2c2 100644 --- a/src/enemy/wizzrobeFire.c +++ b/src/enemy/wizzrobeFire.c @@ -7,6 +7,7 @@ #include "enemy/wizzrobe.h" #include "enemy.h" #include "player.h" +#include "asm.h" extern void (*const WizzrobeFire_Functions[])(WizzrobeEntity*); extern void (*const WizzrobeFire_Actions[])(WizzrobeEntity*); |