diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-08-04 11:44:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-04 11:44:01 -0700 |
| commit | bbcea04f9ef17002bb98f1793ff058dc34b4f235 (patch) | |
| tree | daf0e58fe58d5f4d46d678ab044b5e1b80fefaad /include | |
| parent | 7f3bc829e91af0b15fd2d969bcc93b348931b92e (diff) | |
| parent | b20c9cb98c33feef7ec6c82c9231987ed238615e (diff) | |
Merge pull request #547 from hatal175/DelayedEntityLoadManager_Main
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.h | 1 | ||||
| -rw-r--r-- | include/npc.h | 13 | ||||
| -rw-r--r-- | include/script.h | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/include/asm.h b/include/asm.h index f14e6f01..7a05b9b7 100644 --- a/include/asm.h +++ b/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 diff --git a/include/npc.h b/include/npc.h index 05ee9e36..6f719154 100644 --- a/include/npc.h +++ b/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); diff --git a/include/script.h b/include/script.h index 4591ac27..0c1c4ed5 100644 --- a/include/script.h +++ b/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*); |