3 files changed, 28 insertions, 28 deletions

diff --git a/include/menu.h b/include/menu.h
index 49dd43e26..36a3cc942 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -5,6 +5,8 @@
 #include "text.h"
 #include "window.h"
 
+#define MON_COORD_
+
 #define MENU_NOTHING_CHOSEN -2
 #define MENU_B_PRESSED -1
 
@@ -24,8 +26,8 @@ void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 x, u
 void Menu_PrintFormatIntlPlayerName(u8 windowId, const u8 * src, u16 x, u16 y);
 void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority);
 bool8 IsBlendTaskActive(void);
-u8 sub_812EA78(u16 species, u32 personality, u8 a2);
-s8 sub_812EAE4(u16 species, u32 personality, u8 a2);
+u8 Menu2_GetMonSpriteAnchorCoord(u16 species, u32 personality, u8 a2);
+s8 Menu2_GetMonSpriteAnchorCoordMinusx20(u16 species, u32 personality, u8 a2);
 
 // list_menu
 void sub_8107CD8(u8 palOffset, u16 speciesId);
diff --git a/include/pokemon_special_anim.h b/include/pokemon_special_anim.h
index c1d64f072..8d2e6ebb6 100644
--- a/include/pokemon_special_anim.h
+++ b/include/pokemon_special_anim.h
@@ -3,14 +3,14 @@
 
 #include "global.h"
 
-void sub_811E5B8(u16, u16, u16, u16, u16, u16);
-bool8 sub_811E680(void);
+void CreateLevelUpVerticalSpritesTask(u16 x, u16 y, u16 tileTag, u16 paletteTag, u16 priority, u16 subpriority);
+bool8 LevelUpVerticalSpritesTaskIsRunning(void);
 void GetMonLevelUpWindowStats(struct Pokemon *mon, u16 *currStats);
 void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bgClr, u8 fgClr, u8 shadowClr);
 void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 shadowClr);
 void StartUseItemAnim_Normal(u8 slotId, u16 itemId, MainCallback callback);
 void StartUseItemAnim_CantEvolve(u8 slotId, u16 itemId, MainCallback callback);
-u32 PSA_IsCancelDisabled(void);
+bool32 PSA_IsCancelDisabled(void);
 void StartUseItemAnim_ForgetMoveAndLearnTMorHM(u8 slotId, u16 itemId, u16 moveId, MainCallback callback);
 
 #endif // GUARD_POKEMON_SPECIAL_ANIM_H
diff --git a/include/pokemon_special_anim_internal.h b/include/pokemon_special_anim_internal.h
index f3f912fac..e9df6f985 100644
--- a/include/pokemon_special_anim_internal.h
+++ b/include/pokemon_special_anim_internal.h
@@ -22,9 +22,9 @@ struct PokemonSpecialAnimScene
     u16 state;
     u16 field_0002;
     u16 field_0004;
-    u16 field_0006;
-    u16 field_0008;
-    u8 field_000a;
+    u16 monSpriteY1;
+    u16 monSpriteY2;
+    u8 lastCloseness;
     struct Sprite * monSprite;
     struct Sprite * itemIconSprite;
     u8 textBuf[0x900];
@@ -49,7 +49,7 @@ struct PokemonSpecialAnim
     /*0x0098*/ u16 animType;
     /*0x009a*/ u16 slotId;
     /*0x009c*/ u16 closeness;
-    /*0x009e*/ u16 field_009e;
+    /*0x009e*/ u16 delayTimer;
     /*0x00a0*/ u32 personality;
     /*0x00a4*/ u32 field_00a4;
     /*0x00a8*/ struct PokemonSpecialAnimScene sceneResources;
@@ -66,31 +66,29 @@ u8 *PSA_GetMonNickname(void);
 u8 PSA_GetAnimType(void);
 u16 PSA_GetMonSpecies(void);
 u32 PSA_GetMonPersonality(void);
-void GetMonLevelUpWindowStats(struct Pokemon * pokemon, u16 *data);
-bool32 PSA_IsCancelDisabled(void);
 
 void InitPokemonSpecialAnimScene(struct PokemonSpecialAnimScene * buffer, u16 animType);
 bool8 PokemonSpecialAnimSceneInitIsNotFinished(void);
 void PSA_FreeWindowBuffers(void);
-void sub_811D2A8(void);
-void sub_811D2D0(void);
+void PSA_ShowMessageWindow(void);
+void PSA_HideMessageWindow(void);
 void PSA_PrintMessage(u8 messageId);
-void sub_811D4D4(void);
+void PSA_AfterPoof_ClearMessageWindow(void);
 bool8 PSA_IsMessagePrintTaskActive(void);
-void sub_811D4FC(void);
-bool8 sub_811D530(void);
-void sub_811D5A0(void);
-void sub_811D5B0(void);
-bool8 sub_811D5C0(void);
-void sub_811D6EC(void);
-bool8 sub_811D6FC(void);
-bool8 sub_811D754(void);
-void sub_811D830(u8 closeness);
+void PSA_DarkenMonSprite(void);
+bool8 PSA_RunPoofAnim(void);
+void PSA_UseTM_SetUpZoomOutAnim(void);
+void PSA_UseTM_CleanUpForCancel(void);
+bool8 PSA_UseTM_RunZoomOutAnim(void);
+void PSA_UseTM_SetUpMachineSetWobble(void);
+bool8 PSA_UseTM_RunMachineSetWobble(void);
+bool8 PSA_LevelUpVerticalSpritesTaskIsRunning(void);
+void PSA_CreateMonSpriteAtCloseness(u8 closeness);
 void PSA_SetUpZoomAnim(u8 closeness);
-bool8 sub_811D9A8(void);
-void PSA_SetUpZoomOutMonTask(u16 itemId, u8 closeness, bool32 a2);
-void sub_811DCF0(u16 itemId);
-bool8 PSA_IsZoomOutMonTaskRunning(void);
-void sub_811E040(void);
+bool8 PSA_IsZoomTaskActive(void);
+void PSA_SetUpItemUseOnMonAnim(u16 itemId, u8 closeness, bool32 a2);
+void CreateItemIconSpriteAtMaxCloseness(u16 itemId);
+bool8 PSA_IsItemUseOnMonAnimActive(void);
+void PSA_UseItem_CleanUpForCancel(void);
 
 #endif //GUARD_POKEMON_SPECIAL_ANIM_INTERNAL_H