big d_a_alink pass (#214)

* d_a_alink pass1 wip

* more d_a_alink work

* remove asm

* more daalink work

* 20% dol code decompiled

* fixed some nonmatchings for building

* a few daalink functions and labeling some HIO data

3 files changed, 8 insertions, 8 deletions

diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
index 8585bfcd17..1268d8e9ab 100644
--- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp
+++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
@@ -995,17 +995,17 @@ void J2DTevBlock1::setGX() {
     for (int i = 0; i < 4; i++) {
         GXColorS10 color = mTevColor[i];
 
-        GXTevRegID id;
+        int id;
         if (i == 3) {
             id = 0;
         } else {
             id = i + 1;
         }
-        GXSetTevColorS10(id, color);
+        GXSetTevColorS10((GXTevRegID)id, color);
     }
 
     GXSetNumTevStages(1);
-    GXSetTevColorIn(GX_TEVSTAGE0, )
+
 }
 #else
 #pragma push
diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp
index b74dba0716..3e3a0ec79b 100644
--- a/libs/JSystem/J2DGraph/J2DPicture.cpp
+++ b/libs/JSystem/J2DGraph/J2DPicture.cpp
@@ -251,7 +251,7 @@ SECTION_DATA extern void* __vt__10J2DPicture[83 + 1 /* padding */] = {
 /* 802FC050-802FC118 2F6990 00C8+00 0/0 2/2 0/0 .text            __ct__10J2DPictureFv */
 #ifdef NONMATCHING
 J2DPicture::J2DPicture()
-    : field_0x10a(), field_0x12c(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(),
+    : field_0x10a(), mPalette(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(),
       field_0x14c() {
     for (int i = 0; i < 2; i++) {
         mTexture[i] = NULL;
@@ -276,7 +276,7 @@ asm J2DPicture::J2DPicture() {
  * __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */
 #ifdef NONMATCHING
 J2DPicture::J2DPicture(J2DPane* p_pane, JSURandomInputStream* p_stream, JKRArchive* p_archive)
-    : field_0x10a(), field_0x12c(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(),
+    : field_0x10a(), mPalette(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(),
       field_0x14c() {
     private_readStream(p_pane, p_stream, p_archive);
 }
diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp
index bb60ce1778..d4aeeaa12b 100644
--- a/libs/JSystem/J2DGraph/J2DScreen.cpp
+++ b/libs/JSystem/J2DGraph/J2DScreen.cpp
@@ -468,10 +468,10 @@ SECTION_SDATA2 static f32 lit_1830 = 1.0f;
 // matches with literals
 #ifdef NONMATCHING
 void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) {
-    u32 x, y, width, height;
+    u32 l_x, l_y, width, height;
 
     if (mScissor) {
-        GXGetScissor(&x, &y, &width, &height);
+        GXGetScissor(&l_x, &l_y, &width, &height);
     }
 
     if (grafCtx != NULL) {
@@ -483,7 +483,7 @@ void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) {
     }
 
     if (mScissor) {
-        GXSetScissor(x, y, width, height);
+        GXSetScissor(l_x, l_y, width, height);
     }
 
     GXSetNumIndStages(0);