Merge branch 'Rainchus:main' into main

This commit is contained in:
CreateSource 2023-12-28 16:56:38 -05:00 committed by GitHub
commit db63616c5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 1461 additions and 234 deletions

23
include/game/card.h Normal file
View file

@ -0,0 +1,23 @@
#ifndef _GAME_CARD_H
#define _GAME_CARD_H
#include "dolphin.h"
extern u8 UnMountCnt;
void HuCardInit(void);
s32 HuCardCheck(void);
s32 HuCardSlotCheck(s16 slot);
s32 HuCardMount(s16 slot);
void HuCardUnMount(s16 slot);
s32 HuCardFormat(s16 slot);
s32 HuCardOpen(s16 slot, const char *fileName, CARDFileInfo *fileInfo);
s32 HuCardRead(CARDFileInfo *fileInfo, void *addr, s32 length, s32 offset);
s32 HuCardCreate(s16 slot, const char *fileName, s32 size, CARDFileInfo *fileInfo);
s32 HuCardClose(CARDFileInfo *fileInfo);
s32 HuCardWrite(CARDFileInfo *fileInfo, const void *addr, s32 length, s32 offset);
s32 HuCardDelete(s16 slot, const char *fileName);
s32 HuCardSectorSizeGet(s16 slot);
s32 HuCardFreeSpaceGet(s16 slot, u32 *byteNotUsed, u32 *filesNotUsed);
#endif

11
include/game/flag.h Normal file
View file

@ -0,0 +1,11 @@
#ifndef _GAME_FLAG_H
#define _GAME_FLAG_H
#define FLAG_ID_MAKE(group, index) (((group) << 16)|(index))
s32 _CheckFlag(u32 flag);
void _SetFlag(u32 flag);
void _ClearFlag(u32 flag);
void _InitFlag(void);
#endif

View file

@ -206,7 +206,7 @@ void Hu3DCameraPerspectiveSet(s32, f32, f32, f32, f32);
void Hu3DCameraViewportSet(s32, f32, f32, f32, f32, f32, f32);
void Hu3DCameraScissorSet(s32, s32, s32, s32, s32);
void Hu3DCameraPosSet(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void Hu3DCameraPosSetV(s32, Vec, Vec, Vec);
void Hu3DCameraPosSetV(s32 cam, Vec *pos, Vec *up, Vec *target);
void Hu3DCameraKill(s32);
void Hu3DCameraAllKill(void);
void Hu3DCameraSet(s32, Mtx);

35
include/game/saveload.h Normal file
View file

@ -0,0 +1,35 @@
#ifndef _GAME_SAVELOAD_H
#define _GAME_SAVELOAD_H
#include "common.h"
s32 SLFileOpen(char *arg0);
s32 SLFileCreate(char *arg0, u32 arg1, void *arg2);
s32 SLFileWrite(s32 arg0, void *arg1);
s32 SLFileRead(s32 arg0, void *arg1);
s32 SLFileClose(void);
void SLCurSlotNoSet(s16 arg0);
void SLCurBoxNoSet(s8 arg0);
void SLSaveFlagSet(s32 arg0);
s32 SLSaveFlagGet(void);
void SLSaveDataMake(s32 arg0, OSTime *arg1);
void SLSaveDataInfoSet(OSTime *arg0);
void SLCommonSet(void);
void SLSaveBoard(void);
void SLSaveBoardBackup(void);
s32 SLSave(void);
s32 SLLoad(void);
void SLLoadGameStat(void);
void SLLoadBoard(void);
void SLLoadBoardBackup(void);
void SLSerialNoGet(void);
BOOL SLSerialNoCheck(void);
BOOL SLCheckSumCheck(void);
u16 SLCheckSumGet(void);
void SLCheckSumSet(void);
s32 SLStatSet(s32 arg0);
s32 SLCardMount(s16 arg0);
s32 SLFormat(s16 arg0);
s16 SLMessOut(s16 arg0);
#endif

View file

@ -75,6 +75,8 @@ typedef struct {
/* 0x160 */ u8 ATTRIBUTE_ALIGN(32) mess_pal[10][3];
} WindowData; // Size 0x180
extern WindowData winData[32];
void HuWindowInit(void);
void HuWinInit(s32 mess_data_no);
s16 HuWinCreate(float x, float y, s16 w, s16 h, s16 frame);