diff options
| author | Catobat <69204835+Catobat@users.noreply.github.com> | 2023-01-07 20:51:24 +0100 |
|---|---|---|
| committer | Catobat <69204835+Catobat@users.noreply.github.com> | 2023-01-07 20:51:24 +0100 |
| commit | 1cb62deadddf29f7d6d5e22bf2e92cdb1b16794e (patch) | |
| tree | 3046d7a541d311dfe4fbcb5e12a50be7480399c9 /src | |
| parent | 81534899cd20b6c78d82d3c27a50a7fd75fc7aab (diff) | |
Fix Kinstone constant names
Diffstat (limited to 'src')
| -rw-r--r-- | src/gameData.c | 6 | ||||
| -rw-r--r-- | src/itemUtils.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gameData.c b/src/gameData.c index 26462587..12407475 100644 --- a/src/gameData.c +++ b/src/gameData.c @@ -10,9 +10,9 @@ // extern const u8 gUnk_080FE1B4[]; // const u8 gUnk_080FE1B4[] = {0, 84, 85, 86, 95, 96, 93, 94, 63, 252, 253, 254, 255, 0, 0, 0,0,}; const u8 gUnk_080FE1B4[] = { - ITEM_NONE, ITEM_RUPEE1, ITEM_RUPEE5, ITEM_RUPEE20, ITEM_HEART, ITEM_FAIRY, - ITEM_BOMBS5, ITEM_ARROWS5, ITEM_SHELLS, ITEM_KINSTONE_GREEN, ITEM_KINSTONE_BLUE, ITEM_KINSTONE_RED, - ITEM_ENEMY_BEETLE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, + ITEM_NONE, ITEM_RUPEE1, ITEM_RUPEE5, ITEM_RUPEE20, ITEM_HEART, ITEM_FAIRY, + ITEM_BOMBS5, ITEM_ARROWS5, ITEM_SHELLS, ITEM_KINSTONE_RED, ITEM_KINSTONE_BLUE, ITEM_KINSTONE_GREEN, + ITEM_ENEMY_BEETLE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, }; const u8 gUnk_080FE1C6[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 9, 10, 10, 11, 12, 13, 14, 15, 8, 15, 1, 8, diff --git a/src/itemUtils.c b/src/itemUtils.c index 97201c9c..dc53d28c 100644 --- a/src/itemUtils.c +++ b/src/itemUtils.c @@ -408,9 +408,9 @@ extern u32 sub_08000F2C(s16*, const s16*, const s16*, const s16*); u32 CreateItemDrop(Entity* arg0, u32 itemId, u32 itemParameter); u32 CreateRandomItemDrop(Entity* arg0, u32 arg1) { extern const u8 gUnk_080FE1B4[] /* = { - ITEM_NONE, ITEM_RUPEE1, ITEM_RUPEE5, ITEM_RUPEE20, ITEM_HEART, ITEM_FAIRY, - ITEM_BOMBS5, ITEM_ARROWS5, ITEM_SHELLS, ITEM_KINSTONE_GREEN, ITEM_KINSTONE_BLUE, ITEM_KINSTONE_RED, - ITEM_ENEMY_BEETLE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, + ITEM_NONE, ITEM_RUPEE1, ITEM_RUPEE5, ITEM_RUPEE20, ITEM_HEART, ITEM_FAIRY, + ITEM_BOMBS5, ITEM_ARROWS5, ITEM_SHELLS, ITEM_KINSTONE_RED, ITEM_KINSTONE_BLUE, ITEM_KINSTONE_GREEN, + ITEM_ENEMY_BEETLE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, }*/; int r0, r1, rand, summOdds, item; @@ -539,7 +539,7 @@ u32 CreateItemDrop(Entity* arg0, u32 itemId, u32 itemParameter) { break; } case ITEM_KINSTONE: - case ITEM_KINSTONE_GREEN ... ITEM_KINSTONE_RED: { + case ITEM_KINSTONE_RED ... ITEM_KINSTONE_GREEN: { u32 rand; if (GetInventoryValue(ITEM_KINSTONE_BAG) == 0) { @@ -550,7 +550,7 @@ u32 CreateItemDrop(Entity* arg0, u32 itemId, u32 itemParameter) { } if (itemId != ITEM_KINSTONE) { - adjustedParam = itemId - ITEM_KINSTONE_GREEN; + adjustedParam = itemId - ITEM_KINSTONE_RED; rand = (Random() & 0x3f); adjustedParam = gUnk_080FE1DD[(rand + adjustedParam * 0x40)]; if (adjustedParam == 0) { |