Having the option to use Vigor in some spells

Hey, I JUST finished work on something like this and am playtesting it right now. It works, I'm just playtesting to adjust the damage of weapons and physical spells since it's obviously much higher now.

The Great Physical and Magical damage formula Equalizer EDIT: Update: fixed a bug and cleaned up the code.

Code:

;Physical Damage Formula Overhaul
;Author: Seibaby

;What this patch does:
;1. Equalizes the damage formulas for characters and monsters.
;2. Equalizes the formulas for physical and magical damage:
;   Magical damage = 4 * Spell Power + [Level * Magic * Spell Power / 32]
;   Physical damage = 4 * Battle Power + [Level * Magic * Battle Power / 32]

;Notes:
;1. This makes Vigor and Battle Power MUCH more powerful than in vanilla.
;2. It makes the damage of physical abilites scale linearly with level instead
;   of quadratically, meaning they don't retain their competitiveness with
;   stronger spells as level at higher levels.
;3. You probably want to adjust Battle Power for weapons and physical abilities
;   since they are insanely high compared to Magic. Ex. Ultima is 150 power
;   while Illumina is 255 power.
;4. This patch is not compatible with Leet Sketcher's Ultimate Damage fix.


hirom             ;Do not change this
;header            ;Uncomment this if your ROM has a header

org $C22890
NOP #2            ;Skip doubling Vigor for characters:

org $C22BA7
BRA skip1:
org $C22BAD
skip1:            ;Skip unnecessary stuff

org $C22BB3
BRA skip2         ;Skip quadrupling battle power for monsters:
org $C22BB9
skip2:

org $C22BCE
STA $11A6         ;Make sure Gauntlet still works
SEP #$20          ;Make game not crash :)
BRA skip3         ;Skip unnecessary stuff
org $C22BE7
skip3:
JSR $2B69         ;Discard physical damage formula, call magic formula instead
REP #$20

org $C22BF0      
REP #$20          ;Set 16-bit accumulator, since C2/2B69 sets it to 8-bit
BRA skip4         ;Skip (Damage = Damage * 3/2 + Battle Power) for characters
org $C22C02
skip4:


;Optional extras:

;org $C22D64
;ADC $3B40,Y       ;Set monster Vigor to Monster's Stamina + [1..8]

;org $C22CE9
;NOP               ;Increase the cap on monster Stamina to 96
;CMP #$50          ;(Monster Stamina = (Max HP / 256) + 16. If this number is
;BCC cont2         ; greater than 96, then the monster's stamina is set to 96.)
;LDA #$4F
;org $C22CF0
;cont2:

;Pick ONE of the following two:
;org $C20F3A      
;LSR               ;Hyper Wrist boosts Vigor by 25% instead of 50% (rounded UP)
                  ;(NOTE: not compatible with Assassin's Genji Glove damage
                  ;reduction fix)

;org $C20F3F       ;Hyper Wrist boosts Vigor by 25% instead of 50% (rounded UP)
;LSR               ;(NOTE: compatible with Assassin's Genji Glove damage
                  ; reduction fix. Apply this AFTER applying that one or it
                  ; will just overwrite this)

;Pick ONE of the following two:
;org $C22BC7
;NOP #4            ;Gauntlet increases battle power by 50% instead of 75%

;org $C22BC4
;LSR               ;Gauntlet increases Battle Power by 62.5% instead of 75%


;For testing:

;org $C233FE
;db $80            ;No criticals

;org $C20CB3
;LDA #$FF          ;Disable random damage variance

This has some extra stuff in it that I feel makes sense/is neat, overall it is a complete rebalance of Vigor.
You absolutely need to severely decrease the Battle Power of weapons/characters and Spell Power of Physical spells since they're balanced for the crappy physical formula.

Also, @Kugawattan, here's how to make physical Blitzes and Swdtechs Row-dependent:

Code:

;Halve damage for physical Blitzes and Swdtechs

hirom
;header

;Blitz
org $C215C2
JSR rowblitz

;Swdtech
org $C21854
JSR rowblitz

org $C2A75A ; change this to free space
rowblitz:
JSR $2951      ;(Load Magic Power / Vigor and Level)
LDA $11A2
BIT #$01
BEQ exit       ;(Exit if magical damage)
LDA #$20
TRB $B3
exit:
RTS

EDIT: I just spotted a way to shrink the rowblitz code, I think. Am I correct in thinking BIT #$01 / BEQ could be shrunk to LSR / BCC?