diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/script.h | 9 | ||||
| -rw-r--r-- | include/sprite.h | 6 | ||||
| -rw-r--r-- | include/util.h | 17 |
3 files changed, 28 insertions, 4 deletions
diff --git a/include/script.h b/include/script.h index 2a738698c..ec6a212bc 100644 --- a/include/script.h +++ b/include/script.h @@ -23,9 +23,9 @@ struct ScriptContext void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd); u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr); -void SetupNativeScript(struct ScriptContext *ctx, void *ptr); +void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void)); void StopScript(struct ScriptContext *ctx); -u8 RunScriptCommand(struct ScriptContext *ctx); +bool8 RunScriptCommand(struct ScriptContext *ctx); u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr); const u8 *ScriptPop(struct ScriptContext *ctx); void ScriptJump(struct ScriptContext *ctx, u8 *ptr); @@ -37,6 +37,7 @@ void ScriptContext2_Enable(void); void ScriptContext2_Disable(void); bool8 ScriptContext2_IsEnabled(void); void ScriptContext1_Init(void); +bool8 ScriptContext1_IsScriptSetUp(void); bool8 ScriptContext2_RunScript(void); void ScriptContext1_SetupScript(const u8 *ptr); void ScriptContext1_Stop(void); @@ -48,6 +49,7 @@ u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag); void mapheader_run_script_with_tag_x1(void); void mapheader_run_script_with_tag_x3(void); void mapheader_run_script_with_tag_x5(void); +void mapheader_run_script_with_tag_x7(void); void mapheader_run_script_with_tag_x6(void); bool8 mapheader_run_first_tag2_script_list_match(void); void mapheader_run_first_tag4_script_list_match(void); @@ -55,5 +57,8 @@ u32 CalculateRamScriptChecksum(void); void ClearRamScript(void); bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); u8 *GetRamScript(u8 objectId, u8 *script); +bool32 sub_80991F8(void); +u8 *sub_8099244(void); +void sub_80992A0(u8 *script, u16 scriptSize); #endif // GUARD_SCRIPT_H diff --git a/include/sprite.h b/include/sprite.h index 68474b2ae..7b3c9fb5a 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -237,9 +237,11 @@ struct OamMatrix s16 d; }; -extern struct Sprite gSprites[]; - extern const struct OamData gDummyOamData; +extern const union AnimCmd *const gDummySpriteAnimTable[]; +extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; + +extern struct Sprite gSprites[]; void ResetSpriteData(void); void AnimateSprites(void); diff --git a/include/util.h b/include/util.h new file mode 100644 index 000000000..63887b13f --- /dev/null +++ b/include/util.h @@ -0,0 +1,17 @@ +#ifndef GUARD_UTIL_H +#define GUARD_UTIL_H + +#include "sprite.h" + +extern const u8 gMiscBlank_Gfx[]; // unused in Emerald +extern const u32 gBitTable[]; + +u8 CreateInvisibleSpriteWithCallback(void (*)(struct Sprite *)); +void StoreWordInTwoHalfwords(u16 *, u32); +void LoadWordFromTwoHalfwords(u16 *, u32 *); +int CountTrailingZeroBits(u32 value); +u16 CalcCRC16(u8 *data, s32 length); +u16 CalcCRC16WithTable(u8 *data, u32 length); +u32 CalcByteArraySum(const u8* data, u32 length); + +#endif // GUARD_UTIL_H |