diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-03 20:54:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 20:54:34 -0400 |
| commit | c4cc1522c86ec240c53c75455b650b1c69b2d5a4 (patch) | |
| tree | c6db27ae5b9ae3ad1469ddff799e8d340cbead42 /include | |
| parent | 65fd5f89e17ae08bde8e0b70ac41484f5330c282 (diff) | |
| parent | ee6951e331df29718355891598fe46285932209e (diff) | |
Merge pull request #7 from pret/master
merging from source repo
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 10 | ||||
| -rw-r--r-- | include/rom_8077ABC.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index b5b85625e..e3a3bd7b1 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -34,6 +34,15 @@ struct UnknownStruct3 u8 filler1[0xB]; }; +struct EWRAM_19348_Struct +{ + /*0x00*/ u16 species2; + /*0x02*/ u16 species; + /*0x04*/ u8 filler4[0x8]; + /*0x0C*/ u32 otId; + /*0x10*/ u32 personality; +}; + extern void (*gAnimScriptCallback)(void); extern u8 gAnimScriptActive; extern u8 gAnimFriendship; @@ -129,5 +138,6 @@ s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); s16 sub_8077104(s16 newPan, int oldPan); void DestroyAnimSoundTask(u8 taskId); void sub_8076464(u8 a); +s8 BattleAnimAdjustPanning2(s8); #endif diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 26b2a9475..7cfdff2d4 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -119,5 +119,6 @@ u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, void sub_8079098(struct Sprite *sprite); void sub_807A0F4(struct Sprite *sprite); void sub_8078634(u8 task); +u8 sub_80793A8(u8); #endif // GUARD_ROM_8077ABC_H |