diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-03-27 23:26:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 23:26:55 -0700 |
| commit | c86ada3e3d7b91f59b9a1b9dca32047898cfa2b2 (patch) | |
| tree | c7055ee8f78da580a3c578c59101294719577612 /src/object | |
| parent | ea34ee76f41dc31990d60f14173cd77ab1cb0fa6 (diff) | |
| parent | 2049e4654f911489129290154b250fac398a8516 (diff) | |
Merge pull request #471 from notyourav/player_fns
move function decls from player.c
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/gentariCurtains.c | 5 | ||||
| -rw-r--r-- | src/object/minecart.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/object/gentariCurtains.c b/src/object/gentariCurtains.c index eed470dc..e5b1d0eb 100644 --- a/src/object/gentariCurtains.c +++ b/src/object/gentariCurtains.c @@ -26,9 +26,6 @@ void sub_080921BC(GentariCurtainEntity* this); void sub_080921F0(GentariCurtainEntity* this); void sub_08092214(GentariCurtainEntity* this); -extern Entity gUnk_030011E8[7]; -extern Entity gCarryEntities; - void GentariCurtain(Entity* this) { static void (*const actionFuncs[])(GentariCurtainEntity*) = { sub_08092050, @@ -93,7 +90,7 @@ void sub_080921BC(GentariCurtainEntity* this) { GenericEntity* pEVar1; GenericEntity* end; - pEVar1 = (GenericEntity*)gUnk_030011E8; + pEVar1 = (GenericEntity*)gItemGetEntities; end = pEVar1 + 0x4f; do { diff --git a/src/object/minecart.c b/src/object/minecart.c index 2d0f95f7..581152c2 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -9,7 +9,6 @@ typedef struct { struct_030010EC* minecartData; } MinecartEntity; -extern u32 sub_08007DD6(u32, u32); extern void sub_08017744(Entity*); u32 sub_08091DDC(MinecartEntity*); @@ -22,7 +21,7 @@ void sub_08091C98(MinecartEntity*); void sub_08091CC8(MinecartEntity*); void sub_08091D90(MinecartEntity*); -extern const u32 gUnk_081223D8[]; +extern const u16* const gUnk_081223D8[]; void Minecart(Entity* this) { static void (*const actionFuncs[])(MinecartEntity*) = { |