some rename in player controller and spawn players (#524)

* some rename in player controller and spawn players

1 files changed, 79 insertions, 79 deletions

diff --git a/src/player_controller.h b/src/player_controller.h
index 5270de4d6..6e61c44b4 100644
--- a/src/player_controller.h
+++ b/src/player_controller.h
@@ -71,12 +71,12 @@ void func_8002FE84(Player*, f32);
 
 f32  func_80030150(Player*, s8);
 void func_80030A34(Player*);
-void func_80030C34(Player*);
-void func_80030E00(Player*);
+void detect_triple_a_combo_a_released(Player*);
+void detect_triple_a_combo_a_pressed(Player*);
 void player_speed(Player*);
 void func_80031F48(Player*, f32);
-void func_80032050(Player*);
-void func_8003221C(Player*);
+void detect_triple_b_combo_b_released(Player*);
+void detect_triple_b_combo_b_pressed(Player*);
 void func_800323E4(Player*);
 void func_80032700(Player*);
 void func_80032CB0(Player*, f32);
@@ -113,81 +113,81 @@ void func_80038C6C(Player*, Camera*, s8, s8);
 
 /* This is where I'd put my static data, if I had any */
 
-extern s16 D_800E3810[];
-extern s16 D_800E3820[];
-extern s16 D_800E3830[];
-extern s16 D_800E3840[];
-extern s16 D_800E3850[];
-extern s16 D_800E3860[];
-extern s16 D_800E3870[];
-extern s16 D_800E3880[];
-extern s16 *D_800E3890[];
-
-extern s16 D_800E38B0[];
-extern s16 D_800E38BC[];
-extern s16 D_800E38C8[];
-extern s16 D_800E38D4[];
-extern s16 D_800E38E0[];
-extern s16 D_800E38EC[];
-extern s16 D_800E38F8[];
-extern s16 D_800E3904[];
-extern s16 D_800E3910[];
-extern s16 D_800E391C[];
-extern s16 D_800E3928[];
-extern s16 D_800E3934[];
-extern s16 D_800E3940[];
-extern s16 D_800E394C[];
-extern s16 D_800E3958[];
-extern s16 D_800E3964[];
-extern s16 D_800E3970[];
-extern s16 D_800E397C[];
-extern s16 D_800E3988[];
-extern s16 D_800E3994[];
-extern s16 D_800E39A0[];
-extern s16 D_800E39AC[];
-extern s16 D_800E39B8[];
-extern s16 D_800E39C4[];
-extern s16 D_800E39D0[];
-extern s16 D_800E39DC[];
-extern s16 D_800E39E8[];
-extern s16 D_800E39F4[];
-extern s16 D_800E3A00[];
-extern s16 D_800E3A0C[];
-extern s16 D_800E3A18[];
-extern s16 D_800E3A24[];
-extern s16 D_800E3A30[];
-extern s16 D_800E3A3C[];
-extern s16 D_800E3A48[];
-extern s16 D_800E3A54[];
-extern s16 D_800E3A60[];
-extern s16 D_800E3A6C[];
-extern s16 D_800E3A78[];
-extern s16 D_800E3A84[];
-extern s16 D_800E3A90[];
-extern s16 D_800E3A9C[];
-extern s16 D_800E3AA8[];
-extern s16 D_800E3AB4[];
-extern s16 D_800E3AC0[];
-extern s16 D_800E3ACC[];
-extern s16 D_800E3AD8[];
-extern s16 D_800E3AE4[];
-extern s16 D_800E3AF0[];
-extern s16 D_800E3AFC[];
-extern s16 D_800E3B08[];
-extern s16 D_800E3B14[];
-extern s16 D_800E3B20[];
-extern s16 D_800E3B2C[];
-extern s16 D_800E3B38[];
-extern s16 D_800E3B44[];
-extern s16 *D_800E3B50[];
-extern s16 *D_800E3B70[];
-extern s16 *D_800E3B90[];
-extern s16 *D_800E3BB0[];
-extern s16 *D_800E3BD0[];
-extern s16 *D_800E3BF0[];
-extern s16 *D_800E3C10[];
-extern s16 *D_800E3C30[];
-extern s16 **D_800E3C50[];
+extern s16 gCPUforMario[];
+extern s16 gCPUforLuigi[];
+extern s16 gCPUforYoshi[];
+extern s16 gCPUforToad[];
+extern s16 gCPUforDk[];
+extern s16 gCPUforWario[];
+extern s16 gCPUforPeach[];
+extern s16 gCPUforBowser[];
+extern s16 *gCPUforPlayer[];
+
+extern s16 gCPUforMarioAndLuigi[];
+extern s16 gCPUforMarioAndYoshi[];
+extern s16 gCPUforMarioAndToad[];
+extern s16 gCPUforMarioAndDk[];
+extern s16 gCPUforMarioAndWario[];
+extern s16 gCPUforMarioAndPeach[];
+extern s16 gCPUforMarioAndBowser[];
+extern s16 gCPUforLuigiAndMario[];
+extern s16 gCPUforLuigiAndYoshi[];
+extern s16 gCPUforLuigiAndToad[];
+extern s16 gCPUforLuigiAndDk[];
+extern s16 gCPUforLuigiAndWario[];
+extern s16 gCPUforLuigiAndPeach[];
+extern s16 gCPUforLuigiAndBowser[];
+extern s16 gCPUforYoshiAndMario[];
+extern s16 gCPUforYoshiAndLuigi[];
+extern s16 gCPUforYoshiAndToad[];
+extern s16 gCPUforYoshiAndDk[];
+extern s16 gCPUforYoshiAndWario[];
+extern s16 gCPUforYoshiAndPeach[];
+extern s16 gCPUforYoshiAndBowser[];
+extern s16 gCPUforToadAndMario[];
+extern s16 gCPUforToadAndLuigi[];
+extern s16 gCPUforToadAndYoshi[];
+extern s16 gCPUforToadAndDk[];
+extern s16 gCPUforToadAndWario[];
+extern s16 gCPUforToadAndPeach[];
+extern s16 gCPUforToadAndBowser[];
+extern s16 gCPUforDkAndMario[];
+extern s16 gCPUforDkAndLuigi[];
+extern s16 gCPUforDkAndToad[];
+extern s16 gCPUforDkAndYoshi[];
+extern s16 gCPUforDkAndWario[];
+extern s16 gCPUforDkAndPeach[];
+extern s16 gCPUforDkAndBowser[];
+extern s16 gCPUforWarioAndMario[];
+extern s16 gCPUforWarioAndLuigi[];
+extern s16 gCPUforWarioAndYoshi[];
+extern s16 gCPUforWarioAndDk[];
+extern s16 gCPUforWarioAndToad[];
+extern s16 gCPUforWarioAndPeach[];
+extern s16 gCPUforWarioAndBowser[];
+extern s16 gCPUforPeachAndMario[];
+extern s16 gCPUforPeachAndLuigi[];
+extern s16 gCPUforPeachAndYoshi[];
+extern s16 gCPUforPeachAndDk[];
+extern s16 gCPUforPeachAndWario[];
+extern s16 gCPUforPeachAndToad[];
+extern s16 gCPUforPeachAndBowser[];
+extern s16 gCPUforBowserAndMario[];
+extern s16 gCPUforBowserAndLuigi[];
+extern s16 gCPUforBowserAndYoshi[];
+extern s16 gCPUforBowserAndDk[];
+extern s16 gCPUforBowserAndWario[];
+extern s16 gCPUforBowserAndToad[];
+extern s16 gCPUforBowserAndPeach[];
+extern s16 *gListCPUforMario[];
+extern s16 *gListCPUforLuigi[];
+extern s16 *gListCPUforYoshi[];
+extern s16 *gListCPUforToad[];
+extern s16 *gListCPUforDk[];
+extern s16 *gListCPUforWario[];
+extern s16 *gListCPUforPeach[];
+extern s16 *gListCPUforBowser[];
+extern s16 **gCPUforTwoPlayer[];
 
 extern s16 gMatrixEffectCount;