asm subweapon logic..

So, I got my subweapon scripts 90 percent done..
Basically, you press up and it bypasses your melee attack and fires a projectile..

Works great except, when coming down from a jump, holding the up button causes it to bypass the idle state and continue in jumping state...

Can someone help me out with the logic ?
Basically its:

If not in air and not subattacking and up is pressed
Changed to idle state...

I'm currently about to try this:

Lda object_physics_byte,x
And #%00000001
Bne+
Jmp fin
+
Cmp #$06
Bne ++
Jmp fin
++
Lda gamepad
And #%00010000
Bne fin
ChangeObjectState #$00, #$00
Fin:
Rts