[Script] Problem with script after applying the complete fire red upgrade?

[Jscothy]

So I recently added the Complete fire red upgrade to my 90% complete hack and it all worked perfectly......except for all my new rival battles? before applying the upgrade the scripts work fine but when i apply it, for some reason it stops working? any ideas why? Ive attached imagines of the script in Advanced map and Ive put the script down below.

(I think it is the scripts that have "var number" in but not certain)

thanks for any help

Spoiler:

#org 0x80307F
lock
faceplayer
checkflag 0x1206
if 0x1 goto 0x88030E6
setvar 0x6004 0x0
msgbox 0x88030E8 MSG_NORMAL '"JOSH: [player]!"
applymovement 0x2 0x88030D1
waitmovement 0x0
trainerbattle 0x1 0x1 0x0 0x880311B 0x8803150 0x88030B5
release
end

'---------------
#org 0x8030E6
release
end

'---------------
#org 0x8030B5
msgbox 0x88030F2 MSG_NORMAL '"JOSH: Oh well!\n I'll beat you nex..."
applymovement 0x2 0x88030DC
waitmovement 0x0
hidesprite 0x2
setflag 0x1206
release
end


'---------
' Strings
'---------
#org 0x8030E8
= JOSH: [player]!

#org 0x80311B
= JOSH: You missed it [player]!!\lOh well look what I caught!

#org 0x803150
= Woah!

#org 0x8030F2
= JOSH: Oh well!\n I'll beat you next time!


'-----------
' Movements
'-----------
#org 0x8030D1
#raw 0x1D 'Step Down (Fast)
#raw 0x1D 'Step Down (Fast)
#raw 0x1D 'Step Down (Fast)
#raw 0x1D 'Step Down (Fast)
#raw 0x12 'Step Left (Normal)
#raw 0x12 'Step Left (Normal)
#raw 0x12 'Step Left (Normal)
#raw 0x12 'Step Left (Normal)
#raw 0x12 'Step Left (Normal)
#raw 0xFE 'End of Movements

#org 0x8030DC
#raw 0x13 'Step Right (Normal)
#raw 0x11 'Step Up (Normal)
#raw 0x11 'Step Up (Normal)
#raw 0x11 'Step Up (Normal)
#raw 0x11 'Step Up (Normal)
#raw 0x11 'Step Up (Normal)
#raw 0x11 'Step Up (Normal)
#raw 0x11 'Step Up (Normal)
#raw 0xFE 'End of Movements

*Resolved*

*0x6004 is not a valid var
You can use 0x4000 to 0x40FF or 0x5000 to 0x51FF*