diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2023-01-10 19:03:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-10 13:03:31 -0500 |
| commit | 542012efa68d110d6b631f9d149f6e5f4e68cc8e (patch) | |
| tree | 6da8592b14b6be82219c09189ad8aeef537362a3 /src/code/z_parameter.c | |
| parent | b4c97ce17eb35329b4a7e3d98d7f06d558683f6d (diff) | |
Fix misc 19 (#1488)
* "bgs sword" -> "biggoron sword"
* Animation_ChangeImpl: last arg is `ANIMTAPER_` enum
* TransitionTileStatus -> state
* Tiny gbi.h formatting fixups
* some cleanup on floormaster
* misc float ops cleanup
* sunsSongState = SUNSSONG_INACTIVE
* continueFlag == CS_CMD_STOP
* fix few camera names inconsistency
* textual 0 padding? not on my lawn
* libultra: construct address from end of dmem rather than oob from imem
* more free1 -> 2 fixup
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 00d16db9a..bb90b2f7d 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1282,7 +1282,7 @@ void Interface_InitHorsebackArchery(PlayState* play) { } void func_800849EC(PlayState* play) { - gSaveContext.inventory.equipment |= OWNED_EQUIP_FLAG(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BGS); + gSaveContext.inventory.equipment |= OWNED_EQUIP_FLAG(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BIGGORON); gSaveContext.inventory.equipment ^= OWNED_EQUIP_FLAG_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE); if (CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE)) { @@ -1419,7 +1419,7 @@ u8 Item_Give(PlayState* play, u8 item) { gSaveContext.swordHealth = 8; if (ALL_EQUIP_VALUE(EQUIP_TYPE_SWORD) == - ((1 << EQUIP_INV_SWORD_KOKIRI) | (1 << EQUIP_INV_SWORD_MASTER) | (1 << EQUIP_INV_SWORD_BGS) | + ((1 << EQUIP_INV_SWORD_KOKIRI) | (1 << EQUIP_INV_SWORD_MASTER) | (1 << EQUIP_INV_SWORD_BIGGORON) | (1 << EQUIP_INV_SWORD_BROKENGIANTKNIFE))) { gSaveContext.inventory.equipment ^= OWNED_EQUIP_FLAG_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE); |