diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-03-27 21:34:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 21:34:36 -0700 |
| commit | 190bc2162420c38ba6eda647ff39f029ec2173bb (patch) | |
| tree | cda1fed81673c172626e6652ce7e3ac361a25185 /include | |
| parent | ad03bc5f25e69471022628d765abc31a3dec11df (diff) | |
| parent | a6e70132dc229d4c668692b205edff1bc5470ff3 (diff) | |
Merge pull request #469 from notyourav/hw
player asm stuff
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.h | 2 | ||||
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rw-r--r-- | include/player.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/asm.h b/include/asm.h index dda4b380..a2c28581 100644 --- a/include/asm.h +++ b/include/asm.h @@ -4,7 +4,7 @@ #include "global.h" extern u32 Random(void); -extern void sub_08000152(u32, u32, u32); +extern void CloneTile(u32, u32, u32); extern u32 GetTileTypeByEntity(struct Entity_*); extern u32 GetTileTypeByPos(s32 x, s32 y, u32 layer); extern u32 GetTileType(u32 position, u32 layer); diff --git a/include/functions.h b/include/functions.h index ce06665c..64e15113 100644 --- a/include/functions.h +++ b/include/functions.h @@ -84,7 +84,7 @@ extern void UpdatePlayerMovement(void); extern void sub_08000148(u32, u32, u32); extern u32 sub_080B1A0C(Entity*, s32, s32); extern u32 sub_080B1A48(u32, u32, u32); -extern u32 sub_080B1A8C(Entity*, u32, u32); +extern u32 GetRelativeCollisionTile(Entity*, u32, u32); extern u32 GetTileUnderEntity(Entity*); extern u32 sub_080B1AE0(u16, u8); extern u32 sub_080B1AF0(Entity*, s32, s32); @@ -228,7 +228,7 @@ extern u32 sub_0807B014(); extern void sub_0807B0C8(void); extern void sub_0807B7D8(u32, u32, u32); extern void sub_0807B9B8(u32, u32, u32); -extern void sub_0807BA8C(u32, u32); +extern void RestorePrevTileEntity(u32, u32); extern void sub_0807BB68(s16*, u32, u32); extern bool32 sub_0807BD14(Entity*, u32); extern bool32 sub_080806BC(u32, u32, u32, u32); diff --git a/include/player.h b/include/player.h index 0776c0a5..1ec25ed8 100644 --- a/include/player.h +++ b/include/player.h @@ -341,7 +341,7 @@ void DeleteClones(void); void sub_08077728(); extern void sub_08077B20(); -extern u32 sub_08008B22(); +extern u32 PlayerCheckNEastTile(); extern u32* sub_08008790(Entity*, u32); extern void sub_08079E58(s32 speed, u32 direction); |