merge changes from master

This commit is contained in:
Henny022p
2021-10-22 23:30:04 +02:00
883 changed files with 73179 additions and 49474 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef SCRIPT_H
#define SCRIPT_H
#include "global.h"
#include "entity.h"
typedef struct ScriptExecutionContext {
u16* scriptInstructionPointer;