From 5acaec4486a6ba9c6a308c3987f664d1bbe6ab6b Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Wed, 15 Nov 2023 22:01:42 -0700 Subject: [PATCH] Fix ultratypes types (#1454) * Fix ultratypes types * Add back size_t and NULL * Callocs * Callocs pt 2 * bool * STDC version checks --- include/PR/os_libc.h | 2 +- include/PR/os_time.h | 4 +- include/PR/ultratypes.h | 12 +++-- include/PR/xstdio.h | 2 +- include/audio/load.h | 2 +- include/functions.h | 48 ++++++++--------- include/libc/stdbool.h | 9 +++- include/libc/stdint.h | 6 +-- include/system_malloc.h | 2 +- include/z64message.h | 2 +- src/boot/O2/system_malloc.c | 4 +- src/boot/fault.c | 2 +- src/boot/z_std_dma.c | 6 +-- src/code/TwoHeadGfxArena.c | 2 +- src/code/graph.c | 2 +- src/code/speed_meter.c | 8 +-- src/code/z_actor.c | 12 ++--- src/code/z_actor_dlftbls.c | 2 +- src/code/z_en_item00.c | 2 +- src/code/z_kaleido_manager.c | 2 +- src/code/z_malloc.c | 14 ++--- src/code/z_message.c | 4 +- src/code/z_play.c | 2 +- src/code/z_player_lib.c | 34 ++++++------ src/libultra/os/stoptimer.c | 2 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 36 ++++++------- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.h | 2 +- .../ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c | 2 +- .../ovl_Bg_Ikana_Block/z_bg_ikana_block.c | 6 +-- .../ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c | 2 +- .../ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c | 2 +- .../ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c | 2 +- .../ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c | 2 +- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 2 +- src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c | 3 +- src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c | 2 +- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 2 +- src/overlays/actors/ovl_En_Fsn/z_en_fsn.c | 2 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 4 +- .../actors/ovl_En_Mushi2/z_en_mushi2.c | 2 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 2 +- src/overlays/actors/ovl_En_Sob1/z_en_sob1.c | 2 +- src/overlays/actors/ovl_En_Test3/z_en_test3.c | 2 +- src/overlays/actors/ovl_En_Trt/z_en_trt.c | 2 +- .../actors/ovl_Obj_Armos/z_obj_armos.c | 6 +-- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 2 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 2 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 3 +- .../actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c | 6 +-- .../ovl_Obj_Spidertent/z_obj_spidertent.c | 2 +- src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c | 2 +- src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c | 2 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 4 +- .../actors/ovl_player_actor/z_player.c | 54 +++++++++---------- 54 files changed, 178 insertions(+), 171 deletions(-) diff --git a/include/PR/os_libc.h b/include/PR/os_libc.h index 755f24692c..ffbf879936 100644 --- a/include/PR/os_libc.h +++ b/include/PR/os_libc.h @@ -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, ...); diff --git a/include/PR/os_time.h b/include/PR/os_time.h index d0da9b8a9b..4c825c38c4 100644 --- a/include/PR/os_time.h +++ b/include/PR/os_time.h @@ -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 diff --git a/include/PR/ultratypes.h b/include/PR/ultratypes.h index 76afdf6a0f..3f04c6ed3c 100644 --- a/include/PR/ultratypes.h +++ b/include/PR/ultratypes.h @@ -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 diff --git a/include/PR/xstdio.h b/include/PR/xstdio.h index 9850d88f85..76972871d2 100644 --- a/include/PR/xstdio.h +++ b/include/PR/xstdio.h @@ -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); diff --git a/include/audio/load.h b/include/audio/load.h index 1e896d744b..eccdc2db29 100644 --- a/include/audio/load.h +++ b/include/audio/load.h @@ -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); diff --git a/include/functions.h b/include/functions.h index 330510a1dd..9052db4ed8 100644 --- a/include/functions.h +++ b/include/functions.h @@ -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); diff --git a/include/libc/stdbool.h b/include/libc/stdbool.h index 52546edb32..f6a321aa76 100644 --- a/include/libc/stdbool.h +++ b/include/libc/stdbool.h @@ -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 diff --git a/include/libc/stdint.h b/include/libc/stdint.h index 854fd2546b..fdc16688e1 100644 --- a/include/libc/stdint.h +++ b/include/libc/stdint.h @@ -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) diff --git a/include/system_malloc.h b/include/system_malloc.h index cf91899ef0..6c6f3456ad 100644 --- a/include/system_malloc.h +++ b/include/system_malloc.h @@ -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); diff --git a/include/z64message.h b/include/z64message.h index 2a6eab7f35..fc96c5ff78 100644 --- a/include/z64message.h +++ b/include/z64message.h @@ -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); diff --git a/src/boot/O2/system_malloc.c b/src/boot/O2/system_malloc.c index cea017b38b..e7dc064fc2 100644 --- a/src/boot/O2/system_malloc.c +++ b/src/boot/O2/system_malloc.c @@ -19,9 +19,9 @@ void SystemArena_Free(void* ptr) { __osFree(&gSystemArena, ptr); } -void* SystemArena_Calloc(u32 elements, size_t size) { +void* SystemArena_Calloc(size_t num, size_t size) { void* ptr; - size_t totalSize = elements * size; + size_t totalSize = num * size; ptr = __osMalloc(&gSystemArena, totalSize); if (ptr != NULL) { diff --git a/src/boot/fault.c b/src/boot/fault.c index 0ee4faed75..49734191bc 100644 --- a/src/boot/fault.c +++ b/src/boot/fault.c @@ -208,7 +208,7 @@ void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) { FaultAddrConvClient* iter = sFaultInstance->addrConvClients; FaultAddrConvClient* lastIter = NULL; OSIntMask mask; - bool listIsEmpty = false; + s32 listIsEmpty = false; mask = osSetIntMask(1); diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 5b52656295..205771f92a 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -34,13 +34,13 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, void* ram, size_t size) { ioMsg.dramAddr = ram; ioMsg.size = buffSize; ret = osEPiStartDma(gCartHandle, &ioMsg, 0); - if (ret) { + if (ret != 0) { goto END; } osRecvMesg(&queue, NULL, OS_MESG_BLOCK); size -= buffSize; - rom = rom + buffSize; + rom += buffSize; ram = (u8*)ram + buffSize; } } @@ -50,7 +50,7 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, void* ram, size_t size) { ioMsg.dramAddr = ram; ioMsg.size = size; ret = osEPiStartDma(gCartHandle, &ioMsg, 0); - if (ret) { + if (ret != 0) { goto END; } diff --git a/src/code/TwoHeadGfxArena.c b/src/code/TwoHeadGfxArena.c index d40512efd0..3811bbd12c 100644 --- a/src/code/TwoHeadGfxArena.c +++ b/src/code/TwoHeadGfxArena.c @@ -93,7 +93,7 @@ Mtx* THGA_AllocMtx(TwoHeadGfxArena* thga) { /** * Allocates `num` vertices to the tail end of the Two Head Gfx Arena. */ -Vtx* THGA_AllocVtxArray(TwoHeadGfxArena* thga, u32 num) { +Vtx* THGA_AllocVtxArray(TwoHeadGfxArena* thga, size_t num) { return THGA_AllocTail(thga, num * sizeof(Vtx)); } diff --git a/src/code/graph.c b/src/code/graph.c index 7b67b84875..004659f34d 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -95,7 +95,7 @@ GameStateOverlay* Graph_GetNextGameState(GameState* gameState) { uintptr_t Graph_FaultAddrConv(uintptr_t address, void* param) { uintptr_t addr = address; GameStateOverlay* gameStateOvl = &gGameStateOverlayTable[0]; - size_t ramConv; + uintptr_t ramConv; void* ramStart; size_t diff; s32 i; diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 3550d62ce2..0835cbd1b4 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -213,9 +213,9 @@ void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, Gam TwoHeadArena* tha; s32 y; TwoHeadGfxArena* thga; - u32 zeldaFreeMax; - u32 zeldaFree; - u32 zeldaAlloc; + size_t zeldaFreeMax; + size_t zeldaFree; + size_t zeldaAlloc; s32 sysFreeMax; s32 sysFree; s32 sysAlloc; @@ -233,7 +233,7 @@ void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, Gam } if (R_ENABLE_ARENA_DBG > 1) { - SystemArena_GetSizes((u32*)&sysFreeMax, (u32*)&sysFree, (u32*)&sysAlloc); + SystemArena_GetSizes((size_t*)&sysFreeMax, (size_t*)&sysFree, (size_t*)&sysAlloc); SpeedMeter_InitAllocEntry(&entry, sysFree + sysAlloc - state->tha.size, sysAlloc - state->tha.size, GPACK_RGBA5551(0, 0, 255, 1), GPACK_RGBA5551(255, 128, 128, 1), ulx, lrx, y, y); SpeedMeter_DrawAllocEntry(&entry, gfxCtx); diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 015ee39587..209894a978 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1363,15 +1363,15 @@ f32 Player_GetRunSpeedLimit(Player* player) { } } -s32 func_800B7118(Player* player) { +bool func_800B7118(Player* player) { return player->stateFlags1 & PLAYER_STATE1_8; } -s32 func_800B7128(Player* player) { +bool func_800B7128(Player* player) { return func_800B7118(player) && (player->unk_ACC != 0); } -s32 func_800B715C(PlayState* play) { +bool func_800B715C(PlayState* play) { Player* player = GET_PLAYER(play); return player->stateFlags2 & PLAYER_STATE2_8; @@ -1393,7 +1393,7 @@ void Actor_MountHorse(PlayState* play, Player* player, Actor* horse) { horse->child = &player->actor; } -s32 func_800B7200(Player* player) { +bool func_800B7200(Player* player) { return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_20000000)) || (player->csAction != PLAYER_CSACTION_NONE); } @@ -2100,7 +2100,7 @@ void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y) { *y = PROJECTED_TO_SCREEN_Y(projectedPos, invW); } -s32 Actor_OnScreen(PlayState* play, Actor* actor) { +bool Actor_OnScreen(PlayState* play, Actor* actor) { Vec3f projectedPos; f32 invW; s32 pad[2]; @@ -3492,7 +3492,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) { return newHead; } -s32 Target_InTargetableScreenRegion(PlayState* play, Actor* actor) { +bool Target_InTargetableScreenRegion(PlayState* play, Actor* actor) { s16 x; s16 y; diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index d48ed24bcd..a20f5f93ce 100644 --- a/src/code/z_actor_dlftbls.c +++ b/src/code/z_actor_dlftbls.c @@ -65,7 +65,7 @@ void ActorOverlayTable_FaultClient(void* arg0, void* arg1) { uintptr_t ActorOverlayTable_FaultAddrConv(uintptr_t address, void* param) { uintptr_t addr = address; ActorOverlay* actorOvl = &gActorOverlayTable[0]; - size_t ramConv; + uintptr_t ramConv; void* ramStart; size_t diff; ActorId actorId; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index d22576ad7d..f93b5bcbaa 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1477,6 +1477,6 @@ s32 func_800A817C(s32 index) { return D_801AE214[index]; } -s32 Item_CanDropBigFairy(PlayState* play, s32 index, s32 collectibleFlag) { +bool Item_CanDropBigFairy(PlayState* play, s32 index, s32 collectibleFlag) { return (func_800A8150(index) == ITEM00_BIG_FAIRY) && (!Flags_GetCollectible(play, collectibleFlag)); } diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index d0bacdd222..6598eb19fa 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -20,7 +20,7 @@ FaultAddrConvClient sKaleidoMgrFaultAddrConvClient; uintptr_t KaleidoManager_FaultAddrConv(uintptr_t address, void* param) { uintptr_t addr = address; KaleidoMgrOverlay* kaleidoMgrOvl = gKaleidoMgrCurOvl; - size_t ramConv; + uintptr_t ramConv; void* ramStart; size_t diff; diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c index ac56231cfb..c23da39277 100644 --- a/src/code/z_malloc.c +++ b/src/code/z_malloc.c @@ -24,16 +24,16 @@ void ZeldaArena_Free(void* ptr) { __osFree(&sZeldaArena, ptr); } -void* ZeldaArena_Calloc(u32 num, size_t size) { - void* ret; - u32 n = num * size; +void* ZeldaArena_Calloc(size_t num, size_t size) { + void* ptr; + size_t totalSize = num * size; - ret = __osMalloc(&sZeldaArena, n); - if (ret != NULL) { - bzero(ret, n); + ptr = __osMalloc(&sZeldaArena, totalSize); + if (ptr != NULL) { + bzero(ptr, totalSize); } - return ret; + return ptr; } void ZeldaArena_GetSizes(size_t* outMaxFree, size_t* outFree, size_t* outAlloc) { diff --git a/src/code/z_message.c b/src/code/z_message.c index 2044077db4..4ebcda37fe 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -131,7 +131,7 @@ void Message_ResetOcarinaButtonState(PlayState* play) { sOcarinaButtonCEnvB = 10; } -s32 Message_ShouldAdvance(PlayState* play) { +bool Message_ShouldAdvance(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; Input* controller = CONTROLLER1(&play->state); @@ -150,7 +150,7 @@ s32 Message_ShouldAdvance(PlayState* play) { } } -s32 Message_ShouldAdvanceSilent(PlayState* play) { +bool Message_ShouldAdvanceSilent(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; Input* controller = CONTROLLER1(&play->state); diff --git a/src/code/z_play.c b/src/code/z_play.c index d2110c1e22..ee519270a0 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1512,7 +1512,7 @@ void Play_Main(GameState* thisx) { CutsceneManager_ClearWaiting(); } -s32 Play_InCsMode(PlayState* this) { +bool Play_InCsMode(PlayState* this) { return (this->csCtx.state != CS_STATE_IDLE) || Player_InCsMode(this); } diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 6d056dd58b..547b8bf83b 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -366,13 +366,13 @@ void func_80122F28(Player* player) { } } -s32 func_80122F9C(PlayState* play) { +bool func_80122F9C(PlayState* play) { Player* player = GET_PLAYER(play); return (player->stateFlags2 & PLAYER_STATE2_80000) && (player->av1.actionVar1 == 2); } -s32 func_80122FCC(PlayState* play) { +bool func_80122FCC(PlayState* play) { Player* player = GET_PLAYER(play); return (player->stateFlags2 & PLAYER_STATE2_80000) && @@ -494,29 +494,29 @@ void func_80123140(PlayState* play, Player* player) { Actor_SetScale(&player->actor, scale); } -s32 Player_InBlockingCsMode(PlayState* play, Player* player) { +bool Player_InBlockingCsMode(PlayState* play, Player* player) { return (player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_200 | PLAYER_STATE1_20000000)) || (player->csAction != PLAYER_CSACTION_NONE) || (play->transitionTrigger == TRANS_TRIGGER_START) || (play->transitionMode != TRANS_MODE_OFF) || (player->stateFlags1 & PLAYER_STATE1_1) || (player->stateFlags3 & PLAYER_STATE3_80) || (play->actorCtx.unk268 != 0); } -s32 Player_InCsMode(PlayState* play) { +bool Player_InCsMode(PlayState* play) { Player* player = GET_PLAYER(play); return Player_InBlockingCsMode(play, player) || (player->unk_AA5 == PLAYER_UNKAA5_5); } -s32 func_80123420(Player* player) { +bool func_80123420(Player* player) { return player->stateFlags3 & PLAYER_STATE3_80000000; } -s32 func_80123434(Player* player) { +bool func_80123434(Player* player) { return player->stateFlags1 & (PLAYER_STATE1_10000 | PLAYER_STATE1_20000 | PLAYER_STATE1_40000000); } // Unused -s32 func_80123448(PlayState* play) { +bool func_80123448(PlayState* play) { Player* player = GET_PLAYER(play); return (player->stateFlags1 & PLAYER_STATE1_400000) && @@ -525,11 +525,11 @@ s32 func_80123448(PlayState* play) { // TODO: Player_IsGoronOrDeku is a temporary name until we have more info on this function. // Hypothesis: this function checks if the current form would crouch when he tries to use the shield -s32 Player_IsGoronOrDeku(Player* player) { +bool Player_IsGoronOrDeku(Player* player) { return player->transformation == PLAYER_FORM_GORON || player->transformation == PLAYER_FORM_DEKU; } -s32 func_801234D4(PlayState* play) { +bool func_801234D4(PlayState* play) { Player* player = GET_PLAYER(play); return (player->stateFlags2 & PLAYER_STATE2_8) || (player->actor.speed != 0.0f) || @@ -539,7 +539,7 @@ s32 func_801234D4(PlayState* play) { (player->currentBoots < PLAYER_BOOTS_ZORA_UNDERWATER))); } -s32 func_80123590(PlayState* play, Actor* actor) { +bool func_80123590(PlayState* play, Actor* actor) { Player* player = GET_PLAYER(play); if ((player->stateFlags1 & PLAYER_STATE1_800) && (player->heldActor == actor)) { @@ -1356,7 +1356,7 @@ void func_80123E90(PlayState* play, Actor* actor) { Camera_ChangeMode(Play_GetCamera(play, CAM_ID_MAIN), CAM_MODE_FOLLOWTARGET); } -s32 func_80123F14(PlayState* play) { +bool func_80123F14(PlayState* play) { Player* player = GET_PLAYER(play); return player->stateFlags1 & PLAYER_STATE1_800000; @@ -1368,7 +1368,7 @@ s32 func_80123F2C(PlayState* play, s32 ammo) { return 1; } -s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 yRange) { +bool Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 yRange) { Player* player = GET_PLAYER(play); Vec3f diff; s32 pad; @@ -1398,24 +1398,24 @@ void Player_RemoveMask(PlayState* play) { player->currentMask = PLAYER_MASK_NONE; } -s32 Player_HasMirrorShieldEquipped(PlayState* play) { +bool Player_HasMirrorShieldEquipped(PlayState* play) { Player* player = GET_PLAYER(play); return (player->transformation == PLAYER_FORM_HUMAN) && (player->currentShield == PLAYER_SHIELD_MIRROR_SHIELD); } -s32 Player_IsHoldingMirrorShield(PlayState* play) { +bool Player_IsHoldingMirrorShield(PlayState* play) { Player* player = GET_PLAYER(play); return (player->transformation == PLAYER_FORM_HUMAN) && (player->rightHandType == PLAYER_MODELTYPE_RH_SHIELD) && (player->currentShield == PLAYER_SHIELD_MIRROR_SHIELD); } -s32 Player_IsHoldingHookshot(Player* player) { +bool Player_IsHoldingHookshot(Player* player) { return player->heldItemAction == PLAYER_IA_HOOKSHOT; } -s32 func_801240DC(Player* player) { +bool func_801240DC(Player* player) { return Player_IsHoldingHookshot(player) && (player->heldActor == NULL); } @@ -1500,7 +1500,7 @@ PlayerSword Player_SwordFromIA(Player* player, PlayerItemAction itemAction) { return PLAYER_SWORD_NONE; } -s32 func_801242B4(Player* player) { +bool func_801242B4(Player* player) { return (player->stateFlags1 & PLAYER_STATE1_8000000) && (player->currentBoots < PLAYER_BOOTS_ZORA_UNDERWATER); } diff --git a/src/libultra/os/stoptimer.c b/src/libultra/os/stoptimer.c index 936a19af8b..6810907aaf 100644 --- a/src/libultra/os/stoptimer.c +++ b/src/libultra/os/stoptimer.c @@ -1,6 +1,6 @@ #include "ultra64.h" -s32 osStopTimer(OSTimer* t) { +int osStopTimer(OSTimer* t) { register u32 savedMask; OSTimer* timep; diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index cbfc592102..c8fddfc483 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -23,15 +23,15 @@ void BgBreakwall_Init(Actor* thisx, PlayState* play); void BgBreakwall_Update(Actor* thisx, PlayState* play); void BgBreakwall_SetupAction(BgBreakwall* this, BgBreakwallActionFunc actionFunc); -s32 func_808B736C(BgBreakwall* this, PlayState* play); -s32 func_808B7380(BgBreakwall* this, PlayState* play); -s32 func_808B73C4(BgBreakwall* this, PlayState* play); -s32 func_808B73FC(BgBreakwall* this, PlayState* play); -s32 func_808B7410(BgBreakwall* this, PlayState* play); -s32 func_808B7460(BgBreakwall* this, PlayState* play); -s32 func_808B74A8(BgBreakwall* this, PlayState* play); -s32 func_808B74D8(BgBreakwall* this, PlayState* play); -s32 func_808B751C(BgBreakwall* this, PlayState* play); +bool func_808B736C(BgBreakwall* this, PlayState* play); +bool func_808B7380(BgBreakwall* this, PlayState* play); +bool func_808B73C4(BgBreakwall* this, PlayState* play); +bool func_808B73FC(BgBreakwall* this, PlayState* play); +bool func_808B7410(BgBreakwall* this, PlayState* play); +bool func_808B7460(BgBreakwall* this, PlayState* play); +bool func_808B74A8(BgBreakwall* this, PlayState* play); +bool func_808B74D8(BgBreakwall* this, PlayState* play); +bool func_808B751C(BgBreakwall* this, PlayState* play); void func_808B76CC(BgBreakwall* this, PlayState* play); void func_808B77D0(BgBreakwall* this, PlayState* play); void func_808B77E0(BgBreakwall* this, PlayState* play); @@ -146,26 +146,26 @@ void BgBreakwall_SetupAction(BgBreakwall* this, BgBreakwallActionFunc actionFunc this->actionFunc = actionFunc; } -s32 func_808B736C(BgBreakwall* this, PlayState* play) { +bool func_808B736C(BgBreakwall* this, PlayState* play) { return true; } -s32 func_808B7380(BgBreakwall* this, PlayState* play) { +bool func_808B7380(BgBreakwall* this, PlayState* play) { if ((gSaveContext.save.day >= 2) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_DEFENDED_AGAINST_THEM)) { return false; } return true; } -s32 func_808B73C4(BgBreakwall* this, PlayState* play) { +bool func_808B73C4(BgBreakwall* this, PlayState* play) { return CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_SNOWHEAD_TEMPLE) || CHECK_WEEKEVENTREG(WEEKEVENTREG_21_01); } -s32 func_808B73FC(BgBreakwall* this, PlayState* play) { +bool func_808B73FC(BgBreakwall* this, PlayState* play) { return true; } -s32 func_808B7410(BgBreakwall* this, PlayState* play) { +bool func_808B7410(BgBreakwall* this, PlayState* play) { if (Flags_GetSwitch(play, this->switchFlag)) { this->dyna.actor.draw = NULL; } @@ -173,28 +173,28 @@ s32 func_808B7410(BgBreakwall* this, PlayState* play) { return true; } -s32 func_808B7460(BgBreakwall* this, PlayState* play) { +bool func_808B7460(BgBreakwall* this, PlayState* play) { if (!Flags_GetSwitch(play, this->switchFlag)) { this->dyna.actor.scale.x = 0.1f; } return true; } -s32 func_808B74A8(BgBreakwall* this, PlayState* play) { +bool func_808B74A8(BgBreakwall* this, PlayState* play) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE)) { return false; } return true; } -s32 func_808B74D8(BgBreakwall* this, PlayState* play) { +bool func_808B74D8(BgBreakwall* this, PlayState* play) { if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_09_80) || CHECK_WEEKEVENTREG(WEEKEVENTREG_23_20)) { return false; } return true; } -s32 func_808B751C(BgBreakwall* this, PlayState* play) { +bool func_808B751C(BgBreakwall* this, PlayState* play) { Actor_SetScale(&this->dyna.actor, 0.1f); if ((BGBREAKWALL_SWITCH_FLAG(&this->dyna.actor) != 0x7F) && diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h index f1f3c2b5c5..8142774a12 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h @@ -6,7 +6,7 @@ struct BgBreakwall; typedef void (*BgBreakwallActionFunc)(struct BgBreakwall*, PlayState*); -typedef s32 (*BgBreakwallUnkFunc)(struct BgBreakwall*, PlayState*); +typedef bool (*BgBreakwallUnkFunc)(struct BgBreakwall*, PlayState*); typedef void (*BgBreakwallUnkFunc2)(struct BgBreakwall*, PlayState*); #define BGBREAKWALL_GET_F(thisx) ((thisx)-> params & 0xF) diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index 949dbb0a07..b7c420b1a1 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -294,7 +294,7 @@ void func_80B8296C(PlayState* play, Vec3f* arg1, f32 arg2) { } } -s32 func_80B82B00(s16 arg0, s16 arg1, s16 arg2) { +bool func_80B82B00(s16 arg0, s16 arg1, s16 arg2) { if (arg0 < arg1) { return (arg0 < arg2 && arg1 >= arg2); } diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c index 8b0ba12178..2a626961d8 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c @@ -78,11 +78,11 @@ void func_80B7EB30(BgIkanaBlock* this) { } } -s32 func_80B7EB64(BgIkanaBlock* this, PlayState* play) { +bool func_80B7EB64(BgIkanaBlock* this, PlayState* play) { return !(this->unk_17C & 8); } -s32 func_80B7EB7C(BgIkanaBlock* this, PlayState* play) { +bool func_80B7EB7C(BgIkanaBlock* this, PlayState* play) { return this->unk_17B > 10; } @@ -129,7 +129,7 @@ s32 func_80B7EB94(BgIkanaBlock* this, PlayState* play) { &this->dyna.actor, 0.0f); } -s32 func_80B7ECFC(BgIkanaBlock* this, PlayState* play) { +bool func_80B7ECFC(BgIkanaBlock* this, PlayState* play) { return func_80B7EB64(this, play) && func_80B7EB7C(this, play) && func_80B7EB94(this, play); } diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c index cec0dbf189..f45d8782cc 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c @@ -55,7 +55,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -s32 BgIkanaShutter_AllSwitchesPressed(BgIkanaShutter* this, PlayState* play) { +bool BgIkanaShutter_AllSwitchesPressed(BgIkanaShutter* this, PlayState* play) { return Flags_GetSwitch(play, BGIKANASHUTTER_GET_SWITCH_FLAG(&this->dyna.actor)) && Flags_GetSwitch(play, BGIKANASHUTTER_GET_SWITCH_FLAG(&this->dyna.actor) + 1) && Flags_GetSwitch(play, BGIKANASHUTTER_GET_SWITCH_FLAG(&this->dyna.actor) + 2) && diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c index 50023193d6..a8f5dbd514 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c @@ -51,7 +51,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -s32 func_80C0A740(BgIkninSusceil* this, PlayState* play) { +bool func_80C0A740(BgIkninSusceil* this, PlayState* play) { s32 pad2[2]; Vec3f offset; Player* player = GET_PLAYER(play); diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c index 11dd35e9b6..3d7a8bd7ca 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c @@ -85,7 +85,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -s32 BgKin2Picture_IsSkulltulaCollected(PlayState* play, s32 skulltulaParams) { +bool BgKin2Picture_IsSkulltulaCollected(PlayState* play, s32 skulltulaParams) { s32 flag = -1; if ((u8)skulltulaParams & 3) { diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c index 55c2d66f78..ffed97ba58 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c @@ -185,7 +185,7 @@ s32 func_80B6FEBC(BgKin2Shelf* this, PlayState* play) { return false; } -s32 func_80B6FF28(BgKin2Shelf* this, PlayState* play) { +bool func_80B6FF28(BgKin2Shelf* this, PlayState* play) { return (this->unk_165 > 8) && func_80B6FE48(this, play) && func_80B6FEBC(this, play) && !func_80B6FE08(this, play); } diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index 597823ff60..b28fb93736 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -100,7 +100,7 @@ s32 func_8092E1D0(ElfMsg* this) { } } -s32 func_8092E1FC(ElfMsg* this) { +bool func_8092E1FC(ElfMsg* this) { return (this->actor.xzDistToPlayer < (100.0f * this->actor.scale.x)) && (this->actor.playerHeightRel >= 0.0f) && (this->actor.playerHeightRel < (100.0f * this->actor.scale.y)); } diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c index 545ac06881..ce7701691f 100644 --- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c @@ -20,7 +20,6 @@ void func_80AFD668(ElfMsg4* this, PlayState* play); void func_80AFD770(ElfMsg4* this, PlayState* play); s32 func_80AFD380(ElfMsg4* this, PlayState* play); s32 ElfMsg4_GetTextId(ElfMsg4* this); -s32 func_80AFD5E0(ElfMsg4* this); ActorInit Elf_Msg4_InitVars = { /**/ ACTOR_ELF_MSG4, @@ -104,7 +103,7 @@ s32 ElfMsg4_GetTextId(ElfMsg4* this) { } } -s32 func_80AFD5E0(ElfMsg4* this) { +bool func_80AFD5E0(ElfMsg4* this) { return (this->actor.xzDistToPlayer < (100.0f * this->actor.scale.x)) && (this->actor.playerHeightRel >= 0.0f) && (this->actor.playerHeightRel < (100.0f * this->actor.scale.y)); } diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c index 7f144ad53c..333d5d5fd0 100644 --- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c @@ -235,7 +235,7 @@ void ElfMsg6_Init(Actor* thisx, PlayState* play) { void ElfMsg6_Destroy(Actor* thisx, PlayState* play) { } -s32 func_80BA1C00(ElfMsg6* this) { +bool func_80BA1C00(ElfMsg6* this) { return (this->actor.xzDistToPlayer < (100.0f * this->actor.scale.x)) && ((this->actor.playerHeightRel >= 0.0f) && (this->actor.playerHeightRel < (100.0f * this->actor.scale.y))); } diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index af335c872d..7c906e7397 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -165,7 +165,7 @@ Actor* func_8091D944(EnFish* this, PlayState* play) { return retActor; } -s32 func_8091DA14(EnFish* this, PlayState* play) { +bool func_8091DA14(EnFish* this, PlayState* play) { return (play->sceneId == SCENE_LABO) && func_8091D944(this, play); } diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index 99d48772b1..98da224993 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -123,7 +123,7 @@ static Vec3f sShopItemPositions[3] = { { 31.0f, 35.0f, -95.0f }, }; -s32 EnFsn_TestItemSelected(PlayState* play) { +bool EnFsn_TestItemSelected(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; if ((msgCtx->textboxEndType == TEXTBOX_ENDTYPE_10) || (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_11)) { diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 5c2a6a44df..ea92d954c5 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -547,7 +547,7 @@ void func_8087C288(PlayState* play, Vec3f* arg1, Vec3f* arg2, f32* arg3) { SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, arg1, arg2, arg3); } -s32 func_8087C2B8(PlayState* play, EnHorse* this, Vec3f* arg2, f32 arg3) { +bool func_8087C2B8(PlayState* play, EnHorse* this, Vec3f* arg2, f32 arg3) { f32 phi_f14; if ((arg2->z > 0.0f) && (arg2->z < (this->actor.uncullZoneForward + this->actor.uncullZoneScale))) { @@ -565,7 +565,7 @@ s32 func_8087C2B8(PlayState* play, EnHorse* this, Vec3f* arg2, f32 arg3) { return false; } -s32 func_8087C38C(PlayState* play, EnHorse* this, Vec3f* arg2) { +bool func_8087C38C(PlayState* play, EnHorse* this, Vec3f* arg2) { Vec3f sp24; f32 sp20; f32 eyeDist; diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c index 6aea97807d..a394093939 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -200,7 +200,7 @@ void func_80A68B6C(EnMushi2* this) { } } -s32 func_80A68BA0(EnMushi2* this) { +bool func_80A68BA0(EnMushi2* this) { return (D_80A6B994 > 3) && this->unk_34C == NULL; } diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index ded860c33f..439ab323cf 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -195,7 +195,7 @@ void EnOssan_SetupAction(EnOssan* this, EnOssanActionFunc action) { this->actionFunc = action; } -s32 EnOssan_TestItemSelected(PlayState* play) { +bool EnOssan_TestItemSelected(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; if ((msgCtx->textboxEndType == TEXTBOX_ENDTYPE_10) || (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_11)) { diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index 42a2b36639..dc5f663bad 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -173,7 +173,7 @@ void EnSob1_SetupAction(EnSob1* this, EnSob1ActionFunc action) { this->actionFunc = action; } -s32 EnSob1_TestItemSelected(PlayState* play) { +bool EnSob1_TestItemSelected(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; if ((msgCtx->textboxEndType == TEXTBOX_ENDTYPE_10) || (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_11)) { diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index 5386d415ed..6bad34bff5 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -603,7 +603,7 @@ s32 func_80A3F384(EnTest3* this, PlayState* play) { return false; } -s32 func_80A3F4A4(PlayState* play) { +bool func_80A3F4A4(PlayState* play) { return (Player_GetMask(play) == PLAYER_MASK_NONE) || (Player_GetMask(play) == PLAYER_MASK_BUNNY) || (Player_GetMask(play) == PLAYER_MASK_POSTMAN) || (Player_GetMask(play) == PLAYER_MASK_KEATON) || (Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK); diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index 13041c81ff..8877044ddd 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -123,7 +123,7 @@ void EnTrt_ChangeAnim(SkelAnime* skelAnime, AnimationInfoS* animationInfo, s32 a frameCount, animationInfo->mode, animationInfo->morphFrames); } -s32 EnTrt_TestItemSelected(PlayState* play) { +bool EnTrt_TestItemSelected(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; if ((msgCtx->textboxEndType == TEXTBOX_ENDTYPE_10) || (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_11)) { diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c index 7de81dca0c..47489bd78f 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -44,7 +44,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; -s32 func_809A4E00(ObjArmos* this, PlayState* play, s16 arg2) { +bool func_809A4E00(ObjArmos* this, PlayState* play, s16 arg2) { return !DynaPolyActor_ValidateMove(play, &this->dyna, 30, arg2, 1) || !DynaPolyActor_ValidateMove(play, &this->dyna, 30, arg2, 28); } @@ -75,7 +75,7 @@ s32 func_809A4E68(ObjArmos* this) { return -1; } -s32 func_809A4F00(ObjArmos* this, s32 arg1) { +bool func_809A4F00(ObjArmos* this, s32 arg1) { s32 temp_v0 = OBJARMOS_GET_ROTZ_7(&this->dyna.actor); if (temp_v0 == OBJARMOS_ROT_7_0) { @@ -117,7 +117,7 @@ s32 func_809A4F00(ObjArmos* this, s32 arg1) { return false; } -s32 func_809A500C(ObjArmos* this, s32 arg1) { +bool func_809A500C(ObjArmos* this, s32 arg1) { s32 temp_v0 = OBJARMOS_GET_ROTZ_7(&this->dyna.actor); s32 temp_v1 = OBJARMOS_GET_ROTX_F(&this->dyna.actor); s32 temp; diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 6544e67ea4..2a2fe2e62f 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -68,7 +68,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), }; -s32 func_8098CE40(ObjComb* this, PlayState* play) { +bool func_8098CE40(ObjComb* this, PlayState* play) { s32 phi_a2 = -1; s32 temp_v0 = (OBJCOMB_GET_1F(&this->actor) << 2) | 0xFF01; diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 8d7c793829..e6a2f595ea 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -58,7 +58,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), }; -s32 ObjKibako2_ContainsSkulltula(ObjKibako2* this, PlayState* play) { +bool ObjKibako2_ContainsSkulltula(ObjKibako2* this, PlayState* play) { s32 actorSpawnParam = KIBAKO2_SKULLTULA_SPAWN_PARAM(&this->dyna.actor); s32 flag = -1; diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 992b9c5a93..0c17f934f9 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -14,7 +14,6 @@ void ObjMakekinsuta_Init(Actor* thisx, PlayState* play); void ObjMakekinsuta_Destroy(Actor* thisx, PlayState* play); void ObjMakekinsuta_Update(Actor* thisx, PlayState* play); -s32 func_8099FA40(ObjMakekinsuta* this, PlayState* play); void func_8099FB64(Actor* thisx, PlayState* play); void func_8099FD7C(Actor* thisx, PlayState* play); @@ -36,7 +35,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 1, ICHAIN_STOP), }; -s32 func_8099FA40(ObjMakekinsuta* this, PlayState* play) { +bool func_8099FA40(ObjMakekinsuta* this, PlayState* play) { s32 chestFlag = -1; s32 skulltulaParams = (OBJMAKEKINSUTA_GET_1F(&this->actor) << 2) | 0xFF01; diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c index d7ea5b710d..d82f14d08e 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -63,7 +63,7 @@ Color_RGB8 D_809A4088[] = { { 0, 255, 255 }, { 255, 0, 255 }, { 0, 0, 0 }, { 255, 255, 255 }, }; -s32 func_809A33E0(ObjPzlblock* this, PlayState* play, s16 arg2) { +bool func_809A33E0(ObjPzlblock* this, PlayState* play, s16 arg2) { return !DynaPolyActor_ValidateMove(play, &this->dyna, 30, arg2, 1) || !DynaPolyActor_ValidateMove(play, &this->dyna, 30, arg2, 28); } @@ -94,7 +94,7 @@ s32 func_809A3448(ObjPzlblock* this) { return -1; } -s32 func_809A34E0(ObjPzlblock* this, s32 arg1) { +bool func_809A34E0(ObjPzlblock* this, s32 arg1) { s32 temp_v0 = OBJPZLBLOCK_GET_ROTZ(&this->dyna.actor); if (temp_v0 == 0) { @@ -134,7 +134,7 @@ s32 func_809A34E0(ObjPzlblock* this, s32 arg1) { return false; } -s32 func_809A35EC(ObjPzlblock* this, s32 arg1) { +bool func_809A35EC(ObjPzlblock* this, s32 arg1) { s32 temp_v0 = OBJPZLBLOCK_GET_ROTZ(&this->dyna.actor); s32 temp_v1 = this->dyna.actor.home.rot.x & 0xF; s32 temp; diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c index 2529525869..8db086b80d 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -375,7 +375,7 @@ s32 func_80B2FB94(Vec3f* arg0, f32 arg1, TriNorm* triNorm, Vec3f* arg3, f32* arg return false; } -s32 func_80B2FC98(TriNorm* triNorm, Vec3f* arg1) { +bool func_80B2FC98(TriNorm* triNorm, Vec3f* arg1) { Vec3f sp84; Vec3f sp78; Vec3f* vtx; diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index fb39e274f4..b03e5bacbb 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -63,7 +63,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), }; -s32 func_80B9B6E0(ObjTaru* this, PlayState* play) { +bool func_80B9B6E0(ObjTaru* this, PlayState* play) { s32 chestFlag = -1; s32 skulltulaParams = (OBJ_TSUBO_P001F(&this->dyna.actor) * 4) | 0xFF01; diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c index ca2cc260d3..f248f5777f 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -105,7 +105,7 @@ void func_809A43A8(ObjToge* this, PlayState* play) { } } -s32 func_809A43EC(ObjToge* this, PlayState* play) { +bool func_809A43EC(ObjToge* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 temp_fv1 = player->actor.world.pos.x - this->unk_1B8; f32 temp_fa0 = player->actor.world.pos.z - this->unk_1BC; diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 119ab4f227..979484bccd 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -101,7 +101,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), }; -s32 func_809275C0(ObjTsubo* this, PlayState* play) { +bool func_809275C0(ObjTsubo* this, PlayState* play) { s32 chestFlag = -1; s32 skulltulaParams = (OBJ_TSUBO_P001F(&this->actor) << 2) | 0xFF01; @@ -159,7 +159,7 @@ void func_80927818(ObjTsubo* this, PlayState* play, s32 arg2) { } } -s32 ObjTsubo_IsSceneNotGohtOrTwinmold(ObjTsubo* this, PlayState* play) { +bool ObjTsubo_IsSceneNotGohtOrTwinmold(ObjTsubo* this, PlayState* play) { return (play->sceneId != SCENE_HAKUGIN_BS) && (play->sceneId != SCENE_INISIE_BS); } diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 069663f31d..873673f05b 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -526,7 +526,7 @@ s32 sPlayerHeldItemButtonIsHeldDown; // Indicates if the button for the current AdjLightSettings D_80862B50; // backup of lay->envCtx.adjLightSettings s32 D_80862B6C; // this->skelAnime.moveFlags // sPlayerSkelMoveFlags? -s32 func_8082DA90(PlayState* play) { +bool func_8082DA90(PlayState* play) { return (play->transitionTrigger != TRANS_TRIGGER_OFF) || (play->transitionMode != TRANS_MODE_OFF); } @@ -2706,7 +2706,7 @@ PlayerAnimationHeader* func_8082EEE0(Player* this) { } } -s32 func_8082EF20(Player* this) { +bool func_8082EF20(Player* this) { return func_8082ECCC(this) && (this->unk_ACC != 0); } @@ -3583,11 +3583,11 @@ s32 func_8082FB68(Player* this) { return false; } -s32 func_8082FBE8(Player* this) { +bool func_8082FBE8(Player* this) { return func_80123420(this) || func_80123434(this); } -s32 func_8082FC24(Player* this) { +bool func_8082FC24(Player* this) { return func_8082FB68(this) || func_80123434(this); } @@ -3596,7 +3596,7 @@ void func_8082FC60(Player* this) { this->unk_B40 = 0.0f; } -s32 Player_ItemIsInUse(Player* this, ItemId item) { +bool Player_ItemIsInUse(Player* this, ItemId item) { if ((item < ITEM_FD) && (Player_ItemToItemAction(this, item) == this->itemAction)) { return true; } else { @@ -3604,7 +3604,7 @@ s32 Player_ItemIsInUse(Player* this, ItemId item) { } } -s32 Player_ItemIsItemAction(Player* this, ItemId item, PlayerItemAction itemAction) { +bool Player_ItemIsItemAction(Player* this, ItemId item, PlayerItemAction itemAction) { if ((item < ITEM_FD) && (Player_ItemToItemAction(this, item) == itemAction)) { return true; } else { @@ -4089,17 +4089,17 @@ s32 func_80830E30(Player* this, PlayState* play) { return true; } -s32 func_80830F9C(PlayState* play) { +bool func_80830F9C(PlayState* play) { return (play->unk_1887C > 0) && CHECK_BTN_ALL(sPlayerControlInput->press.button, BTN_B); } -s32 func_80830FD4(PlayState* play) { +bool func_80830FD4(PlayState* play) { return (play->unk_1887C != 0) && ((play->unk_1887C < 0) || CHECK_BTN_ANY(sPlayerControlInput->cur.button, BTN_CRIGHT | BTN_CLEFT | BTN_CDOWN | BTN_CUP | BTN_B | BTN_A)); } -s32 func_80831010(Player* this, PlayState* play) { +bool func_80831010(Player* this, PlayState* play) { if ((this->unk_AA5 == PLAYER_UNKAA5_0) || (this->unk_AA5 == PLAYER_UNKAA5_3)) { if (func_8082FBE8(this) || (this->lockOnActor != NULL) || (Camera_CheckValidMode(Play_GetCamera(play, CAM_ID_MAIN), CAM_MODE_BOWARROW) == 0)) { @@ -4110,7 +4110,7 @@ s32 func_80831010(Player* this, PlayState* play) { return false; } -s32 func_80831094(Player* this, PlayState* play) { +bool func_80831094(Player* this, PlayState* play) { if ((this->doorType == PLAYER_DOORTYPE_NONE) && !(this->stateFlags1 & PLAYER_STATE1_2000000)) { if (sPlayerUseHeldItem || func_80830F9C(play)) { if (func_80830E30(this, play)) { @@ -4121,7 +4121,7 @@ s32 func_80831094(Player* this, PlayState* play) { return false; } -s32 func_80831124(PlayState* play, Player* this) { +bool func_80831124(PlayState* play, Player* this) { if (this->actor.child != NULL) { if (this->heldActor == NULL) { this->heldActor = this->actor.child; @@ -4133,7 +4133,7 @@ s32 func_80831124(PlayState* play, Player* this) { return false; } -s32 func_80831194(PlayState* play, Player* this) { +bool func_80831194(PlayState* play, Player* this) { if (this->heldActor != NULL) { if (!Player_IsHoldingHookshot(this)) { ItemId item; @@ -4185,7 +4185,7 @@ void func_8083133C(Player* this) { this->targetYaw = this->actor.shape.rot.y; } -s32 func_808313A8(PlayState* play, Player* this, Actor* actor) { +bool func_808313A8(PlayState* play, Player* this, Actor* actor) { if (actor == NULL) { func_8082DE50(play, this); func_80836988(this, play); @@ -4514,7 +4514,7 @@ void func_80831F34(PlayState* play, Player* this, PlayerAnimationHeader* anim) { } } -s32 Player_CanUpdateItems(Player* this) { +bool Player_CanUpdateItems(Player* this) { return (!(Player_Action_34 == this->actionFunc) || ((this->stateFlags3 & PLAYER_STATE3_START_CHANGING_HELD_ITEM) && ((this->heldItemId == ITEM_FC) || (this->heldItemId == ITEM_NONE)))) && @@ -4523,11 +4523,11 @@ s32 Player_CanUpdateItems(Player* this) { } // Whether action is Bremen marching or Kamaro dancing -s32 func_8083213C(Player* this) { +bool func_8083213C(Player* this) { return (Player_Action_11 == this->actionFunc) || (Player_Action_12 == this->actionFunc); } -s32 Player_UpdateUpperBody(Player* this, PlayState* play) { +bool Player_UpdateUpperBody(Player* this, PlayState* play) { if (!(this->stateFlags1 & PLAYER_STATE1_800000) && (this->actor.parent != NULL) && Player_IsHoldingHookshot(this)) { Player_SetAction(play, this, Player_Action_92, 1); this->stateFlags3 |= PLAYER_STATE3_80; @@ -4574,7 +4574,7 @@ s32 Player_UpdateUpperBody(Player* this, PlayState* play) { return true; } -s32 func_808323C0(Player* this, s16 csId) { +bool func_808323C0(Player* this, s16 csId) { if ((csId > CS_ID_NONE) && (CutsceneManager_GetCurrentCsId() != csId)) { if (!CutsceneManager_IsNext(csId)) { CutsceneManager_Queue(csId); @@ -4588,7 +4588,7 @@ s32 func_808323C0(Player* this, s16 csId) { return true; } -s32 func_80832444(Player* this) { +bool func_80832444(Player* this) { if (this->csId > CS_ID_NONE) { if (!CutsceneManager_IsNext(this->csId)) { CutsceneManager_Queue(this->csId); @@ -4600,7 +4600,7 @@ s32 func_80832444(Player* this) { return true; } -s32 func_8083249C(Player* this) { +bool func_8083249C(Player* this) { if ((this->csId > CS_ID_NONE) && (CutsceneManager_GetCurrentCsId() != this->csId)) { return func_80832444(this); } @@ -5596,7 +5596,7 @@ s32 func_808340AC(FloorType floorType) { return -1; } -s32 func_808340D4(FloorType floorType) { +bool func_808340D4(FloorType floorType) { return (floorType == FLOOR_TYPE_4) || (floorType == FLOOR_TYPE_7) || (floorType == FLOOR_TYPE_12); } @@ -6946,7 +6946,7 @@ void func_808378FC(PlayState* play, Player* this) { } } -s32 func_8083798C(Player* this) { +bool func_8083798C(Player* this) { return (this->interactRangeActor != NULL) && (this->heldActor == NULL) && (this->transformation != PLAYER_FORM_DEKU); } @@ -9989,7 +9989,7 @@ s32 func_8083FD80(Player* this, PlayState* play) { return false; } -s32 func_8083FE38(Player* this, PlayState* play) { +bool func_8083FE38(Player* this, PlayState* play) { return Player_ActionChange_13(this, play) || Player_ActionChange_4(this, play) || Player_ActionChange_2(this, play); } @@ -10004,7 +10004,7 @@ void func_8083FEF4(PlayState* play, Player* this) { Player_UseItem(play, this, ITEM_NONE); } -s32 func_8083FF30(PlayState* play, Player* this) { +bool func_8083FF30(PlayState* play, Player* this) { if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_B0C > 0.5f)) { if (AMMO(ITEM_DEKU_STICK) != 0) { EffectSsStick_Spawn(play, &this->bodyPartsPos[PLAYER_BODYPART_RIGHT_HAND], @@ -10020,7 +10020,7 @@ s32 func_8083FF30(PlayState* play, Player* this) { } // handles razor sword health and breaking -s32 func_8083FFEC(PlayState* play, Player* this) { +bool func_8083FFEC(PlayState* play, Player* this) { if (this->heldItemAction == PLAYER_IA_SWORD_RAZOR) { if (gSaveContext.save.saveInfo.playerData.swordHealth > 0) { gSaveContext.save.saveInfo.playerData.swordHealth--; @@ -13047,7 +13047,7 @@ void func_80847E2C(Player* this, f32 arg1, f32 minFrame) { } } -s32 func_80847ED4(Player* this) { +bool func_80847ED4(Player* this) { return (this->interactRangeActor != NULL) && (this->interactRangeActor->id == ACTOR_EN_ZOG) && CHECK_BTN_ALL(sPlayerControlInput->cur.button, BTN_A); } @@ -15968,7 +15968,7 @@ void func_8084FD7C(PlayState* play, Player* this, Actor* actor) { this->unk_AA8 = -0x1388; } -s32 func_8084FE48(Player* this) { +bool func_8084FE48(Player* this) { return (this->lockOnActor == NULL) && !func_8082FC24(this); } @@ -16636,7 +16636,7 @@ void Player_Action_62(Player* this, PlayState* play) { func_8084748C(this, &this->linearVelocity, 0.0f, this->actor.shape.rot.y); } -s32 func_80851C40(PlayState* play, Player* this) { +bool func_80851C40(PlayState* play, Player* this) { return ((play->sceneId == SCENE_MILK_BAR) && Audio_IsSequencePlaying(NA_BGM_BALLAD_OF_THE_WIND_FISH)) || (((play->sceneId != SCENE_MILK_BAR) && (this->csAction == PLAYER_CSACTION_68)) || ((play->msgCtx.msgMode == MSGMODE_SONG_PLAYED) ||