Merge pull request #108 from robojumper/d_a_obj_tbox

dAcTbox_c

include/toBeSorted/arc_managers/oarc_manager.h

@@ -19,7 +19,7 @@ public:
     bool checkIfObjectArcExistsOnDisk(const char *object);
     bool loadObjectArcFromDisk(const char *object, EGG::Heap *heap);
     bool addEntryFromSuperArc(const char *object, void *data, EGG::Heap *heap);
-    void ensureLoaded1(const char *object);
+    int ensureLoaded1(const char *object);
     void ensureLoaded2(const char *object);
     bool decrement(const char *path);
     void *getData(const char *oarcName, const char *fileName);

include/toBeSorted/blur_and_palette_manager.h

@@ -0,0 +1,27 @@
+#ifndef BLUR_AND_PALETTE_MANAGER_H
+#define BLUR_AND_PALETTE_MANAGER_H
+
+#include "common.h"
+#include "m/m_vec.h"
+
+class BlurAndPaletteManager {
+public:
+    static BlurAndPaletteManager &GetInstance() {
+        return sInstance;
+    }
+
+    void fn_800247D0(mVec3_c, f32);
+    void fn_80022AF0(f32);
+    void setField_0x2F20(f32 arg) {
+        field_0x2F20 = arg;
+    }
+    void fn_800223A0(void *);
+    void fn_80022440(void *);
+
+private:
+    u8 field_0x0000[0x2F20 - 0x0000];
+    f32 field_0x2F20;
+    static BlurAndPaletteManager sInstance;
+};
+
+#endif

include/toBeSorted/counters/counter.h

@@ -16,4 +16,4 @@ public:
     u16 counterId;
 };
 
-#endif COUNTER_H
+#endif

include/toBeSorted/counters/goddess_chest_counter.h

@@ -0,0 +1,19 @@
+#ifndef GODDESS_CHEST_COUNTER_H
+#define GODDESS_CHEST_COUNTER_H
+
+#include "toBeSorted/counters/counter.h"
+
+class GoddessChestCounter : public Counter {
+public:
+    GoddessChestCounter() : Counter(0x43F) {}
+    virtual ~GoddessChestCounter() {};
+
+    virtual u16 getCommittedValue() override;
+    virtual u16 getMax() override;
+    virtual u16 getUncommittedValue() override;
+    virtual void setValue(u16 num) override;
+
+    static GoddessChestCounter sInstance;
+};
+
+#endif

include/toBeSorted/event.h

@@ -16,8 +16,9 @@ public:
 
 public:
     /** 0x800A0C40 */
-    Event(char *eventName, u32 unk, u32 eventFlags, void *callback1, void *callback2);
+    Event(const char *eventName, u32 unk, u32 eventFlags, void *callback1, void *callback2);
     Event(u32 eventId, s32 roomId, u32 eventFlags, void *callback1, void *callback2);
+    Event(const char *eventName, void *zevDat, u32 unk, u32 eventFlags, void *callback1, void *callback2);
     /** 0x800A1240 */
     virtual ~Event();
 };

include/toBeSorted/event_manager.h

@@ -12,6 +12,7 @@ class EventManager {
 public:
     static bool isInEvent(dAcBase_c *actor, const char *eventName);
     static bool finishEvent(dAcBase_c *actor, const char *eventName);
+    static void changeOwnEvent(dAcBase_c *actor1, dAcBase_c *actor2, Event *event, UNKWORD);
     static bool alsoSetAsCurrentEvent(dAcBase_c *actor, Event *event, void *unknown);
 
     static EventManager *sInstance;

include/toBeSorted/room_manager.h

@@ -60,6 +60,10 @@ public:
     char _7[3];
     bool hasAnmTexPat;
     bool didAlreadyInit;
+
+    bool checkFlag(u32 flag) {
+        return flags & flag;
+    }
 };
 
 class dRoomTable {