ASM Requests

I have a couple more requests here if any assembly junkies wanna help a brotha out! They are nothing too exciting, and obscure as usual, but are important to my hack so it would be greatly appreciated, as always! I hope it's nothing too crazy.

1) I need characters equipped weapon graphic to show back up after using Rage (I have it now so rage doesn't use berserk on the character anymore so they can use something else next turn you see, but the weapon of the monster sticks on the character, is the problem.) I'm able to knock off the weapon switch from happening, but I'd like it to still do the switch, and then revert back to normal weapon.

is handled here:
C2/0625: BF 1A 00 CF LDA $CF001A,X (monster's regular weapon graphic)

2) I need the spell learn % show up on weapons too, like it does already for armor.

item spell learn % code:

C3/87CE: BF0350D8 LDA $D85003,X (Load item X's spell learn rate)
C3/87D2: F016 BEQ $87EA
C3/87D4: 85E0 STA $E0
C3/87D6: BF0450D8 LDA $D85004,X (Load item X's spell learned)
C3/87DA: 85E1 STA $E1
C3/87DC: C220 REP #$20 (16 bit memory/accum.)
C3/87DE: A92F83 LDA #$832F
C3/87E1: 8F899E7E STA $7E9E89
C3/87E5: E220 SEP #$20 (8 bit memory/accum.)
C3/87E7: 20ED5A JSR $5AED (draw spell name and learn rate)
C3/87EA: 60 RTS

Big ol' thanks and credit for anyone willing to take the time out for this.