Skip to content

Commit b00ce1e

Browse files
Admentus64Admentus64
committed
Misc small fixes
1 parent 3685fb4 commit b00ce1e

File tree

3 files changed

+33
-40
lines changed

3 files changed

+33
-40
lines changed

‎Files/Scripts/Options/Ocarina of Time.psm1‎

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -450,14 +450,6 @@ function ByteOptions() {
450450
ChangeBytes -Offset "B65660" -Values "1001010110020101010101020202000000010100000001010101010100000000" # Skulltula
451451
ChangeBytes -Offset "DFE767" -Values "F1F0F0F1F1F0F1F222F0F0F0F0F02200000000F0F2F1F0F4F2" # Freezard
452452
}
453-
454-
# MultiplyBytes -Offset "EEF780" -Factor $multi -Max 127 # Guay
455-
# MultiplyBytes -Offset "xxxxxx" -Factor $multi -Max 127 # Peehat Larva (HP: 01) C2F8D0 -> C32FD0 (Length: 3700) (ovl_En_Peehat)
456-
# MultiplyBytes -Offset "xxxxxx" -Factor $multi -Max 127 # Anubis (HP: 01) D79240 -> D7A4F0 (Length: 12B0) (ovl_En_Anubice)
457-
# MultiplyBytes -Offset @("DFC9A3", "DFDE43") -Factor $multi -Max 127 # Freezard
458-
# MultiplyBytes -Offset @("C96A5B", "C96B0C") -Factor $multi -Max 127 # Armos
459-
# MultiplyBytes -Offset @("C6417C", "C15814", "CB1BCB") -Factor $multi -Max 127 # Skulltula, Keese, Green Bubble
460-
# MultiplyBytes -Offset "CE39AF" -Factor $multi -Max 127 # Skullwalltula
461453
}
462454

