izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use libc functions for bcmp, bcpy, bzero, LibMemset, LibMemCmp.

Browse Source
This commit is contained in:
louist103
2024-05-22 09:04:58 -05:00
committed by Garrett Cox
parent 1ad3317705
commit ff8ba2cc10
51 changed files with 189 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/include/PR/os_libc.h
+3 -3
View File
@@ -5,9 +5,9 @@
#include <string.h>
#ifndef __GNUC__
void bcopy(void* __src, void* __dest, int __n);
int bcmp(void* __s1, void* __s2, int __n);
void bzero(void* begin, int length);
//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 sprintf(char* dst, const char* fmt, ...);
mm/include/functions.h
-2
View File
@@ -526,8 +526,6 @@ void Font_LoadCharNES(PlayState* play, u8 codePointIndex, s32 offset);
void Font_LoadMessageBoxEndIcon(Font* font, u16 icon);
void Font_LoadOrderedFont(Font* font);
void* Lib_MemCpy(void* dest, void* src, size_t size);
void* Lib_MemSet(void* buffer, s32 value, size_t size);
void Lib_GetControlStickData(f32* outMagnitude, s16* outAngle, Input* input);
void Actor_ProcessInitChain(Actor* actor, InitChainEntry* ichain);
void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src);
mm/src/audio/lib/load.c
+3 -3
View File
@@ -12,7 +12,7 @@
#include "global.h"
#include "buffers.h"
#include <string.h>
/**
* SoundFont Notes:
*
@@ -788,7 +788,7 @@ void* AudioLoad_SyncLoad(s32 tableType, u32 id, s32* didAllocate) {
size -= 0x10;
}
bcopy(romAddr, ramAddr, size);
memcpy(ramAddr, romAddr, size);
} else if (medium2 == mediumUnk) {
AudioLoad_SyncDmaUnkMedium(romAddr, ramAddr, size, (s16)table->unkMediumParam);
} else {
@@ -1746,7 +1746,7 @@ void AudioLoad_AsyncDmaRamUnloaded(AudioAsyncLoad* asyncLoad, size_t size) {
size = ALIGN16(size);
Audio_InvalDCache(asyncLoad->curRamAddr, size);
osCreateMesgQueue(&asyncLoad->msgQueue, &asyncLoad->msg, 1);
bcopy(asyncLoad->curDevAddr, asyncLoad->curRamAddr, size);
memcpy(asyncLoad->curRamAddr, asyncLoad->curDevAddr, size);
osSendMesg(&asyncLoad->msgQueue, OS_MESG_PTR(NULL), OS_MESG_NOBLOCK);
}
mm/src/boot/O2/__osMalloc.c
+4 -3
View File
@@ -3,6 +3,7 @@
#include "libc/stdint.h"
#include "macros.h"
#include "functions.h"
#include <string.h>
#define FILL_ALLOCBLOCK (1 << 0)
#define FILL_FREEBLOCK (1 << 1)
@@ -57,7 +58,7 @@ ArenaNode* ArenaImpl_GetLastBlock(Arena* arena) {
* @param size The size of the heap.
*/
void __osMallocInit(Arena* arena, void* heap, size_t size) {
bzero(arena, sizeof(Arena));
memset(arena, 0, sizeof(Arena));
ArenaImpl_LockInit(arena);
@@ -112,7 +113,7 @@ void __osMallocAddHeap(Arena* arena, void* heap, size_t size) {
* @param arena The Arena to clear.
*/
void __osMallocCleanup(Arena* arena) {
bzero(arena, sizeof(Arena));
memset(arena, 0, sizeof(Arena));
}
/**
@@ -377,7 +378,7 @@ void* __osRealloc(Arena* arena, void* ptr, size_t newSize) {
// Create a new pointer and manually copy the data from the old pointer to the new one
newPtr = __osMalloc(arena, newSize);
if (newPtr != NULL) {
bcopy(newPtr, ptr, node->size);
memcpy(ptr, newPtr, node->size);
__osFree(arena, ptr);
}
ptr = newPtr;
mm/src/boot/O2/loadfragment.c
+3 -2
View File
@@ -13,6 +13,7 @@
#include "global.h"
#include "system_malloc.h"
#include "loadfragment.h"
#include <string.h>
s32 gLoadLogSeverity = 2;
@@ -165,7 +166,7 @@ size_t Fragment_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, vo
if (ovlRelocs->bssSize != 0) {
if (gLoadLogSeverity >= 3) {}
bzero((void*)end, ovlRelocs->bssSize);
memset((void*)end, 0, ovlRelocs->bssSize);
}
osWritebackDCache(allocatedRamAddr, allocatedBytes);
@@ -220,7 +221,7 @@ void* Fragment_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, void* vra
if (ovlRelocs->bssSize != 0) {
if (gLoadLogSeverity >= 3) {}
bzero((void*)end, ovlRelocs->bssSize);
memset((void*)end, 0, ovlRelocs->bssSize);
}
osInvalICache(allocatedRamAddr, allocatedBytes);
mm/src/boot/O2/system_malloc.c
+2 -1
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "os_malloc.h"
#include <string.h>
Arena gSystemArena;
@@ -25,7 +26,7 @@ void* SystemArena_Calloc(u32 elements, size_t size) {
ptr = __osMalloc(&gSystemArena, totalSize);
if (ptr != NULL) {
bzero(ptr, totalSize);
memset(ptr, 0, totalSize);
}
return ptr;
}
mm/src/boot/yaz0.c
+2 -1
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "fault.h"
#include <stdio.h>
#include <string.h>
u8 sYaz0DataBuffer[0x400] ALIGNED(16);
u8* sYaz0CurDataEnd;
@@ -35,7 +36,7 @@ void* Yaz0_NextDMA(void* curSrcPos) {
dst = (restSize & 7) ? (sYaz0DataBuffer - (restSize & 7)) + 8 : sYaz0DataBuffer;
bcopy(curSrcPos, dst, restSize);
memcpy(dst, curSrcPos, restSize);
dmaSize = ((u32)sYaz0CurDataEnd - (u32)dst) - restSize;
if (sYaz0CurSize < dmaSize) {
dmaSize = sYaz0CurSize;
mm/src/code/PreRender.c
+2 -1
View File
@@ -17,6 +17,7 @@
#include "stack.h"
#include "stackcheck.h"
#include <stdlib.h>
#include <string.h>
/**
* Assigns the "save" values in PreRender
@@ -34,7 +35,7 @@ void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf,
}
void PreRender_Init(PreRender* this) {
bzero(this, sizeof(PreRender));
memset(this, 0, sizeof(PreRender));
ListAlloc_Init(&this->alloc);
}
mm/src/code/TwoHeadArena.c
+3 -2
View File
@@ -13,6 +13,7 @@
#include "tha.h"
#include "alignment.h"
#include "functions.h"
#include <string.h>
void* THA_GetHead(TwoHeadArena* tha) {
return tha->head;
@@ -122,7 +123,7 @@ void THA_Reset(TwoHeadArena* tha) {
* Creates a new Two Head Arena at `start` with available size `size`
*/
void THA_Init(TwoHeadArena* tha, void* start, size_t size) {
bzero(tha, sizeof(TwoHeadArena));
memset(tha, 0, sizeof(TwoHeadArena));
tha->start = start;
tha->size = size;
THA_Reset(tha);
@@ -132,5 +133,5 @@ void THA_Init(TwoHeadArena* tha, void* start, size_t size) {
* Destroys the Two Head Arena, no further allocations are possible
*/
void THA_Destroy(TwoHeadArena* tha) {
bzero(tha, sizeof(TwoHeadArena));
memset(tha, 0, sizeof(TwoHeadArena));
}
mm/src/code/audio_thread_manager.c
+2 -1
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "audiomgr.h"
#include <string.h>
void AudioMgr_NotifyTaskDone(AudioMgr* audioMgr) {
AudioTask* task = audioMgr->rspTask;
@@ -128,7 +129,7 @@ void AudioMgr_Unlock(AudioMgr* audioMgr) {
}
void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedContext* sched, IrqMgr* irqMgr) {
bzero(audioMgr, sizeof(AudioMgr));
memset(audioMgr, 0, sizeof(AudioMgr));
audioMgr->sched = sched;
audioMgr->irqMgr = irqMgr;
mm/src/code/graph.c
+3 -2
View File
@@ -5,6 +5,7 @@
#include "fault.h"
#include "gfxdebuggerbridge.h"
#include "libultraship/libultraship.h"
#include <string.h>
// Variables are put before most headers as a hacky way to bypass bss reordering
FaultAddrConvClient sGraphFaultAddrConvClient;
@@ -121,7 +122,7 @@ uintptr_t Graph_FaultAddrConv(uintptr_t address, void* param) {
}
void Graph_Init(GraphicsContext* gfxCtx) {
bzero(gfxCtx, sizeof(GraphicsContext));
memset(gfxCtx, 0, sizeof(GraphicsContext));
gfxCtx->gfxPoolIdx = 0;
gfxCtx->framebufferIndex = 0;
gfxCtx->viMode = NULL;
@@ -400,7 +401,7 @@ void RunFrame() {
runFrameContext.gameState = SystemArena_Malloc(size);
bzero(runFrameContext.gameState, size); // fix
memset(runFrameContext.gameState, 0, size); // fix
GameState_Init(runFrameContext.gameState, runFrameContext.ovl->init, &runFrameContext.gfxCtx);
uint64_t freq = GetFrequency();
mm/src/code/padmgr.c
+4 -4
View File
@@ -36,7 +36,7 @@
#include "PR/os_motor.h"
#include "fault.h"
#include <stdio.h>
#include <string.h>
//extern FaultMgr gFaultMgr;
#define PADMGR_RETRACE_MSG (1 << 0)
@@ -614,11 +614,11 @@ void PadMgr_HandleRetrace(void) {
osContGetReadData(sPadMgrInstance->pads);
// Clear all but controller 1
bzero(&sPadMgrInstance->pads[1], sizeof(*sPadMgrInstance->pads) * (MAXCONTROLLERS - 1));
memset(&sPadMgrInstance->pads[1], 0, sizeof(*sPadMgrInstance->pads) * (MAXCONTROLLERS - 1));
// If in PreNMI, clear all controllers
if (sPadMgrInstance->isResetting) {
bzero(sPadMgrInstance->pads, sizeof(sPadMgrInstance->pads));
memset(sPadMgrInstance->pads, 0, sizeof(sPadMgrInstance->pads));
}
// Query controller statuses
@@ -796,7 +796,7 @@ void PadMgr_ThreadEntry() {
}
void PadMgr_Init(OSMesgQueue* siEvtQ, IrqMgr* irqMgr, OSId threadId, OSPri pri, void* stack) {
bzero(sPadMgrInstance, sizeof(PadMgr));
memset(sPadMgrInstance, 0, sizeof(PadMgr));
sPadMgrInstance->irqMgr = irqMgr;
// These are unique access tokens, there should only ever be room for one OSMesg in these queues
mm/src/code/sched.c
+2 -1
View File
@@ -18,6 +18,7 @@ u32 gAudioSPDataSize;
#include "stackcheck.h"
#include "z64speed_meter.h"
#include "z64thread.h"
#include <string.h>
#define RSP_DONE_MSG 667
#define RDP_DONE_MSG 668
@@ -611,7 +612,7 @@ void Sched_ThreadEntry(void* arg) {
* Directs the OS to send SP and DP OS messages to interruptQ when the RSP or RDP signal task completion.
*/
void Sched_Init(SchedContext* sched, void* stack, OSPri pri, u8 viModeType, UNK_TYPE arg4, IrqMgr* irqMgr) {
bzero(sched, sizeof(SchedContext));
memset(sched, 0, sizeof(SchedContext));
sched->shouldUpdateVi = true;
mm/src/code/stubs.c
-12
View File
@@ -164,18 +164,6 @@ void osUnmapTLBAll(void) {
}
#ifndef __GNUC__
void bzero(void* src, int length) {
memset(src, 0, length);
}
void bcopy(void* __src, void* __dest, int __n) {
memcpy(__dest, __src, __n);
}
int bcmp(void* __s1, void* __s2, int __n) {
return memcmp(__s1, __s2, __n);
}
#endif
int ResourceMgr_OTRSigCheck(char* imgData);
char* ResourceMgr_LoadTexOrDListByName(const char* data);
mm/src/code/sys_flashrom.c
+2 -2
View File
@@ -177,7 +177,7 @@ s32 SysFlashrom_WriteData(void* addr, u32 pageNum, u32 pageCount) {
ret = SysFlashrom_AttemptWrite(addr, pageNum, pageCount);
} else {
SysFlashrom_ReadData(data, pageNum, pageCount);
if (bcmp(data, addr, size) == 0) {
if (memcmp(data, addr, size) == 0) {
ret = 0;
} else {
// Will always erase the sector even if it wouldn't normally need to.
@@ -188,7 +188,7 @@ s32 SysFlashrom_WriteData(void* addr, u32 pageNum, u32 pageCount) {
}
if (ret == 0) {
SysFlashrom_ReadData(data, pageNum, pageCount);
if (bcmp(data, addr, size) == 0) {
if (memcmp(data, addr, size) == 0) {
ret = 0;
} else {
ret = -1;
mm/src/code/sys_rumble.c
+2 -1
View File
@@ -5,6 +5,7 @@
#include "global.h"
#include "z64rumble.h"
#include <string.h>
// sRumbleWasEnabledOnLastTick/sWillDisableRumble? Probably name it after updateEnabled
u8 D_801D1E70 = true;
@@ -151,7 +152,7 @@ void RumbleManager_Update(RumbleManager* rumbleMgr) {
}
void RumbleManager_Init(RumbleManager* rumbleMgr) {
bzero(rumbleMgr, sizeof(RumbleManager));
memset(rumbleMgr, 0, sizeof(RumbleManager));
rumbleMgr->state = RUMBLEMANAGER_STATE_INITIAL;
rumbleMgr->updateEnabled = true;
}
mm/src/code/sys_slowly.c
+2 -1
View File
@@ -13,6 +13,7 @@
#include "global.h"
#include "stackcheck.h"
#include "z64thread.h"
#include <string.h>
void Slowly_Main(SlowlyMgr* slowly) {
slowly->status |= SLOWLY_STATUS_STARTED;
@@ -44,7 +45,7 @@ void Slowly_ThreadEntry(void* arg) {
}
void Slowly_Init(SlowlyMgr* slowly, void* stack, SlowlyCallbackTwo callback, void* arg0, void* arg1) {
bzero(slowly, sizeof(SlowlyMgr));
memset(slowly, 0, sizeof(SlowlyMgr));
slowly->argCount = 2;
slowly->status = 0;
mm/src/code/z_actor.c
+4 -2
View File
@@ -20,6 +20,8 @@
#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "objects/object_bdoor/object_bdoor.h"
#include <string.h>
// bss
// FaultClient sActorFaultClient; // 2 funcs
@@ -2412,7 +2414,7 @@ void Actor_InitContext(PlayState* play, ActorContext* actorCtx, ActorEntry* acto
SET_WEEKEVENTREG(WEEKEVENTREG_92_80);
cycleFlags = &gSaveContext.cycleSceneFlags[Play_GetOriginalSceneId(play->sceneId)];
bzero(actorCtx, sizeof(ActorContext));
memset(actorCtx, 0, sizeof(ActorContext));
ActorOverlayTable_Init();
Matrix_MtxFCopy(&play->billboardMtxF, &gIdentityMtxF);
Matrix_MtxFCopy(&play->viewProjectionMtxF, &gIdentityMtxF);
@@ -3339,7 +3341,7 @@ Actor* Actor_SpawnAsChildAndCutscene(ActorContext* actorCtx, PlayState* play, s1
overlayEntry->numLoaded++;
}
bzero(actor, actorInit->instanceSize);
memset(actor, 0, actorInit->instanceSize);
actor->overlayEntry = overlayEntry;
actor->id = actorInit->id;
actor->flags = actorInit->flags;
mm/src/code/z_common_data.c
+2 -1
View File
@@ -5,11 +5,12 @@
#include "libc/stdbool.h"
#include "z64environment.h"
#include "z64transition.h"
#include <string.h>
SaveContext gSaveContext ALIGNED(16);
void SaveContext_Init(void) {
bzero(&gSaveContext, sizeof(SaveContext));
memset(&gSaveContext, 0, sizeof(SaveContext));
gSaveContext.save.playerForm = 0;
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
mm/src/code/z_demo.c
+27 -26
View File
@@ -7,6 +7,7 @@
#include "z64shrink_window.h"
#include "overlays/gamestates/ovl_daytelop/z_daytelop.h"
#include "overlays/actors/ovl_En_Elf/z_en_elf.h"
#include <string.h>
s16 sCutsceneQuakeIndex;
struct CutsceneCamera sCutsceneCameraInfo;
@@ -915,7 +916,7 @@ void CutsceneCmd_Transition(PlayState* play, CutsceneContext* csCtx, CsCmdTransi
s32 CutsceneCmd_UpdateCamSpline(PlayState* play, u8* script) {
s32 cmdBytes = 0;
bcopy(script, &cmdBytes, sizeof(cmdBytes));
memcpy(&cmdBytes, script, sizeof(cmdBytes));
script += sizeof(cmdBytes);
if (!Play_IsDebugCamEnabled()) {
@@ -1119,7 +1120,7 @@ void Cutscene_SetActorCue(CutsceneContext* csCtx, u8** script, s16 cueChannel) {
s32 i;
s32 numCues;
bcopy(*script, &numCues, sizeof(numCues));
memcpy(&numCues, *script, sizeof(numCues));
*script += sizeof(numCues);
for (i = 0; i < numCues; i++) {
@@ -1171,10 +1172,10 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
void* cmd;
// Read the command list count and the ending frame for this cutscene
bcopy(script, &totalEntries, sizeof(totalEntries));
memcpy(&totalEntries, script, sizeof(totalEntries));
script += sizeof(totalEntries);
bcopy(script, &csFrameCount, sizeof(csFrameCount));
memcpy(&csFrameCount, script, sizeof(csFrameCount));
script += sizeof(csFrameCount);
if ((csCtx->curFrame > (u16)csFrameCount) && (play->transitionTrigger != TRANS_TRIGGER_START) &&
@@ -1186,7 +1187,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
// Loop over every command list
for (i = 0; i < totalEntries; i++) {
// Read the command type of the current command list.
bcopy(script, &cmdType, sizeof(cmdType));
memcpy(&cmdType, script, sizeof(cmdType));
script += sizeof(cmdType);
if (cmdType == CS_CAM_STOP) {
@@ -1214,7 +1215,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
switch (cmdType) {
case CS_CMD_MISC:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1224,7 +1225,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_LIGHT_SETTING:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1234,7 +1235,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_START_SEQ:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1244,7 +1245,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_STOP_SEQ:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1254,7 +1255,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_FADE_OUT_SEQ:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1264,7 +1265,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_START_AMBIENCE:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1274,7 +1275,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_FADE_OUT_AMBIENCE:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1284,7 +1285,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_SFX_REVERB_INDEX_2:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1294,7 +1295,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_SFX_REVERB_INDEX_1:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1304,7 +1305,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_MODIFY_SEQ:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1314,7 +1315,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_RUMBLE:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1324,7 +1325,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_TRANSITION_GENERAL:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1334,7 +1335,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_TIME:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1344,7 +1345,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_PLAYER_CUE:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1363,7 +1364,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_DESTINATION:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1373,7 +1374,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_CHOOSE_CREDITS_SCENES:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1383,7 +1384,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_TEXT:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1397,7 +1398,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_TRANSITION:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1407,7 +1408,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_MOTION_BLUR:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1417,7 +1418,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
case CS_CMD_GIVE_TATL:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {
@@ -1430,7 +1431,7 @@ void Cutscene_ProcessScript(PlayState* play, CutsceneContext* csCtx, u8* script)
break;
default:
bcopy(script, &cmdEntries, sizeof(cmdEntries));
memcpy(&cmdEntries, script, sizeof(cmdEntries));
script += sizeof(cmdEntries);
for (j = 0; j < cmdEntries; j++) {

Some files were not shown because too many files have changed in this diff Show More