Merge pull request #547 from hatal175/DelayedEntityLoadManager_Main

include/asm.h

@@ -46,5 +46,6 @@ extern u32 sub_0800445C(struct Entity_*);
 extern u32 sub_080B1AF0(struct Entity_*, s32, s32);
 extern u32 GetRelativeCollisionTile(struct Entity_*, u32, u32);
 extern bool32 sub_080B1B54(u32);
+extern u32 CheckRectOnScreen(s32, s32, u32, u32);
 
 #endif // ASM_H

include/npc.h

@@ -51,6 +51,19 @@ typedef struct {
     } data;
 } Dialog;
 
+typedef struct {
+    /*0x00*/ u8 id;
+    /*0x01*/ u8 type;
+    /*0x02*/ u8 type2;
+    /*0x03*/ u8 collisionLayer;
+    /*0x04*/ u16 x;
+    /*0x06*/ u16 y;
+    /*0x08*/ u16* script;
+    /*0x0c*/ u16 timer;
+    /*0x0e*/ u16 progressBitfield; /**< For which gSave.global_process this NPC should appear. */
+} NPCStruct;
+extern NPCStruct gNPCData[50];
+
 void sub_0806EC20(Entity* ent);
 void sub_0806EC38(void);
 u32 sub_0806ED78(Entity* ent);

include/script.h

@@ -29,6 +29,8 @@ typedef struct {
 } ActiveScriptInfo;
 extern ActiveScriptInfo gActiveScriptInfo;
 
+ScriptExecutionContext* CreateScriptExecutionContext(void);
+void InitScriptForEntity(Entity*, ScriptExecutionContext*, u16*);
 void ExecuteScript(Entity* entity, ScriptExecutionContext* context);
 
 extern u32 GetNextScriptCommandHalfword(u16*);