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

Merge branch 'master' into enemies

Browse Source
This commit is contained in:
octorock
2023-12-30 22:18:38 +01:00
parent a818f1b704 3c0c1ba5a0
commit 917ca10ba5
28 changed files with 843 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/itemOnGround.c
+1 -1
View File
@@ -95,7 +95,7 @@ void ItemOnGround(ItemOnGroundEntity* this) {
}
if (super->type == 0x5C) {
gRoomVars.field_0x4++;
gRoomVars.numKinstoneDrops++;
}
sub_08080CB4(super);
src/object/pressurePlate.c
+1 -1
View File
@@ -104,7 +104,7 @@ static u32 sub_08088938(PressurePlateEntity* this) {
x = super->x.HALF.HI - 8;
y = super->y.HALF.HI - 8;
for (i = 0; i < 8; ++i) {
Entity* e = gRoomVars.entities[i];
Entity* e = gRoomVars.puzzleEntities[i];
if (e != NULL) {
if ((u16)(e->x.HALF.HI - x) < 0x11 && ((u16)(e->y.HALF_U.HI - y) < 0x11)) {
e->spriteOffsetY = sSpriteOffsets[this->dir];
src/object/pushableStatue.c
+4 -4
View File
@@ -172,8 +172,8 @@ void sub_08089454(PushableStatueEntity* this) {
void sub_080894C8(PushableStatueEntity* this) {
u32 index;
for (index = 0; index < 8; index++) {
if (gRoomVars.entities[index] == NULL) {
gRoomVars.entities[index] = super;
if (gRoomVars.puzzleEntities[index] == NULL) {
gRoomVars.puzzleEntities[index] = super;
break;
}
}
@@ -182,8 +182,8 @@ void sub_080894C8(PushableStatueEntity* this) {
void sub_080894FC(PushableStatueEntity* this) {
u32 index;
for (index = 0; index <= 7; index++) {
if (super == gRoomVars.entities[index]) {
gRoomVars.entities[index] = NULL;
if (super == gRoomVars.puzzleEntities[index]) {
gRoomVars.puzzleEntities[index] = NULL;
break;
}
}