cleanup asm.h

This commit is contained in:
Henny022p
2025-03-09 14:26:33 +00:00
parent 0d58d2c5d7
commit deacc6e95e
87 changed files with 96 additions and 10 deletions
-8
View File
@@ -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);
+3 -1
View File
@@ -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*);
+2
View File
@@ -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);
+3
View File
@@ -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