mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-09 18:58:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

dungeon stuff

Browse Source
This commit is contained in:
theo3
2021-12-27 18:19:47 -08:00
parent 24750a6bb5
commit dc8bcb32e0
26 changed files with 114 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/manager17.c
+2 -1
View File
@@ -1,6 +1,7 @@
#include "manager.h"
#include "flags.h"
#include "room.h"
#include "object.h"
typedef struct {
Manager manager;
@@ -32,7 +33,7 @@ void sub_0805AD60(Manager17* manager) {
void sub_0805AD80(Manager17* manager) {
if (CheckFlags(manager->field_0x3e) != 0) {
Entity* object = CreateObject(0, manager->manager.unk_0a, manager->manager.unk_0b);
Entity* object = CreateObject(GROUND_ITEM, manager->manager.unk_0a, manager->manager.unk_0b);
if (object != NULL) {
object->actionDelay = manager->field_0x35;
object->collisionLayer = manager->field_0x36;
src/manager/manager24.c
+2 -2
View File
@@ -178,7 +178,7 @@ void sub_0805C294(u32 pos, u32 layer) {
SetTileType(0xd7, pos + 0x41, layer);
if (layer == 1) {
if (CheckIsInteriorWithEnemies() != 0) {
object = CreateObject(0x4f, 0xe, 2);
object = CreateObject(ARCHWAY, 0xe, 2);
if (object != NULL) {
object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.roomOriginX;
object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 0x20 + gRoomControls.roomOriginY;
@@ -199,7 +199,7 @@ void sub_0805C294(u32 pos, u32 layer) {
if (CheckIsDungeon() == 0) {
return;
}
object = CreateObject(0x4f, sub_0805C608(), 8);
object = CreateObject(ARCHWAY, sub_0805C608(), 8);
if (object == NULL) {
return;
}
src/manager/managerF.c
+8 -6
View File
@@ -10,6 +10,8 @@
#include "script.h"
#include "utils.h"
#include "tiles.h"
#include "object.h"
#include "item.h"
void sub_08058ECC(ManagerF*);
@@ -125,7 +127,7 @@ void sub_08058F44(u32 unk0, u32 unk1, u32 unk2) {
void sub_08058F84(u32 unk0, u32 unk1) {
Entity* tmp;
tmp = CreateObject(0x21, 0, 0);
tmp = CreateObject(OBJECT_21, 0, 0);
if (!tmp)
return;
tmp->x.HALF.HI = gRoomControls.roomOriginX + unk0;
@@ -177,7 +179,7 @@ void sub_08058FB0(ManagerF* this) {
void sub_08059064(ManagerF* this) {
Entity* tmp;
tmp = CreateObject(0, 0x53, 0);
tmp = CreateObject(GROUND_ITEM, ITEM_SMALL_KEY, 0);
if (!tmp)
return;
tmp->actionDelay = 2;
@@ -324,9 +326,9 @@ void sub_080592EC(ManagerF* this) {
void sub_0805930C(ManagerF* this) {
Entity* tmp;
#ifdef EU
tmp = CreateObject(0xF, 0x43, 0x0);
tmp = CreateObject(SPECIAL_FX, FX_BIG_EXPLOSION2, 0x0);
#else
tmp = CreateObject(0xF, 0x43, 0x40);
tmp = CreateObject(SPECIAL_FX, FX_BIG_EXPLOSION2, 0x40);
#endif
if (!tmp)
return;
@@ -361,7 +363,7 @@ void sub_0805938C(ManagerF* this) {
u32 sub_080593CC(ManagerF* this) {
if (!(gPlayerState.flags & PL_MINISH) && gPlayerState.swimState != 0 && gPlayerEntity.animationState == 0 &&
(gPlayerState.field_0x90.HALF.LO & 0xF00) == 0x400) {
(gPlayerState.field_0x90 & 0xF00) == 0x400) {
return sub_0806FCB8(&gPlayerEntity, this->unk_38, this->unk_3a + 0xC, 6);
}
return 0;
@@ -374,7 +376,7 @@ void sub_08059424(ManagerF* this) {
}
if (!CheckFlags(this->unk_3c))
return;
tmp = CreateObject(0xF, 0x35, 0);
tmp = CreateObject(SPECIAL_FX, FX_BIG_EXPLOSION, 0);
if (!tmp)
return;
tmp->collisionLayer = 2;