diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-22 11:35:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-22 11:35:36 -0800 |
| commit | 85aaada18f7eace3284937c4da8db05f047d316b (patch) | |
| tree | b9aa9840d57e5d3bd889e29a86163d3387b5aec5 /include | |
| parent | 93e745e9638bb4f48e27908eebe2bb4eb349812e (diff) | |
| parent | 737302d9d1808e5a1def42725e27cef99d0196b2 (diff) | |
Merge pull request #310 from notyourav/pressurePlate
pressure plate ok
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/object.h | 2 | ||||
| -rw-r--r-- | include/player.h | 1 | ||||
| -rw-r--r-- | include/sound.h | 4 | ||||
| -rw-r--r-- | include/sprite.h | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/include/functions.h b/include/functions.h index c301b841..22079a02 100644 --- a/include/functions.h +++ b/include/functions.h @@ -86,7 +86,7 @@ extern u32 sub_080002B8(Entity*); extern u32 sub_08049F84(Entity*, u32); extern u32 sub_0800419C(Entity*, Entity*, u32, u32); extern void sub_08004542(Entity*); -extern u32 sub_08017850(Entity*); +extern u32 IsCollidingPlayer(Entity*); extern void sub_080809D4(void); extern void sub_08080CB4(Entity*); extern void sub_0807B7D8(u32, u32, u32); diff --git a/include/object.h b/include/object.h index fa41a123..53338ef3 100644 --- a/include/object.h +++ b/include/object.h @@ -262,7 +262,7 @@ void Object20(Entity*); void Object21(Entity*); void FigurineDevice(Entity*); void EyeSwitch(Entity*); -void PressurePlate(Entity*); +void PressurePlate(); void BigBarrel(Entity*); void BarrelInside(Entity*); void PushableStatue(Entity*); diff --git a/include/player.h b/include/player.h index 09483161..b0658c39 100644 --- a/include/player.h +++ b/include/player.h @@ -278,6 +278,7 @@ extern void (*const gPlayerItemFunctions[])(Entity*); extern u8 gBombBagSizes[]; extern u8 gQuiverSizes[]; extern u16 gWalletSizes[]; +extern Entity* gPlayerClones[]; extern PlayerState gPlayerState; extern Entity gPlayerEntity; diff --git a/include/sound.h b/include/sound.h index 8549510f..58462600 100644 --- a/include/sound.h +++ b/include/sound.h @@ -299,7 +299,7 @@ typedef enum { SFX_109, SFX_10A, SFX_10B, - SFX_10C, + SFX_BUTTON_PRESS, SFX_10D, SFX_10E, SFX_10F, @@ -394,7 +394,7 @@ typedef enum { SFX_168, SFX_169, SFX_16A, - SFX_16B, + SFX_PRESSURE_PLATE, SFX_16C, SFX_16D, SFX_16E, diff --git a/include/sprite.h b/include/sprite.h index bb2445b1..7539891f 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -22,7 +22,7 @@ typedef struct { u8 endOfAnimation : 1; } PACKED b; } PACKED frameSettings; -} Frame; +} PACKED Frame; typedef struct { u8 numGfxTiles; |