Merge 'main' into 'BriBaSA_ex'

.vscode/settings.json

@@ -19,7 +19,6 @@
     "stddef.h": "c",
     "defines.h": "c",
     "functions.h": "c",
-    "game/init.h": "c",
     "chrono": "c",
     "core.h": "c",
     "ios": "c",
@@ -258,7 +257,54 @@
     "gohla.h": "c",
     "multipak_connection.h": "c",
     "eggmobile_escape_sequence.h": "c",
-    "screen_shake.h": "c"
+    "screen_shake.h": "c",
+    "player_controls.h": "c",
+    "stage.h": "c",
+    "screen_fade.h": "c",
+    "cheese.h": "c",
+    "amy_attack_heart_effect.h": "c",
+    "zone_3.h": "c",
+    "zone_5.h": "c",
+    "camera.h": "c",
+    "dummy.h": "c",
+    "animation_commands_bg.h": "c",
+    "zone_4.h": "c",
+    "globals.h": "c",
+    "zone_7.h": "c",
+    "cannon.h": "c",
+    "player_transitions.h": "c",
+    "hook_rail.h": "c",
+    "connection.h": "c",
+    "rings_scatter.h": "c",
+    "mode_select.h": "c",
+    "geji_geji.h": "c",
+    "unknown_1.h": "c",
+    "platform.h": "c",
+    "anim_commands.h": "c",
+    "platform_crumbling.h": "c",
+    "german_flute.h": "c",
+    "guitar_string.h": "c",
+    "giant_propeller.h": "c",
+    "collect_ring_effect.h": "c",
+    "zone_1.h": "c",
+    "zone_2.h": "c",
+    "zone_6.h": "c",
+    "zone_final.h": "c",
+    "pause_menu.h": "c",
+    "title_screen.h": "c",
+    "game_modes.h": "c",
+    "main.h": "c",
+    "unknown_task.h": "c",
+    "entities_0.h": "c",
+    "dust_cloud.h": "c",
+    "unknown_effect.h": "c",
+    "underwater_effects.h": "c",
+    "dust_effect_braking.h": "c",
+    "water_effects.h": "c",
+    "player_mp_actor.h": "c",
+    "player_unk_2.h": "c",
+    "dummy_task.h": "c",
+    "player_super_sonic.h": "c"
   },
   "asm-code-lens.donated": true,
   "editor.formatOnSave": true,