Pony Fantasy VI Remake

I'll explain what I've suggested so far. This is the battle event bit that enables the event to be triggered (in Novalia Spirit event bits document):

Code:

1DD1:1 Enables the "M-M-M-MAGIC!?" scene to be triggered

If you look at event event dump (search "1DD1, bit 1"), it is set right before the battle with the M-Tek Armors. Normally clearing the bit (command B9 instead of B8) or deleting the setting ("FD" on both bytes) should disable the battle event. There is no other instance in the event dump except a little subroutine at CA/766C that does a return if it's clear or clear it if it's set. Worst that this does is clearing it anyway , so it shouldn't be a concern. I don't know where it is called from, but I'm suspecting after the battle if it happens on your way to South Figaro.

Code:

CA/637F: B8    Set bit $1DC9($41) [$1DD1, bit 1]
CA/6381: 35    Pause execution until action queue for object $30 (Camera) is complete
CA/6383: 4D    Invoke battle, enemy set $41, background $02 (Desert), (mosaic effect enabled), (swoosh sound enabled)

Code:

CA/766C: B7    If bit $1DC9($41) [$1DD1, bit 1] is clear, branch to $CA5EB3
CA/7671: B9    Clear bit $1DC9($41) [$1DD1, bit 1]
CA/7673: FE    Return

Last thing I suggested, it disabling it in the ASM code. By changing the CMP #$00 to BRA $175F (80 15), you're supposed to skip Terra check and the battle event "calling" (C2/1753 to C2/175E) and return to normal code where all magic spell execution normally go (C2/175F). One last thing I will suggest is NOP C2/1753 to C2/175E (by editing all bytes as "EA") but that does a similar job as the branch I've mentionned but clears the event bit (C2/174C to C2/1750). Either thing you do, the clearing of the bit is irrelevant if you skip C2/1753 to C2/175E or NOP it.

I hope I'm not missing something obvious but I don't think it's the case.

Code:

C2/1745: B9 D8 3E     LDA $3ED8,Y
C2/1748: C9 00        CMP #$00
C2/174A: D0 13        BNE $175F   (Branch if not Terra)
C2/174C: A9 02        LDA #$02
C2/174E: 1C BC 3E     TRB $3EBC   (Clear bit for that classic Terra/Locke/Edgar
                                   "M..M..Magic" skit, as it only happens once.)
                                  (Keep in mind the game will also clear this when
                                   exiting Figaro Cave to the South Figaro plains.)
C2/1751: F0 0C        BEQ $175F   (If it wasn't set, skip the special spellcast
                                   and the ensuing convo)
C2/1753: A2 06        LDX #$06    (Attack)
C2/1755: A9 23        LDA #$23    (Command)
C2/1757: 20 91 4E     JSR $4E91
C2/175A: A9 20        LDA #$20
C2/175C: 0C A4 11     TSB $11A4   (Set can't be dodged)
C2/175F: A9 00        LDA #$00    (Lore / Enemy attack / Magitek commands jump here)