Match EUC_GetPlayer

JaceCear · JaceCear · commit 48efd4485ce9 · 2026-03-15T15:30:01.000+01:00
diff --git a/asm/enemy_unknown_code.s b/asm/enemy_unknown_code.s
@@ -6,122 +6,10 @@
 .arm
 
 .if 0
-	thumb_func_start sub_805CC5C
-sub_805CC5C: @ 0x0805CC5C
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	mov ip, r1
-	ldr r0, [sp, #0x10]
-	lsls r0, r0, #0x18
-	lsrs r1, r0, #0x18
-	movs r0, #0x80
-	lsls r0, r0, #0xc
-	ands r0, r2
-	cmp r0, #0
-	beq _0805CC7A
-	movs r5, #0x18
-	ldrsh r0, [r4, r5]
-	cmp r0, #0
-	blt _0805CC8C
-_0805CC7A:
-	movs r0, #0x80
-	lsls r0, r0, #0xb
-	ands r0, r2
-	cmp r0, #0
-	beq _0805CD1A
-	movs r2, #0x1a
-	ldrsh r0, [r4, r2]
-	cmp r0, #0
-	ble _0805CD1A
-_0805CC8C:
-	ldr r0, [sp, #0xc]
-	subs r0, #0x30
-	lsls r0, r0, #8
-	str r0, [r4, #0x14]
-	movs r0, #0xfd
-	lsls r0, r0, #8
-	strh r0, [r4, #0x1a]
-	lsls r0, r1, #0x18
-	adds r2, r0, #0
-	cmp r2, #0
-	bge _0805CCBC
-	mov r0, ip
-	adds r0, #0x2c
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	adds r0, r3, r0
-	lsls r0, r0, #8
-	ldr r1, [r4, #0x10]
-	cmp r1, r0
-	bge _0805CCD6
-	adds r0, r3, #0
-	subs r0, #0x10
-	b _0805CCEC
-_0805CCBC:
-	mov r0, ip
-	adds r0, #0x2c
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	adds r0, r3, r0
-	lsls r0, r0, #8
-	ldr r1, [r4, #0x10]
-	cmp r1, r0
-	bge _0805CCD6
-	adds r0, r3, #0
-	subs r0, #0x10
-	b _0805CCEC
-_0805CCD6:
-	mov r0, ip
-	adds r0, #0x2e
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	adds r0, r3, r0
-	lsls r0, r0, #8
-	cmp r1, r0
-	ble _0805CCF0
-	adds r0, r3, #0
-	adds r0, #0x10
-_0805CCEC:
-	lsls r0, r0, #8
-	str r0, [r4, #0x10]
-_0805CCF0:
-	asrs r1, r2, #0x18
-	cmp r1, #0
-	bge _0805CCFE
-	movs r3, #0x18
-	ldrsh r0, [r4, r3]
-	cmp r0, #0
-	blt _0805CD0A
-_0805CCFE:
-	cmp r1, #0
-	ble _0805CD1A
-	movs r5, #0x18
-	ldrsh r0, [r4, r5]
-	cmp r0, #0
-	ble _0805CD1A
-_0805CD0A:
-	cmp r2, #0
-	bge _0805CD14
-	movs r0, #0xc0
-	lsls r0, r0, #2
-	b _0805CD18
-_0805CD14:
-	movs r0, #0xfd
-	lsls r0, r0, #8
-_0805CD18:
-	strh r0, [r4, #0x18]
-_0805CD1A:
-	pop {r4, r5}
-	pop {r0}
-	bx r0
-.endif
 
 @ This function is inlined in most places, but seemingly not everywhere?
-	thumb_func_start sub_805CD20
-sub_805CD20: @ 0x0805CD20
+	thumb_func_start GetPlayer
+GetPlayer: @ 0x0805CD20
 	push {lr}
 	lsls r0, r0, #0x18
 	movs r1, #0
@@ -162,6 +50,7 @@ _0805CD66:
 	bx r1
 	.align 2, 0
 _0805CD6C: .4byte gPlayers
+.endif
 
 	thumb_func_start sub_805CD70
 sub_805CD70: @ 0x0805CD70
diff --git a/asm/non_matching/game/enemies/ape__sub_805A964.inc b/asm/non_matching/game/enemies/ape__sub_805A964.inc
@@ -79,7 +79,7 @@ _0805A9F2:
 	cmp r4, #1
 	bhi _0805AA02
 	adds r0, r4, #0
-	bl sub_805CD20
+	bl EUC_GetPlayer
 	adds r1, r0, #0
 	cmp r1, #0
 	bne _0805A98C
diff --git a/asm/non_matching/game/enemies/condor__sub_805933C.inc b/asm/non_matching/game/enemies/condor__sub_805933C.inc
@@ -127,7 +127,7 @@ _08059426:
 	cmp r3, #1
 	bhi _08059438
 	mov r0, sl
-	bl sub_805CD20
+	bl EUC_GetPlayer
 	adds r5, r0, #0
 	cmp r5, #0
 	bne _0805936C
diff --git a/asm/non_matching/game/enemies/jousun__sub_805BD08.inc b/asm/non_matching/game/enemies/jousun__sub_805BD08.inc
@@ -87,7 +87,7 @@ _0805BDA2:
 	cmp r6, #1
 	bhi _0805BDB2
 	adds r0, r6, #0
-	bl sub_805CD20
+	bl EUC_GetPlayer
 	adds r5, r0, #0
 	cmp r5, #0
 	bne _0805BD2A
diff --git a/include/game/enemy_unknown.h b/include/game/enemy_unknown.h
@@ -29,7 +29,7 @@ bool32 sub_805C280(EnemyUnknownStruc0 *);
 bool32 sub_805C63C(EnemyUnknownStruc0 *);
 bool32 sub_805C890(EnemyUnknownStruc0 *param0, s8 param1);
 
-Player *sub_805CD20(u8);
+Player *EUC_GetPlayer(u8);
 
 void sub_805CD70(Vec2_32 *qVal, Vec2_32 *param1, u16 region[2], s8 *param3);
 void sub_805CE14(Vec2_32 *qVal, Vec2_32 *param1, u16 region[2], s8 *param3);
diff --git a/src/game/enemies/aotento.c b/src/game/enemies/aotento.c
@@ -269,7 +269,7 @@ bool32 sub_8058A00(Aotento *enemy)
     worldY = (TO_WORLD_POS_RAW(worldY, enemy->region[1]));
 
     for (i = 0, qWorldX = Q(worldX); i < NUM_SINGLE_PLAYER_CHARS; i++) {
-        Player *p = sub_805CD20(i);
+        Player *p = EUC_GetPlayer(i);
         if (p == NULL)
             break;
 
diff --git a/src/game/enemies/ape.c b/src/game/enemies/ape.c
@@ -287,7 +287,7 @@ NONMATCH("asm/non_matching/game/enemies/ape__sub_805A964.inc", bool32 sub_805A96
     worldY = (TO_WORLD_POS_RAW(worldY, enemy->region[1]));
 
     for (i = 0, qWorldX = Q(worldX); i < NUM_SINGLE_PLAYER_CHARS; i++) {
-        Player *p = sub_805CD20(i);
+        Player *p = EUC_GetPlayer(i);
         if (p == NULL)
             break;
 
diff --git a/src/game/enemies/buzzer.c b/src/game/enemies/buzzer.c
@@ -240,7 +240,7 @@ bool32 sub_805A04C(Buzzer *enemy)
     worldY = (TO_WORLD_POS_RAW(worldY, enemy->region[1]));
 
     for (i = 0, qWorldX = Q(worldX); i < NUM_SINGLE_PLAYER_CHARS; i++) {
-        Player *p = sub_805CD20(i);
+        Player *p = EUC_GetPlayer(i);
         if (p == NULL)
             break;
 
diff --git a/src/game/enemies/clam.c b/src/game/enemies/clam.c
@@ -468,7 +468,7 @@ bool32 sub_8064684(Clam *enemy)
     worldX = TO_WORLD_POS_RAW(worldX, enemy->region[0]);
 
     for (i = 0; i < NUM_SINGLE_PLAYER_CHARS; i++) {
-        p = sub_805CD20(i);
+        p = EUC_GetPlayer(i);
         if (p == NULL) {
             break;
         }
diff --git a/src/game/enemies/condor.c b/src/game/enemies/condor.c
@@ -337,7 +337,7 @@ NONMATCH("asm/non_matching/game/enemies/condor__sub_805933C.inc", bool32 sub_805
     worldY = (TO_WORLD_POS_RAW(worldY, enemy->region[1]));
 
     for (i = 0, qWorldX = Q(worldX); i < NUM_SINGLE_PLAYER_CHARS; i++) {
-        Player *p = sub_805CD20(i);
+        Player *p = EUC_GetPlayer(i);
         if (p == NULL)
             break;
 
diff --git a/src/game/enemies/enemy_unknown_code.c b/src/game/enemies/enemy_unknown_code.c
@@ -42,8 +42,8 @@ void Task_40_805C198(void);
 void TaskDestructor_805C03C(struct Task *t);
 bool32 sub_805CF90(s16 worldX, s16 worldY, s16 spriteX, s16 spriteY);
 void sub_805CB70(Player *p, Sprite *s, u32 collision, s32 x, UNUSED s32 y, s8 dir);
-void sub_805CC5C(Player *p, Sprite *s, s32 arg2, s32 x, u32 y, s8 dir);
-void sub_805CFE8(Player *p, UNUSED Sprite *s, s32 arg2, s32 arg3, u32 arg4, s32 arg5);
+void sub_805CC5C(Player *p, Sprite *s, s32 collision, s32 x, u32 y, s8 dir);
+void sub_805CFE8(Player *p, Sprite *s, s32 collision, s32 x, u32 y, s8 dir);
 AnimCmdResult sub_805D058(EUC_Strc40 *strc40);
 void TaskDestructor_805D09C(struct Task *t);
 extern void sub_8027578(MapEntity *me);
@@ -81,6 +81,24 @@ static inline void sub_805CEBC__inline(s32 qWorldX, s32 qWorldY, u16 regionX, u1
     }
 }
 
+static inline Player *GetPlayer__inline(u8 pid)
+{
+    Player *p = NULL;
+
+    if (pid == PLAYER_1) {
+        p = GET_SP_PLAYER_V0(pid);
+    } else {
+#if BUG_FIX
+        // TODO: Not sure whether this is the correct assignment to fix this NULLPTR
+        p = GET_SP_PLAYER_V0(PLAYER_1);
+#endif
+        if (p->charFlags.someIndex == 1) {
+            p = &gPlayers[p->charFlags.partnerIndex];
+        }
+    }
+    return p;
+}
+
 // (98.18%) https://decomp.me/scratch/8XN8s
 NONMATCH("asm/non_matching/game/enemies/euc__Task_14_805C03C.inc", void Task_14_805C03C(void))
 {
@@ -603,12 +621,6 @@ void sub_805CB70(Player *p, Sprite *s, u32 collision, s32 x, UNUSED s32 y, s8 di
 
 void sub_805CC5C(Player *p, Sprite *s, s32 arg2, s32 x, u32 y, s8 dir)
 {
-    s16 var_r0_2;
-    s32 temp_r0;
-    s32 var_r0;
-    s8 temp_r1_2;
-    u8 temp_r1;
-
     if (((0x80000 & arg2) && (p->qSpeedAirX < 0)) || ((0x40000 & arg2) && (p->qSpeedAirY > 0))) {
         p->qWorldY = Q(y - 48);
         p->qSpeedAirY = -Q(3);
@@ -634,23 +646,25 @@ void sub_805CC5C(Player *p, Sprite *s, s32 arg2, s32 x, u32 y, s8 dir)
     }
 }
 
-#if 0
-Player *sub_805CD20(u8 arg0) {
-    Player *var_r1;
-    u8 temp_r2;
+Player *EUC_GetPlayer(u8 pid)
+{
+    Player *p = NULL;
 
-    var_r1 = NULL;
-    if ((arg0 << 0x18) == 0) {
-        var_r1 = &gPlayers[gStageData.playerIndex];
+    if (pid == PLAYER_1) {
+        p = GET_SP_PLAYER_V0(pid);
     } else {
-        temp_r2 = *(u8 *)0x2B;
-        if ((0x1C & temp_r2) == 4) {
-            var_r1 = &gPlayers[(u32) (temp_r2 << 0x1E) >> 0x1E];
+#if BUG_FIX
+        // TODO: Not sure whether this is the correct assignment to fix this NULLPTR
+        p = GET_SP_PLAYER_V0(PLAYER_1);
+#endif
+        if (p->charFlags.someIndex == 1) {
+            p = &gPlayers[p->charFlags.partnerIndex];
         }
     }
-    return var_r1;
+    return p;
 }
 
+#if 0
 void sub_805CD70(Vec2_32 *qVal, Vec2_32 *param1, u16 *region, s8 *param3) {
     s16 temp_r1;
     s32 var_r4;
diff --git a/src/game/enemies/gekogeko.c b/src/game/enemies/gekogeko.c
@@ -203,7 +203,7 @@ bool32 sub_8059AE8(GekoGeko *enemy)
     worldY = TO_WORLD_POS_RAW(worldY, enemy->region[1]);
 
     for (i = 0; i < NUM_SINGLE_PLAYER_CHARS; i++) {
-        Player *p = sub_805CD20(i);
+        Player *p = EUC_GetPlayer(i);
         if (p == NULL)
             break;
 
diff --git a/src/game/enemies/hariisen_proj.c b/src/game/enemies/hariisen_proj.c
@@ -98,7 +98,7 @@ bool32 sub_806172C(Hariisen *enemy)
     u8 i;
 
     for (i = 0; i < NUM_SINGLE_PLAYER_CHARS; i++) {
-        Player *p = sub_805CD20(i);
+        Player *p = EUC_GetPlayer(i);
         if (p == NULL)
             break;
 
diff --git a/src/game/enemies/jousun.c b/src/game/enemies/jousun.c
@@ -262,7 +262,7 @@ NONMATCH("asm/non_matching/game/enemies/jousun__sub_805BD08.inc", bool32 sub_805
     for (i = 0; i < NUM_SINGLE_PLAYER_CHARS; i++) {
         Sprite *s;
 
-        Player *p = sub_805CD20(i);
+        Player *p = EUC_GetPlayer(i);
         if (p == NULL)
             break;
 
diff --git a/src/game/enemies/juggling.c b/src/game/enemies/juggling.c
@@ -446,7 +446,7 @@ u32 sub_805E950(Juggling *enemy)
     worldX = I(enemy->qPos.x);
     worldX = TO_WORLD_POS_RAW(worldX, enemy->region[0]);
     for (i = 0; i < NUM_SINGLE_PLAYER_CHARS; i++) {
-        p = sub_805CD20(i);
+        p = EUC_GetPlayer(i);
         if (p == NULL) {
             break;
         }
diff --git a/src/game/enemies/kyacchaa.c b/src/game/enemies/kyacchaa.c
@@ -210,7 +210,7 @@ bool32 sub_8065B90(Kyacchaa *enemy)
     worldY = TO_WORLD_POS_RAW(worldY, enemy->region[1]);
 
     for (i = 0; i < 2; i++) {
-        p = sub_805CD20(i);
+        p = EUC_GetPlayer(i);
         if (!p) {
             break;
         }
diff --git a/src/game/enemies/marun.c b/src/game/enemies/marun.c
@@ -357,7 +357,7 @@ bool32 sub_8063C98(Marun *enemy)
     worldY = (TO_WORLD_POS_RAW(worldY, enemy->region[1]));
 
     for (i = 0; i < 2; i++) {
-        Player *p = sub_805CD20(i);
+        Player *p = EUC_GetPlayer(i);
         if (!p) {
             break;
         }
diff --git a/src/game/enemies/minimole.c b/src/game/enemies/minimole.c
@@ -225,7 +225,7 @@ bool32 sub_805B22C(Minimole *enemy)
         s32 playerToMoleX;
         Player *p;
 
-        p = sub_805CD20(i);
+        p = EUC_GetPlayer(i);
         if (!p) {
             break;
         }
diff --git a/src/game/enemies/muukaden.c b/src/game/enemies/muukaden.c
@@ -445,7 +445,7 @@ bool32 sub_8062FC0(Muukaden *enemy)
     u8 i;
 
     for (i = 0; i < NUM_SINGLE_PLAYER_CHARS; i++) {
-        p = sub_805CD20(i);
+        p = EUC_GetPlayer(i);
         if (p == NULL) {
             break;
         }
diff --git a/src/game/enemies/takkon.c b/src/game/enemies/takkon.c
@@ -322,7 +322,7 @@ bool32 sub_805B7C0(Takkon *enemy)
     for (i = 0; i < NUM_SINGLE_PLAYER_CHARS; i++) {
         s32 wx;
 
-        Player *p = sub_805CD20(i);
+        Player *p = EUC_GetPlayer(i);
         if (p == NULL)
             break;
 
diff --git a/src/game/enemies/uutsubo.c b/src/game/enemies/uutsubo.c
@@ -431,7 +431,7 @@ bool32 sub_805D8D4(Uutsubo *enemy)
     s32 max;
 
     for (i = 0, max = Q(5); i < 2; i++) {
-        p = sub_805CD20(i);
+        p = EUC_GetPlayer(i);
         if (p == NULL)
             break;
 
diff --git a/src/game/enemies/yadokk.c b/src/game/enemies/yadokk.c
@@ -294,7 +294,7 @@ static bool32 CheckPlayerCollision(Yadokk *enemy)
     worldX = TO_WORLD_POS_RAW(worldX, enemy->region[0]);
 
     for (i = 0; i < NUM_SINGLE_PLAYER_CHARS; i++) {
-        p = sub_805CD20(i);
+        p = EUC_GetPlayer(i);
         if (p == 0) {
             break;
         }

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ bool32 sub_8064684(Clam *enemy)`
`468`	`468`	`worldX = TO_WORLD_POS_RAW(worldX, enemy->region[0]);`
`469`	`469`
`470`	`470`	`for (i = 0; i < NUM_SINGLE_PLAYER_CHARS; i++) {`
`471`		`- p = sub_805CD20(i);`
	`471`	`+ p = EUC_GetPlayer(i);`
`472`	`472`	`if (p == NULL) {`
`473`	`473`	`break;`
`474`	`474`	`}`