Integrate multiplayer_event_recv_mgr.c, start multiplayer_event_mgr.c

SAT-R · Jan 23, 2025 · 985dc5d · 985dc5d
1 parent ce24014
commit 985dc5d
Show file tree

Hide file tree

Showing 67 changed files with 7,661 additions and 7,291 deletions.
diff --git a/asm/game_0_3.s b/asm/game_0_3.s
diff --git a/asm/game_0_4.s b/asm/game_0_4.s
diff --git a/asm/game__multiplayer_event_recv_mgr.s b/asm/game__multiplayer_event_recv_mgr.s
@@ -0,0 +1,17 @@
+.include "asm/macros.inc"
+.include "constants/constants.inc"
+
+.text
+.syntax unified
+.arm
+
+@ SA2:
+.if 0
+thumb_func_start ReceiveRoomEvent_Unknown
+ReceiveRoomEvent_Unknown:
+	ldr	r0, .L29
+	ldr	r0, [r0]
+	bx	lr
+.endif
+
+@ --- End of multiplayer_event_recv_mgr.c ---
diff --git a/asm/game__sa1_sa2_shared__collision.s b/asm/game__sa1_sa2_shared__collision.s
@@ -2023,7 +2023,7 @@ _0800B636:
 	ldrb r0, [r1]
 	cmp r0, #1
 	bls _0800B654
-	bl sa2__sub_8019224
+	bl CreateRoomEvent
 	movs r1, #3
 	strb r1, [r0]
 	mov r2, r8
@@ -2144,7 +2144,7 @@ _0800B716:
 	ldrb r0, [r1]
 	cmp r0, #1
 	bls _0800B742
-	bl sa2__sub_8019224
+	bl CreateRoomEvent
 	movs r1, #3
 	strb r1, [r0]
 	mov r2, r8

diff --git a/asm/game__stage__player.s b/asm/game__stage__player.s
@@ -10265,8 +10265,8 @@ _08046CE4:
 	bx r0
 	.align 2, 0
 
