diff options
| author | Henny022p <info@henny022.de> | 2023-07-05 00:57:06 +0200 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2023-07-05 00:57:06 +0200 |
| commit | 70675cedc19d75420adb9d7458651d3b3c64f8e6 (patch) | |
| tree | cacbab88e62cc005639535e5b22915d424ba7523 /src/object | |
| parent | 9b907d121df5616b7e538c7847fd5037926a7456 (diff) | |
format
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/chestSpawner.c | 2 | ||||
| -rw-r--r-- | src/object/graveyardKey.c | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c index 9105681a..96702b71 100644 --- a/src/object/chestSpawner.c +++ b/src/object/chestSpawner.c @@ -178,7 +178,7 @@ void ChestSpawner_Type2Action4(ChestSpawnerEntity* this) { } void sub_08084074(u32 flag) { - TileEntity* tileEntity = (TileEntity *)GetCurrentRoomProperty(3); + TileEntity* tileEntity = (TileEntity*)GetCurrentRoomProperty(3); if (tileEntity != NULL) { for (; tileEntity->type != 0; tileEntity++) { if ((tileEntity->type == BIG_CHEST) && (flag == tileEntity->localFlag)) { diff --git a/src/object/graveyardKey.c b/src/object/graveyardKey.c index b9e142be..3a4d664c 100644 --- a/src/object/graveyardKey.c +++ b/src/object/graveyardKey.c @@ -45,8 +45,8 @@ void GraveyardKey_Action2(Entity*, const struct_gUnk_08123FB0*); void GraveyardKey_Action3(Entity*, const struct_gUnk_08123FB0*); static const struct_gUnk_08123FB0 gUnk_08123FB0[] = { - { sub_0809D91C, sub_0809D93C, 0, 0, 0x30, 0x30, 0x1, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x13, Q_16_16(1.0), 0x1800, 0x60, 0x40, 0x4021, - 0x1, 0x0 }, + { sub_0809D91C, sub_0809D93C, 0, 0, 0x30, 0x30, 0x1, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x13, + Q_16_16(1.0), 0x1800, 0x60, 0x40, 0x4021, 0x1, 0x0 }, { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_HEART_PIECE, ITEM_HEART_PIECE, 0x10, 0, 0x1800, 0, 0x18, #if defined(JP) || defined(DEMO_JP) || defined(EU) 0xCD, @@ -54,11 +54,16 @@ static const struct_gUnk_08123FB0 gUnk_08123FB0[] = { 0xd0, #endif 0, 0 }, - { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0xf, Q_16_16(1.0), 0x1800, 0x60, 0x40, 0x4021, 0x1, 0x0 }, - { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x2, Q_16_16(1.0), 0x1800, 0x140, 0x40, 0x4021, 0x1, 0x0 }, - { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0xd, Q_16_16(1.0), 0x1800, 0x60, 0x40, 0x4021, 0x1, 0x0 }, - { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x1a, Q_16_16(1.0), 0x1800, 0x100, 0x40, 0x4021, 0x1, 0x0 }, - { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x13, Q_16_16(1.0), 0x1800, 0x60, 0x40, 0x4021, 0x1, 0x0 }, + { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0xf, Q_16_16(1.0), 0x1800, + 0x60, 0x40, 0x4021, 0x1, 0x0 }, + { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x2, Q_16_16(1.0), 0x1800, + 0x140, 0x40, 0x4021, 0x1, 0x0 }, + { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0xd, Q_16_16(1.0), 0x1800, + 0x60, 0x40, 0x4021, 0x1, 0x0 }, + { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x1a, Q_16_16(1.0), 0x1800, + 0x100, 0x40, 0x4021, 0x1, 0x0 }, + { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x13, Q_16_16(1.0), 0x1800, + 0x60, 0x40, 0x4021, 0x1, 0x0 }, { NULL, NULL, 0, 0, 0, 0, 0, ITEM_KINSTONE, ITEM_KINSTONE, 0x81, 0, 0x1800, 0x100, 0x20, 0x0, 0x1, 0x0 }, }; |