Current Changes (#14)

* Couple minor fixes

* test

* OTR changes

* More otr stuff

* Some fixes

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>

1 files changed, 144 insertions, 147 deletions

diff --git a/src/render_player.h b/src/render_player.h
index ede2d5033..2a66f3197 100644
--- a/src/render_player.h
+++ b/src/render_player.h
@@ -87,9 +87,6 @@ extern s32 D_80164B80[];
 
 extern s32 D_8018D930[];
 
-extern Gfx common_square_plain_render[];
-extern Gfx D_0D008D58[];
-
 extern s32 gPlayersToRenderCount;
 extern void *D_800DDB5C[];
 extern Vtx *D_800DDBB4[];
@@ -134,150 +131,150 @@ extern u16 **D_800DDE54[];
 
 
 // These all come the kart data stuff, they should end up in their own inc.c eventually
-extern u8 *gKartMario168Wheel0[];
-extern u8 *gKartMario147Wheel0[];
-extern u8 *gKartMario126Wheel0[];
-extern u8 *gKartMario105Wheel0[];
-extern u8 *gKartMario084Wheel0[];
-extern u8 *gKartMario063Wheel0[];
-extern u8 *gKartMario042Wheel0[];
-extern u8 *gKartMario021Wheel0[];
-extern u8 *gKartMario000Wheel0[];
-extern u8 *gKartMario269Wheel0[];
-extern u8 *gKartMario269Wheel0[];
-extern u8 *gKartMario249Wheel0[];
-extern u8 *gKartMario229Wheel0[];
-extern u8 *gKartMario229Wheel0[];
-extern u8 *gKartMario229Wheel0[];
-extern u8 *gKartMario209Wheel0[];
-extern u8 *gKartMario189Wheel0[];
-extern u8 *gKartMario189Wheel0[];
-extern u8 *gKartLuigi168Wheel0[];
-extern u8 *gKartLuigi147Wheel0[];
-extern u8 *gKartLuigi126Wheel0[];
-extern u8 *gKartLuigi105Wheel0[];
-extern u8 *gKartLuigi084Wheel0[];
-extern u8 *gKartLuigi063Wheel0[];
-extern u8 *gKartLuigi042Wheel0[];
-extern u8 *gKartLuigi021Wheel0[];
-extern u8 *gKartLuigi000Wheel0[];
-extern u8 *gKartLuigi269Wheel0[];
-extern u8 *gKartLuigi269Wheel0[];
-extern u8 *gKartLuigi249Wheel0[];
-extern u8 *gKartLuigi229Wheel0[];
-extern u8 *gKartLuigi229Wheel0[];
-extern u8 *gKartLuigi229Wheel0[];
-extern u8 *gKartLuigi209Wheel0[];
-extern u8 *gKartLuigi189Wheel0[];
-extern u8 *gKartLuigi189Wheel0[];
-extern u8 *gKartBowser168Wheel0[];
-extern u8 *gKartBowser147Wheel0[];
-extern u8 *gKartBowser126Wheel0[];
-extern u8 *gKartBowser105Wheel0[];
-extern u8 *gKartBowser084Wheel0[];
-extern u8 *gKartBowser063Wheel0[];
-extern u8 *gKartBowser042Wheel0[];
-extern u8 *gKartBowser021Wheel0[];
-extern u8 *gKartBowser000Wheel0[];
-extern u8 *gKartBowser269Wheel0[];
-extern u8 *gKartBowser269Wheel0[];
-extern u8 *gKartBowser249Wheel0[];
-extern u8 *gKartBowser229Wheel0[];
-extern u8 *gKartBowser229Wheel0[];
-extern u8 *gKartBowser229Wheel0[];
-extern u8 *gKartBowser209Wheel0[];
-extern u8 *gKartBowser189Wheel0[];
-extern u8 *gKartBowser189Wheel0[];
-extern u8 *gKartToad168Wheel0[];
-extern u8 *gKartToad147Wheel0[];
-extern u8 *gKartToad126Wheel0[];
-extern u8 *gKartToad105Wheel0[];
-extern u8 *gKartToad084Wheel0[];
-extern u8 *gKartToad063Wheel0[];
-extern u8 *gKartToad042Wheel0[];
-extern u8 *gKartToad021Wheel0[];
-extern u8 *gKartToad000Wheel0[];
-extern u8 *gKartToad269Wheel0[];
-extern u8 *gKartToad269Wheel0[];
-extern u8 *gKartToad249Wheel0[];
-extern u8 *gKartToad229Wheel0[];
-extern u8 *gKartToad229Wheel0[];
-extern u8 *gKartToad229Wheel0[];
-extern u8 *gKartToad209Wheel0[];
-extern u8 *gKartToad189Wheel0[];
-extern u8 *gKartToad189Wheel0[];
-extern u8 *gKartYoshi168Wheel0[];
-extern u8 *gKartYoshi147Wheel0[];
-extern u8 *gKartYoshi126Wheel0[];
-extern u8 *gKartYoshi105Wheel0[];
-extern u8 *gKartYoshi084Wheel0[];
-extern u8 *gKartYoshi063Wheel0[];
-extern u8 *gKartYoshi042Wheel0[];
-extern u8 *gKartYoshi021Wheel0[];
-extern u8 *gKartYoshi000Wheel0[];
-extern u8 *gKartYoshi269Wheel0[];
-extern u8 *gKartYoshi269Wheel0[];
-extern u8 *gKartYoshi249Wheel0[];
-extern u8 *gKartYoshi229Wheel0[];
-extern u8 *gKartYoshi229Wheel0[];
-extern u8 *gKartYoshi229Wheel0[];
-extern u8 *gKartYoshi209Wheel0[];
-extern u8 *gKartYoshi189Wheel0[];
-extern u8 *gKartYoshi189Wheel0[];
-extern u8 *gKartDK168Wheel0[];
-extern u8 *gKartDK147Wheel0[];
-extern u8 *gKartDK126Wheel0[];
-extern u8 *gKartDK105Wheel0[];
-extern u8 *gKartDK084Wheel0[];
-extern u8 *gKartDK063Wheel0[];
-extern u8 *gKartDK042Wheel0[];
-extern u8 *gKartDK021Wheel0[];
-extern u8 *gKartDK000Wheel0[];
-extern u8 *gKartDK269Wheel0[];
-extern u8 *gKartDK269Wheel0[];
-extern u8 *gKartDK249Wheel0[];
-extern u8 *gKartDK229Wheel0[];
-extern u8 *gKartDK229Wheel0[];
-extern u8 *gKartDK229Wheel0[];
-extern u8 *gKartDK209Wheel0[];
-extern u8 *gKartDK189Wheel0[];
-extern u8 *gKartDK189Wheel0[];
-extern u8 *gKartPeach168Wheel0[];
-extern u8 *gKartPeach147Wheel0[];
-extern u8 *gKartPeach126Wheel0[];
-extern u8 *gKartPeach105Wheel0[];
-extern u8 *gKartPeach084Wheel0[];
-extern u8 *gKartPeach063Wheel0[];
-extern u8 *gKartPeach042Wheel0[];
-extern u8 *gKartPeach021Wheel0[];
-extern u8 *gKartPeach000Wheel0[];
-extern u8 *gKartPeach269Wheel0[];
-extern u8 *gKartPeach269Wheel0[];
-extern u8 *gKartPeach249Wheel0[];
-extern u8 *gKartPeach229Wheel0[];
-extern u8 *gKartPeach229Wheel0[];
-extern u8 *gKartPeach229Wheel0[];
-extern u8 *gKartPeach209Wheel0[];
-extern u8 *gKartPeach189Wheel0[];
-extern u8 *gKartPeach189Wheel0[];
-extern u8 *gKartWario168Wheel0[];
-extern u8 *gKartWario147Wheel0[];
-extern u8 *gKartWario126Wheel0[];
-extern u8 *gKartWario105Wheel0[];
-extern u8 *gKartWario084Wheel0[];
-extern u8 *gKartWario063Wheel0[];
-extern u8 *gKartWario042Wheel0[];
-extern u8 *gKartWario021Wheel0[];
-extern u8 *gKartWario000Wheel0[];
-extern u8 *gKartWario269Wheel0[];
-extern u8 *gKartWario269Wheel0[];
-extern u8 *gKartWario249Wheel0[];
-extern u8 *gKartWario229Wheel0[];
-extern u8 *gKartWario229Wheel0[];
-extern u8 *gKartWario229Wheel0[];
-extern u8 *gKartWario209Wheel0[];
-extern u8 *gKartWario189Wheel0[];
-extern u8 *gKartWario189Wheel0[];
+// extern u8 *gKartMario168Wheel0[];
+// extern u8 *gKartMario147Wheel0[];
+// extern u8 *gKartMario126Wheel0[];
+// extern u8 *gKartMario105Wheel0[];
+// extern u8 *gKartMario084Wheel0[];
+// extern u8 *gKartMario063Wheel0[];
+// extern u8 *gKartMario042Wheel0[];
+// extern u8 *gKartMario021Wheel0[];
+// extern u8 *gKartMario000Wheel0[];
+// extern u8 *gKartMario269Wheel0[];
+// extern u8 *gKartMario269Wheel0[];
+// extern u8 *gKartMario249Wheel0[];
+// extern u8 *gKartMario229Wheel0[];
+// extern u8 *gKartMario229Wheel0[];
+// extern u8 *gKartMario229Wheel0[];
+// extern u8 *gKartMario209Wheel0[];
+// extern u8 *gKartMario189Wheel0[];
+// extern u8 *gKartMario189Wheel0[];
+// extern u8 *gKartLuigi168Wheel0[];
+// extern u8 *gKartLuigi147Wheel0[];
+// extern u8 *gKartLuigi126Wheel0[];
+// extern u8 *gKartLuigi105Wheel0[];
+// extern u8 *gKartLuigi084Wheel0[];
+// extern u8 *gKartLuigi063Wheel0[];
+// extern u8 *gKartLuigi042Wheel0[];
+// extern u8 *gKartLuigi021Wheel0[];
+// extern u8 *gKartLuigi000Wheel0[];
+// extern u8 *gKartLuigi269Wheel0[];
+// extern u8 *gKartLuigi269Wheel0[];
+// extern u8 *gKartLuigi249Wheel0[];
+// extern u8 *gKartLuigi229Wheel0[];
+// extern u8 *gKartLuigi229Wheel0[];
+// extern u8 *gKartLuigi229Wheel0[];
+// extern u8 *gKartLuigi209Wheel0[];
+// extern u8 *gKartLuigi189Wheel0[];
+// extern u8 *gKartLuigi189Wheel0[];
+// extern u8 *gKartBowser168Wheel0[];
+// extern u8 *gKartBowser147Wheel0[];
+// extern u8 *gKartBowser126Wheel0[];
+// extern u8 *gKartBowser105Wheel0[];
+// extern u8 *gKartBowser084Wheel0[];
+// extern u8 *gKartBowser063Wheel0[];
+// extern u8 *gKartBowser042Wheel0[];
+// extern u8 *gKartBowser021Wheel0[];
+// extern u8 *gKartBowser000Wheel0[];
+// extern u8 *gKartBowser269Wheel0[];
+// extern u8 *gKartBowser269Wheel0[];
+// extern u8 *gKartBowser249Wheel0[];
+// extern u8 *gKartBowser229Wheel0[];
+// extern u8 *gKartBowser229Wheel0[];
+// extern u8 *gKartBowser229Wheel0[];
+// extern u8 *gKartBowser209Wheel0[];
+// extern u8 *gKartBowser189Wheel0[];
+// extern u8 *gKartBowser189Wheel0[];
+// extern u8 *gKartToad168Wheel0[];
+// extern u8 *gKartToad147Wheel0[];
+// extern u8 *gKartToad126Wheel0[];
+// extern u8 *gKartToad105Wheel0[];
+// extern u8 *gKartToad084Wheel0[];
+// extern u8 *gKartToad063Wheel0[];
+// extern u8 *gKartToad042Wheel0[];
+// extern u8 *gKartToad021Wheel0[];
+// extern u8 *gKartToad000Wheel0[];
+// extern u8 *gKartToad269Wheel0[];
+// extern u8 *gKartToad269Wheel0[];
+// extern u8 *gKartToad249Wheel0[];
+// extern u8 *gKartToad229Wheel0[];
+// extern u8 *gKartToad229Wheel0[];
+// extern u8 *gKartToad229Wheel0[];
+// extern u8 *gKartToad209Wheel0[];
+// extern u8 *gKartToad189Wheel0[];
+// extern u8 *gKartToad189Wheel0[];
+// extern u8 *gKartYoshi168Wheel0[];
+// extern u8 *gKartYoshi147Wheel0[];
+// extern u8 *gKartYoshi126Wheel0[];
+// extern u8 *gKartYoshi105Wheel0[];
+// extern u8 *gKartYoshi084Wheel0[];
+// extern u8 *gKartYoshi063Wheel0[];
+// extern u8 *gKartYoshi042Wheel0[];
+// extern u8 *gKartYoshi021Wheel0[];
+// extern u8 *gKartYoshi000Wheel0[];
+// extern u8 *gKartYoshi269Wheel0[];
+// extern u8 *gKartYoshi269Wheel0[];
+// extern u8 *gKartYoshi249Wheel0[];
+// extern u8 *gKartYoshi229Wheel0[];
+// extern u8 *gKartYoshi229Wheel0[];
+// extern u8 *gKartYoshi229Wheel0[];
+// extern u8 *gKartYoshi209Wheel0[];
+// extern u8 *gKartYoshi189Wheel0[];
+// extern u8 *gKartYoshi189Wheel0[];
+// extern u8 *gKartDK168Wheel0[];
+// extern u8 *gKartDK147Wheel0[];
+// extern u8 *gKartDK126Wheel0[];
+// extern u8 *gKartDK105Wheel0[];
+// extern u8 *gKartDK084Wheel0[];
+// extern u8 *gKartDK063Wheel0[];
+// extern u8 *gKartDK042Wheel0[];
+// extern u8 *gKartDK021Wheel0[];
+// extern u8 *gKartDK000Wheel0[];
+// extern u8 *gKartDK269Wheel0[];
+// extern u8 *gKartDK269Wheel0[];
+// extern u8 *gKartDK249Wheel0[];
+// extern u8 *gKartDK229Wheel0[];
+// extern u8 *gKartDK229Wheel0[];
+// extern u8 *gKartDK229Wheel0[];
+// extern u8 *gKartDK209Wheel0[];
+// extern u8 *gKartDK189Wheel0[];
+// extern u8 *gKartDK189Wheel0[];
+// extern u8 *gKartPeach168Wheel0[];
+// extern u8 *gKartPeach147Wheel0[];
+// extern u8 *gKartPeach126Wheel0[];
+// extern u8 *gKartPeach105Wheel0[];
+// extern u8 *gKartPeach084Wheel0[];
+// extern u8 *gKartPeach063Wheel0[];
+// extern u8 *gKartPeach042Wheel0[];
+// extern u8 *gKartPeach021Wheel0[];
+// extern u8 *gKartPeach000Wheel0[];
+// extern u8 *gKartPeach269Wheel0[];
+// extern u8 *gKartPeach269Wheel0[];
+// extern u8 *gKartPeach249Wheel0[];
+// extern u8 *gKartPeach229Wheel0[];
+// extern u8 *gKartPeach229Wheel0[];
+// extern u8 *gKartPeach229Wheel0[];
+// extern u8 *gKartPeach209Wheel0[];
+// extern u8 *gKartPeach189Wheel0[];
+// extern u8 *gKartPeach189Wheel0[];
+// extern u8 *gKartWario168Wheel0[];
+// extern u8 *gKartWario147Wheel0[];
+// extern u8 *gKartWario126Wheel0[];
+// extern u8 *gKartWario105Wheel0[];
+// extern u8 *gKartWario084Wheel0[];
+// extern u8 *gKartWario063Wheel0[];
+// extern u8 *gKartWario042Wheel0[];
+// extern u8 *gKartWario021Wheel0[];
+// extern u8 *gKartWario000Wheel0[];
+// extern u8 *gKartWario269Wheel0[];
+// extern u8 *gKartWario269Wheel0[];
+// extern u8 *gKartWario249Wheel0[];
+// extern u8 *gKartWario229Wheel0[];
+// extern u8 *gKartWario229Wheel0[];
+// extern u8 *gKartWario229Wheel0[];
+// extern u8 *gKartWario209Wheel0[];
+// extern u8 *gKartWario189Wheel0[];
+// extern u8 *gKartWario189Wheel0[];
 
 extern s16 D_80165020[40];
 extern Vec3f D_80165070[8];