use object enum in object creation

This commit is contained in:
Henny022p
2021-05-02 02:27:18 +02:00
parent 0cfa5a9a06
commit f477e63fa4
36 changed files with 98 additions and 65 deletions
+3 -2
View File
@@ -4,6 +4,7 @@
#include "save.h"
#include "script.h"
#include "audio.h"
#include "object.h"
#include "functions.h"
extern Hitbox gUnk_080FD170;
@@ -200,12 +201,12 @@ void sub_0806DB44(Entity* this, ScriptExecutionContext* context) {
void sub_0806DB84(Entity* this, ScriptExecutionContext* context) {
Entity* ent;
this->hitbox = (Hitbox*)&gUnk_08114154;
ent = CreateObject(0x3e, 4, 0);
ent = CreateObject(OBJECT_3E, 4, 0);
if (ent != NULL) {
PositionRelative(this, ent, -0x80000, 0);
*(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_08016030);
}
ent = CreateObject(0x3e, 5, 0);
ent = CreateObject(OBJECT_3E, 5, 0);
if (ent != NULL) {
PositionRelative(this, ent, 0x80000, 0);
*(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_0801606C);
+3 -2
View File
@@ -1,10 +1,11 @@
#include "global.h"
#include "audio.h"
#include "entity.h"
#include "functions.h"
#include "room.h"
#include "flags.h"
#include "script.h"
#include "object.h"
#include "functions.h"
typedef struct {
u8 filler[4];
@@ -31,7 +32,7 @@ void sub_0806C224(void) {
}
void Simon_CreateChest(Entity* this) {
CreateObjectWithParent(this, 0xf, 0x43, 0);
CreateObjectWithParent(this, SPECIAL_FX, 0x43, 0);
SetTileType(0x73, COORD_TO_TILE(this), this->collisionLayer);
SoundReq(SFX_SECRET_BIG);
}
+1 -1
View File
@@ -46,7 +46,7 @@ void sub_0806A26C(Entity* this) {
u8 unk;
u32 uVar2;
Entity* pEVar1;
pEVar1 = CreateObject(0xf, 0x2f, 0);
pEVar1 = CreateObject(SPECIAL_FX, 0x2f, 0);
if (pEVar1 != NULL) {
PositionEntityOnTop(this, pEVar1);
if (uVar2 = Random(), uVar2) {