diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2021-03-24 23:21:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 23:21:32 -0700 |
| commit | 167fe388b68802bdf17d4017bff8e60b76bf372c (patch) | |
| tree | 1a43b761934babcdf3eaa545c21cd009acda03a4 /include | |
| parent | c3536ca129dc2212bb051d2d2ca432649e36c2fc (diff) | |
| parent | 58445541d2621d30f44cb29743fe85635c4966a4 (diff) | |
Merge pull request #136 from octorock/pointers
Split constant data and animations
Diffstat (limited to 'include')
| -rw-r--r-- | include/item.h | 30 | ||||
| -rw-r--r-- | include/manager.h | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/include/item.h b/include/item.h index 0f9fd6f2..7c36eb15 100644 --- a/include/item.h +++ b/include/item.h @@ -5,21 +5,21 @@ #include "entity.h" #include "player.h" -extern void DebugItem(ItemBehavior*, u32); -extern void Sword(ItemBehavior*, u32); -extern void Bomb(ItemBehavior*, u32); -extern void Bow(ItemBehavior*, u32); -extern void sub_08075D14(ItemBehavior*, u32); -extern void Shield(ItemBehavior*, u32); -extern void Lantern(ItemBehavior*, u32); -extern void GustJar(ItemBehavior*, u32); -extern void PacciCane(ItemBehavior*, u32); -extern void MoleMitts(ItemBehavior*, u32); -extern void RocsCape(ItemBehavior*, u32); -extern void sub_08076800(ItemBehavior*, u32); -extern void Ocarina(ItemBehavior*, u32); -extern void TryPickupObject(ItemBehavior*, u32); -extern void JarEmpty(ItemBehavior*, u32); +extern void ItemDebug(ItemBehavior*, u32); +extern void ItemSword(ItemBehavior*, u32); +extern void ItemBomb(ItemBehavior*, u32); +extern void ItemBow(ItemBehavior*, u32); +extern void ItemBoomerang(ItemBehavior*, u32); +extern void ItemShield(ItemBehavior*, u32); +extern void ItemLantern(ItemBehavior*, u32); +extern void ItemGustJar(ItemBehavior*, u32); +extern void ItemPacciCane(ItemBehavior*, u32); +extern void ItemMoleMitts(ItemBehavior*, u32); +extern void ItemRocsCape(ItemBehavior*, u32); +extern void ItemPegasusBoots(ItemBehavior*, u32); +extern void ItemOcarina(ItemBehavior*, u32); +extern void ItemTryPickupObject(ItemBehavior*, u32); +extern void ItemJarEmpty(ItemBehavior*, u32); /* On hold until naming conflicts are resolved */ /* diff --git a/include/manager.h b/include/manager.h index d86f203c..66d2e202 100644 --- a/include/manager.h +++ b/include/manager.h @@ -122,7 +122,7 @@ extern struct { u8 unk_0b; } gUnk_03004030; -extern DiggingCaveEntrance* gUnk_08107DC0[]; +extern DiggingCaveEntrance* diggingCaveEntrances[]; typedef struct { u8 unk_00; |