wip

doldecomp · Aug 9, 2024 · 69071e0 · 69071e0
1 parent dd7334b
commit 69071e0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/melee/mp/mpisland.c b/src/melee/mp/mpisland.c
@@ -48,9 +48,9 @@ void mpIsland_8005A728(void)
     int v20;               // r26
     int v21;               // r27
     float v22;             // fp31
-    float* v22_2;
+    int* v22_2;
     int* v23; // r19
-    float* v24_2;
+    int* v24_2;
     mpisland* v24;           // r3
     mpisland* v25;           // r25
     int v26;                 // r4

diff --git a/src/melee/mp/types.h b/src/melee/mp/types.h
@@ -8,10 +8,10 @@
 struct mp_UnkStruct0 {
     /*  +0 */ mp_UnkStruct0* next;
     /*  +4 */ int x4;
-    /*  +8 */ float x8;
-    /*  +C */ float xC;
+    /*  +8 */ int x8;
+    /*  +C */ int xC;
     /* +10 */ int x10;
-    /* +14 */ float x14;
+    /* +14 */ int x14;
     /* +18 */ int x18;
     /* +1C */ int x1C;
     /* +20 */ int x20;

diff --git a/src/melee/pl/player.c b/src/melee/pl/player.c
@@ -827,7 +827,7 @@ s8 Player_GetCpuType(int slot)
     return cpu_type;
 }
 
-void Player_SetPlayerAndEntityCpuType(int slot, s8 cpu_type)
+void Player_SetPlayerAndEntityCpuType(int slot, int cpu_type)
 {
     StaticPlayer* player;
     int i;

diff --git a/src/melee/pl/player.h b/src/melee/pl/player.h
@@ -49,7 +49,7 @@ typedef struct _StaticPlayer {
     /*0x47*/ u8 team; /// 00 = red, 01 = blue, 02 = green
     /*0x48*/ s8 player_id;
     /*0x49*/ u8 cpu_level;
-    /*0x4A*/ s8 cpu_type;
+    /*0x4A*/ u8 cpu_type;
     /*0x4B*/ s8 handicap;
 
     /*0x4C*/ s8 unk4C;
@@ -197,7 +197,7 @@ void Player_SetPlayerId(int slot, s8 player_id);
 s8 Player_GetCpuLevel(int slot);
 void Player_SetPlayerAndEntityCpuLevel(int slot, int cpu_level);
 s8 Player_GetCpuType(int slot);
-void Player_SetPlayerAndEntityCpuType(int slot, s8 cpu_type);
+void Player_SetPlayerAndEntityCpuType(int slot, int cpu_type);
 int Player_GetHandicap(int slot);
 void Player_SetHandicap(int slot, s8 handicap);
 f32 Player_GetUnk50(int slot);