d_a_tag_shop_camera OK, d_a_tag_watchge OK, JUTFader OK, JUtility work from Pikmin 2 (#292)

include/JSystem/JUtility/JUTFader.h

@@ -3,7 +3,6 @@
 
 #include "JSystem/JGeometry.h"
 #include "JSystem/JUtility/TColor.h"
-#include "dolphin/types.h"
 
 class JUTFader {
 public:
@@ -24,7 +23,6 @@ public:
     s32 getStatus() const { return mStatus; }
     void setColor(JUtility::TColor color) { mColor.set(color); }
 
-//private:
     /* 0x04 */ s32 mStatus;
     /* 0x08 */ u16 field_0x8;
     /* 0x0A */ u16 field_0xa;

include/JSystem/JUtility/JUTFont.h

@@ -23,6 +23,7 @@ struct ResFONT {
         /* 0x04 */ u32 size;
         /* 0x08 */ u16 startCode;
         /* 0x0A */ u16 endCode;
+        /* 0x0C */ u8 mChunkNum[4];
     };
 
     struct MAP1 {
@@ -32,6 +33,7 @@ struct ResFONT {
         /* 0x0A */ u16 startCode;
         /* 0x0C */ u16 endCode;
         /* 0x0E */ u16 numEntries;
+        /* 0x10 */ u16 mLeading;
     };
 
     struct GLY1 {

include/JSystem/JUtility/JUTResFont.h

@@ -5,6 +5,8 @@
 #include "JSystem/JUtility/JUTFont.h"
 #include "dolphin/types.h"
 
+typedef bool (*IsLeadByte)(int);
+
 class JUTResFont : public JUTFont {
 public:
     /* 802DF000 */ virtual ~JUTResFont();
@@ -34,7 +36,7 @@ public:
     /* 802DF248 */ void countBlock();
     /* 802DFBE8 */ void loadFont(int, _GXTexMapID, JUTFont::TWidth*);
     /* 802DFDD8 */ int getFontCode(int) const;
-    /* 802E00C4 */ void convertSjis(int, u16*) const;
+    /* 802E00C4 */ int convertSjis(int, u16*) const;
 
     inline void delete_and_initialize() {
         deleteMemBlocks_ResFont();
@@ -44,22 +46,22 @@ public:
     static void* const saoAboutEncoding_[3];
 
     // some types uncertain, may need to be fixed
-    /* 0x1C */ void* field_0x1c;
-    /* 0x20 */ void* field_0x20;
+    /* 0x1C */ int mWidth;
+    /* 0x20 */ int mHeight;
     /* 0x24 */ _GXTexObj field_0x24;
     /* 0x44 */ int field_0x44;
     /* 0x48 */ const ResFONT* mResFont;
     /* 0x4C */ ResFONT::INF1* mInf1Ptr;
-    /* 0x50 */ void* field_0x50;
-    /* 0x54 */ ResFONT::WID1* mWid1Ptr;
-    /* 0x58 */ ResFONT::GLY1* mGly1Ptr;
-    /* 0x5C */ ResFONT::MAP1* mMap1Ptr;
+    /* 0x50 */ void** mMemBlocks;
+    /* 0x54 */ ResFONT::WID1** mpWidthBlocks;
+    /* 0x58 */ ResFONT::GLY1** mpGlyphBlocks;
+    /* 0x5C */ ResFONT::MAP1** mpMapBlocks;
     /* 0x60 */ u16 mWid1BlockNum;
     /* 0x62 */ u16 mGly1BlockNum;
     /* 0x64 */ u16 mMap1BlockNum;
     /* 0x66 */ u16 field_0x66;
-    /* 0x68 */ u16 field_0x68;
-    /* 0x6C */ void* field_0x6c;
+    /* 0x68 */ u16 mMaxCode;
+    /* 0x6C */ IsLeadByte* mIsLeadByte;
 };
 
 #endif /* JUTRESFONT_H */

include/dolphin/gx/GX.h

@@ -111,6 +111,10 @@ inline void GXTexCoord2s8(s8 x, s8 y) {
     GFX_FIFO(s8) = y;
 }
 
+inline void i_GXTexCoord2u16(u16 x, u16 y) {
+    GFX_FIFO(u16) = x;
+    GFX_FIFO(u16) = y;
+}
 
 inline void GFWriteBPCmd(u32 param_1) {
   GXFIFO.u8 = 0x61;

include/rel/d/a/e/d_a_e_ge/d_a_e_ge.h

@@ -1,6 +1,57 @@
 #ifndef D_A_E_GE_H
 #define D_A_E_GE_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+struct daE_GE_HIO_c {
+    /* 806C7A4C */ daE_GE_HIO_c();
+    /* 806CCA58 */ ~daE_GE_HIO_c();
+};
+
+class daE_GE_c : public fopEn_enemy_c {
+public:
+    u8 getGroupNo() {
+        return mGroupNo;
+    }
+
+    /* 806C7AB8 */ void bckSet(int, f32, u8, f32);
+    /* 806C7B5C */ void bckCheck(int);
+    /* 806C7BB8 */ void draw();
+    /* 806C7CAC */ void checkBeforeBg(int, f32);
+    /* 806C80F8 */ void setActionMode(int);
+    /* 806C8130 */ void damage_check();
+    /* 806C8374 */ void checkOtherAttacker();
+    /* 806C83F8 */ void searchNextAttacker();
+    /* 806C84A0 */ void checkCircleSpeedAdd(cXyz*, cXyz*);
+    /* 806C8518 */ void setAddCalcSpeed(cXyz&, cXyz const&, f32, f32, f32, f32);
+    /* 806C88C8 */ void calcCircleFly(cXyz*, cXyz*, s16, f32, s16, f32);
+    /* 806C89C0 */ void executeWait();
+    /* 806C8C20 */ void executeFly();
+    /* 806C9150 */ void checkAttackPossible(s16, bool);
+    /* 806C921C */ void executeAttack();
+    /* 806C9F04 */ void setBackAnime(int);
+    /* 806CA024 */ void executeBack();
+    /* 806CAA34 */ void executeDown();
+    /* 806CADCC */ void setSurpriseTime(s16);
+    /* 806CADF4 */ void setSurprise();
+    /* 806CAE58 */ void executeSurprise();
+    /* 806CB280 */ void setCaw();
+    /* 806CB2F0 */ void executeCaw();
+    /* 806CB6FC */ void executeWind();
+    /* 806CBAB8 */ void executeShield();
+    /* 806CBC38 */ void action();
+    /* 806CBE98 */ void mtx_set();
+    /* 806CBEF0 */ void cc_set();
+    /* 806CC068 */ void execute();
+    /* 806CC1E4 */ void _delete();
+    /* 806CC278 */ void CreateHeap();
+    /* 806CC390 */ void create();
+
+    /* 0x5AC */ u8 field_0x5ac[1519];
+    /* 0xB9B */ u8 mGroupNo;
+    /* 0xB9C */ u8 field_0xb9c[4];
+
+    static u8 l_actionmenu[108];
+};
 
 #endif /* D_A_E_GE_H */

include/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.h

@@ -1,6 +1,18 @@
 #ifndef D_A_TAG_SHOP_CAMERA_H
 #define D_A_TAG_SHOP_CAMERA_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+class daTag_ShopCamera_c : public fopAc_ac_c {
+public:
+    /* 80D60898 */ int create();
+    /* 80D608FC */ int Delete();
+    /* 80D60904 */ int Execute();
+    /* 80D6090C */ int Draw();
+    /* 80D60914 */ void initialize();
+    /* 80D60A18 */ virtual ~daTag_ShopCamera_c() {};
+
+    /* 0x568 */ u8 field_0x568[4];
+};
 
 #endif /* D_A_TAG_SHOP_CAMERA_H */

include/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.h

@@ -1,6 +1,22 @@
 #ifndef D_A_TAG_WATCHGE_H
 #define D_A_TAG_WATCHGE_H
 
-#include "dolphin/types.h"
+#include "rel/d/a/e/d_a_e_ge/d_a_e_ge.h"
+#include "d/com/d_com_inf_game.h"
 
-#endif /* D_A_TAG_WATCHGE_H */
+class daTagWatchGe_c : public fopAc_ac_c {
+public:
+    u8 getGroupNo() {
+        return mGroupNo;
+    }
+
+    /* 80D642D8 */ int draw();
+    /* 80D64338 */ int execute();
+    /* 80D643F8 */ int create();
+
+    /* 0x568 */ u8 field_0x568;
+    /* 0x569 */ u8 mGroupNo;
+    /* 0x56A */ u8 field_0x56a;
+};
+
+#endif /* D_A_TAG_WATCHGE_H */