Shock Ability

Sounds like we created another Sketch Bug!  

I don't know the source of the Gogo getting unlimited Shocks bug, but I wonder if the Air Force battle runs the Final Battle Tier Transition code? If it does, there are 2 other battles that I can think of that might run Tier Transition Code:
1. Barren Falls Rizopas Battle
2. Sr. Behemoth
Can anyone else think of a time where you have to do a 2nd battle without exiting the first one?

Anyway, in the Final Battle tier transition code, there is a line that I'm almost certain is wrong (marked with ***):

Code:

finalShock: TRB $3F2F               ; Make eligible for a Desperation attack
           ASL #4                  ; Shuffle bit into high nibble
***         TRB $2F2E               ; And make eligible for another Shock
           RTS

When $2F2E is called elsewhere in C2, it is distinguishing between the Short Command Window and the normal one.

Code:

C2/2472: AD 4D 1D     LDA $1D4D      (from Configuration menu: Battle Mode, Battle Speed,
                                     Message Speed, and Command Set)
C2/2475: 30 03        BMI $247A      (branch if "Short" Command Set)
C2/2477: 9C 2E 2F     STZ $2F2E      (otherwise, it's "Window")

My best guess is that the line should be "TRB $3F2F". However, I am nowhere near as good at ASM as GrayShadows.

The other think you can try is to write Shock to a different bit. Right now it's using the top half of the Desperation Attack bit ($3F2F). You could change all instances of that to the Summon Bit ($3F2E) and try again.

Also, as an FYI, between when GrayShadows wrote that patch for you and now, he's started a new job that is taking everything he has to give. He will probably be out of the scene for a little while.

So you are saying I could try changing "TRB $2F2E" to "TRB $3F2F", and it might solve the window issue?  As for your other suggestion, do you mean to only change the one instance of $3F2F in the new code to $3F2E? 

By the way, I also noticed that the shock code randomly works in certain battles, and stops working in other battles.  That is, after I pass the battle with Airforce (which seems to permanently glitch out Leo's Shock command).