mirror of
https://github.com/zeldaret/mm.git
synced 2026-09-07 19:10:38 -04:00
Fix ultratypes types (#1454)
* Fix ultratypes types * Add back size_t and NULL * Callocs * Callocs pt 2 * bool * STDC version checks
This commit is contained in:
Derek Hensley
@@ -8,7 +8,7 @@ void bcopy(void* __src, void* __dest, int __n);
|
||||
int bcmp(void* __s1, void* __s2, int __n);
|
||||
void bzero(void* begin, int length);
|
||||
|
||||
s32 vsprintf(char* dst, char* fmt, va_list args);
|
||||
int vsprintf(char* dst, char* fmt, va_list args);
|
||||
int sprintf(char* dst, const char* fmt, ...);
|
||||
void osSyncPrintf(const char* fmt, ...);
|
||||
|
||||
|
||||
@@ -18,8 +18,8 @@ typedef struct OSTimer_s {
|
||||
|
||||
OSTime osGetTime(void);
|
||||
void osSetTime(OSTime ticks);
|
||||
s32 osSetTimer(OSTimer* t, OSTime countdown, OSTime interval, OSMesgQueue* mq, OSMesg msg);
|
||||
s32 osStopTimer(OSTimer* t);
|
||||
int osSetTimer(OSTimer* t, OSTime countdown, OSTime interval, OSMesgQueue* mq, OSMesg msg);
|
||||
int osStopTimer(OSTimer* t);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -5,8 +5,8 @@ typedef signed char s8;
|
||||
typedef unsigned char u8;
|
||||
typedef signed short int s16;
|
||||
typedef unsigned short int u16;
|
||||
typedef signed int s32;
|
||||
typedef unsigned int u32;
|
||||
typedef signed long s32;
|
||||
typedef unsigned long u32;
|
||||
typedef signed long long int s64;
|
||||
typedef unsigned long long int u64;
|
||||
|
||||
@@ -22,10 +22,14 @@ typedef volatile s64 vs64;
|
||||
typedef float f32;
|
||||
typedef double f64;
|
||||
|
||||
typedef u32 size_t;
|
||||
#if defined(_MIPS_SZLONG) && (_MIPS_SZLONG == 64)
|
||||
typedef unsigned long size_t;
|
||||
#else
|
||||
typedef unsigned int size_t;
|
||||
#endif
|
||||
|
||||
#ifndef NULL
|
||||
#define NULL (void*)0
|
||||
#define NULL ((void*)0)
|
||||
#endif
|
||||
|
||||
// TODO: move this somewhere else
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ typedef void* (*PrintCallback)(void*, const char*, size_t);
|
||||
#define FLAGS_HASH 8
|
||||
#define FLAGS_ZERO 16
|
||||
|
||||
s32 _Printf(PrintCallback pfn, void* arg, const char* fmt, va_list ap);
|
||||
int _Printf(PrintCallback pfn, void* arg, const char* fmt, va_list ap);
|
||||
void _Litob(_Pft* args, u8 type);
|
||||
void _Ldtob(_Pft* args, u8 type);
|
||||
|
||||
|
||||
@@ -132,7 +132,7 @@ s32 AudioLoad_SyncInitSeqPlayer(s32 playerIndex, s32 seqId, s32 arg2);
|
||||
s32 AudioLoad_SyncInitSeqPlayerSkipTicks(s32 playerIndex, s32 seqId, s32 skipTicks);
|
||||
void AudioLoad_ProcessLoads(s32 resetStatus);
|
||||
void AudioLoad_SetDmaHandler(DmaHandler callback);
|
||||
void AudioLoad_Init(void* heap, u32 heapSize);
|
||||
void AudioLoad_Init(void* heap, size_t heapSize);
|
||||
void AudioLoad_InitSlowLoads(void);
|
||||
s32 AudioLoad_SlowLoadSample(s32 fontId, s32 instId, s8* isDone);
|
||||
s32 AudioLoad_SlowLoadSeq(s32 seqId, u8* ramAddr, s8* isDone);
|
||||
|
||||
+24
-24
@@ -99,7 +99,7 @@ Actor* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s32 params);
|
||||
void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnPos, s16 params);
|
||||
s32 func_800A8150(s32 index);
|
||||
s32 func_800A817C(s32 index);
|
||||
s32 Item_CanDropBigFairy(PlayState* play, s32 index, s32 collectibleFlag);
|
||||
bool Item_CanDropBigFairy(PlayState* play, s32 index, s32 collectibleFlag);
|
||||
void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2);
|
||||
void EffectBlure_AddSpace(EffectBlure* this);
|
||||
void EffectBlure_Init1(void* thisx, void* initParamsx);
|
||||
@@ -298,9 +298,9 @@ f32 Actor_HeightDiff(Actor* actor1, Actor* actor2);
|
||||
void func_800B6F20(PlayState* play, Input* input, f32 magnitude, s16 baseYaw);
|
||||
f32 Player_GetHeight(Player* player);
|
||||
f32 Player_GetRunSpeedLimit(Player* player);
|
||||
s32 func_800B7118(Player* player);
|
||||
s32 func_800B7128(Player* player);
|
||||
s32 func_800B715C(PlayState* play);
|
||||
bool func_800B7118(Player* player);
|
||||
bool func_800B7128(Player* player);
|
||||
bool func_800B715C(PlayState* play);
|
||||
void Actor_SetCameraHorseSetting(PlayState* play, Player* player);
|
||||
void Actor_MountHorse(PlayState* play, Player* player, Actor* horse);
|
||||
s32 Player_SetCsAction(PlayState* play, Actor* csActor, u8 csAction);
|
||||
@@ -337,7 +337,7 @@ s32 func_800B874C(Actor* actor, PlayState* play, f32 xzRange, f32 yRange);
|
||||
s32 func_800B8804(Actor* actor, PlayState* play, f32 xzRange);
|
||||
s32 func_800B886C(Actor* actor, PlayState* play);
|
||||
void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y);
|
||||
s32 Actor_OnScreen(PlayState* play, Actor* actor);
|
||||
bool Actor_OnScreen(PlayState* play, Actor* actor);
|
||||
s32 Actor_HasParent(Actor* actor, PlayState* play);
|
||||
s32 Actor_OfferGetItem(Actor* actor, PlayState* play, GetItemId getItemId, f32 xzRange, f32 yRange);
|
||||
s32 Actor_OfferGetItemNearby(Actor* actor, PlayState* play, GetItemId getItemId);
|
||||
@@ -541,7 +541,7 @@ s32 LifeMeter_IncreaseInterfaceHealth(PlayState* play);
|
||||
s32 LifeMeter_DecreaseInterfaceHealth(PlayState* play);
|
||||
void LifeMeter_Draw(PlayState* play);
|
||||
void LifeMeter_UpdateSizeAndBeep(PlayState* play);
|
||||
bool LifeMeter_IsCritical(void);
|
||||
u32 LifeMeter_IsCritical(void);
|
||||
void Lights_PointSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius, s32 type);
|
||||
void Lights_PointNoGlowSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius);
|
||||
void Lights_PointGlowSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius);
|
||||
@@ -573,7 +573,7 @@ void* ZeldaArena_Malloc(size_t size);
|
||||
void* ZeldaArena_MallocR(size_t size);
|
||||
void* ZeldaArena_Realloc(void* ptr, size_t newSize);
|
||||
void ZeldaArena_Free(void* ptr);
|
||||
void* ZeldaArena_Calloc(u32 num, size_t size);
|
||||
void* ZeldaArena_Calloc(size_t num, size_t size);
|
||||
void ZeldaArena_GetSizes(size_t* outMaxFree, size_t* outFree, size_t* outAlloc);
|
||||
s32 ZeldaArena_Check(void);
|
||||
void ZeldaArena_Init(void* start, size_t size);
|
||||
@@ -779,19 +779,19 @@ void func_80122D44(PlayState* play, struct_80122D44_arg1* arg1);
|
||||
u8 Player_MaskIdToItemId(s32 maskIdMinusOne);
|
||||
s32 Player_GetCurMaskItemId(PlayState* play);
|
||||
void func_80122F28(Player* player);
|
||||
s32 func_80122F9C(PlayState* play);
|
||||
s32 func_80122FCC(PlayState* play);
|
||||
bool func_80122F9C(PlayState* play);
|
||||
bool func_80122FCC(PlayState* play);
|
||||
void func_8012300C(PlayState* play, s32 arg1);
|
||||
void func_8012301C(Actor* thisx, PlayState* play2);
|
||||
void func_80123140(PlayState* play, Player* player);
|
||||
s32 Player_InBlockingCsMode(PlayState* play, Player* player);
|
||||
s32 Player_InCsMode(PlayState* play);
|
||||
s32 func_80123420(Player* player);
|
||||
s32 func_80123434(Player* player);
|
||||
s32 func_80123448(PlayState* play);
|
||||
s32 Player_IsGoronOrDeku(Player* player);
|
||||
s32 func_801234D4(PlayState* play);
|
||||
s32 func_80123590(PlayState* play, Actor* actor);
|
||||
bool Player_InBlockingCsMode(PlayState* play, Player* player);
|
||||
bool Player_InCsMode(PlayState* play);
|
||||
bool func_80123420(Player* player);
|
||||
bool func_80123434(Player* player);
|
||||
bool func_80123448(PlayState* play);
|
||||
bool Player_IsGoronOrDeku(Player* player);
|
||||
bool func_801234D4(PlayState* play);
|
||||
bool func_80123590(PlayState* play, Actor* actor);
|
||||
ItemId Player_GetItemOnButton(PlayState* play, Player* player, EquipSlot slot);
|
||||
PlayerItemAction func_80123810(PlayState* play);
|
||||
PlayerModelGroup Player_ActionToModelGroup(Player* player, PlayerItemAction itemAction);
|
||||
@@ -805,14 +805,14 @@ void Player_Untarget(Player* player);
|
||||
void func_80123DC0(Player* player);
|
||||
void func_80123E90(PlayState* play, Actor* actor);
|
||||
s32 func_80123F2C(PlayState* play, s32 ammo);
|
||||
s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 yRange);
|
||||
bool Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 yRange);
|
||||
u8 Player_GetStrength(void);
|
||||
u8 Player_GetMask(PlayState* play);
|
||||
void Player_RemoveMask(PlayState* play);
|
||||
s32 Player_HasMirrorShieldEquipped(PlayState* play);
|
||||
s32 Player_IsHoldingMirrorShield(PlayState* play);
|
||||
s32 Player_IsHoldingHookshot(Player* player);
|
||||
s32 func_801240DC(Player* player);
|
||||
bool Player_HasMirrorShieldEquipped(PlayState* play);
|
||||
bool Player_IsHoldingMirrorShield(PlayState* play);
|
||||
bool Player_IsHoldingHookshot(Player* player);
|
||||
bool func_801240DC(Player* player);
|
||||
PlayerBButtonSword Player_BButtonSwordFromIA(Player* player, PlayerItemAction itemAction);
|
||||
PlayerBButtonSword Player_GetHeldBButtonSword(Player* player);
|
||||
PlayerMeleeWeapon Player_MeleeWeaponFromIA(PlayerItemAction itemAction);
|
||||
@@ -823,7 +823,7 @@ PlayerBottle Player_GetBottleHeld(Player* Player);
|
||||
PlayerExplosive Player_ExplosiveFromIA(Player* player, PlayerItemAction itemAction);
|
||||
PlayerExplosive Player_GetExplosiveHeld(Player* player);
|
||||
PlayerSword Player_SwordFromIA(Player* player, PlayerItemAction itemAction);
|
||||
s32 func_801242B4(Player* player);
|
||||
bool func_801242B4(Player* player);
|
||||
s32 Player_GetEnvironmentalHazard(PlayState* play);
|
||||
void Player_UpdateBunnyEars(Player* player);
|
||||
void func_80124618(struct_80124618 arg0[], f32 curFrame, Vec3f* arg2);
|
||||
@@ -947,7 +947,7 @@ void Play_DecompressI5ToI8(void* srcI5, void* destI8, size_t size);
|
||||
void Play_Update(PlayState* this);
|
||||
void Play_Draw(PlayState* this);
|
||||
void Play_Main(GameState* thisx);
|
||||
s32 Play_InCsMode(PlayState* this);
|
||||
bool Play_InCsMode(PlayState* this);
|
||||
f32 Play_GetFloorSurfaceImpl(PlayState* this, MtxF* mtx, CollisionPoly** poly, s32* bgId, Vec3f* pos);
|
||||
void Play_GetFloorSurface(PlayState* this, MtxF* mtx, Vec3f* pos);
|
||||
void* Play_LoadFile(PlayState* this, RomFile* entry);
|
||||
|
||||
@@ -5,7 +5,14 @@
|
||||
|
||||
#ifndef __cplusplus
|
||||
|
||||
#define bool u32
|
||||
#if (__STDC_VERSION__ >= 202311L)
|
||||
// bool is a type in C23, do not define it
|
||||
#elif (__STDC_VERSION__ >= 199901L)
|
||||
#define bool _Bool
|
||||
#else
|
||||
#define bool int
|
||||
#endif
|
||||
|
||||
#define false 0
|
||||
#define true 1
|
||||
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
#ifndef LIBC_STDINT_H
|
||||
#define LIBC_STDINT_H
|
||||
|
||||
#include "PR/ultratypes.h"
|
||||
|
||||
typedef s32 intptr_t;
|
||||
typedef u32 uintptr_t;
|
||||
typedef signed long intptr_t;
|
||||
typedef unsigned long uintptr_t;
|
||||
|
||||
#define INT8_MIN (-0x80)
|
||||
#define INT16_MIN (-0x8000)
|
||||
|
||||
@@ -8,7 +8,7 @@ void* SystemArena_Malloc(size_t size);
|
||||
void* SystemArena_MallocR(size_t size);
|
||||
void* SystemArena_Realloc(void* oldPtr, size_t newSize);
|
||||
void SystemArena_Free(void* ptr);
|
||||
void* SystemArena_Calloc(u32 elements, size_t size);
|
||||
void* SystemArena_Calloc(size_t num, size_t size);
|
||||
void SystemArena_GetSizes(size_t* maxFreeBlock, size_t* bytesFree, size_t* bytesAllocated);
|
||||
u32 SystemArena_CheckArena(void);
|
||||
void SystemArena_Init(void* start, size_t size);
|
||||
|
||||
@@ -320,7 +320,7 @@ typedef struct MessageContext {
|
||||
/* 0x120DA */ UNK_TYPE1 unk_120DA[0x6];
|
||||
} MessageContext; // size = 0x120E0
|
||||
|
||||
s32 Message_ShouldAdvance(struct PlayState* play);
|
||||
bool Message_ShouldAdvance(struct PlayState* play);
|
||||
void Message_CloseTextbox(struct PlayState* play);
|
||||
void Message_DrawTextChar(struct PlayState* play, TexturePtr texture, Gfx** gfxP);
|
||||
void Message_DrawItemIcon(struct PlayState* play, Gfx** gfxP);
|
||||
|
||||
Reference in New Issue
Block a user