cleanup asm.h

include/asm.h

@@ -12,9 +12,6 @@ extern void SetTile(u32 tileIndex, u32 tilePos, u32 layer);
 extern void UpdateScrollVram(void);
 extern u32 sub_080B1BA4(u32, u32, u32);
 extern void LoadResourceAsync(const void* src, void* dest, u32 size);
-extern void GenericConfused(struct Entity_*);
-extern void sub_08001290(struct Entity_*, u32);
-extern void GenericKnockback(struct Entity_*);
 extern u32 GetFuserId(struct Entity_*);
 #define GetFuserIdAndFuserTextId(ent) ((union SplitDWord)(*(MultiReturnTypeSingleEntityArg)(&GetFuserId))(ent))
 extern u32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY);
@@ -39,12 +36,9 @@ extern void sub_08004596(struct Entity_*, u32);
 extern u32 sub_080045B4(struct Entity_*, u32, u32);
 extern u32 CalculateDirectionTo(u32, u32, u32, u32);
 extern u32 CalculateDirectionFromOffsets(s32, s32);
-extern u32 sub_080086B4(u32, u32, const u8*);
-extern u32 ResolveCollisionLayer(struct Entity_*);
 extern void sub_0800417E(struct Entity_*, u32);
 extern u32 sub_0800442E(struct Entity_*);
 extern void SoundReqClipped(struct Entity_*, u32);
-extern u32 sub_0800132C(struct Entity_*, struct Entity_*);
 
 extern u32 sub_0800445C(struct Entity_*);
 extern u32 CheckRectOnScreen(s32, s32, u32, u32);
@@ -108,8 +102,6 @@ extern u32 FindValueForKey(u32 key, const KeyValuePair* keyValuePairList);
 
 extern u32 GetTileIndex(u32 tilePos, u32 layer);
 extern void LinearMoveDirectionOLD(struct Entity_*, u32, u32);
-extern u16* DoTileInteraction(struct Entity_*, u32, u32, u32);
-extern void UpdateCollisionLayer(struct Entity_*);
 extern void sub_080028E0(struct Entity_*);
 extern void SnapToTile(struct Entity_*);
 extern u32 sub_0800419C(struct Entity_*, struct Entity_*, u32, u32);

include/enemy.h

@@ -2,7 +2,6 @@
 #define ENEMY_H
 
 #include "global.h"
-#include "asm.h"
 
 #include "sound.h"
 #include "effects.h"
@@ -76,8 +75,11 @@ bool32 sub_08049F1C(Entity*, Entity*, s32);
 bool32 PlayerInRange(Entity*, u32, s32);
 void EnemyCopyParams(Entity*, Entity*);
 void GenericKnockback2(Entity*);
+extern void GenericConfused(struct Entity_*);
 
 extern void sub_08001318(Entity*);
+extern void sub_08001290(Entity*, u32);
+extern u32 sub_0800132C(struct Entity_*, struct Entity_*);
 
 extern void StealRupees(Entity*);
 extern void EnemyDisableRespawn(Enemy*);

include/player.h

@@ -831,6 +831,8 @@ extern void sub_08008926(Entity*);
 extern void sub_08008AC6(Entity*);
 extern void sub_08008AA0(Entity*);
 extern void sub_080085B0(Entity*);
+extern u32 sub_080086B4(u32, u32, const u8*);
+extern u16* DoTileInteraction(struct Entity_*, u32, u32, u32);
 
 // zelda.c
 void SetZeldaFollowTarget(Entity* target);

include/script.h

@@ -64,4 +64,7 @@ void ExecuteScriptAndHandleAnimation(Entity* entity, void (*postScriptCallback)(
 ScriptExecutionContext* CreateScriptExecutionContext(void);
 void InitScriptForEntity(Entity* entity, ScriptExecutionContext* context, Script* script);
 
+extern u32 ResolveCollisionLayer(struct Entity_*);
+extern void UpdateCollisionLayer(struct Entity_*);
+
 #endif // SCRIPT_H

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;

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;

src/enemy/ballChainSoldier.c

@@ -8,6 +8,7 @@
 #include "entity.h"
 #include "room.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;

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;

src/enemy/bowMoblin.c

@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;

src/enemy/businessScrubPrologue.c

@@ -11,6 +11,7 @@
 #include "physics.h"
 #include "room.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;

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;

src/enemy/crow.c

@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;

src/enemy/cuccoAggr.c

@@ -9,6 +9,7 @@
 #include "room.h"
 #include "player.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;

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*);

src/enemy/darkNut.c

@@ -5,6 +5,7 @@
  * @brief Dark Nut enemy
  */
 #include "enemy.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

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;

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;

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;

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 {

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;

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;

src/enemy/flyingPot.c

@@ -10,6 +10,7 @@
 #include "player.h"
 #include "room.h"
 #include "tiles.h"
+#include "asm.h"
 
 extern Hitbox gUnk_080FD34C;
 

src/enemy/flyingSkull.c

@@ -13,6 +13,7 @@
 #include "tiles.h"
 #include "room.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;

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;

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*);

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);

src/enemy/keaton.c

@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

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;

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;

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;

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"

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;

src/enemy/miniFireballGuy.c

@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

src/enemy/miniSlime.c

@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

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;

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;

src/enemy/mulldozer.c

@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

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*);

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*);

src/enemy/peahat.c

@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 #include "room.h"
 
 typedef struct {

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;

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;

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;

src/enemy/scissorsBeetle.c

@@ -7,6 +7,7 @@
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;

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;

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*);

src/enemy/smallPesto.c

@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

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);
 

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;

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;

src/enemy/tektite.c

@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

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;

