So, long story short I went into battle with Riolu first, I let him die on purpose so his happiness fell to 250.
Then, when I got it back to 255 it evolved as normal :Grin:
Don't know if that's what's supposed to happen, but it seems that evolution only triggers when the Pokemon first hit max happiness or something.