463455
if (IsIndex -Elem $Redux.Hero.MiniBossHP -Index 3 -Not) { # Mini-Bosses
@@ -498,9 +490,7 @@ function ByteOptions() {
498490

499491
MultiplyBytes -Offset "E82AFB" -Factor $multi -Max 127 -Min 3 # Ganon (phase 1)
500492
$value = $ByteArrayGame[0xE87F2F]; $value--; $value *= ($ByteArrayGame[0xE82AFB] / 0x1E); $value++;
501-
502-
write-host ($ByteArrayGame[0xE82AFB] / 0x1E) $value
503-
493+
504494
ChangeBytes -Offset "E87F2F" -Values $value # Ganon (phase 2)
505495
}
506496

@@ -667,9 +657,9 @@ function ByteOptions() {
667657
# SWORD TRAIL COLORS #
668658

669659
if ($Redux.Colors.SetSwordTrail -ne $null) {
670-
if (IsColor $Redux.Colors.SetSwordTrail[0] -Not) { ChangeBytes -Offset "BEFF7C" -Values @($Redux.Colors.SetSwordTrail[0].Color.R, $Redux.Colors.SetSwordTrail[0].Color.G, $Redux.Colors.SetSwordTrail[0].Color.B) }
671-
if (IsColor $Redux.Colors.SetSwordTrail[1] -Not) { ChangeBytes -Offset "BEFF84" -Values @($Redux.Colors.SetSwordTrail[1].Color.R, $Redux.Colors.SetSwordTrail[1].Color.G, $Redux.Colors.SetSwordTrail[1].Color.B) }
672-
if (IsIndex $Redux.Colors.SwordTrailDuration -Not -Index 2) { ChangeBytes -Offset "BEFF8C" -Values (($Redux.Colors.SwordTrailDuration.SelectedIndex) * 5) }
660+
if (IsColor $Redux.Colors.SetSwordTrail[0] -Not) { ChangeBytes -Offset "BEFF7C" -Values @($Redux.Colors.SetSwordTrail[0].Color.R, $Redux.Colors.SetSwordTrail[0].Color.G, $Redux.Colors.SetSwordTrail[0].Color.B) }
661+
if (IsColor $Redux.Colors.SetSwordTrail[1] -Not) { ChangeBytes -Offset "BEFF84" -Values @($Redux.Colors.SetSwordTrail[1].Color.R, $Redux.Colors.SetSwordTrail[1].Color.G, $Redux.Colors.SetSwordTrail[1].Color.B) }
662+
if (IsDefault $Redux.Colors.SwordTrailDuration -Not) { ChangeBytes -Offset "BEFF8C" -Values ( $Redux.Colors.SwordTrailDuration.SelectedIndex * 5) }
673663
}
674664

675665

@@ -1713,12 +1703,14 @@ function ByteReduxOptions() {
17131703

17141704
# TUNIC COLORS #
17151705

1716-
if (IsColor $Redux.Colors.SetExtraEquipment[0] -Not) { ChangeBytes -Offset $Symbols.CFG_TUNIC_MAGICIAN -Values @($Redux.Colors.SetExtraEquipment[0].Color.R, $Redux.Colors.SetExtraEquipment[0].Color.G, $Redux.Colors.SetExtraEquipment[0].Color.B) } # Magician Tunic
1717-
if (IsColor $Redux.Colors.SetExtraEquipment[1] -Not) { ChangeBytes -Offset $Symbols.CFG_TUNIC_GUARDIAN -Values @($Redux.Colors.SetExtraEquipment[1].Color.R, $Redux.Colors.SetExtraEquipment[1].Color.G, $Redux.Colors.SetExtraEquipment[1].Color.B) } # Guardian Tunic
1718-
if (IsColor $Redux.Colors.SetExtraEquipment[2] -Not) { ChangeBytes -Offset $Symbols.CFG_TUNIC_HERO -Values @($Redux.Colors.SetExtraEquipment[2].Color.R, $Redux.Colors.SetExtraEquipment[2].Color.G, $Redux.Colors.SetExtraEquipment[2].Color.B) } # Hero Tunic
1719-
if (IsColor $Redux.Colors.SetExtraEquipment[3] -Not) { ChangeBytes -Offset $Symbols.CFG_TUNIC_NONE -Values @($Redux.Colors.SetExtraEquipment[3].Color.R, $Redux.Colors.SetExtraEquipment[3].Color.G, $Redux.Colors.SetExtraEquipment[3].Color.B) } # No Tunic
1720-
if (IsColor $Redux.Colors.SetExtraEquipment[4] -Not) { ChangeBytes -Offset $Symbols.CFG_TUNIC_SHADOW -Values @($Redux.Colors.SetExtraEquipment[4].Color.R, $Redux.Colors.SetExtraEquipment[4].Color.G, $Redux.Colors.SetExtraEquipment[4].Color.B) } # Shadow Tunic
1721-
1706+
if ($Redux.Colors.SetExtraEquipment -ne $null) {
1707+
if (IsColor $Redux.Colors.SetExtraEquipment[0] -Not) { ChangeBytes -Offset $Symbols.CFG_TUNIC_MAGICIAN -Values @($Redux.Colors.SetExtraEquipment[0].Color.R, $Redux.Colors.SetExtraEquipment[0].Color.G, $Redux.Colors.SetExtraEquipment[0].Color.B) } # Magician Tunic
1708+
if (IsColor $Redux.Colors.SetExtraEquipment[1] -Not) { ChangeBytes -Offset $Symbols.CFG_TUNIC_GUARDIAN -Values @($Redux.Colors.SetExtraEquipment[1].Color.R, $Redux.Colors.SetExtraEquipment[1].Color.G, $Redux.Colors.SetExtraEquipment[1].Color.B) } # Guardian Tunic
1709+
if (IsColor $Redux.Colors.SetExtraEquipment[2] -Not) { ChangeBytes -Offset $Symbols.CFG_TUNIC_HERO -Values @($Redux.Colors.SetExtraEquipment[2].Color.R, $Redux.Colors.SetExtraEquipment[2].Color.G, $Redux.Colors.SetExtraEquipment[2].Color.B) } # Hero Tunic
1710+
if (IsColor $Redux.Colors.SetExtraEquipment[3] -Not) { ChangeBytes -Offset $Symbols.CFG_TUNIC_NONE -Values @($Redux.Colors.SetExtraEquipment[3].Color.R, $Redux.Colors.SetExtraEquipment[3].Color.G, $Redux.Colors.SetExtraEquipment[3].Color.B) } # No Tunic
1711+
if (IsColor $Redux.Colors.SetExtraEquipment[4] -Not) { ChangeBytes -Offset $Symbols.CFG_TUNIC_SHADOW -Values @($Redux.Colors.SetExtraEquipment[4].Color.R, $Redux.Colors.SetExtraEquipment[4].Color.G, $Redux.Colors.SetExtraEquipment[4].Color.B) } # Shadow Tunic
1712+
}
1713+
17221714

17231715

17241716
# TRAIL COLORS #
@@ -3256,7 +3248,7 @@ function CreateTabDifficulty() {
32563248
CreateReduxGroup -Tag "Hero" -Text "Hero Mode"
32573249
CreateReduxComboBox -Name "MonsterHP" -Text "Monster HP" -Items $items1 -Default 3 -Info "Set the amount of health for monsters`nDoesn't include monsters which die in 1 hit already" -Credits "Admentus"
32583250
CreateReduxComboBox -Name "MiniBossHP" -Text "Mini-Boss HP" -Items $items2 -Default 3 -Info "Set the amount of health for elite monsters and mini-bosses`nBig Octo and Dark Link are not included" -Credits "Admentus"
3259-
CreateReduxComboBox -Name "BossHP" -Text "Boss HP" -Items $items3 -Default 3 -Info "Set the amount of health for bosses`nPhantom Ganon, Ganondorf and Ganon have a max of 3x HP" -Credits "Admentus & Marcelo20XX"
3251+
CreateReduxComboBox -Name "BossHP" -Text "Boss HP" -Items $items3 -Default 3 -Info "Set the amount of health for bosses`nPhantom Ganon, Ganondorf and Ganon have a max of 3x health" -Credits "Admentus & Marcelo20XX"
32603252
CreateReduxComboBox -Name "Damage" -Text "Damage" -Items @("1x Damage", "2x Damage", "4x Damage", "8x Damage", "OHKO Mode") -Info "Set the amount of damage you receive`nOHKO Mode = You die in one hit" -Credits "Admentus"
32613253
CreateReduxComboBox -Name "MagicUsage" -Text "Magic Usage" -Items @("1x Magic Usage", "2x Magic Usage", "4x Magic Usage", "8x Magic Usage") -Info "Set the amount of times magic is consumed at" -Credits "Admentus"
32623254
CreateReduxComboBox -Name "ItemDrops" -Text "Item Drops" -Items @("Default", "No Hearts", "Only Rupees", "Nothing") -Info "Set the items that will drop from grass, pots and more" -Credits "Randomizer, Admentus, Third M & BilonFullHDemon"
@@ -3278,7 +3270,7 @@ function CreateTabDifficulty() {
32783270
CreateReduxGroup -Tag "HeroHarder" -Text "Hero Mode (Harder Enemies)"
32793271
CreateReduxCheckBox -Name "Guay" -Text "Harder Guay" -Info "Guays attack faster and move further" -Credits "Anthrogi"
32803272
CreateReduxCheckBox -Name "HandMaster" -Text "Harder Handmaster" -Info "Wallmasters drop from above much quicker`nFloormasters attack faster and suffers less lag on miss or impact against player`nSmaller Floormasters jump and start chasing from further away and drain health faster" -Credits "Anthrogi"
3281-
CreateReduxCheckBox -Name "Zombies" -Text "Harder Zombies" -Info "Redeads/Gibdos chase the player more quickly and efficiently, while also draining hp faster" -Credits "Anthrogi"
3273+
CreateReduxCheckBox -Name "Zombies" -Text "Harder Zombies" -Info "Redeads/Gibdos chase the player more quickly and efficiently, while also draining health faster" -Credits "Anthrogi"
32823274
CreateReduxCheckBox -Name "LikeLike" -Text "Harder Like-Like" -Info "Like-Likes move faster and notice the player from much further away" -Credits "Anthrogi"
32833275
CreateReduxCheckBox -Name "Octorok" -Text "Harder Octorok" -Info "Octoroks appear from more distance away from the player and shoot projectiles much faster at quicker intervals" -Credits "Anthrogi"
32843276
CreateReduxCheckBox -Name "Tektite" -Text "Harder Tektite" -Info "Tektites chase the player more effectively and lunge with greater reach" -Credits "Anthrogi"
@@ -3301,12 +3293,12 @@ function CreateTabDifficulty() {
33013293
# RECOVERY #
33023294

33033295
CreateReduxGroup -Tag "Recovery" -Text "Recovery" -Height 4
3304-
CreateReduxTextBox -Name "Heart" -Text "Recovery Heart" -Value 16 -Min 0 -Max 320 -Length 3 -Info "Set the amount of HP that Recovery Hearts will replenish`nRecovery Heart drops are removed if set to 0" -Credits "Admentus, Three Pendants & Randomizer (No Heart Drops)"
3305-
CreateReduxTextBox -Name "Fairy" -Text "Fairy" -Value 128 -Min 0 -Max 320 -Length 3 -Info "Set the amount of HP that a Fairy will replenish" -Credits "Admentus"
3306-
CreateReduxTextBox -Name "FairyBottle" -Text "Fairy (Bottle)" -Value 320 -Min 0 -Max 320 -Length 3 -Info "Set the amount of HP that a Bottled Fairy will replenish" -Credits "Admentus & Three Pendants"
3307-
CreateReduxTextBox -Name "FairyRevive" -Text "Fairy (Revive)" -Value 320 -Min 0 -Max 320 -Length 3 -Info "Set the amount of HP that a Bottled Fairy will replenish after Link died" -Credits "Admentus & Three Pendants"; $Last.Row++
3308-
CreateReduxTextBox -Name "Milk" -Text "Milk" -Value 80 -Min 0 -Max 320 -Length 3 -Info "Set the amount of HP that Milk will replenish" -Credits "Admentus & Three Pendants"
3309-
CreateReduxTextBox -Name "RedPotion" -Text "Red Potion" -Value 320 -Min 0 -Max 320 -Length 3 -Info "Set the amount of HP that a Red Potion will replenish" -Credits "Admentus & Three Pendants"
3296+
CreateReduxTextBox -Name "Heart" -Text "Recovery Heart" -Value 16 -Min 0 -Max 320 -Length 3 -Info "Set the amount of health that Recovery Hearts will replenish`nRecovery Heart drops are removed if set to 0" -Credits "Admentus, Three Pendants & Randomizer (No Heart Drops)"
3297+
CreateReduxTextBox -Name "Fairy" -Text "Fairy" -Value 128 -Min 0 -Max 320 -Length 3 -Info "Set the amount of health that a Fairy will replenish" -Credits "Admentus"
3298+
CreateReduxTextBox -Name "FairyBottle" -Text "Fairy (Bottle)" -Value 320 -Min 0 -Max 320 -Length 3 -Info "Set the amount of health that a Bottled Fairy will replenish" -Credits "Admentus & Three Pendants"
3299+
CreateReduxTextBox -Name "FairyRevive" -Text "Fairy (Revive)" -Value 320 -Min 0 -Max 320 -Length 3 -Info "Set the amount of health that a Bottled Fairy will replenish after Link died" -Credits "Admentus & Three Pendants"; $Last.Row++
3300+
CreateReduxTextBox -Name "Milk" -Text "Milk" -Value 80 -Min 0 -Max 320 -Length 3 -Info "Set the amount of health that Milk will replenish" -Credits "Admentus & Three Pendants"
3301+
CreateReduxTextBox -Name "RedPotion" -Text "Red Potion" -Value 320 -Min 0 -Max 320 -Length 3 -Info "Set the amount of health that a Red Potion will replenish" -Credits "Admentus & Three Pendants"
33103302

33113303
$Redux.Recovery.HeartLabel = CreateLabel -X $Redux.Recovery.Heart.Left -Y ($Redux.Recovery.Heart.Bottom + (DPISize 6)) -Text ("(" + [math]::Round($Redux.Recovery.Heart.text/16, 1) + " Hearts)") -AddTo $Last.Group
33123304
$Redux.Recovery.FairyLabel = CreateLabel -X $Redux.Recovery.Fairy.Left -Y ($Redux.Recovery.Fairy.Bottom + (DPISize 6)) -Text ("(" + [math]::Round($Redux.Recovery.Fairy.text/16, 1) + " Hearts)") -AddTo $Last.Group

0 commit comments

Comments
 (0)