src/enemy/torchTrap.c

@@ -10,6 +10,7 @@
 #include "player.h"
 #include "room.h"
 #include "tiles.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;

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;

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;

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;

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*);

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;

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;

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*);

src/manager/angryStatueManager.c

@@ -7,7 +7,7 @@
 #include "manager/angryStatueManager.h"
 #include "flags.h"
 #include "object.h"
-#include "asm.h"
+#include "script.h"
 
 #include "sound.h"
 #include "room.h"

src/manager/minishSizedEntranceManager.c

@@ -9,6 +9,7 @@
 #include "object.h"
 #include "flags.h"
 #include "room.h"
+#include "script.h"
 #include "asm.h"
 
 typedef struct {

src/manager/templeOfDropletsManager.c

@@ -16,6 +16,7 @@
 #include "game.h"
 #include "vram.h"
 #include "pauseMenu.h"
+#include "asm.h"
 
 static const u16 gUnk_081085B8[] = { 0x1008, 0x1007, 0x1006, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009,
                                      0x1008, 0x1007, 0x1006, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009 };

src/npc/cat.c

@@ -11,6 +11,7 @@
 #include "save.h"
 #include "physics.h"
 #include "manager.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

src/object/ambientClouds.c

@@ -9,6 +9,7 @@
 #include "entity.h"
 #include "object.h"
 #include "player.h"
+#include "script.h"
 
 void AmbientClouds_Init(Entity* this);
 void AmbientClouds_Action1(Entity* this);

src/object/chestSpawner.c

@@ -13,6 +13,7 @@
 #include "room.h"
 #include "player.h"
 #include "screen.h"
+#include "script.h"
 #include "tiles.h"
 #include "manager/lightManager.h"
 #include "pauseMenu.h"

src/object/itemOnGround.c

@@ -17,6 +17,7 @@
 #include "room.h"
 #include "physics.h"
 #include "player.h"
+#include "script.h"
 #include "sound.h"
 #include "tiles.h"
 

src/object/pot.c

@@ -15,6 +15,7 @@
 #include "object/itemOnGround.h"
 #include "player.h"
 #include "room.h"
+#include "script.h"
 #include "sound.h"
 #include "tiles.h"
 

src/object/smokeParticle.c

@@ -8,6 +8,8 @@
 #include "object.h"
 #include "asm.h"
 #include "sound.h"
+#include "script.h"
+#include "player.h"
 #include "room.h"
 #include "tiles.h"
 

src/object/specialFx.c

@@ -7,6 +7,7 @@
 #include "entity.h"
 #include "object.h"
 #include "asm.h"
+#include "script.h"
 #include "sound.h"
 #include "effects.h"
 #include "room.h"

src/object/steam.c

@@ -8,6 +8,7 @@
 #include "entity.h"
 #include "player.h"
 #include "room.h"
+#include "script.h"
 #include "screen.h"
 
 const u8 gUnk_08123484[];

src/object/thunderbolt.c

@@ -6,6 +6,7 @@
  */
 #include "object.h"
 #include "asm.h"
+#include "script.h"
 #include "sound.h"
 #include "physics.h"
 #include "player.h"

src/projectile/boneProjectile.c

@@ -8,6 +8,8 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
+#include "asm.h"
 
 extern void (*const BoneProjectile_Functions[])(Entity*);
 extern void (*const BoneProjectile_Actions[])(Entity*);

src/projectile/cannonballProjectile.c

@@ -8,6 +8,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "asm.h"
 
 extern void (*const CannonballProjectile_Functions[])(Entity*);
 extern void (*const CannonballProjectile_Actions[])(Entity*);

src/projectile/dekuSeedProjectile.c

@@ -8,6 +8,8 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
+#include "asm.h"
 
 extern void (*const DekuSeedProjectile_Functions[])(Entity*);
 extern void (*const DekuSeedProjectile_Actions[])(Entity*);

src/projectile/dirtBallProjectile.c

@@ -9,6 +9,7 @@
 #include "physics.h"
 #include "player.h"
 #include "sound.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

src/projectile/fireProjectile.c

@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
 
 extern void (*const FireProjectile_Actions[])(Entity*);
 

src/projectile/gleerokProjectile.c

@@ -9,6 +9,7 @@
 #include "player.h"
 #include "room.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

src/projectile/iceProjectile.c

@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
 
 extern void (*const IceProjectile_Actions[])(Entity*);
 

src/projectile/mandiblesProjectile.c

@@ -11,6 +11,7 @@
 #include "physics.h"
 #include "tiles.h"
 #include "player.h"
+#include "asm.h"
 #ifndef EU
 #include "game.h"
 #endif

src/projectile/octorokBossProjectile.c

@@ -10,6 +10,7 @@
 #include "physics.h"
 #include "projectile.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

src/projectile/rockProjectile.c

@@ -7,6 +7,8 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
+#include "asm.h"
 
 extern void (*const RockProjectile_Functions[])(Entity*);
 extern void (*const RockProjectile_Actions[])(Entity*);

src/projectile/stalfosProjectile.c

@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "asm.h"
 
 extern void (*const StalfosProjectile_Functions[])(Entity*);
 extern void (*const StalfosProjectile_Actions[])(Entity*);

src/projectile/v1DarkMagicProjectile.c

@@ -8,6 +8,7 @@
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

src/projectile/v1FireProjectile.c

@@ -9,6 +9,7 @@
 #include "player.h"
 #include "room.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

src/projectile/v3ElectricProjectile.c

@@ -9,6 +9,7 @@
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;

src/projectile/windProjectile.c

@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
 
 extern void (*const WindProjectile_Actions[])(Entity*);