Adds a --no-top-spells (-ntm) flag to remove all Tier 3, Ultima, Merton, Life 2, Quick, Pearl, and Flare spells. Fixes bug with Learn Spells reward in which Life spells can appear during permadeath seeds.

Test notes: Generated seed with -ob 31.54.54.0.0, -ntm, and --permadeath --- confirmed in game that none of the top spells nor Life spells were learned --- confirmed in spoiler log that no Espers had top spells nor Life spells

Generated seed with -rns1, rns2, and -ntm --- confirmed in spoiler log that none of the top spells were naturally learned and no Espers had top spells

Generated seed with -ntm but without -rns1, -rns2 --- confirmed in spoiler log that none of the top spells were naturally learned and no Espers had top spells

Added the following KT boss locations as objective conditions:

• Kefka's Tower Ambush
  • Inferno
  • Bit 59
• Kefka's Tower Guardian
  • Guardian
  • Bit 60
• KT Left Triad Statue
  • Doom
  • Bit 61
• KT Mid Triad Statue
  • Poltergeist
  • Bit 62
• KT Right Triad Statue
  • Goddess
  • Bit 63

Testing

Used the following flags to test the five encounters: -oa 40.1.1.11.59 -ob 40.1.1.11.60 -oc 40.1.1.11.61 -od 40.1.1.11.62 -oe 40.1.1.11.63

While adding a result type in another branch it was a bit difficult to see what was going on. The recently added "High Tier Item" result has the highest id (58) but it was listed chronologically and not easy to find. It was not obvious at all that the id I should assign my new result is 59

To make this easier moving forward (and retain backwards compatibility) I am suggesting we:

• Add these chronologically, and sort alphabetically after to retain the similar lists (As I have done in the PR)

Implementing two things with this:

1. Adding -shoedash or --sprint_shoes_b_dash flag. When holding down B while the sprint shoes bit is enabled, it will cause the character to run at speed 5 ("Dashing")
2. Ported over SilentEnigma's Sliding Dash v1.1 fix: https://silentenigma.neocities.org/ff6/index.html

• When dashing right or down, it would freeze the character's animation. This fixes said bug.

KNOWN BUGS

• If dashing in Owzer's Mansion "Musical Doors" room during the door transition, the graphics on the screen become very corrupted and distorted.

Fixed the bug in Elastoid's async where the Zozo clock divisible hint read "The minutes? They're divisible by 20!", even though the minute solution was 20.

Flags to test: -s 1vyyz3qynn0p -cg -oa 2.2.2.2.7.7.4.13.13.6.6.6 -ob 3.5.5.2.7.7.4.13.13.6.6.6.2.5.5.4.10.10.6.4.4 -oc 40.4.4.4.4.4.11.52.12.8.10.9.9 -od 40.2.2.11.22.8.4.4 -oe 39.1.1.12.6 -of 36.1.1.12.9 -og 24.12.12.0.0 -sc1 randomngu -sc2 random -sc3 random -sal -csrp 90 135 -fst -brl -slr 10 16 -lmprp 75 125 -lel -srr 28 50 -rnl -sdr 2 2 -das -dda -dns -del -com 22070912089898989898989999 -scc -rec1 28 -rec2 24 -rec3 6 -rec4 15 -rec5 14 -xpm 4 -mpm 5 -gpm 5 -nxppd -lsce 2.5 -hmh 1.5 -xgced 2 -msl 70 -sed -bbs -be -bnu -res -fer 0 -escr 100 -dgne -wnz -mmnu -cmd -esrt -ebr 80 -emprp 75 125 -ems -nm1 random -nm2 random -rnl2 -rns2 -nmmi -gp 12000 -smc 3 -sws 4 -sfd 5 -sto 2 -ieor 50 -ierr 14 14 -csb 9 18 -mca -stra -saw -sirt -sprp 90 130 -sdm 5 -npi -snbr -snee -snil -ccsr 75 -cor -crvr 255 255 -crm -anca -adeh -nmc -nee -nu -nfps -fs -fe -fvd -fr -fj -fbs -fedc -as -ond -rr -rc -scan -etn -yremove

