mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-18 05:38:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pr/7

Browse Source
This commit is contained in:
elijah-thomas774
2024-05-02 12:42:55 -04:00
parent 8263b21dac 79cb348409
commit 2f8f20d92e
17 changed files with 664 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/c/c_list.h
+4 -4
View File
@@ -31,7 +31,7 @@ public:
/* 802e2be0 */ cListMg_c() : mpFirst(nullptr), mpLast(nullptr) {}
// /* 802e2880 */ ~cListMg_c();
bool insertAfter(cListNd_c *node, cListNd_c *prevNode);
void insertAfter(cListNd_c *node, cListNd_c *prevNode);
/**
* @brief Removes a node from the list.
@@ -39,7 +39,7 @@ public:
* @param node The node to remove.
* @return If the operation was successful.
*/
bool remove(cListNd_c *node);
void remove(cListNd_c *node);
/**
* @brief Adds a node to the end of the list.
@@ -47,7 +47,7 @@ public:
* @param node The node to append.
* @return If the operation was successful.
*/
bool append(cListNd_c *node);
void append(cListNd_c *node);
/**
* @brief Adds a node to the beginning of the list.
@@ -55,7 +55,7 @@ public:
* @param node The node to prepend.
* @return If the operation was successful.
*/
bool prepend(cListNd_c *node);
void prepend(cListNd_c *node);
cListNd_c *getFirst() const {
return mpFirst;
include/egg/core/eggAssertHeap.h
+3 -3
View File
@@ -21,9 +21,9 @@ public:
public:
/* 804963a0 */ AssertHeap(MEMiHeapHead *heapHead);
/* 80496460 */ static AssertHeap *create(void *block, u32 size, u16 attr);
/* 80496530 */ static AssertHeap *create(u32 size, Heap *heap);
/* 80496810 */ static u32 getSize(); // returns 0x7C
/* 80496460 */ static AssertHeap *create(void *block, size_t size, u16 attr);
/* 80496530 */ static AssertHeap *create(size_t size, Heap *heap);
/* 80496810 */ static size_t getSize(); // returns 0x7C
};
} // namespace EGG
include/egg/core/eggColorFader.h
+5 -3
View File
@@ -12,12 +12,12 @@ class ColorFader : public Fader {
public:
// vtable at 0x00 | 8056eae8
/* vt 0x08 | 80497a10 */ virtual void setStatus(EStatus);
/* vt 0x0C | 00000000 */ virtual EStatus getStatus() const;
/* vt 0x0C | 80067ec0 */ virtual EStatus getStatus() const { return mStatus; };
/* vt 0x10 | 80497a50 */ virtual bool fadeIn();
/* vt 0x14 | 80497a80 */ virtual bool fadeOut();
/* vt 0x18 | 80497ab0 */ virtual bool calc();
/* vt 0x1C | 80497ba0 */ virtual bool draw();
/* vt 0x1C | 80131b70 */ virtual ~ColorFader();
/* vt 0x1C | 80497ba0 */ virtual void draw();
/* vt 0x1C | 80131b70 */ virtual ~ColorFader() {}
public:
/* 0x04 */ EStatus mStatus;
@@ -35,6 +35,8 @@ public:
/* 80497930 */ ColorFader(f32 startX, f32 startY, f32 lengthX, f32 lengthY, nw4r::ut::Color color, EStatus status);
/* 804979e0 */ void setFrame(u16 frame);
/* 804979f0 */ void setColor(nw4r::ut::Color);
float getWidth() const { return mEndX - mStartX; }
float getHeight() const { return mEndY - mStartY; }
};
} // namespace EGG
include/egg/core/eggExpHeap.h
+1 -1
View File
@@ -21,7 +21,7 @@ public:
public:
/* 80495ab0 */ ExpHeap(MEMiHeapHead *heapHead);
/* 80495b70 */ static ExpHeap *create(void *block, u32 size, u16 attr);
/* 80495b70 */ static ExpHeap *create(void *block, size_t size, u16 attr);
/* 80495c30 */ static ExpHeap *create(size_t size, Heap *heap, u16 attr);
/* 80495d00 */ void setGroupID(u16 groupId);
/* 80495f80 */ u32 getSizeForMBlock(const void *block);
include/egg/core/eggFader.h
+1 -1
View File
@@ -21,7 +21,7 @@ public:
/* vt 0x10 | 00000000 */ virtual bool fadeIn() = 0;
/* vt 0x14 | 00000000 */ virtual bool fadeOut() = 0;
/* vt 0x18 | 00000000 */ virtual bool calc() = 0;
/* vt 0x1C | 00000000 */ virtual bool draw() = 0;
/* vt 0x1C | 00000000 */ virtual void draw() = 0;
};
} // namespace EGG
include/egg/core/eggFrmHeap.h
+1 -1
View File
@@ -21,7 +21,7 @@ public:
public:
/* 80495fa0 */ FrmHeap(MEMiHeapHead *heapHead);
/* 80496060 */ static FrmHeap *create(void *block, u32 size, u16 attr);
/* 80496060 */ static FrmHeap *create(void *block, size_t size, u16 attr);
/* 804962a0 */ void free(u32 flags);
/* 80496370 */ void recordState(u32 id); // non official for now
/* 80496380 */ void freeState(u32 id); // non official for now
include/m/m_heap.h
+14 -14
View File
@@ -1,8 +1,8 @@
#ifndef M_HEAP_H
#define M_HEAP_H
#include "egg/core/eggExpHeap.h"
#include "egg/core/eggFrmHeap.h"
#include "egg/core/eggHeap.h"
// #include "egg/core/eggExpHeap.h"
// #include "egg/core/eggAssertHeap.h"
@@ -15,29 +15,29 @@ class AssertHeap;
} // namespace EGG
// TODO: Doc symbols and func locations
namespace mHeap {
/* 802f0f00 */ u8 copyAttribute(u32);
/* 802f0f00 */ u16 copyAttribute(u32);
/* 802f0f40 */ EGG::Heap *setCurrentHeap(EGG::Heap *);
/* 802f0f50 */ EGG::ExpHeap *createExpHeap(size_t size, EGG::Heap *parentHeap, char *name, s32 align, u32 unk);
/* 802f1060 */ void adjustExpHeap(EGG::Heap *heap);
/* 802f10d0 */ s32 expHeapCost(size_t start, size_t size);
/* 802f10f0 */ EGG::FrmHeap *createFrmHeap(size_t size, EGG::Heap *parentHeap, char *name, s32 align, u32 unk);
/* 802f1060 */ size_t adjustExpHeap(EGG::Heap *heap);
/* 802f10d0 */ size_t expHeapCost(size_t start, s32 size);
/* 802f10f0 */ EGG::FrmHeap *createFrmHeap(size_t size, EGG::Heap *parentHeap, char *name, size_t align, size_t attrs);
/* 802f1200 */ void destroyFrmHeap(EGG::FrmHeap *heap);
/* 802f1220 */ size_t adjustFrmHeap(EGG::FrmHeap *heap);
/* 802f1290 */ s32 frmHeapCost(size_t start, size_t size);
/* 802f12b0 */ void setTempHeap(EGG::Heap **prevHeap, EGG::Heap *tempNewHeap);
/* 802f12f0 */ void restoreTempHeap(EGG::Heap **prevHeap);
/* 802f1350 */ void createHeap(size_t size, EGG::Heap *, char *name);
/* 802f1290 */ size_t frmHeapCost(size_t start, s32 size);
/* 802f12b0 */ EGG::Heap **setTempHeap(EGG::Heap **prevHeap, EGG::Heap *tempNewHeap);
/* 802f12f0 */ EGG::Heap **restoreTempHeap(EGG::Heap **prevHeap, s32 size);
/* 802f1350 */ EGG::ExpHeap *createHeap(size_t size, EGG::Heap *, char *name);
/* 802f13d0 */ void saveCurrentHeap();
/* 802f13e0 */ void restoreCurrentHeap();
/* 802f1410 */ EGG::FrmHeap *makeFrmHeapAndUpdate(size_t size, EGG::Heap *parentHeap, const char *name, s32 align,
u32 unk);
/* 802f1450 */ int getGameHeapNum();
/* 802f1460 */ EGG::Heap *createGameHeap(s32 heapNum, size_t size, EGG::Heap *parentHeap);
/* 802f1460 */ EGG::ExpHeap *createGameHeap(s32 heapNum, size_t size, EGG::Heap *parentHeap);
/* 802f1510 */ EGG::Heap *createGameHeap1(s32 size, EGG::Heap *parentHeap);
/* 802f1560 */ void createArchiveHeap(size_t size, EGG::Heap *parentHeap);
/* 802f1590 */ void createCommandHeap(size_t size, EGG::Heap *parentHeap);
/* 802f15c0 */ void createDylinkHeap(size_t size, EGG::Heap *parentHeap);
/* 802f15f0 */ void createAssertHeap(EGG::Heap *parentHeap);
/* 802f1560 */ EGG::ExpHeap *createArchiveHeap(size_t size, EGG::Heap *parentHeap);
/* 802f1590 */ EGG::ExpHeap *createCommandHeap(size_t size, EGG::Heap *parentHeap);
/* 802f15c0 */ EGG::ExpHeap *createDylinkHeap(size_t size, EGG::Heap *parentHeap);
/* 802f15f0 */ EGG::AssertHeap *createAssertHeap(EGG::Heap *parentHeap);
/* 802f1640 */ EGG::Heap *makeHeapOnCurrentGameHeap(size_t size, char *name, s32 align, u32 unk);
extern EGG::ExpHeap *g_gameHeaps[4];
extern EGG::ExpHeap *s_SavedCurrentHeap;