-	thumb_func_start sub_8046CEC
-sub_8046CEC: @ 0x08046CEC
+	thumb_func_start Player_TransitionCancelFlyingAndBoost
+Player_TransitionCancelFlyingAndBoost: @ 0x08046CEC
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	ldr r0, [r4, #0x10]

diff --git a/asm/game__stage__stage.s b/asm/game__stage__stage.s
@@ -370,8 +370,8 @@ _0803D14C:
 	ldrb r0, [r0]
 	cmp r0, #1
 	bls _0803D26C
-	bl sub_801827C
-	bl sub_80181F8
+	bl CreateMultiplayerReceiveEventMgr
+	bl CreateMultiplayerSendEventMgr
 	ldr r0, _0803D214 @ =gUnknown_03005074
 	strb r4, [r0]
 	movs r4, #0

diff --git a/asm/ia_034.s b/asm/ia_034.s
@@ -91,7 +91,7 @@ _0804D7B8:
 	cmp r4, #0
 	bne _0804D848
 	adds r0, r5, #0
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	ldr r1, [r5, #0x10]
 	movs r0, #0x81
 	lsls r0, r0, #2

diff --git a/asm/ia_084.s b/asm/ia_084.s
@@ -523,7 +523,7 @@ _0808CB8A:
 	ldrb r0, [r0]
 	cmp r0, #1
 	bls _0808CBEA
-	bl sa2__sub_8019224
+	bl CreateRoomEvent
 	mov r1, sl
 	strb r1, [r0]
 	ldrh r1, [r6, #4]
@@ -945,7 +945,7 @@ _0808CED8:
 	ldr r0, _0808CEF8 @ =gPartner
 _0808CEE0:
 	str r3, [sp, #0x30]
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	ldr r3, [sp, #0x30]
 	cmp r5, #0
 	beq _0808CEFC
@@ -1377,7 +1377,7 @@ _0808D208:
 	ldr r0, _0808D228 @ =gPartner
 _0808D210:
 	str r3, [sp, #0x30]
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	ldr r3, [sp, #0x30]
 	cmp r5, #0
 	beq _0808D22C
@@ -1884,7 +1884,7 @@ _0808D58C:
 	beq _0808D5AA
 	ldr r0, _0808D5CC @ =gPartner
 _0808D5AA:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r6, #0
 	beq _0808D5D0
 	ldr r0, [r5, #0x10]
@@ -2046,7 +2046,7 @@ _0808D6AC:
 	beq _0808D6CC
 	ldr r0, _0808D6EC @ =gPartner
 _0808D6CC:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r6, #0
 	beq _0808D6F0
 	ldr r0, [r5, #0x10]
@@ -2219,7 +2219,7 @@ _0808D7F6:
 	beq _0808D7FE
 	ldr r0, _0808D818 @ =gPartner
 _0808D7FE:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r6, #0
 	beq _0808D81C
 	ldr r0, [r5, #0x10]
@@ -2318,7 +2318,7 @@ _0808D8A6:
 	beq _0808D8BA
 	ldr r0, _0808D8D0 @ =gPartner
 _0808D8BA:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r6, #0
 	beq _0808D8D4
 	ldr r0, [r5, #0x10]

diff --git a/asm/ia_096.s b/asm/ia_096.s
@@ -144,7 +144,7 @@ _08092316:
 	beq _0809231E
 	ldr r0, _08092334 @ =gPartner
 _0809231E:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r4, #0
 	beq _08092338
 	ldr r0, [r5, #0x10]

diff --git a/asm/ia_107.s b/asm/ia_107.s
@@ -410,7 +410,7 @@ _08094CB0:
 	beq _08094CB8
 	ldr r0, _08094CCC @ =gPartner
 _08094CB8:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r5, #0
 	beq _08094CD4
 	movs r0, #5

diff --git a/asm/ia_air_bubbles.s b/asm/ia_air_bubbles.s
@@ -545,7 +545,7 @@ _0809125C:
 	beq _08091264
 	ldr r0, _08091274 @ =gPartner
 _08091264:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r4, #0
 	beq _08091284
 	movs r0, #0x1b

diff --git a/asm/ia_booster.s b/asm/ia_booster.s
@@ -1137,7 +1137,7 @@ _0807721E:
 	beq _08077224
 	ldr r0, _08077254 @ =gPartner
 _08077224:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	movs r0, #0xac
 	bl m4aSongNumStart
 	mov r1, sl

diff --git a/asm/ia_boss_egg_x.s b/asm/ia_boss_egg_x.s
@@ -5467,7 +5467,7 @@ _08039E2A:
 	strb r0, [r1]
 	ldr r5, _08039E90 @ =gPlayer
 	adds r0, r5, #0
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	lsls r0, r6, #8
 	str r0, [r5]
 	lsls r0, r7, #8

diff --git a/asm/ia_bounce_block.s b/asm/ia_bounce_block.s
@@ -459,7 +459,7 @@ _0807545C:
 	beq _08075464
 	ldr r0, _0807547C @ =gPartner
 _08075464:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r4, #0
 	beq _08075480
 	ldr r0, [r5, #0x10]

diff --git a/asm/ia_bowl.s b/asm/ia_bowl.s
@@ -477,7 +477,7 @@ _08080AC2:
 	beq _08080ACA
 	ldr r0, _08080ADC @ =gPartner
 _08080ACA:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r4, #0
 	beq _08080AE4
 	movs r0, #5
@@ -850,7 +850,7 @@ _08080D86:
 	beq _08080D8E
 	ldr r0, _08080DA0 @ =gPartner
 _08080D8E:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r5, #0
 	beq _08080DA8
 	movs r0, #5

diff --git a/asm/ia_breakable_wall.s b/asm/ia_breakable_wall.s
@@ -445,7 +445,7 @@ _08027CC2:
 	ldrb r0, [r0]
 	cmp r0, #1
 	bls _08027CE0
-	bl sa2__sub_8019224
+	bl CreateRoomEvent
 	movs r2, #1
 	strb r2, [r0]
 	ldrh r1, [r6, #4]

diff --git a/asm/ia_bumpers.s b/asm/ia_bumpers.s
@@ -635,7 +635,7 @@ _08078E9E:
 	beq _08078EA6
 	ldr r0, _08078EBC @ =gPartner
 _08078EA6:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r5, #0
 	beq _08078EC4
 	movs r0, #5
@@ -1707,7 +1707,7 @@ _080796CA:
 	beq _080796D4
 	ldr r0, _080796EC @ =gPartner
 _080796D4:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	mov r3, r8
 	cmp r3, #0
 	beq _080796F4
@@ -2813,7 +2813,7 @@ _08079F66:
 	beq _08079F70
 	ldr r0, _08079F88 @ =gPartner
 _08079F70:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	mov r3, sb
 	cmp r3, #0
 	beq _08079F90
@@ -4690,7 +4690,7 @@ _0807AE06:
 	beq _0807AE0E
 	ldr r0, _0807AE24 @ =gPartner
 _0807AE0E:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r6, #0
 	beq _0807AE2C
 	movs r0, #5
@@ -5204,7 +5204,7 @@ _0807B1B6:
 	beq _0807B1BE
 	ldr r0, _0807B1D4 @ =gPartner
 _0807B1BE:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r5, #0
 	beq _0807B1DC
 	movs r0, #5
@@ -5768,7 +5768,7 @@ _0807B5E2:
 	beq _0807B5EA
 	ldr r0, _0807B604 @ =gPartner
 _0807B5EA:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r6, #0
 	beq _0807B60C
 	movs r0, #5
@@ -6006,7 +6006,7 @@ _0807B79E:
 	beq _0807B7A6
 	ldr r0, _0807B7C0 @ =gPartner
 _0807B7A6:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r6, #0
 	beq _0807B7C8
 	movs r0, #5
@@ -6250,7 +6250,7 @@ _0807B962:
 	beq _0807B96A
 	ldr r0, _0807B984 @ =gPartner
 _0807B96A:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r6, #0
 	beq _0807B98C
 	movs r0, #5
@@ -6497,7 +6497,7 @@ _0807BB2E:
 	beq _0807BB36
 	ldr r0, _0807BB50 @ =gPartner
 _0807BB36:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r6, #0
 	beq _0807BB58
 	movs r0, #5

diff --git a/asm/ia_carousel.s b/asm/ia_carousel.s
@@ -746,7 +746,7 @@ _08085AFA:
 	beq _08085B02
 	ldr r0, _08085B14 @ =gPartner
 _08085B02:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r5, #0
 	beq _08085B1C
 	movs r0, #0x21
@@ -1221,7 +1221,7 @@ _08085E7E:
 	beq _08085E86
 	ldr r0, _08085E98 @ =gPartner
 _08085E86:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r5, #0
 	beq _08085EA0
 	movs r0, #0x21
@@ -1683,7 +1683,7 @@ _080861C8:
 	beq _080861DC
 	ldr r0, _080861F4 @ =gPartner
 _080861DC:
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	cmp r5, #0
 	beq _080861FC
 	ldr r0, [r4, #0x10]

diff --git a/asm/ia_crane_claw_lift.s b/asm/ia_crane_claw_lift.s
@@ -553,7 +553,7 @@ _08089E8A:
 	strh r0, [r4, #0xc]
 	strh r0, [r4, #0xa]
 	adds r0, r4, #0
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	adds r1, r4, #0
 	adds r1, #0x40
 	movs r0, #0x26
@@ -799,7 +799,7 @@ _0808A08C:
 	strh r0, [r4, #0xc]
 	strh r0, [r4, #0xa]
 	adds r0, r4, #0
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	adds r1, r4, #0
 	adds r1, #0x40
 	movs r0, #0x26
@@ -1021,7 +1021,7 @@ _0808A260:
 	strh r3, [r5, #0xc]
 	strh r3, [r5, #0xa]
 	adds r0, r5, #0
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	adds r1, r5, #0
 	adds r1, #0x40
 	movs r0, #0x12
@@ -2098,7 +2098,7 @@ _0808AB0A:
 	strh r6, [r5, #0xc]
 	strh r6, [r5, #0xa]
 	adds r0, r5, #0
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	adds r1, r5, #0
 	adds r1, #0x40
 	movs r0, #0x26
@@ -2619,7 +2619,7 @@ _0808AF48:
 	strh r0, [r4, #0xa]
 	adds r0, r4, #0
 	str r3, [sp]
-	bl sub_8046CEC
+	bl Player_TransitionCancelFlyingAndBoost
 	adds r0, r7, #0
 	adds r0, #0x9c
 	strh r6, [r0]

diff --git a/asm/ia_decoration.s b/asm/ia_decoration.s
@@ -323,7 +323,7 @@ _080233E4:
 	ldrb r0, [r0]
 	cmp r0, #1
 	bls _0802349C
-	bl sa2__sub_8019224
+	bl CreateRoomEvent
 	movs r2, #0
 	movs r1, #1
 	strb r1, [r0]