refactor multiplayer folder for sa1 sa2 merge

.vscode/settings.json

@@ -44,13 +44,13 @@
     "random": "c",
     "multiplayer.h": "c",
     "malloc_vram.h": "c",
-    "game/multiplayer/multipak_connection.h": "c",
-    "game/multiplayer/team_play.h": "c",
+    "game/sa2/multiplayer/multipak_connection.h": "c",
+    "game/sa2/multiplayer/team_play.h": "c",
     "multi_boot.h": "c",
     "game/sa2/ui/character_select.h": "c",
     "game/screen_transition.h": "c",
     "data/palettes.h": "c",
-    "game/multiplayer/mode_select.h": "c",
+    "game/sa2/multiplayer/mode_select.h": "c",
     "game/sa2/time_attack/lobby.h": "c",
     "game/sa2/ui/course_select.h": "c",
     "algorithm": "c",

include/game/sa2/stage/cheese.h

@@ -4,7 +4,7 @@
 #include "global.h"
 #include "core.h"
 
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/shared/stage/player.h"
 
 typedef struct {

ldscript.txt

@@ -44,8 +44,8 @@ SECTIONS
         src/game/shared/stage/water_effects.o(.data);
         src/game/sa2/stage/cheese.o(.data);
         src/game/sa2/stage/boost_effect.o(.data);
-        src/game/multiplayer/mp_player.o(.data);
-        src/game/multiplayer/mp_attack_2_effect.o(.data);
+        src/game/shared/stage/mp_player.o(.data);
+        src/game/sa2/stage/mp_attack_2_effect.o(.data);
         src/game/dummy_task.o(.data);
         src/game/shared/stage/stage.o(.data);
         src/game/shared/stage/camera.o(.data);
@@ -135,12 +135,12 @@ SECTIONS
         src/game/sa2/stage/boost_effect.o(.text);
         src/game/shared/stage/amy_attack_heart_effect.o(.text);
 
-        src/game/multiplayer/mp_player.o(.text);
-        src/game/multiplayer/multiplayer_event_mgr.o(.text);
-        src/game/multiplayer/multiplayer_event_recv_mgr.o(.text);
-        src/game/multiplayer/indicators.o(.text);
-        src/game/multiplayer/finish.o(.text);
-        src/game/multiplayer/mp_attack_2_effect.o(.text);
+        src/game/shared/stage/mp_player.o(.text);
+        src/game/shared/stage/mp_event_mgr.o(.text);
+        src/game/shared/stage/mp_event_recv_mgr.o(.text);
+        src/game/shared/stage/mp_indicators.o(.text);
+        src/game/shared/stage/mp_finish.o(.text);
+        src/game/sa2/stage/mp_attack_2_effect.o(.text);
 
         src/game/game.o(.text);
         src/game/dummy_task.o(.text);
@@ -211,13 +211,13 @@ SECTIONS
         src/game/sa2/stage/enemies/kyura.o(.text);
         src/game/sa2/stage/enemies/bullet_buzzer.o(.text);
         src/game/sa2/stage/enemies/star.o(.text);
-        
+
         /* multiplayer_screens */
-        src/game/multiplayer/mode_select.o(.text);
-        src/game/multiplayer/multipak_connection.o(.text);
-        src/game/multiplayer/communication_outcome.o(.text);
-        src/game/multiplayer/results.o(.text);
-        src/game/multiplayer/team_play.o(.text);
+        src/game/sa2/multiplayer/mode_select.o(.text);
+        src/game/sa2/multiplayer/multipak_connection.o(.text);
+        src/game/sa2/multiplayer/communication_outcome.o(.text);
+        src/game/sa2/multiplayer/results.o(.text);
+        src/game/sa2/multiplayer/team_play.o(.text);
 
         src/game/sa2/stage/interactables/leaf_forest/decoration.o(.text);
         src/game/sa2/stage/interactables/leaf_forest/booster.o(.text);
@@ -400,8 +400,8 @@ SECTIONS
         src/game/sa2/stage/cheese.o(.rodata);
         src/game/sa2/stage/boost_effect.o(.rodata);
         src/game/shared/stage/amy_attack_heart_effect.o(.rodata);
-        src/game/multiplayer/multiplayer_event_mgr.o(.rodata);
-        src/game/multiplayer/finish.o(.rodata);
+        src/game/shared/stage/mp_event_mgr.o(.rodata);
+        src/game/shared/stage/mp_finish.o(.rodata);
 
         src/game/shared/stage/stage.o(.rodata);
         src/game/shared/stage/camera.o(.rodata);
@@ -436,11 +436,11 @@ SECTIONS
         src/game/sa2/stage/enemies/kubinaga.o(.rodata);
         src/game/sa2/stage/enemies/koura.o(.rodata);
         src/game/sa2/stage/enemies/geji_geji.o(.rodata);
-        src/game/multiplayer/mode_select.o(.rodata);
-        src/game/multiplayer/multipak_connection.o(.rodata);
-        src/game/multiplayer/communication_outcome.o(.rodata);
-        src/game/multiplayer/results.o(.rodata);
-        src/game/multiplayer/team_play.o(.rodata);
+        src/game/sa2/multiplayer/mode_select.o(.rodata);
+        src/game/sa2/multiplayer/multipak_connection.o(.rodata);
+        src/game/sa2/multiplayer/communication_outcome.o(.rodata);
+        src/game/sa2/multiplayer/results.o(.rodata);
+        src/game/sa2/multiplayer/team_play.o(.rodata);
         src/game/sa2/stage/interactables/leaf_forest/decoration.o(.rodata);
         src/game/sa2/stage/interactables/leaf_forest/booster.o(.rodata);
         src/game/sa2/stage/interactables/leaf_forest/spring_bouncy.o(.rodata);

multi_boot/roms/collect_rings/Makefile

@@ -117,17 +117,17 @@ SA2_C_FILES := \
 	sa2/malloc_vram.c \
 	sa2/bg_triangles.c \
 	sa2/game/globals.c \
-	sa2/game/multiplayer/multiplayer_event_mgr.c \
-	sa2/game/multiplayer/multiplayer_event_recv_mgr.c \
+	sa2/game/shared/stage/mp_event_mgr.c \
+	sa2/game/shared/stage/mp_event_recv_mgr.c \
 	sa2/game/multiboot/collect_rings/results.c \
 	sa2/game/shared/stage/entities_manager.c \
 	sa2/game/shared/stage/collision.c \
 	sa2/game/sa2/stage/mystery_itembox.c \
 	sa2/game/shared/stage/rings_manager.c \
 	sa2/game/multiboot/collect_rings/time_display.c \
-	sa2/game/multiplayer/indicators.c \
-	sa2/game/multiplayer/mp_player.c \
-	sa2/game/multiplayer/finish.c \
+	sa2/game/shared/stage/mp_indicators.c \
+	sa2/game/shared/stage/mp_player.c \
+	sa2/game/shared/stage/mp_finish.c \
 	sa2/game/sa2/stage/interactables/leaf_forest/toggle_player_layer.c \
 	sa2/game/sa2/stage/interactables/spring.c \
 	sa2/game/sa2/stage/interactables/ramp.c \
@@ -136,7 +136,7 @@ SA2_C_FILES := \
 	sa2/game/sa2/stage/interactables/collect_rings_lap_trigger.c \
 	sa2/game/shared/stage/dust_cloud.c \
 	sa2/game/shared/stage/collect_ring_effect.c \
-	sa2/game/multiplayer/mp_attack_2_effect.c \
+	sa2/game/sa2/stage/mp_attack_2_effect.c \
 	sa2/game/shared/stage/camera.c \
 	sa2/game/shared/stage/terrain_collision.c \
 	sa2/game/shared/stage/player.c \

multi_boot/roms/collect_rings/ldscript.txt

@@ -15,8 +15,8 @@ SECTIONS {
         build/collect_rings/src/sa2/core.o(.data);
         build/collect_rings/src/sa2/game/globals.o(.data);
         build/collect_rings/src/sa2/game/multiboot/collect_rings/time_display.o(.data);
-        build/collect_rings/src/sa2/game/multiplayer/mp_player.o(.data);
-        build/collect_rings/src/sa2/game/multiplayer/mp_attack_2_effect.o(.data);
+        build/collect_rings/src/sa2/game/shared/stage/mp_player.o(.data);
+        build/collect_rings/src/sa2/game/sa2/stage/mp_attack_2_effect.o(.data);
         build/collect_rings/src/sa2/game/shared/stage/camera.o(.data);
         build/collect_rings/src/sa2/game/shared/stage/terrain_collision.o(.data);
         build/collect_rings/src/sa2/game/shared/stage/player.o(.data);
@@ -42,17 +42,17 @@ SECTIONS {
         build/collect_rings/src/sa2/sprite.o(.text);
         build/collect_rings/src/sa2/malloc_vram.o(.text);
         build/collect_rings/src/sa2/bg_triangles.o(.text);
-        build/collect_rings/src/sa2/game/multiplayer/multiplayer_event_mgr.o(.text);
-        build/collect_rings/src/sa2/game/multiplayer/multiplayer_event_recv_mgr.o(.text);
+        build/collect_rings/src/sa2/game/shared/stage/mp_event_mgr.o(.text);
+        build/collect_rings/src/sa2/game/shared/stage/mp_event_recv_mgr.o(.text);
         build/collect_rings/src/sa2/game/multiboot/collect_rings/results.o(.text);
         build/collect_rings/src/sa2/game/shared/stage/entities_manager.o(.text);
         build/collect_rings/src/sa2/game/shared/stage/collision.o(.text);
         build/collect_rings/src/sa2/game/sa2/stage/mystery_itembox.o(.text);
         build/collect_rings/src/sa2/game/shared/stage/rings_manager.o(.text);
         build/collect_rings/src/sa2/game/multiboot/collect_rings/time_display.o(.text);
-        build/collect_rings/src/sa2/game/multiplayer/indicators.o(.text);
-        build/collect_rings/src/sa2/game/multiplayer/mp_player.o(.text);
-        build/collect_rings/src/sa2/game/multiplayer/finish.o(.text);
+        build/collect_rings/src/sa2/game/shared/stage/mp_indicators.o(.text);
+        build/collect_rings/src/sa2/game/shared/stage/mp_player.o(.text);
+        build/collect_rings/src/sa2/game/shared/stage/mp_finish.o(.text);
         build/collect_rings/src/sa2/game/sa2/stage/interactables/leaf_forest/toggle_player_layer.o(.text);
         build/collect_rings/src/sa2/game/sa2/stage/interactables/spring.o(.text);
         build/collect_rings/src/sa2/game/sa2/stage/interactables/ramp.o(.text);
@@ -61,7 +61,7 @@ SECTIONS {
         build/collect_rings/src/sa2/game/sa2/stage/interactables/collect_rings_lap_trigger.o(.text);
         build/collect_rings/src/sa2/game/shared/stage/dust_cloud.o(.text);
         build/collect_rings/src/sa2/game/shared/stage/collect_ring_effect.o(.text);
-        build/collect_rings/src/sa2/game/multiplayer/mp_attack_2_effect.o(.text);
+        build/collect_rings/src/sa2/game/sa2/stage/mp_attack_2_effect.o(.text);
         build/collect_rings/src/sa2/game/shared/stage/camera.o(.text);
         build/collect_rings/src/sa2/game/shared/stage/terrain_collision.o(.text);
         build/collect_rings/src/sa2/game/shared/stage/player.o(.text);
@@ -94,12 +94,12 @@ SECTIONS {
         build/collect_rings/src/sa2/background.o(.rodata);
         build/collect_rings/src/sa2/trig.o(.rodata);
         build/collect_rings/src/sa2/sprite.o(.rodata);
-        build/collect_rings/src/sa2/game/multiplayer/multiplayer_event_mgr.o(.rodata);
+        build/collect_rings/src/sa2/game/shared/stage/mp_event_mgr.o(.rodata);
         build/collect_rings/src/sa2/game/shared/stage/entities_manager.o(.rodata);
         build/collect_rings/src/sa2/game/sa2/stage/mystery_itembox.o(.rodata);
         build/collect_rings/src/sa2/game/multiboot/collect_rings/time_display.o(.rodata);
-        build/collect_rings/src/sa2/game/multiplayer/mp_player.o(.rodata);
-        build/collect_rings/src/sa2/game/multiplayer/finish.o(.rodata);
+        build/collect_rings/src/sa2/game/shared/stage/mp_player.o(.rodata);
+        build/collect_rings/src/sa2/game/shared/stage/mp_finish.o(.rodata);
         build/collect_rings/src/sa2/game/sa2/stage/interactables/spring.o(.rodata);
         build/collect_rings/src/sa2/game/sa2/stage/interactables/leaf_forest/spikes.o(.rodata);
         build/collect_rings/src/sa2/game/shared/stage/camera.o(.rodata);

sa1/include/game/multiplayer/mp_attack_1_effect.h

@@ -1,11 +0,0 @@
-#ifndef GUARD_MULTIPLAYER_ATTACK_1_EFFECT_H
-#define GUARD_MULTIPLAYER_ATTACK_1_EFFECT_H
-
-#include "global.h"
-
-void CreateMPAttackEffect(void);
-
-extern s32 gUnused_03005B78;
-extern bool8 gShouldSpawnMPAttackEffect;
-
-#endif // GUARD_MULTIPLAYER_ATTACK_1_EFFECT_H

sa1/include/game/multiplayer/player_unk_2.h

@@ -1,19 +0,0 @@
-
-
-#ifndef GUARD_MULTIPLAYER_PLAYER_UNK_2_H
-#define GUARD_MULTIPLAYER_PLAYER_UNK_2_H
-
-#include "global.h"
-
-// Copies of BG control regs for Multiplayer(?)
-typedef struct {
-    u16 unk0;
-    u16 unk2;
-    u16 unk4;
-    u16 unk6;
-} MultiPlayerBgCtrlRegs; /* size: 8 */
-extern MultiPlayerBgCtrlRegs *gMPAttackEffect2Regs;
-
-void sub_801A384(void);
-
-#endif // GUARD_MULTIPLAYER_PLAYER_UNK_2_H

sa1/ldscript.txt

@@ -49,25 +49,25 @@ SECTIONS {
         src/game/sa1/save.o(.text);
 
         src/game/shared/stage/unused_flash_task.o(.text);
-        src/game/multiplayer/mp_player.o(.text);
-        src/game/multiplayer/indicators.o(.text);
+        src/game/shared/stage/mp_player.o(.text);
+        src/game/shared/stage/mp_indicators.o(.text);
         src/game/sa1/stage/enemies/bosses_egg_mobile.o(.text);
         src/game/sa1/stage/enemies/bosses_misc.o(.text);
         src/game/sa1/stage/nuts_and_bolts_task.o(.text);
         src/game/shared/stage/spot_lights_manager.o(.text);
 
-        src/game/multiplayer/multiplayer_event_mgr.o(.text);
-        src/game/multiplayer/multiplayer_event_recv_mgr.o(.text);
-        src/game/multiplayer/results.o(.text);
-        src/game/multiplayer/results_b.o(.text);
-        src/game/multiplayer/finish.o(.text);
+        src/game/shared/stage/mp_event_mgr.o(.text);
+        src/game/shared/stage/mp_event_recv_mgr.o(.text);
+        src/game/sa1/stage/mp_results.o(.text);
+        src/game/sa1/stage/mp_results_b.o(.text);
+        src/game/shared/stage/mp_finish.o(.text);
     
         src/game/shared/stage/pause_menu.o(.text);
-        src/game/multiplayer/results_2.o(.text);
-        src/game/multiplayer/hud.o(.text);
+        src/game/sa1/stage/mp_results_2.o(.text);
+        src/game/sa1/stage/mp_hud.o(.text);
         src/game/sa1/stage/mystery_itembox.o(.text);
-        src/game/multiplayer/unk_0.o(.text);
-        src/game/multiplayer/unk_1.o(.text);
+        src/game/sa1/stage/mp_unk_0.o(.text);
+        src/game/sa1/stage/mp_unk_1.o(.text);
         
         /* prototype ? */
         src/game/sa1/stage/enemies/kiki.o(.text);
@@ -329,10 +329,10 @@ SECTIONS {
         src/game/sa1/menus/player_data.o(.rodata);
         src/game/shared/stage/unused_flash_task.o(.rodata);
         data/data_0_1_2.o(.rodata);
-        src/game/multiplayer/multiplayer_event_mgr.o(.rodata);
-        src/game/multiplayer/results_b.o(.rodata);
-        src/game/multiplayer/results.o(.rodata);
-        src/game/multiplayer/finish.o(.rodata);
+        src/game/shared/stage/mp_event_mgr.o(.rodata);
+        src/game/sa1/stage/mp_results_b.o(.rodata);
+        src/game/sa1/stage/mp_results.o(.rodata);
+        src/game/shared/stage/mp_finish.o(.rodata);
         src/game/multiboot/collect_rings/time_display.o(.rodata);
         src/game/sa1/stage/mystery_itembox.o(.rodata);
         src/game/sa1/stage/interactables/spring.o(.rodata);
@@ -589,7 +589,7 @@ SECTIONS {
         sa2/src/lib/agb_flash/agb_flash_mx_512k.o(.rodata);
         sa2/src/lib/agb_flash/agb_flash_at_512k.o(.rodata);
         data/data1.o(.rodata);
-        src/game/multiplayer/unk_0.o(.rodata);
+        src/game/sa1/stage/mp_unk_0.o(.rodata);
         data/data1_1.o(.rodata);
         data/build_info.o(.rodata);
     } = 0

sa1/src/game/multiplayer/communication_outcome.c

@@ -13,7 +13,7 @@
 #include "game/multiplayer/communication_outcome.h"
 #include "game/multiplayer/multipak_connection.h"
 #if (GAME == GAME_SA1)
-#include "game/multiplayer/results.h"
+#include "game/sa1/stage/mp_results.h"
 #endif
 
 #include "game/sa1/stage/tilemap_table.h"

sa1/src/game/sa1/stage/interactables/booster.c

@@ -4,7 +4,7 @@
 #include "malloc_vram.h"
 #include "lib/m4a/m4a.h"
 #include "game/types/entity.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/collision.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/terrain_collision.h"

sa1/src/game/sa1/stage/interactables/boulder_spawner.c

@@ -3,7 +3,7 @@
 #include "trig.h"
 #include "game/types/entity.h"
 #include "game/shared/stage/collision.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/terrain_collision.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/water_effects.h"

sa1/src/game/sa1/stage/interactables/breakable_wall.c

@@ -4,7 +4,7 @@
 #include "malloc_vram.h"
 #include "game/types/entity.h"
 #include "game/shared/stage/collision.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/player.h"
 #include "game/sa1/stage/player_controls.h"
 

sa1/src/game/sa1/stage/interactables/bumpers.c

@@ -6,7 +6,7 @@
 #include "lib/m4a/m4a.h"
 #include "game/types/entity.h"
 #include "game/shared/stage/collision.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/shared/stage/player.h"
 #include "game/sa1/stage/player_controls.h"
 #include "game/shared/stage/terrain_collision.h"

sa1/src/game/sa1/stage/interactables/decoration.c

@@ -8,8 +8,8 @@
 #include "game/shared/stage/collision.h"
 #include "game/shared/stage/dust_cloud.h"
 #include "game/shared/stage/entities_manager.h"
-#include "game/multiplayer/mp_player.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/player.h"
 #include "game/sa1/stage/player_controls.h"
 #include "game/shared/stage/terrain_collision.h"

sa1/src/game/sa1/stage/interactables/ice_block.c

@@ -5,7 +5,7 @@
 #include "game/shared/stage/collision.h"
 #include "game/shared/stage/dust_cloud.h"
 #include "game/shared/stage/entities_manager.h" // TaskDestructor_EntityShared
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/terrain_collision.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/water_effects.h"

sa1/src/game/sa1/stage/interactables/moving_spring.c

@@ -3,7 +3,7 @@
 #include "trig.h"
 #include "game/types/entity.h"
 #include "game/shared/stage/collision.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/terrain_collision.h"
 #include "game/shared/stage/player.h"
 #include "game/sa1/stage/stage_ui.h" // for sub_80549FC

sa1/src/game/sa1/stage/interactables/party_balloon.c

@@ -4,7 +4,7 @@
 #include "lib/m4a/m4a.h"
 #include "game/types/entity.h"
 #include "game/sa1/stage/interactables/party_balloon.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/types/player.h"
 #include "game/shared/stage/player.h"
 

sa1/src/game/sa1/stage/interactables/pipe.c

@@ -8,8 +8,8 @@
 #include "game/shared/stage/collision.h"
 #include "game/shared/stage/dust_cloud.h"
 #include "game/shared/stage/entities_manager.h"
-#include "game/multiplayer/mp_player.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/player.h"
 #include "game/sa1/stage/player_controls.h"
 #include "game/shared/stage/terrain_collision.h"

sa1/src/game/sa1/stage/interactables/platform_crumbling.c

@@ -5,8 +5,8 @@
 #include "malloc_vram.h"
 #include "lib/m4a/m4a.h"
 #include "game/types/entity.h"
-#include "game/multiplayer/mp_player.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/collision.h"
 #include "game/sa1/stage/player_controls.h"

sa1/src/game/sa1/stage/interactables/platform_spiked.c

@@ -3,7 +3,7 @@
 #include "trig.h"
 #include "game/types/entity.h"
 #include "game/shared/stage/collision.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/terrain_collision.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/water_effects.h"

sa1/src/game/sa1/stage/interactables/platform_thin.c

@@ -3,7 +3,7 @@
 #include "trig.h"
 #include "game/types/entity.h"
 #include "game/shared/stage/collision.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/water_effects.h"
 #include "malloc_vram.h"

sa1/src/game/sa1/stage/interactables/platforms_085_089.c

@@ -4,7 +4,7 @@
 #include "malloc_vram.h"
 #include "lib/m4a/m4a.h"
 #include "game/types/entity.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/collision.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/terrain_collision.h"

sa1/src/game/sa1/stage/interactables/skating_stone.c

@@ -4,7 +4,7 @@
 #include "malloc_vram.h"
 #include "lib/m4a/m4a.h"
 #include "game/types/entity.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/collision.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/terrain_collision.h"

sa1/src/game/sa1/stage/interactables/small_fall_block.c

@@ -4,7 +4,7 @@
 #include "malloc_vram.h"
 #include "game/types/entity.h"
 #include "game/shared/stage/collision.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 
 #include "constants/animations.h"
 

sa1/src/game/sa1/stage/interactables/spikes.c

@@ -6,7 +6,7 @@
 #include "lib/m4a/m4a.h"
 #include "game/types/entity.h"
 #include "game/shared/stage/collision.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/shared/stage/player.h"
 #include "game/sa1/stage/player_controls.h"
 #include "game/shared/stage/terrain_collision.h"

sa1/src/game/sa1/stage/interactables/spring.c

@@ -5,7 +5,7 @@
 #include "malloc_vram.h"
 #include "lib/m4a/m4a.h"
 #include "game/types/entity.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/collision.h"
 #include "game/sa1/stage/player_controls.h"

sa1/src/game/sa1/stage/interactables/stage_goal.c

@@ -4,9 +4,9 @@
 #include "malloc_vram.h"
 #include "lib/m4a/m4a.h"
 #include "game/shared/stage/entities_manager.h"
-#include "game/multiplayer/finish.h"
-#include "game/multiplayer/mp_player.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_finish.h"
+#include "game/shared/stage/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/parameters/characters.h"
 #include "game/shared/stage/player.h"
 #include "game/sa1/ui/stage_results.h"

sa1/src/game/sa1/stage/interactables/track.c

@@ -8,8 +8,8 @@
 #include "game/shared/stage/collision.h"
 #include "game/shared/stage/dust_cloud.h"
 #include "game/shared/stage/entities_manager.h"
-#include "game/multiplayer/mp_player.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/player.h"
 #include "game/sa1/stage/player_controls.h"
 #include "game/shared/stage/terrain_collision.h"

sa1/src/game/sa1/stage/interactables/underwater_lava_platform.c

@@ -3,7 +3,7 @@
 #include "trig.h"
 #include "game/types/entity.h"
 #include "game/shared/stage/collision.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/terrain_collision.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/water_effects.h"

sa1/src/game/sa1/stage/itembox.c

@@ -16,8 +16,8 @@
 #include "game/shared/stage/camera.h"
 #include "game/shared/stage/terrain_collision.h"
 
-#include "game/multiplayer/multiplayer_event_mgr.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
+#include "game/shared/stage/mp_player.h"
 
 #include "constants/animations.h"
 #include "constants/char_states.h"

sa1/src/game/sa1/stage/mp_chao.c

@@ -4,8 +4,8 @@
 #include "malloc_vram.h"
 #include "lib/m4a/m4a.h"
 #include "game/globals.h"
-#include "game/multiplayer/chao.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/sa1/stage/mp_chao.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/shared/stage/terrain_collision.h"
 #include "game/types/entity.h"
 

sa1/src/game/sa1/stage/mp_unk_0.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 #include "flags.h"
-#include "game/multiplayer/unk_0.h"
+#include "game/sa1/stage/mp_unk_0.h"
 #include "game/globals.h"
 
 void Task_801C770(void);

sa1/src/game/sa1/stage/mp_unk_1.c

@@ -9,7 +9,7 @@
 #include "game/shared/menus/unused_level_select.h"
 #include "game/gTask_03006240.h"
 #include "game/multiplayer/multipak_connection.h"
-#include "game/multiplayer/unk_1.h"
+#include "game/sa1/stage/mp_unk_1.h"
 #include "game/globals.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/stage.h"

sa1/src/game/sa1/stage/mystery_itembox.c

@@ -4,8 +4,8 @@
 
 #include "game/types/entity.h"
 #include "game/sa1/stage/mystery_itembox.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/shared/stage/dust_cloud.h"
 #include "game/sa1/stage/itembox.h"
 #include "game/shared/stage/camera.h"

sa1/src/game/sa1/stage/stage_ui.c

@@ -7,7 +7,7 @@
 #include "game/globals.h"
 #include "game/sa1/special_stage/main.h"
 #include "game/gTask_03006240.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/sa1/save.h"
 #include "game/sa1/stage/stage_ui.h"
 #include "game/shared/stage/water_effects.h"

sa1/src/game/sa1/stage/stage_ui_z.c

@@ -5,8 +5,8 @@
 #include "game/types/player.h"
 #include "game/globals.h"
 #include "game/gTask_03006240.h"
-#include "game/multiplayer/mp_player.h"
-#include "game/multiplayer/hud.h" // CreateChaoHuntHUD
+#include "game/shared/stage/mp_player.h"
+#include "game/sa1/stage/mp_hud.h" // CreateChaoHuntHUD
 #include "game/sa1/stage/stage_ui.h"
 #include "game/shared/stage/underwater_effects.h"
 #include "game/shared/stage/water_effects.h"

sa1/src/game/sa1/ui/character_select.c

@@ -5,7 +5,7 @@
 #include "data/ui_graphics.h"
 #include "game/gTask_03006240.h"
 #include "game/multiplayer/multipak_connection.h"
-#include "game/multiplayer/unk_1.h"
+#include "game/sa1/stage/mp_unk_1.h"
 #include "game/globals.h"
 #include "game/shared/stage/stage.h"
 #include "game/sa1/stage/stage_ui.h"

sa1/src/game/sa1/ui/game_2_3.c

@@ -2,7 +2,7 @@
 #include "core.h"
 #include "lib/m4a/m4a.h"
 #include "game/gTask_03006240.h"
-#include "game/multiplayer/chao.h"
+#include "game/sa1/stage/mp_chao.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/globals.h"
 #include "game/shared/stage/stage.h"

sa1/src/game/sa1/ui/multiplayer_continue_screen.c

@@ -5,7 +5,7 @@
 #include "game/sa1/ui/game_over.h"
 #include "game/globals.h"
 #include "game/multiplayer/multipak_connection.h"
-#include "game/multiplayer/results.h"
+#include "game/sa1/stage/mp_results.h"
 #include "game/sa1/save.h"
 #include "game/sa1/stage/stage_ui.h"
 

sa1/src/game/shared/menus/unused_level_select.c

@@ -12,7 +12,7 @@
 #include "game/shared/stage/stage.h"
 #include "game/multiplayer/communication_outcome.h"
 #include "game/multiplayer/multipak_connection.h"
-#include "game/multiplayer/results.h"
+#include "game/sa1/stage/mp_results.h"
 
 #if (GAME == GAME_SA2)
 #include "game/bosses/common.h"

sa1/src/game/shared/stage/camera.c

@@ -11,7 +11,7 @@
 #include "game/shared/stage/terrain_collision.h"
 
 #if (GAME == GAME_SA1)
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #elif (GAME == GAME_SA2)
 #include "game/sa2/stage/player_super_sonic.h"
 #include "game/sa1/stage/background/dummy.h"

sa1/src/game/shared/stage/collision.c

@@ -2,7 +2,7 @@
 #include "rect.h"
 #include "sprite.h"
 #include "lib/m4a/m4a.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/globals.h"
 #include "game/shared/stage/collision.h"
 #include "game/shared/stage/dust_cloud.h"
@@ -13,7 +13,7 @@
 #include "game/cheese.h"
 #endif
 #include "game/types/entity.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/parameters/characters.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/rings_scatter.h"

sa1/src/game/shared/stage/collision_0.c

@@ -3,7 +3,7 @@
 #include "sprite.h"
 #if (GAME == GAME_SA1)
 #include "lib/m4a/m4a.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/terrain_collision.h"
 #include "constants/char_states.h"

sa1/src/game/shared/stage/dust_effect_spindash.c

@@ -7,7 +7,7 @@
 
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/camera.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 
 #include "constants/animations.h"
 

sa1/src/game/shared/stage/item_tasks.c

@@ -11,7 +11,7 @@
 #include "game/shared/stage/camera.h"
 #include "game/shared/stage/mp_sprite_task.h"
 #include "game/shared/stage/item_tasks.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 
 #include "constants/animations.h"
 #include "constants/songs.h"

sa1/src/game/shared/stage/mp_event_mgr.c

@@ -4,10 +4,10 @@
 #include "game/shared/stage/camera.h"
 #include "game/shared/stage/item_tasks.h"
 
-#include "game/multiplayer/unk_0.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
-#include "game/multiplayer/finish.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/sa1/stage/mp_unk_0.h"
+#include "game/shared/stage/mp_event_mgr.h"
+#include "game/shared/stage/mp_finish.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/globals.h"
 #include "game/types/player.h"
 

sa1/src/game/shared/stage/mp_event_recv_mgr.c

@@ -2,9 +2,9 @@
 #include "core.h"
 #include "lib/m4a/m4a.h"
 #include "game/types/entity.h"
-#include "game/multiplayer/chao.h"
-#include "game/multiplayer/mp_player.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/sa1/stage/mp_chao.h"
+#include "game/shared/stage/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/rings_scatter.h"
 #include "game/shared/stage/entities_manager.h"
 

sa1/src/game/shared/stage/mp_finish.c

@@ -7,10 +7,10 @@
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/camera.h"
 
-#include "game/multiplayer/finish.h"
-#include "game/multiplayer/mp_player.h"
-#include "game/multiplayer/results.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_finish.h"
+#include "game/shared/stage/mp_player.h"
+#include "game/sa1/stage/mp_results.h"
+#include "game/shared/stage/mp_event_mgr.h"
 
 #include "game/multiboot/collect_rings/results.h"
 

sa1/src/game/shared/stage/mp_indicators.c

@@ -5,7 +5,7 @@
 #include "game/globals.h"
 
 #include "game/shared/stage/camera.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 
 #include "constants/animations.h"
 #include "constants/vram_hardcoded.h"

sa1/src/game/shared/stage/mp_player.c

@@ -13,13 +13,13 @@
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/camera.h"
 
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/item_tasks.h"
 
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #if (GAME == GAME_SA1)
-#include "game/multiplayer/chao.h"
+#include "game/sa1/stage/mp_chao.h"
 #include "constants/sa2_char_states.h"
 #elif (GAME == GAME_SA2)
 #include "game/multiplayer/mp_attack_2_effect.h"

sa1/src/game/shared/stage/mp_sprite_task.c

@@ -12,7 +12,7 @@
 
 #include "game/shared/stage/stage.h"
 #include "game/shared/stage/water_effects.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 
 #include "constants/animations.h"
 

sa1/src/game/shared/stage/player.c

@@ -5,7 +5,7 @@
 #include "gba/io_reg.h"
 #include "lib/m4a/m4a.h"
 #include "game/shared/stage/amy_attack_heart_effect.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/parameters/characters.h"
 #include "game/globals.h"
 #include "game/types/camera.h"

sa1/src/game/shared/stage/rings_manager.c

@@ -14,7 +14,7 @@
 #include "game/sa2/stage/player_super_sonic.h"
 #endif
 
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 
 #include "game/assets/compressed/entities.h"
 

sa1/src/game/shared/stage/stage.c

@@ -3,11 +3,11 @@
 #include "flags.h"
 #include "lib/m4a/m4a.h"
 #include "game/sa1/ui/game_over.h"
-#include "game/multiplayer/chao.h"
-#include "game/multiplayer/finish.h"
-#include "game/multiplayer/indicators.h"
-#include "game/multiplayer/mp_player.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/sa1/stage/mp_chao.h"
+#include "game/shared/stage/mp_finish.h"
+#include "game/shared/stage/mp_indicators.h"
+#include "game/shared/stage/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/globals.h"
 #include "game/shared/stage/entities_manager.h"
 #include "game/shared/stage/music_manager.h"

src/game/globals.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 #include "game/globals.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 
 u8 gSpikesUnknownTimer = 0;
 u32 gCheckpointTime = 0;

src/game/multiboot/collect_rings/results.c

@@ -6,7 +6,7 @@
 #include "game/sa2/stage/tilemap_table.h"
 
 #include "game/multiboot/connection.h"
-#include "game/multiplayer/multipak_connection.h"
+#include "game/sa2/multiplayer/multipak_connection.h"
 #include "game/multiboot/collect_rings/results.h"
 #include "task.h"
 #include "sprite.h"
@@ -20,7 +20,7 @@
 #include "sio32_multi_load.h"
 
 #if COLLECT_RINGS_ROM
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #endif
 
 #include "data/collect_rings.h"

src/game/multiboot/connection.c

@@ -10,10 +10,10 @@
 #include "game/shared/stage/stage.h"
 #include "game/multiboot/connection.h"
 #include "game/multiboot/collect_rings/results.h"
-#include "game/multiplayer/multipak_connection.h"
+#include "game/sa2/multiplayer/multipak_connection.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/camera.h"
-#include "game/multiplayer/mode_select.h"
+#include "game/sa2/multiplayer/mode_select.h"
 #include "game/shared/stage/rings_scatter.h"
 
 #include "game/sa2/stage/player_controls.h"

src/game/sa2/multiplayer/communication_outcome.c

@@ -10,10 +10,10 @@
 #include "game/sa2/ui/character_select.h"
 #include "game/sa2/save.h"
 #include "game/sa2/title_screen.h"
-#include "game/multiplayer/communication_outcome.h"
-#include "game/multiplayer/multipak_connection.h"
+#include "game/sa2/multiplayer/communication_outcome.h"
+#include "game/sa2/multiplayer/multipak_connection.h"
 #if (GAME == GAME_SA1)
-#include "game/multiplayer/results.h"
+#include "game/sa2/multiplayer/results.h"
 #endif
 
 #include "game/sa2/stage/tilemap_table.h"

src/game/sa2/multiplayer/mode_select.c

@@ -7,8 +7,8 @@
 #include "task.h"
 #include "trig.h"
 #include "lib/m4a/m4a.h"
-#include "game/multiplayer/mode_select.h"
-#include "game/multiplayer/multipak_connection.h"
+#include "game/sa2/multiplayer/mode_select.h"
+#include "game/sa2/multiplayer/multipak_connection.h"
 #include "game/multiboot/connection.h"
 #include "game/sa2/save.h"
 #include "game/sa2/stage/screen_fade.h"

src/game/sa2/multiplayer/multipak_connection.c

@@ -4,9 +4,9 @@
 #include "sprite.h"
 #include "multi_sio.h"
 
-#include "game/multiplayer/multipak_connection.h"
-#include "game/multiplayer/communication_outcome.h"
-#include "game/multiplayer/mode_select.h"
+#include "game/sa2/multiplayer/multipak_connection.h"
+#include "game/sa2/multiplayer/communication_outcome.h"
+#include "game/sa2/multiplayer/mode_select.h"
 
 #include "data/sprite_data.h"
 #include "game/sa2/save.h"

src/game/sa2/multiplayer/results.c

@@ -6,13 +6,13 @@
 #include "task.h"
 #include "game/shared/stage/stage.h"
 #include "game/sa2/ui/course_select.h"
-#include "game/multiplayer/results.h"
-#include "game/multiplayer/multipak_connection.h"
+#include "game/sa2/multiplayer/results.h"
+#include "game/sa2/multiplayer/multipak_connection.h"
 #include "game/sa2/multiplayer_lobby.h"
 #include "game/sa2/save.h"
 
 #ifdef TEAMPLAY_AVAILABLE
-#include "game/multiplayer/team_play.h"
+#include "game/sa2/multiplayer/team_play.h"
 #endif
 #include "lib/m4a/m4a.h"
 

src/game/sa2/multiplayer/team_play.c

@@ -1,11 +1,11 @@
 #include "global.h"
-#include "game/multiplayer/team_play.h"
+#include "game/sa2/multiplayer/team_play.h"
 #include "game/sa2/save.h"
 #include "core.h"
 #include "task.h"
 #include "sprite.h"
 #include "multi_sio.h"
-#include "game/multiplayer/multipak_connection.h"
+#include "game/sa2/multiplayer/multipak_connection.h"
 #include "lib/m4a/m4a.h"
 #include "flags.h"
 #include "game/sa2/ui/course_select.h"

src/game/sa2/options_screen.c

@@ -14,7 +14,7 @@
 #include "game/sa2/sound_test.h"
 #include "game/shared/stage/stage.h"
 #include "game/sa2/stage/stage_ui.h"
-#include "game/multiplayer/mode_select.h"
+#include "game/sa2/multiplayer/mode_select.h"
 #include "game/sa2/ui/character_select.h"
 
 #include "constants/tilemaps.h"

src/game/sa2/stage/cheese.c

@@ -5,7 +5,7 @@
 #include "game/globals.h"
 #include "game/sa2/stage/cheese.h"
 #include "game/shared/stage/camera.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 
 #include "lib/m4a/m4a.h"
 

src/game/sa2/stage/enemies/yado.c

@@ -7,7 +7,7 @@
 #include "game/sa2/stage/cheese.h"
 #include "game/sa2/stage/enemies/projectiles.h"
 #include "game/sa2/stage/trapped_animals.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "lib/m4a/m4a.h"
 
 #include "constants/animations.h"

src/game/sa2/stage/interactables/leaf_forest/stage_goal.c

@@ -12,9 +12,9 @@
 
 #include "game/sa2/stage/interactables/leaf_forest/stage_goal.h"
 
-#include "game/multiplayer/mp_player.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
-#include "game/multiplayer/finish.h"
+#include "game/shared/stage/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
+#include "game/shared/stage/mp_finish.h"
 
 #include "sprite.h"
 #include "task.h"

src/game/sa2/stage/interactables/platform.c

@@ -10,7 +10,7 @@
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/camera.h"
 #include "game/types/entity.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 
 #include "constants/animations.h"
 #include "constants/interactables.h"

src/game/sa2/stage/interactables/platform_thin.c

@@ -9,7 +9,7 @@
 #include "game/sa2/stage/interactables/platform_thin.h"
 #include "game/types/entity.h"
 
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/camera.h"
 

src/game/sa2/stage/itembox.c

@@ -14,8 +14,8 @@
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/camera.h"
 
-#include "game/multiplayer/multiplayer_event_mgr.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_event_mgr.h"
+#include "game/shared/stage/mp_player.h"
 
 #include "constants/animations.h"
 #include "constants/char_states.h"

src/game/sa2/stage/mp_attack_2_effect.c

@@ -3,7 +3,7 @@
 
 #include "game/globals.h"
 
-#include "game/multiplayer/mp_attack_2_effect.h"
+#include "game/sa2/stage/mp_attack_2_effect.h"
 
 #include "constants/zones.h"
 

src/game/sa2/stage/mystery_itembox.c

@@ -4,7 +4,7 @@
 
 #include "game/types/entity.h"
 #include "game/sa2/stage/mystery_itembox.h"
-#include "game/multiplayer/multiplayer_event_mgr.h"
+#include "game/shared/stage/mp_event_mgr.h"
 #include "game/shared/stage/dust_cloud.h"
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/camera.h"

src/game/sa2/stage/race_progress.c

@@ -6,7 +6,7 @@
 #include "game/globals.h"
 #include "game/sa2/stage/race_progress.h"
 #include "game/shared/stage/player.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "game/sa2/stage/screen_fade.h"
 
 #include "constants/animations.h"

src/game/sa2/title_screen.c

@@ -13,7 +13,7 @@
 #include "game/sa2/bg_palette_effects.h"
 #include "game/sa2/ui/character_select.h"
 #include "game/math.h"
-#include "game/multiplayer/mode_select.h"
+#include "game/sa2/multiplayer/mode_select.h"
 #include "game/sa2/options_screen.h"
 #include "game/shared/stage/demo_manager.h"
 #include "game/sa2/save.h"

src/game/sa2/ui/character_select.c

@@ -10,8 +10,8 @@
 #include "malloc_vram.h"
 #include "flags.h"
 #include "trig.h"
-#include "game/multiplayer/multipak_connection.h"
-#include "game/multiplayer/results.h"
+#include "game/sa2/multiplayer/multipak_connection.h"
+#include "game/sa2/multiplayer/results.h"
 #include "game/sa2/options_screen.h"
 #include "game/sa2/ui/course_select.h"
 #include "game/sa2/title_screen.h"

src/game/sa2/ui/countdown.c

@@ -8,7 +8,7 @@
 
 #include "game/shared/stage/player.h"
 #include "game/shared/stage/camera.h"
-#include "game/multiplayer/mp_player.h"
+#include "game/shared/stage/mp_player.h"
 #include "lib/m4a/m4a.h"
 
 #include "constants/animations.h"

src/game/sa2/ui/course_select.c

@@ -12,7 +12,7 @@
 #include "constants/text.h"
 #include "task.h"
 #include "malloc_vram.h"
-#include "game/multiplayer/multipak_connection.h"
+#include "game/sa2/multiplayer/multipak_connection.h"
 #include "game/sa2/stage/bosses/final_intro.h"
 #include "trig.h"