mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-07 21:10:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

TwoHeadArena and TwoHeadGfxArena OK (#83)

Browse Source 
* TwoHeadArena and TwoHeadGfxArena OK

* Changed negatives to ~ in TwoHeadArena.c

* Renamed functions to match OoT

* Formatted code files

* Removed dispbuf
This commit is contained in:
kyleburnette
2021-03-27 10:13:56 -07:00
committed by GitHub
parent 6e4d156ad7
commit a0b8a7c718
12 changed files with 242 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+30 -30
View File
@@ -3093,35 +3093,35 @@ void func_80171F4C(s32 param_1);
// void func_801720C4(void);
// void func_801720FC(void);
// void func_80172758(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE1 param_6, UNK_TYPE1 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10, UNK_TYPE4 param_11, UNK_TYPE4 param_12, UNK_TYPE4 param_13, UNK_TYPE4 param_14);
void func_801727F0(GameStateHeap* heap, void* memoryBlock, u32 size);
// void func_80172810(void);
s32 func_80172830(GameStateHeap* pzParm1);
// void func_80172850(void);
// void func_80172870(void);
// void func_80172890(void);
// void func_801728B0(void);
// void func_801728D0(void);
void func_801728F0(GameStateHeap* heap, s32 iParm2);
// void func_80172914(void);
// void func_80172934(void);
// void func_80172954(void);
// void func_80172974(void);
// void func_80172998(void);
// void func_801729B8(void);
// void func_801729DC(void);
void* GameStateHeap_GetStart(GameStateHeap* heap);
void GameStateHeap_SetStart(GameStateHeap* heap, void* start);
void* GameStateHeap_GetEnd(GameStateHeap* heap);
void* GameStateHeap_Alloc(GameStateHeap* heap, s32 iParm2);
void* GameStateHeap_AllocByte(GameStateHeap* pzParm1);
void* GameStateHeap_AllocFromEndAlignedTo(GameStateHeap* heap, void* ptr);
void* GameStateHeap_AllocFromEnd(GameStateHeap* heap, u32 size);
void* GameStateHeap_AllocFromEndAligned(GameStateHeap* heap, u32 size, u32 allignment);
s32 GameStateHeap_GetFreeSize(GameStateHeap* iParm1);
s32 GameStateHeap_GetHasOverflowed(GameStateHeap* pzParm1);
void GameStateHeap_InitAppend(GameStateHeap* heap);
void GameStateHeap_Init(GameStateHeap* heap, void* memoryBlock, u32 size);
void GameStateHeap_Clear(GameStateHeap* pvParm1);
void THGA_Ct(TwoHeadGfxArena* thga, Gfx* start, u32 size);
void THGA_Dt(TwoHeadGfxArena* thga);
u32 THGA_IsCrash(TwoHeadGfxArena* thga);
void THGA_Init(TwoHeadGfxArena* thga);
s32 THGA_GetSize(TwoHeadGfxArena* thga);
Gfx* THGA_GetHead(TwoHeadGfxArena* thga);
void THGA_SetHead(TwoHeadGfxArena* thga, Gfx* start);
Gfx* THGA_GetTail(TwoHeadGfxArena* thga);
Gfx* THGA_AllocStartArray8(TwoHeadGfxArena* thga, u32 count);
Gfx* THGA_AllocStart8(TwoHeadGfxArena* thga);
Gfx* THGA_AllocStart8Wrapper(TwoHeadGfxArena* thga);
Gfx* THGA_AllocEnd(TwoHeadGfxArena* thga, u32 size);
Gfx* THGA_AllocEndArray64(TwoHeadGfxArena* thga, u32 count);
Gfx* THGA_AllocEnd64(TwoHeadGfxArena* thga);
Gfx* THGA_AllocEndArray16(TwoHeadGfxArena* thga, u32 count);
Gfx* THGA_AllocEnd16(TwoHeadGfxArena* thga);
void* THA_GetHead(TwoHeadArena* tha);
void THA_SetHead(TwoHeadArena* tha, void* start);
void* THA_GetTail(TwoHeadArena* tha);
void* THA_AllocStart(TwoHeadArena* tha, u32 size);
void* THA_AllocStart1(TwoHeadArena* tha);
void* THA_AllocEnd(TwoHeadArena* tha, u32 size);
void* THA_AllocEndAlign16(TwoHeadArena* tha, u32 size);
void* THA_AllocEndAlign(TwoHeadArena* tha, u32 size, u32 mask);
s32 THA_GetSize(TwoHeadArena* tha);
u32 THA_IsCrash(TwoHeadArena* tha);
void THA_Init(TwoHeadArena* tha);
void THA_Ct(TwoHeadArena* tha, void* ptr, u32 size);
void THA_Dt(TwoHeadArena* tha);
void func_80172BC0(void);
void func_80172C30(AudioThreadStruct* audio);
void func_80172C68(AudioThreadStruct* audio);
@@ -3158,7 +3158,7 @@ void Gamealloc_Free(GameAlloc* heap, void* ptr);
void Gamealloc_FreeAll(GameAlloc* heap);
void Gamealloc_Init(GameAlloc* iParm1);
// void Graph_FaultClient(void);
void Graph_DlAlloc(DispBuf* dl, void* memoryBlock, u32 size);
void Graph_DlAlloc(TwoHeadGfxArena* dl, void* memoryBlock, u32 size);
void Graph_InitTHGA(GraphicsContext* gCtxt);
GameStateOverlay* Graph_GetNextGameState(GameState* ctxt);
void* Graph_FaultAddrConvFunc(void* addr);
include/z64.h
+18 -18
View File
@@ -133,13 +133,6 @@ typedef struct {
/* 0x8 */ u8* textureDlOffsets;
} CyclingTextureParams; // size = 0xC
typedef struct {
/* 0x0 */ u32 size;
/* 0x4 */ Gfx* buf;
/* 0x8 */ Gfx* p;
/* 0xC */ Gfx* d;
} DispBuf; // size = 0x10
typedef struct {
/* 0x0 */ s16 x;
/* 0x2 */ s16 y;
@@ -212,11 +205,18 @@ typedef struct {
} GameInfo; // size = 0x15D4
typedef struct {
/* 0x0 */ UNK_TYPE4 size;
/* 0x4 */ void* heapStart;
/* 0x8 */ void* heapAppendStart;
/* 0xC */ void* heapAppendEnd;
} GameStateHeap; // size = 0x10
/* 0x0000 */ u32 size;
/* 0x0004 */ void* bufp;
/* 0x0008 */ void* head;
/* 0x000C */ void* tail;
} TwoHeadArena; // size = 0x10
typedef struct {
/* 0x0000 */ u32 size;
/* 0x0004 */ Gfx* bufp;
/* 0x0008 */ Gfx* p;
/* 0x000C */ Gfx* d;
} TwoHeadGfxArena; // size = 0x10
typedef struct {
/* 0x00000 */ u16 headMagic; // 1234
@@ -245,16 +245,16 @@ typedef struct {
/* 0x05C */ OSMesgQueue unk5C;
/* 0x074 */ UNK_TYPE1 pad74[0x12C];
/* 0x1A0 */ Gfx* unk1A0;
/* 0x1A4 */ DispBuf unk1A4;
/* 0x1A4 */ TwoHeadGfxArena unk1A4;
/* 0x1B4 */ Gfx* unk1B4;
/* 0x1B8 */ DispBuf unk1B8;
/* 0x1B8 */ TwoHeadGfxArena unk1B8;
/* 0x1C8 */ UNK_TYPE1 pad1C8[0xAC];
/* 0x274 */ OSViMode* unk274;
/* 0x278 */ void* zbuffer;
/* 0x27C */ UNK_TYPE1 pad27C[0x1C];
/* 0x298 */ DispBuf overlay;
/* 0x2A8 */ DispBuf polyOpa;
/* 0x2B8 */ DispBuf polyXlu;
/* 0x298 */ TwoHeadGfxArena overlay;
/* 0x2A8 */ TwoHeadGfxArena polyOpa;
/* 0x2B8 */ TwoHeadGfxArena polyXlu;
/* 0x2C8 */ s32 displaylistCounter;
/* 0x2CC */ void* framebuffer;
/* 0x2D0 */ int pad2D0;
@@ -1151,7 +1151,7 @@ struct GameState {
/* 0x0C */ GameStateFunc nextGameStateInit;
/* 0x10 */ u32 nextGameStateSize;
/* 0x14 */ Input input[4];
/* 0x74 */ GameStateHeap heap;
/* 0x74 */ TwoHeadArena heap;
/* 0x84 */ GameAlloc alloc;
/* 0x98 */ UNK_TYPE1 pad98[0x3];
/* 0x9B */ u8 running; // If 0, switch to next game state