Time = 8:20:50

Without change, these are the clues:

That clock has no hour hand. It's never pointing to the right time anyway!<end>
Hand's pointin' at the eight.<end>
The minutes? They're divisible by 20!<end>
It's now 0:00:40.<end>
Time?<line>It's 0:10.<end>
You can trust me!<line>It's 0:50.<end>
0:30!<line>Time to go home!<end>
It's already 0:00:10.<end>
Clock's second hand's pointin' at 30.<end>
The second hand of my watch is pointing at four.<end>

With the change, these are the clues:

That clock has no hour hand. It's never pointing to the right time anyway!<end>
Hand's pointin' at the eight.<end>
The minutes? They're not divisible by 20!<end>
It's now 0:00:40.<end>
Time?<line>It's 0:40.<end>
You can trust me!<line>It's 0:00:30.<end>
0:00:10!<line>Time to go home!<end>
It's already 0:00:20.<end>
Clock's minute hand's pointin' at 40.<end>
The second hand of my watch is pointing at two.<end>

Overview

This Pull Request is designed to add Magitek as a valid command for FF6WC. Changes include:

• Removing Magitek from the Always-excluded list of commands
• Fixing the Magitek reflect bug, documented here: http://assassin17.brinkster.net/patches.htm#anchor40
• Giving all characters every Magitek, by modifying this list to match Terra's: https://github.com/clementgallet/ff6-tas/blob/master/DisassemblyDocs/Bank%20C1%20disassembly.txt#L18568
• Adding a Random Exclude Command 6 option, so that those who don't enjoy fun (albeit OP) things can disable Magitek and 5 other commands.

The implementation of magiteks.py was modeled after espers.py (for example, phoenix_life3) and lores.py.

Testing Notes

Hex Compares

Before this change, this is the hex for the magiteks available (note the FFs)

After this change, this is the hex for the magiteks available (note no FFs)

And here's the hex for the Magitek Abilities (ref: https://www.ff6hacking.com/wiki/doku.php?id=ff3:ff3us:doc:asm:fmt:spell_data) before the change:

And here's the hex for the Magitek Abilities with the Special Flags 2 set to 0x22 ("Ignore reflect" set to 1):

Play Testing

Play Testing was performed with the following flags: wc.py -com 29299898989898989898989898 -sc1 Terra -sc2 Locke -as

To test the Magitek Reflect bug, first a test was performed without the patch in which Leafers and Dark Winds were given the Reflect status using FF3usME). A video of the results is here: https://youtu.be/8RCbWPdiO8Y

Then, following the patch, here's a video showing no reflect bug (again, Leafers and Dark Winds were given the Reflect status using FF3usME). A video of the results is here: https://youtu.be/k--nohPVmjY

Finally, wc.py -h was checked to ensure that -rec6 shows up. That flag was also checked in the menu (using -rec6 29):

This functions similarly to how we are currently excluding Phunbaba 3, in that he is naturally in the boss pool, but is removed under his respective flag. Using the same logic we can keep the statue fights in place

I'm getting errors when generating seeds both locally and on the website when either the Sour Mouth or Imp Song results are selected. Traceback for an Imp Song error below:

