Merge branch 'master' of https://github.com/pret/pokeruby into visual_studio

1 files changed, 11 insertions, 12 deletions

diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index ff737135b..ed42871a6 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -16,8 +16,8 @@ u8 GetAnimBankSpriteId(u8 side);
 void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *));
 void sub_8078314(struct Sprite *sprite);
 void sub_8078364(struct Sprite *sprite);
-void sub_8078458(struct Sprite *sprite);
-void sub_80784A8(struct Sprite *sprite);
+void TranslateMonBGUntil(struct Sprite *sprite);
+void TranslateMonBGSubPixelUntil(struct Sprite *sprite);
 u8 GetBankSide(u8);
 u8 GetBankSide(u8);
 u8 GetBankSide(u8 side);
@@ -34,11 +34,10 @@ u8 IsDoubleBattle(void);
 bool8 IsDoubleBattle(void);
 void sub_8078914();
 u8 sub_80789BC();
-void sub_8078A5C(struct Sprite *sprite);
-void sub_8078A5C(struct Sprite *sprite);
-void obj_translate_based_on_private_1_2_3_4(struct Sprite *sprite);
-bool8 sub_8078B5C(struct Sprite *sprite);
-void sub_8078BB8(struct Sprite *sprite);
+void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
+void InitAnimSpriteTranslationDeltas(struct Sprite *sprite);
+bool8 TranslateAnimSpriteByDeltas(struct Sprite *sprite);
+void TranslateAnimSpriteByDeltasUntil(struct Sprite *sprite);
 void sub_8078D44(struct Sprite *sprite);
 void obj_id_set_rotscale(u8 sprite, s16, s16, u16);
 bool8 sub_8078E38();
@@ -65,9 +64,9 @@ void sub_807A850(struct Task *task, u8 taskId);
 void sub_807A8D4(struct Sprite *sprite);
 void sub_807A960(struct Sprite *sprite);
 void sub_8078A34(struct Sprite *sprite);
-void sub_80787B0(struct Sprite *sprite, u8);
+void InitAnimSpritePos(struct Sprite *sprite, u8);
 void sub_8078764(struct Sprite *sprite, u8);
-void sub_8078B34(struct Sprite *sprite);
+void StartTranslateAnimSpriteByDeltas(struct Sprite *sprite);
 void sub_8078D60(struct Sprite *sprite);
 void sub_80786EC(struct Sprite *sprite);
 void sub_80782D8(struct Sprite *sprite);
@@ -83,7 +82,7 @@ void sub_8078C00(struct Sprite *sprite);
 void sub_8078114(struct Sprite *sprite);
 void sub_8078174(struct Sprite *sprite);
 void sub_80793C4(struct Sprite *sprite);
-void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4);
+void SetAverageBattlerPositions(u8 slot, u8 a2, s16 *a3, s16 *a4);
 u8 sub_8079ED4(u8 slot);
 s16 sub_807A100(u8 slot, u8 a2);
 u16 sub_80790F0(s16 a, s16 b);
@@ -99,11 +98,11 @@ void sub_80798F4(struct Task *task, u8 a2, const void *a3);
 bool8 sub_807992C(struct Task *task);
 u8 sub_8077FC0(u8 slot);
 void move_anim_8074EE0(struct Sprite *sprite);
-bool8 sub_8078718(struct Sprite *sprite);
+bool8 TranslateAnimSpriteLinearAndSine(struct Sprite *sprite);
 bool8 sub_8078CE8(struct Sprite *sprite);
 void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
 void sub_8078BD4(struct Sprite *sprite);
-void sub_807941C(struct Sprite *sprite);
+void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
 void sub_80789D4(bool8 a1);
 void sub_8079AB8(u8 sprite, u8 sprite2);
 u8 sub_807A4A0(int bank, u8 sprite, int species);