mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link m_eappli.c

Browse Source
This commit is contained in:
Cuyler36
2023-05-29 02:56:52 -04:00
parent cf3e221a10
commit e9ad57bdd4
7 changed files with 193 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libjsys/jsyswrapper.h
+6
View File
@@ -9,12 +9,18 @@
extern "C" {
#endif
enum resource_index {
/* TODO: finish */
RESOURCE_MY_ORIGINAL = 27,
};
extern void JW_Init();
extern void JW_Init2();
extern void* JW_Alloc(size_t size, int align);
extern void JW_Free(void* ptr);
extern s32 JW_Resize(void* ptr, size_t new_size);
extern size_t JW_GetMemBlockSize(void* ptr);
extern size_t JW_GetResSizeFileNo(int file_no);
extern void JW_BeginFrame();
extern void JW_EndFrame();
extern void JW_JUTReport(int x, int y, int show_count, const char* fmt, ...);
include/m_eappli.h
+16
View File
@@ -0,0 +1,16 @@
#ifndef M_EAPPLI_H
#define M_EAPPLI_H
#include "types.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
}
#endif
#endif
include/m_malloc.h
+7 -7
View File
@@ -10,15 +10,15 @@ extern "C" {
extern Arena zelda_arena;
extern void zelda_malloc_align(u32,u32);
extern void zelda_malloc(u32);
extern void zelda_malloc_r(u32);
extern void* zelda_malloc_align(size_t,u32);
extern void* zelda_malloc(size_t);
extern void* zelda_malloc_r(size_t);
extern void zelda_free(void*);
extern void zelda_GetFreeArena(size_t* max, size_t* free, size_t* alloc);
extern u32 zelda_GetTotalFreeSize(void);
extern u32 zelda_GetMemBlockSize(void*);
extern void zelda_InitArena(void*, u32);
extern void zelda_AddBlockArena(void*, u32);
extern size_t zelda_GetTotalFreeSize(void);
extern size_t zelda_GetMemBlockSize(void*);
extern void zelda_InitArena(void*, size_t);
extern void zelda_AddBlockArena(void*, size_t);
extern void zelda_CleanupArena(void);
extern int zelda_MallocIsInitalized();
include/m_private.h
+4 -1
View File
@@ -28,6 +28,9 @@ enum {
mPr_PLAYER_NUM
};
#define mPr_ECARD_NUM 367
#define mPr_ECARD_LETTER_NUM ((mPr_ECARD_NUM + 7) / 8) // 46
#define mPr_POCKETS_SLOT_COUNT 15
#define mPr_INVENTORY_MAIL_COUNT 10
#define mPr_DELIVERY_QUEST_NUM mPr_POCKETS_SLOT_COUNT
@@ -95,7 +98,7 @@ typedef struct player_sunburn_s {
/* sizeof(mPr_carde_data_c) == 0x32 */
typedef struct player_ecard_data_s {
/* 0x00 */ lbRTC_ymd_t letter_send_date; /* date the latest eCard letter was sent */
/* 0x04 */ u8 card_letters_sent[46]; /* bitfield keeping track of which eCard letters have been sent to the player [0, 366] */
/* 0x04 */ u8 card_letters_sent[mPr_ECARD_LETTER_NUM]; /* bitfield keeping track of which eCard letters have been sent to the player [0, 366] */
} mPr_carde_data_c;
typedef struct private_s {