Decompile Object74

2 files changed, 156 insertions, 148 deletions

diff --git a/include/functions.h b/include/functions.h
index d895fef5..f6bc2bc4 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -64,6 +64,14 @@ extern bool32 ProcessMovementInternal(Entity*, s32, s32, u32);
 extern void SetDirtTile(u32);
 /** @see Item */
 extern void SetInventoryValue(u32, u32);
+/**
+ * @brief Sets multiple tiles at once
+ *
+ * @param tileData [u16 tileIndex, s16 positionOffset], ends with 0xffff
+ * @param basePosition the position the offsets in tileData are based on
+ * @param layer the tile layer
+ */
+extern void SetMultipleTiles(u16* tileData, u32 basePosition, u32 layer);
 extern void SoundReqClipped(Entity*, u32);
 extern void TryLoadPrologueHyruleTown(void);
 extern void UnloadGFXSlots(Entity*);
diff --git a/include/object.h b/include/object.h
index e7b66e3b..f6f7f5c5 100644
--- a/include/object.h
+++ b/include/object.h
@@ -226,198 +226,198 @@ typedef enum {
     OBJECT_C1,
 } Object;
 
-void ItemOnGround(Entity*);
-void DeathFx(Entity*);
+void ItemOnGround();
+void DeathFx();
 void ItemForSale();
-void Button(Entity*);
-void MinishEmoticon(Entity*);
-void Pot(Entity*);
+void Button();
+void MinishEmoticon();
+void Pot();
 void EzloCap();
 void BlockPushed();
-void LockedDoor(Entity*);
-void Object9(Entity*);
-void ObjectA(Entity*);
+void LockedDoor();
+void Object9();
+void ObjectA();
 void ObjectB();
 void ChestSpawner();
-void ObjectD(Entity*);
-void ObjectE(Entity*);
-void SpecialFx(Entity*);
-void Object10(Entity*);
+void ObjectD();
+void ObjectE();
+void SpecialFx();
+void Object10();
 void Object11();
-void Object12(Entity*);
-void Railtrack(Entity*);
+void Object12();
+void Railtrack();
 void LilypadLarge();
-void Object15(Entity*);
-void FloatingPlatform(Entity*);
-void Object17(Entity*);
-void EvilSpirit(Entity*);
-void HouseDoorExterior(Entity*);
-void Rupee(Entity*);
-void GreatFairy(Entity*);
-void Object1C(Entity*);
-void Object1D(Entity*);
-void Object1E(Entity*);
-void Object1F(Entity*);
-void Object20(Entity*);
+void Object15();
+void FloatingPlatform();
+void Object17();
+void EvilSpirit();
+void HouseDoorExterior();
+void Rupee();
+void GreatFairy();
+void Object1C();
+void Object1D();
+void Object1E();
+void Object1F();
+void Object20();
 void Object21();
 void FigurineDevice();
-void EyeSwitch(Entity*);
+void EyeSwitch();
 void PressurePlate();
-void BigBarrel(Entity*);
-void BarrelInside(Entity*);
+void BigBarrel();
+void BarrelInside();
 void PushableStatue();
-void Object28(Entity*);
-void AmbientClouds(Entity*);
-void Object2A(Entity*);
-void Object2B(Entity*);
+void Object28();
+void AmbientClouds();
+void Object2A();
+void Object2B();
 void Beanstalk();
-void Smoke(Entity*);
+void Smoke();
 void PushableRock();
 void HittableLever();
-void Object30(Entity*);
-void FrozenFlower(Entity*);
+void Object30();
+void FrozenFlower();
 void PullableMushroom();
-void Bollard(Entity*);
-void WarpPoint(Entity*);
+void Bollard();
+void WarpPoint();
 void Object35();
-void Object36(Entity*);
-void Object37(Entity*);
-void JarPortal(Entity*);
+void Object36();
+void Object37();
+void JarPortal();
 void BossDoor();
 void Object3A();
-void MacroMushromStalks(Entity*);
-void MacroPlayer(Entity*);
-void Object3D(Entity*);
+void MacroMushromStalks();
+void MacroPlayer();
+void Object3D();
 void Object3E();
-void GiantLeaf(Entity*);
+void GiantLeaf();
 void Fairy();
-void LadderUp(Entity*);
-void Object42(Entity*);
+void LadderUp();
+void Object42();
 void Object43();
-void Object44(Entity*);
-void Object45(Entity*);
-void GiantBookLadder(Entity*);
-void HeartContainer(Entity*);
-void FileScreenObjects(Entity*);
-void Object49(Entity*);
-void BackgroundCloud(Entity*);
-void Object4B(Entity*);
+void Object44();
+void Object45();
+void GiantBookLadder();
+void HeartContainer();
+void FileScreenObjects();
+void Object49();
+void BackgroundCloud();
+void Object4B();
 void PushableFurniture();
-void Furniture(Entity*);
-void MinishSizedEntrance(Entity*);
-void Archway(Entity*);
-void GiantRock(Entity*);
-void GiantRock2(Entity*);
-void Object52(Entity*);
-void Object53(Entity*);
+void Furniture();
+void MinishSizedEntrance();
+void Archway();
+void GiantRock();
+void GiantRock2();
+void Object52();
+void Object53();
 void PullableLever();
-void Minecart(Entity*);
-void ThoughtBubble(Entity*);
-void HiddenLadderDown(Entity*);
-void GentariCurtain(Entity*);
+void Minecart();
+void ThoughtBubble();
+void HiddenLadderDown();
+void GentariCurtain();
 void LavaPlatform();
