Merge pull request #619 from octorock/objects

assets/assets.json

@@ -22883,19 +22883,19 @@
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Thunderbold_0.bin",
+    "path": "animations/gSpriteAnimations_Thunderbolt_0.bin",
     "start": 1190252,
     "size": 16,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Thunderbold_1.bin",
+    "path": "animations/gSpriteAnimations_Thunderbolt_1.bin",
     "start": 1190268,
     "size": 12,
     "type": "animation"
   },
   {
-    "path": "animations/gSpriteAnimations_Thunderbold_2.bin",
+    "path": "animations/gSpriteAnimations_Thunderbolt_2.bin",
     "start": 1190280,
     "size": 28,
     "type": "animation"

data/animations/object/thunderbolt.s

@@ -0,0 +1,20 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gSpriteAnimations_Thunderbolt_0:: @ 0812296C
+	.include "animations/gSpriteAnimations_Thunderbolt_0.s"
+
+gSpriteAnimations_Thunderbolt_1:: @ 0812297C
+	.include "animations/gSpriteAnimations_Thunderbolt_1.s"
+
+gSpriteAnimations_Thunderbolt_2:: @ 08122988
+	.include "animations/gSpriteAnimations_Thunderbolt_2.s"
+
+gSpriteAnimations_Thunderbolt:: @ 081229A4
+	.4byte gSpriteAnimations_Thunderbolt_0
+	.4byte gSpriteAnimations_Thunderbolt_1
+	.4byte gSpriteAnimations_Thunderbolt_2
+	.4byte 00000000

data/gfx/sprite_ptrs.s

@@ -825,7 +825,7 @@ gSpritePtrs:: @ 080029B4
 	.4byte 00000000
 	.4byte 00000000
 
-	.4byte gSpriteAnimations_Thunderbold
+	.4byte gSpriteAnimations_Thunderbolt
 	.4byte 00000000
 	.4byte 00000000
 	.4byte 00000000

include/asm.h

@@ -19,7 +19,7 @@ extern void sub_08001290(struct Entity_*, u32);
 extern void GenericKnockback(struct Entity_*);
 extern u32 GetFuserId(struct Entity_*);
 extern u32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY);
-extern u32 GravityUpdate(struct Entity_*, u32);
+extern u32 GravityUpdate(struct Entity_* entity, u32 gravity);
 extern u32 CheckOnScreen(struct Entity_*);
 extern bool32 EntityInRectRadius(struct Entity_*, struct Entity_*, u32, u32);
 extern void UpdateAnimationVariableFrames(struct Entity_*, u32);

include/item.h

@@ -6,7 +6,6 @@
 #include "player.h"
 
 void CreateItemEntity(u32, u32, u32);
-void sub_08081404(Entity*, u32);
 extern void ExecuteItemFunction(ItemBehavior* this, u32 index);
 
 extern void ItemDebug(ItemBehavior*, u32);

include/object.h

