* merge master * gi objects * Some more and fix dungeon keep and field keep * the rest of them * fix field keep * Remove extra underscore
* object_triforce_spot * object_gi_jewel * object_efc_crystal_light * object_efc_fire_ball * object_efc_lgt_shower * object_god_lgt * object_light_ring * object_efc_tw * undefined_syms * fix gameplay_keep