Yeah, without the Lance, it would have to be a sword that needs to be upgraded. It is a bit more difficult to do with hammers since you will then take damage most of the time.
