Minor cleanup; still minor errors and no vine clip

(Played on: GBAHawk 2.1.2; inputs file: https://drive.google.com/file/d/1NaG6B_tHvI8OOpYsBd-9JUfi8IoC0l8W/view?usp=sharing ; time: 3708 GBA frames, starts at: 45134 frames)