diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-02-06 18:50:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 18:50:47 -0600 |
| commit | 7a264da18b6177d78373568c5110d5c98fb86c0f (patch) | |
| tree | 0a417042fbff57d8e606e84d8d69b74b2e4f4309 /include | |
| parent | 5563c78798f95130cccf7d5a5c17b02cfb06442b (diff) | |
| parent | 5969695b8bbdab5182d0d651bbd2d256a12c0404 (diff) | |
Merge branch 'master' into german_debug
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 1 | ||||
| -rw-r--r-- | include/rom_8077ABC.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index a94e6d13c..fd1becf39 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -63,5 +63,6 @@ void sub_80763FC(u16 a, u16 *b, u32 c, u8 d); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); s16 sub_8077104(s16 newPan, int oldPan); void DestroyAnimSoundTask(u8 taskId); +void sub_8076464(u8 a); #endif diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 81a11ba04..ff737135b 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -85,7 +85,7 @@ void sub_8078174(struct Sprite *sprite); void sub_80793C4(struct Sprite *sprite); void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4); u8 sub_8079ED4(u8 slot); -int sub_807A100(u8 slot, u8 a2); +s16 sub_807A100(u8 slot, u8 a2); u16 sub_80790F0(s16 a, s16 b); void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); void sub_807867C(struct Sprite *sprite, s16 a2); @@ -105,5 +105,7 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite); void sub_8078BD4(struct Sprite *sprite); void sub_807941C(struct Sprite *sprite); void sub_80789D4(bool8 a1); +void sub_8079AB8(u8 sprite, u8 sprite2); +u8 sub_807A4A0(int bank, u8 sprite, int species); #endif // GUARD_ROM_8077ABC_H |