diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-21 13:25:12 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-21 13:25:12 -0500 |
| commit | 0f116854b2408ea7750e9c3f8da4d4ea2a3e0d38 (patch) | |
| tree | 38bb9b6d56ea6c60be2087e9ff4e76b82c6a8d1b /include | |
| parent | 272cd213391b5ce87cb2aeac263b3eedb0f19a07 (diff) | |
| parent | 85a8e5f1ded5a0a2354916617dd0b82091a42ee0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_data.h | 6 | ||||
| -rw-r--r-- | include/item_use.h | 2 | ||||
| -rw-r--r-- | include/rom_8077ABC.h | 8 | ||||
| -rw-r--r-- | include/sprite.h | 8 |
4 files changed, 20 insertions, 4 deletions
diff --git a/include/event_data.h b/include/event_data.h index 80c6b9478..5656ab8dc 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -37,8 +37,8 @@ extern u16 gSpecialVar_0x8008; extern u16 gSpecialVar_0x8009; extern u16 gSpecialVar_0x800A; extern u16 gSpecialVar_0x800B; -extern u16 gScriptResult; -extern u16 gScriptLastTalked; -extern u16 gScriptFacing; +extern u16 gSpecialVar_Result; +extern u16 gSpecialVar_LastTalked; +extern u16 gSpecialVar_Facing; #endif // GUARD_EVENT_DATA_H diff --git a/include/item_use.h b/include/item_use.h index 227c0c9ee..ee7939824 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -1,7 +1,7 @@ #ifndef GUARD_ITEM_USE_H #define GUARD_ITEM_USE_H -extern u16 gScriptItemId; +extern u16 gSpecialVar_ItemId; void ItemUseOutOfBattle_Mail(u8); void ItemUseOutOfBattle_Bike(u8); diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 2a2947968..70bd6fe5a 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -12,6 +12,12 @@ enum ANIM_BANK_DEF_PARTNER }; +struct Struct_sub_8078914 { + u8 *field_0; + u8 *field_4; + u8 field_8; +}; + u8 sub_8077ABC(u8, u8); u8 sub_8077E44(u8 slot, u16 species, u8 a3); u8 GetAnimBankSpriteId(u8 side); @@ -99,5 +105,7 @@ u8 sub_8077FC0(u8 slot); void move_anim_8074EE0(struct Sprite *sprite); bool8 sub_8078718(struct Sprite *sprite); bool8 sub_8078CE8(struct Sprite *sprite); +void oamt_add_pos2_onto_pos1(struct Sprite *sprite); +void sub_8078BD4(struct Sprite *sprite); #endif // GUARD_ROM_8077ABC_H diff --git a/include/sprite.h b/include/sprite.h index a87260ec0..29a0be562 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -222,6 +222,14 @@ struct Sprite /*0x43*/ u8 subpriority; }; +struct OamMatrix +{ + s16 a; + s16 b; + s16 c; + s16 d; +}; + extern const struct OamData gDummyOamData; extern const union AnimCmd *const gDummySpriteAnimTable[]; extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; |