Traceback (most recent call last):
  File "C:\Users\Will\PycharmProjects\worldscollide\wc.py", line 30, in <module>
    main()
  File "C:\Users\Will\PycharmProjects\worldscollide\wc.py", line 12, in main
    events = Events(memory.rom, args, data)
  File "C:\Users\Will\PycharmProjects\worldscollide\event\events.py", line 18, in __init__
    self.mod()
  File "C:\Users\Will\PycharmProjects\worldscollide\event\events.py", line 51, in mod
    event.mod()
  File "C:\Users\Will\PycharmProjects\worldscollide\event\ancient_castle.py", line 31, in mod
    self.finish_check_mod()
  File "C:\Users\Will\PycharmProjects\worldscollide\event\ancient_castle.py", line 110, in finish_check_mod
    field.FinishCheck(),
  File "C:\Users\Will\PycharmProjects\worldscollide\instruction\field\functions.py", line 137, in __init__
    CheckObjectives(),
  File "C:\Users\Will\PycharmProjects\worldscollide\instruction\field\functions.py", line 123, in __init__
    objective.check_complete.field(),
  File "C:\Users\Will\PycharmProjects\worldscollide\objectives\_check_complete.py", line 70, in field
    return Field(self.objective)
  File "C:\Users\Will\PycharmProjects\worldscollide\objectives\_check_complete.py", line 14, in __init__
    field.Call.__init__(self, self.address(*args, **kwargs))
  File "C:\Users\Will\PycharmProjects\worldscollide\objectives\_cached_function.py", line 14, in address
    self.space = self.write(*args, **kwargs)
  File "C:\Users\Will\PycharmProjects\worldscollide\objectives\_check_complete.py", line 23, in write
    objective.result.field(),
  File "C:\Users\Will\PycharmProjects\worldscollide\objectives\results\_objective_result.py", line 26, in field
    return self.field_class(*(self.args + args), **kwargs)
  File "C:\Users\Will\PycharmProjects\worldscollide\objectives\results\_field_result.py", line 8, in __init__
    field.Call.__init__(self, self.address(*args, **kwargs))
  File "C:\Users\Will\PycharmProjects\worldscollide\objectives\_cached_function.py", line 14, in address
    self.space = self.write(*args, **kwargs)
  File "C:\Users\Will\PycharmProjects\worldscollide\objectives\results\_field_result.py", line 12, in write
    self.src(*args, **kwargs),
  File "C:\Users\Will\PycharmProjects\worldscollide\objectives\results\imp_song.py", line 8, in src
    field.AddStatusEffects(Characters.PARTY0, field.Status.IMP),
AttributeError: type object 'Characters' has no attribute 'PARTY0'

Summary This pull request adds a "Better Steal" flag to the Party tab, under a "Steal" category. When enabled, it makes two modifications in the Steal algorithm at C2/399E:

• It modifies the Steal Constant Value from 50 to 90, effectively making the probability of a successful steal of same-level targets change from 50% to 90%
• It modifies the Rare Item Constant Value from 32 to 96, effectively changing the probably of stealing a rare item change from 1/8 to 3/8

Testing notes:

• Confirmed that "Better Steal" shows up in the the log on the starting screen and the Seed Log:

-------------------------------------------------------- Party ---------------------------------------------------------

Starting Party                                              Characters
    Start Character            Locke                            Start Average Level        False
    Start Character            None                             Start Naked                False
    Start Character            None                             Equipable Umaro            False
    Start Character            None                             Character Stats            100-100%

SwdTechs                                                    Commands
    Fast SwdTech               False                            Morph                      Morph
    Everyone Learns            False                            Steal                      Steal
                                                                SwdTech                    SwdTech
Blitzes                                                         Throw                      Throw
    Bum Rush Last              False                            Tools                      Tools
    Everyone Learns            False                            Blitz                      Blitz
                                                                Runic                      Runic
Lores                                                           Lore                       Lore
    Start Lores                Original                         Sketch                     Sketch
    MP                         Original                         Slot                       Slot
    Everyone Learns            False                            Dance                      Dance
                                                                Rage                       Rage
Rages                                                           Leap                       Leap
    Start Rages                Original
    No Leap                    False                            Shuffle Commands           False
    No Charm                   False                            Random Exclude             None
                                                                Random Exclude             None
Dances                                                          Random Exclude             None
    Start Dances               None                             Random Exclude             None
    Shuffle Abilities          False                            Random Exclude             None
    Display Abilities          False
    No Stumble                 False
    Everyone Learns            False

