Merge branch 'main' of https://github.com/SamuraiOndo/RatDecomp

Author: 0x5abe

configure.py

@@ -235,6 +235,23 @@
     "-rostr"
 ]
 
+cflags_rat_base_libgc = [
+    *cflags_base,
+    "-pool off",
+    "-schedule on",
+    "-str reuse,pool,readonly",
+    "-fp fmadd",
+    "-use_lmw_stmw on",
+    '-pragma "cpp_extensions on"',
+    "-sym on",
+    "-inline on",
+    "-opt level=4, peep, space",
+    "-i src/Engine/includes",
+    "-i src/LibGC/includes",
+    "-i src/Rat/includes",
+    "-i src/sdk/includes",
+    "-O4,p"
+]
 # Debug flags
 if args.debug:
     # Or -sym dwarf-2 for Wii compilers

src/Engine/Bitmap_Z.cpp

@@ -1,4 +1,6 @@
 #include "Bitmap_Z.h"
+#include "Assert_Z.h"
+extern void Z_FreeContiguous(void* ptr);
 
 Bitmap_Z::Bitmap_Z()
 {
@@ -31,4 +33,63 @@ void Bitmap_Z::Init() {
     m_PrecalculatedSize = 0;
     m_PalFormat = PAL_8888;
 }
-  
+  
+void Bitmap_Z::Invalidate() {
+    //stub
+};
+
+void Bitmap_Z::Reset() {
+    Invalidate();
+    if (this->m_Datas) {
+        Z_FreeContiguous(this->m_Datas);
+    }
+    this->m_Datas = 0;
+
+    if (this->m_Palette) {
+        delete this->m_Palette;
+    }
+    this->m_Palette = 0;
+
+    Init();
+}
+
+void Bitmap_Z::InitBmap(S32 m_Width, S32 m_Height, U8 m_Format, U8* m_Palette, U8 m_Datas)
+{
+    //stub
+}
+
+//far from matching
+Float Bitmap_Z::GetBytePerPixel() {
+    Float result; // st7
+
+    switch ( this->m_Format )
+    {
+      case BM_4:
+        result = 0.5;
+        break;
+      case BM_8:
+      case BM_I4A4:
+        result = 1.0;
+        break;
+      case BM_5551:
+      case BM_565:
+      case BM_4444:
+      case BM_1555:
+        result = 2.0;
+        break;
+      case BM_8888:
+        result = 4.0;
+        break;
+      case BM_888:
+        result = 3.0;
+        break;
+      case BM_CMPR:
+        result = 0.0;
+        break;
+      default:
+        ExceptionFonc_Z("FALSE", "Bitmap_Z.cpp", 117, "Bitmap_Z::GetBytePerPixel", 0, 0, 0, 0, 0, 0);
+        result = 0.0;
+        break;
+    }
+    return result;
+}

src/Engine/Fonts_Z.cpp

@@ -1,4 +1,7 @@
 #include "Fonts_Z.h"
+#include "Main_Z.h"
+
+extern Globals gData;
 
 S32 GetUTF8CharBytes(const S8* a1)
 {

src/Engine/includes/BaseObject_Z.h

@@ -9,7 +9,7 @@ class BaseObject_Z
     Name_Z m_Name;
     BaseObject_ZHdl m_Handle;
     BaseObject_Z();
-    virtual void Init();
+    virtual void Init() {};
     ~BaseObject_Z();
     virtual void Load(void* a1);
     virtual void EndLoad();

src/Engine/includes/Bitmap_Z.h

@@ -47,8 +47,10 @@ class Bitmap_Z : public ResourceObject_Z
     virtual void Load(void* a1);
     virtual void Clean();
     void InitBmap(S32 m_Width, S32 m_Height, U8 m_Format, U8* m_Palette, U8 m_Datas);
-    void EnableFlag(U8 i_Flag)   {m_Flag|=i_Flag;}
+    void EnableFlag(S16 i_Flag)   {m_Flag|=i_Flag;}
     void Reset();
+    void Invalidate();
+    Float GetBytePerPixel();
 private:
     void* m_Datas;
     void* m_Palette;
@@ -62,8 +64,7 @@ class Bitmap_Z : public ResourceObject_Z
     U8 m_Transp;
     U8 m_MipmapCount;
     U8 m_UnkU8_0x31; // Always set to 4
-    U8 m_Flag;
-    U8 m_DontDelete;
+    S16 m_Flag;
 };
 
 #endif

src/Engine/includes/Fonts_Z.h

@@ -5,4 +5,13 @@
 S32 GetUTF8CharBytes(const S8* a1);
 U32 GetUTF8CharCode(const S8* a1);
 
+class Fonts_Z
+{
+    virtual ~Fonts_Z();
+    virtual void Load(void* a1);
+    virtual void EndLoad();
+    virtual void AfterEndLoad();
+    virtual void MarkHandles();
+};
+
 #endif

src/Engine/includes/Main_Z.h

@@ -13,14 +13,15 @@ class Globals {
     virtual U32 GetMgrSize(Name_Z *l_Name, S32 *a1, S32 *a2);
     virtual void Minimize();
     virtual void GetDate();
+    void InitTime();
 
     U8 m_Pad_0x0[0x4];
     GCConsole_Z* Cons;
     U8 m_Pad_0xc[0x4]; // GCRenderer_Z
     HandleManager_Z* ClassMgr; // Actually is ClassManager_Z
     U8 m_Pad_0x14[0x7CC];
 
-    Globals() {
+    inline Globals() {
         m_Pad_0x14[137] = 0;
         m_Pad_0x14[393] = 0;
         m_Pad_0x14[649] = 0;