Yeah, I should be using Ghidira in my toolchain. I didn't know it existed so I had to reinvent the wheel.

Although - Ghidira is often wrong about what code does. Make it run tests to verify its theories? BINGO.