Steal
    Better Steal               True

• Confirmed that with the -bst flag set, the hex for the resulting seed contains the modified values at 0x239BB and 0x239DD:

With flag:

Without flag:

• Used a basic flag set with Locke and this flag enabled (-sc1 locke -lsa 1 -bst). Outside WoR Narshe, tested steal against Mantodeas and Reach Frogs: -- Stealing Imp Halberds (Rare Item) from Mantodeas was effective about 3/8 of the time (other times failed, as Mantodeas do not have a Common Item) -- Stealing from Reach Frogs failed about 1/10 of the time, as expected. Of the times that succeeded, Tack Stars (Rare Item) were stolen about 3/8 of the time and Potions (Common Item) were stolen about 5/8 of the time.

Fixing bug that prevented learning Bum Rush if the Blitzer was recruited at level >= 42

Ref: https://discord.com/channels/666661907628949504/666811452350398493/964611903068454993

Test flags:

-cg -sl -oa 45.99.99.0.0 -ob 46.99.99.0.0 -oc 47.99.99.0.0 -od 48.99.99.0.0 -sc1 terra -sal -eu -csrp 200 200 -fst -brl -slr 1 5 -lmprp 75 125 -lel -srr 3 15 -rnl -rnc -sdr 1 1 -das -dda -dns -com 27101010101010101010101027 -rec1 28 -rec2 23 -xpm 255 -mpm 255 -gpm 255 -nxppd -lsced 2 -hmced 2 -xgced 2 -ase 2 -msl 40 -sed -bbs -be -bnu -res -fer 0 -escr 100 -dgne -wnz -mmnu -cmd -esr 1 5 -ebr 68 -emprp 75 125 -nm1 random -rnl1 -rns1 -nm2 random -rnl2 -rns2 -nmmi -gp 999999 -smc 3 -sws 10 -sfd 10 -ieor 33 -ieror 33 -csb 1 32 -mca -stra -saw -sisr 20 -sprp 75 125 -sdm 4 -npi -ccsr 20 -cms -cor -crr -crvr 255 255 -ari -anca -adeh -nfps -nu -fs -fe -fvd -fr -fj -fbs -fedc -as -ond -rr

Video of fix: https://www.youtube.com/watch?v=nAJKAZqG0VY

Also confirmed that getting to 42 through level ups still sets the CAN_LEARN_BUM_RUSH flag. Also confirmed that CAN_LEARN_BUM_RUSH flag is not set if you recruit the Blitzer at level <42

This seed exposed an issue with add_enemy_levels in which the resulting branch instructions can end up exceeding 127 bytes and therefore branch into other F0 code, ultimate crashing the game.

This was exposed with this flag set. Going to the Whelk boss, for example, would crash the game at the start of that battle.