-void Paper(Entity*);
-void Object5B(Entity*);
-void Mask(Entity*);
-void HouseDoorInterior(Entity*);
-void Whirlwind(Entity*);
-void ObjectBlockingStairs(Entity*);
-void SwordsmanNewsletter(Entity*);
+void Paper();
+void Object5B();
+void Mask();
+void HouseDoorInterior();
+void Whirlwind();
+void ObjectBlockingStairs();
+void SwordsmanNewsletter();
 void Object61();
 void GiantTwig();
-void Object63(Entity*);
-void Object64(Entity*);
-void LadderHoleInBookshelf(Entity*);
-void Object66(Entity*);
-void Object67(Entity*);
+void Object63();
+void Object64();
+void LadderHoleInBookshelf();
+void Object66();
+void Object67();
 void Object68();
-void Object69(Entity*);
-void Object6A(Entity*);
+void Object69();
+void Object6A();
 void CrenelBeanSprout();
 void MinecartDoor();
 void ObjectOnPillar();
-void MineralWaterSource(Entity*);
-void MinishSizedArchway(Entity*);
-void Object70(Entity*);
+void MineralWaterSource();
+void MinishSizedArchway();
+void Object70();
 void PushableGrave();
-void StoneTablet(Entity*);
-void LilypadSmall(Entity*);
-void Object74(Entity*);
-void Object75(Entity*);
-void Object76(Entity*);
-void Bell(Entity*);
-void MacroDecoration(Entity*);
-void Object79(Entity*);
-void Steam(Entity*);
+void StoneTablet();
+void LilypadSmall();
+void Object74();
+void Object75();
+void Object76();
+void Bell();
+void MacroDecoration();
+void Object79();
+void Steam();
 void PushableLever();
-void MacroShoes(Entity*);
+void MacroShoes();
 void ObjectOnSpinyBeetle();
-void Object7E(Entity*);
-void PicoBloom(Entity*);
-void Board(Entity*);
-void Object81(Entity*);
-void BigVortex(Entity*);
+void Object7E();
+void PicoBloom();
+void Board();
+void Object81();
+void BigVortex();
 void BigPushableLever();
 void SmallIceBlock();
 void BigIceBlock();
-void Object86(Entity*);
-void OctorokBossObject(Entity*);
-void MacroBook(Entity*);
-void MazaalBossObject(Entity*);
-void CabinFurniture(Entity*);
+void Object86();
+void OctorokBossObject();
+void MacroBook();
+void MazaalBossObject();
+void CabinFurniture();
 void DoubleBookshelf();
-void Book(Entity*);
-void Fireplace(Entity*);
+void Book();
+void Fireplace();
 void Object8E();
 void FrozenWaterElement();
-void Object90(Entity*);
+void Object90();
 void FrozenOctorok();
-void BakerOven(Entity*);
-void Lamp(Entity*);
-void WindTribeFlag(Entity*);
-void Bird(Entity*);
-void Object96(Entity*);
+void BakerOven();
+void Lamp();
+void WindTribeFlag();
+void Bird();
+void Object96();
 void KeyStealingTakkuri();
-void Object98(Entity*);
-void Object99(Entity*);
-void MacroAcorn(Entity*);
-void Object9B(Entity*);
-void TreeHidingPortal(Entity*);
-void LightableSwitch(Entity*);
-void TreeThorns(Entity*);
-void Fan(Entity*);
-void AngryStatue(Entity*);
-void PalaceArchway(Entity*);
-void ObjectA2(Entity*);
-void Cloud(Entity*);
-void MinishLight(Entity*);
-void FireballChain(Entity*);
-void ObjectA6(Entity*);
-void ObjectA7(Entity*);
+void Object98();
+void Object99();
+void MacroAcorn();
+void Object9B();
+void TreeHidingPortal();
+void LightableSwitch();
+void TreeThorns();
+void Fan();
+void AngryStatue();
+void PalaceArchway();
+void ObjectA2();
+void Cloud();
+void MinishLight();
+void FireballChain();
+void ObjectA6();
+void ObjectA7();
 void ObjectA8();
-void ObjectA9(Entity*);
-void WaterfallOpening(Entity*);
-void ObjectAB(Entity*);
+void ObjectA9();
+void WaterfallOpening();
+void ObjectAB();
 void FourElements();
-void ObjectAD(Entity*);
-void FloatingBlock(Entity*);
-void ObjectAF(Entity*);
-void MetalDoor(Entity*);
-void JailBars(Entity*);
-void ObjectB2(Entity*);
-void ObjectB3(Entity*);
-void ObjectB4(Entity*);
-void ObjectB5(Entity*);
-void ObjectB6(Entity*);
-void Well(Entity*);
+void ObjectAD();
+void FloatingBlock();
+void ObjectAF();
+void MetalDoor();
+void JailBars();
+void ObjectB2();
+void ObjectB3();
+void ObjectB4();
+void ObjectB5();
+void ObjectB6();
+void Well();
 void WindTribeTeleporter();
-void ObjectB9(Entity*);
-void GyorgBossObject(Entity*);
-void Windcrest(Entity*);
-void LitArea(Entity*);
-void ObjectBD(Entity*);
-void Pinwheel(Entity*);
-void ObjectBF(Entity*);
+void ObjectB9();
+void GyorgBossObject();
+void Windcrest();
+void LitArea();
+void ObjectBD();
+void Pinwheel();
+void ObjectBF();
 void EnemyItem();
 void ObjectC1();