summaryrefslogtreecommitdiff
path: root/include/player.h
diff options
context:
space:
mode:
authoroctorock <79596758+octorock@users.noreply.github.com>2024-01-06 14:59:48 +0100
committeroctorock <79596758+octorock@users.noreply.github.com>2024-01-06 15:01:44 +0100
commitaced0bef691dbc41bdd39b6e62662d2436877a4b (patch)
treee90f9fd8e4c4c3471c2fb246bb1372974294b469 /include/player.h
parentc3b771a20923b335bbea2ab97a68ac29d04fcc43 (diff)
Rename metaTiles
Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.
Diffstat (limited to 'include/player.h')
-rw-r--r--include/player.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/player.h b/include/player.h
index f0032b04..12970f65 100644
--- a/include/player.h
+++ b/include/player.h
@@ -516,7 +516,7 @@ typedef struct {
/*0x1e*/ u8 dash_state;
/*0x1f*/ u8 field_0x1f[2];
/*0x21*/ u8 bow_state;
- /*0x22*/ u16 tilePosition;
+ /*0x22*/ u16 tilePos;
/*0x24*/ u16 tileType;
/*0x26*/ u8 swim_state; /**< Is the player swimming? 0x80 for diving */
/*0x27*/ u8 field_0x27[5];
@@ -718,13 +718,13 @@ void sub_08078D60(void);
void PlayerSetNormalAndCollide(void);
bool32 PlayerTryDropObject(ItemBehavior* arg0, u32 unk);
void InitItemGetSequence(u32, u32, u32);
-void sub_0807B7D8(u32 metaTileType, u32 metaTilePos, u32 layer);
+void sub_0807B7D8(u32 tileType, u32 tilePos, u32 layer);
void SetInteractableObjectCollision(Entity*, u32, u32, const void*);
void sub_08079D84(void);
u32 sub_0807953C(void);
void sub_0807BB68(const s16*, u32, u32);
-void SetMetaTileByIndex(u32 tileIndex, u32 metaTilePos, u32 layer);
-void RestorePrevTileEntity(u32 metaTilePos, u32 layer);
+void SetTileByIndex(u32 tileIndex, u32 tilePos, u32 layer);
+void RestorePrevTileEntity(u32 tilePos, u32 layer);
void UpdateItemAnim(ItemBehavior*);
void PlayerCancelHoldItem(ItemBehavior*, u32);
void RegisterCarryEntity(Entity*);