-open -oa 2.3.3.2.3.3.4.21.21.6.8.8 -ob 30.8.8.1.1.11.8 -oc 24.16.16.0.0 -od 23.16.16.0.0 -oe 41.0.0 -of 21.23.23.1.1.11.4 -og 21.23.23.1.1.11.15 -oh 21.23.23.1.1.11.20 -oi 21.23.23.1.1.11.25 -oj 21.23.23.1.1.11.27 -ok 21.23.23.1.1.11.46 -ol 21.23.23.1.1.11.49 -om 21.23.23.1.1.11.54 -on 35.1.1.11.3 -oo 35.1.1.11.5 -op 35.1.1.11.32 -oq 58.1.1.11.44 -or 58.1.1.11.51 -os 39.1.1.11.57 -sc1 celes -sc2 edgar -sc3 setzer -sal -eu -csrp 100 120 -fst -brl -slr 3 3 -lmprv 16 80 -lel -srr 28 28 -rnl -rnc -sdr 4 4 -das -dda -dns -del -sch -com 99999999999999999999999999 -rec1 28 -rec2 6 -rec3 29 -rec4 27 -xpm 3 -mpm 3 -gpm 3 -nxppd -lsced 2.5 -hmc 3 -xgced 2.5 -msl 80 -bbs -bnu -res -fer 0 -escr 100 -dgne -wnz -mmnu -cmd -ess -ebr 50 -emprv 16 99 -nm1 random -rns1 -nm2 celes -nmmi -gp 2000 -smc 3 -sws 6 -sto 2 -iebr 9 -ieror 100 -csb 18 18 -mca -stra -saw -sisr 25 -sprp 75 125 -sdm 5 -npi -snbr -snes -snsb -snee -snil -ccsr 10 -cpal 0.144.4.3.92.5.6 -cspr 123.156.2.32.4.5.6.7.104.9.92.68.12.142.10.10.18.10.10.10 -cspp 1.1.2.0.0.0.0.3.4.2.5.3.3.5.2.0.6.4.6.1 -crm -cnee -anca -adeh -nmc -nfps -nu -nfce -fs -fe -fvd -fj -fbs -fedc -as -ond -rr -scan -etn

This change simply inverts the branches such that that will not be an issue -- it'll just immediately return.

An update to label.py was made to catch any attempts to branch <-128 or >127 bytes. During testing, this proved to catch the original bug.

This is currently very volatile with character gating, will add example flags to break it soon

Overview

Consolidated a lot of data around checks into one spot (checks.py) Refactored a ton of code to allow for forcing any check to reward anything

Notable Files

• checks.py is where check definitions are now kept
• event/event.py where the overrides take place

Check Changes

• Narshe weapon shop supports 2 esper choices now (will probably set this back to item but it's stable)
• Lone wolf can offer an esper now i.e. "You'll never get this 'Bahamut'!"
• There can now be a magicite at the top of Fanatics Tower
• Kefka at narshe is a Character/Esper guaranteed now by default

Flags

• --force-item-rewards id1,id2,etc. force an item reward on any number of checks in the game
• --force-esper-rewards id1,id2,etc. force an esper reward on any checks in the game
• --force-esper-item-rewards id1,id2,etc. force an esper or item reward on any checks in the game

Extra

I made a tool to allow selecting these ids https://tracker.kielbasiago.com/checks

This adds a different take on the KT skip, allowing the player to fight the five bosses back-to-back before being dropped into the final switch room.

It may be worth noting this was originally branched off of feature/mix-statues-bosses so some code may look familiar/redundant here

Here's a 3 minute video showing it in action: https://www.youtube.com/watch?v=dtlHM_naEoo

Additional Changes

• Added utility functions that were used throughout the creation of the gauntlet (adding save points, disabling warp on maps, things like that)
• Refactored dialogs to auto allocate known available unused dialogs self.dialogs.create_dialog("text")
• Added a lot of cutscenes

Flags to test

-open -oa 90.0.0 -sc1 terra -sc2 locke -sc3 celes -debug

You will one shot any bosses with -debug on, and immediately unlock the gauntlet

Test notes:

• Confirmed that both Flags menus just say "Flags Hidden"
• Confirmed that .txt file (even with -sl) doesn't include the flag details
• Confirmed that console output doesn't include flags.
• Confirmed that without -hf, all of the opposite of the above is true (so, current behavior stays the same)

Added -llr flag to randomize L.x lore levels (L.5 Doom, L? Pearl, L.3 Muddle, L.4 Flare). All except L.5 Doom can be L?, L1-L5. L.5 Doom can be L2-L5 to avoid soft-lock possibility with Doom Gaze or other random-ability bosses.

Tested by rolling a bunch of seeds with these flags and fighting Leafers/Dark Winds of growing levels: -llr -sc1 strago -slr 24 24 -lmprp 0 0 -lst 0.5

Also confirmed via ff3usme that the expected changes were made to the Lore data:

Finally, confirmed that battle dialogs are updated: