mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-10 07:06:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ply

Browse Source
This commit is contained in:
notyourav
2021-03-17 20:23:01 -07:00
committed by GitHub
parent a39686c24c 2d1b0da52e
commit 8b81269271
250 changed files with 580 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script.c
+10 -8
View File
@@ -5,8 +5,10 @@
#include "script.h"
#include "structures.h"
#include "textbox.h"
#include "functions.h"
#include "dma.h"
#include "save.h"
#include "random.h"
#include "functions.h"
void InitScriptForEntity(Entity*, ScriptExecutionContext*, u16*);
void InitScriptExecutionContext(ScriptExecutionContext* context, u16* script);
@@ -304,9 +306,9 @@ extern ScriptExecutionContext gPlayerScriptExecutionContext;
extern ScriptExecutionContext gScriptExecutionContextArray[0x20];
void InitScriptData(void) {
MemClear32(&gActiveScriptInfo, sizeof(gActiveScriptInfo));
MemClear32(&gScriptExecutionContextArray, sizeof(gScriptExecutionContextArray));
MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
MemClear(&gActiveScriptInfo, sizeof(gActiveScriptInfo));
MemClear(&gScriptExecutionContextArray, sizeof(gScriptExecutionContextArray));
MemClear(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
gActiveScriptInfo.unk_08 = 8;
}
@@ -324,7 +326,7 @@ ScriptExecutionContext* CreateScriptExecutionContext(void) {
}
void DestroyScriptExecutionContext(ScriptExecutionContext* context) {
MemClear32(context, sizeof(ScriptExecutionContext));
MemClear(context, sizeof(ScriptExecutionContext));
}
ScriptExecutionContext* StartCutscene(Entity* entity, u16* script) {
@@ -354,7 +356,7 @@ void UnloadCutsceneData(Entity* entity) {
void StartPlayerScript(u16* script) {
Entity* player;
MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
MemClear(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext));
gPlayerScriptExecutionContext.scriptInstructionPointer = script;
player = &gPlayerEntity;
*(ScriptExecutionContext**)&player->cutsceneBeh = &gPlayerScriptExecutionContext;
@@ -377,7 +379,7 @@ ScriptExecutionContext* StartCutscene2(Entity* entity, u16* script) {
}
void InitScriptExecutionContext(ScriptExecutionContext* context, u16* script) {
MemClear32(context, sizeof(ScriptExecutionContext));
MemClear(context, sizeof(ScriptExecutionContext));
context->scriptInstructionPointer = script;
}
@@ -701,7 +703,7 @@ void ScriptCommand_CallWithArg(Entity* entity, ScriptExecutionContext* context)
}
void ScriptCommand_LoadRoomEntityList(Entity* entity, ScriptExecutionContext* context) {
LoadRoomEntityList(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
LoadRoomEntityList((EntityData*)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
}
void ScriptCommand_TestBit(Entity* entity, ScriptExecutionContext* context) {