@@ -134,7 +134,7 @@ typedef enum {
     EZLO_CAP_FLYING,
     GIANT_TWIG,
     OBJECT_63,
-    THUNDERBOLD,
+    THUNDERBOLT,
     LADDER_HOLE,
     WATER_DROP_OBJECT,
     GLEEROK_PARTICLE,
@@ -330,7 +330,7 @@ void SwordsmanNewsletter();
 void EzloCapFlying();
 void GiantTwig();
 void Object63();
-void Thunderbold();
+void Thunderbolt();
 void LadderHoleInBookshelf();
 void WaterDropObject();
 void GleerokParticle();

include/object/cutsceneOrchestrator.h

@@ -0,0 +1,12 @@
+#ifndef CUTSCENEORCHESTRATOR_H
+#define CUTSCENEORCHESTRATOR_H
+
+#include "script.h"
+
+typedef struct {
+    /*0x00*/ Entity base;
+    /*0x68*/ u8 unused1[28];
+    /*0x84*/ ScriptExecutionContext* context;
+} CutsceneOrchestratorEntity;
+
+#endif // CUTSCENEORCHESTRATOR_H

include/object/itemOnGround.h

@@ -0,0 +1,18 @@
+#ifndef ITEMONGROUND_H
+#define ITEMONGROUND_H
+
+#include "entity.h"
+
+typedef struct {
+    /*0x00*/ Entity base;
+    /*0x68*/ u8 unk_68;
+    /*0x69*/ u8 unk_69;
+    /*0x6a*/ u8 unk_6a;
+    /*0x6b*/ u8 unused1[1];
+    /*0x6c*/ u16 unk_6c;
+    /*0x6e*/ u16 unk_6e;
+    /*0x70*/ u8 unused2[22];
+    /*0x86*/ u16 unk_86;
+} ItemOnGroundEntity;
+
+#endif // ITEMONGROUND_H

include/object/lilypadLarge.h

@@ -0,0 +1,21 @@
+#ifndef LILYPADLARGE_H
+#define LILYPADLARGE_H
+
+#include "entity.h"
+
+typedef struct {
+    Entity base;
+    u8 unk_68[4];
+    s32 unk_6c;
+    s32 unk_70;
+    s16 unk_74;
+    s16 unk_76;
+    union SplitWord unk_78;
+    union SplitWord unk_7c;
+    u8 unk_80[2];
+    u16 unk_82;
+    u8 unk_84;
+    u8 unk_85;
+} LilypadLargeEntity;
+
+#endif // LILYPADLARGE_H

linker.ld

@@ -706,7 +706,7 @@ SECTIONS {
         src/object/ezloCapFlying.o(.text);
         src/object/giantTwig.o(.text);
         src/object/object63.o(.text);
-        src/object/thunderbold.o(.text);
+        src/object/thunderbolt.o(.text);
         src/object/ladderHoleInBookshelf.o(.text);
         src/object/waterDropObject.o(.text);
         src/object/gleerokParticle.o(.text);
@@ -1487,8 +1487,8 @@ SECTIONS {
         src/object/ezloCapFlying.o(.rodata);
         src/object/giantTwig.o(.rodata);
         src/object/object63.o(.rodata);
-        src/object/thunderbold.o(.rodata);
-        data/animations/object/thunderbold.o(.rodata);
+        src/object/thunderbolt.o(.rodata);
+        data/animations/object/thunderbolt.o(.rodata);
         src/object/ladderHoleInBookshelf.o(.rodata);
         src/object/gleerokParticle.o(.rodata);
         src/object/linkEmptyingBottle.o(.rodata);

src/manager/vaati3StartManager.c

@@ -71,7 +71,7 @@ void Vaati3StartManager_Type0_Action1(Vaati3StartManager* this) {
         super->timer = 120;
         SetPlayerControl(2);
         sub_08078B48();
-        object = CreateObject(THUNDERBOLD, 0, 0);
+        object = CreateObject(THUNDERBOLT, 0, 0);
         if (object != NULL) {
             object->x.HALF.HI = gRoomControls.origin_x + 0x88;
             object->y.HALF.HI = gRoomControls.origin_y + 0x48;

src/object.c

@@ -102,7 +102,7 @@ void (*const gObjectFunctions[])(Entity*) = {
     [EZLO_CAP_FLYING] = EzloCapFlying,
     [GIANT_TWIG] = GiantTwig,
     [OBJECT_63] = Object63,
-    [THUNDERBOLD] = Thunderbold,
+    [THUNDERBOLT] = Thunderbolt,
     [LADDER_HOLE] = LadderHoleInBookshelf,
     [WATER_DROP_OBJECT] = WaterDropObject,
     [GLEEROK_PARTICLE] = GleerokParticle,

src/object/ambientClouds.c

@@ -4,6 +4,7 @@
  *
  * @brief Ambient Clouds object
  */
+#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
@@ -27,8 +28,6 @@ void AmbientClouds(Entity* this) {
 }
 
 void AmbientClouds_Init(Entity* this) {
-    Entity* pEVar2;
-
 #ifndef EU
     if ((this->flags & ENT_DID_INIT) != 0) {
 #endif
@@ -44,10 +43,10 @@ void AmbientClouds_Init(Entity* this) {
                 this->parent = NULL;
                 CreateObjectWithParent(this, AMBIENT_CLOUDS, 0, 0xff);
                 for (; this->type != 0; --this->type) {
-                    pEVar2 = CreateObjectWithParent(this, AMBIENT_CLOUDS, 0, this->type);
-                    this->child = pEVar2;
-                    if (pEVar2 != NULL) {
-                        pEVar2->parent = this->parent;
+                    Entity* entity = CreateObjectWithParent(this, AMBIENT_CLOUDS, 0, this->type);
+                    this->child = entity;
+                    if (entity != NULL) {
+                        entity->parent = this->parent;
                         if (this->parent != NULL) {
                             this->parent->child = this->child;
                         }
@@ -77,9 +76,6 @@ void AmbientClouds_Init(Entity* this) {
 }
 
 void AmbientClouds_Action1(Entity* this) {
-    int iVar1;
-    Entity* pEVar2;
-
     if (this->type2 == 0xff) {
         this->spritePriority.b0 = 7;
         this->spriteRendering.b3 = 3;
@@ -92,8 +88,7 @@ void AmbientClouds_Action1(Entity* this) {
             else
                 this->timer = 0;
             this->y.HALF.HI += (this->type2 - 1) * -0x24;
-            iVar1 = EntityInRectRadius(this, &gPlayerEntity, 0xf, 0xf);
-            if ((iVar1 != 0) && (this->timer != 0)) {
+            if (EntityInRectRadius(this, &gPlayerEntity, 15, 15) && (this->timer != 0)) {
                 this->action = 2;
                 this->spriteOrientation.flipY = 2;
                 this->spriteRendering.b3 = 3;
@@ -105,21 +100,21 @@ void AmbientClouds_Action1(Entity* this) {
                 gPlayerEntity.z.HALF.HI += 0x24;
                 sub_0807AA80(&gPlayerEntity);
                 if (this->subtimer == 0) {
-                    pEVar2 = CreateFx(&gPlayerEntity, FX_DEATH, 0);
-                    if (pEVar2 != NULL) {
-                        pEVar2->x.HALF.HI += 8;
+                    Entity* fx = CreateFx(&gPlayerEntity, FX_DEATH, 0);
+                    if (fx != NULL) {
+                        fx->x.HALF.HI += 8;
                     }
-                    pEVar2 = CreateFx(&gPlayerEntity, FX_DEATH, 0);
-                    if (pEVar2 != NULL) {
-                        pEVar2->x.HALF.HI -= 8;
+                    fx = CreateFx(&gPlayerEntity, FX_DEATH, 0);
+                    if (fx != NULL) {
+                        fx->x.HALF.HI -= 8;
                     }
-                    pEVar2 = CreateFx(&gPlayerEntity, FX_DEATH, 0);
-                    if (pEVar2 != NULL) {
-                        pEVar2->y.HALF.HI += 8;
+                    fx = CreateFx(&gPlayerEntity, FX_DEATH, 0);
+                    if (fx != NULL) {
+                        fx->y.HALF.HI += 8;
                     }
-                    pEVar2 = CreateFx(&gPlayerEntity, FX_DEATH, 0);
-                    if (pEVar2 != NULL) {
-                        pEVar2->y.HALF.HI -= 8;
+                    fx = CreateFx(&gPlayerEntity, FX_DEATH, 0);
+                    if (fx != NULL) {
+                        fx->y.HALF.HI -= 8;
                     }
                 }
             }
@@ -131,7 +126,7 @@ void AmbientClouds_Action1(Entity* this) {
 
 void AmbientClouds_Action2(Entity* this) {
     this->y.HALF.HI += this->type2 * -0x24;
-    if (EntityInRectRadius(this, &gPlayerEntity, 0xf, 0xf)) {
+    if (EntityInRectRadius(this, &gPlayerEntity, 15, 15)) {
         gPlayerState.field_0x14 = 1;
         gPlayerState.flags |= PL_FLAGS2;
     } else {
@@ -144,7 +139,7 @@ void AmbientClouds_Action2(Entity* this) {
 }
 
 void AmbientClouds_Action3(Entity* this) {
-    if (EntityInRectRadius(this, &gPlayerEntity, 0xf, 0xf)) {
+    if (EntityInRectRadius(this, &gPlayerEntity, 15, 15)) {
         gPlayerState.field_0x14 = 1;
     }
 }

src/object/angryStatue.c

@@ -4,6 +4,7 @@
  *
  * @brief Angry Statue object
  */
+#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "hitbox.h"

src/object/archway.c

@@ -4,6 +4,7 @@
  *
  * @brief Archway object
  */
+#define NENT_DEPRECATED
 #include "entity.h"
 #include "game.h"