This is looking great, but I have one comment in the code and two things I'd like to see before this gets merged.

1. I'd like to see if we can get these in as possible Ice Trap models. I forget exactly where right this minute, but I think it's in item_pool.cpp, there's a place where a vector gets filled with RGs, and I think if we add the Ocarina Button RGs in there it should just work.
2. Even if it's just placeholder text, I'd like to see something in the item tracker. I won't require it for this to get merged because I'm not familiar enough with that code to know how easy it is to add these buttons to, but I would like for that to be looked into.

If we can get those addressed then I'll say LGTM!

Have you tested the ice trap models to make sure they actually render correctly? Adding them to the list should be all that's needed for that, just curious if that's actually been verified. If not I'll gen a few seeds and check. Assuming they render correctly, LGTM!

Sorry for the review whiplash. Turns out the custom models as they are now as Ice Trap models won't work (at least during the GetItem Animation where link holds the item above his head), and fixing that is outside the scope of this PR. So just remove the added Ice Trap models for now, but do keep the trick names so that those will work when the ability to draw custom models as Ice Traps is fixed.

This one is my bad from when I attempted to resolve the merge conflict, I included what should be the needed fix for it.