From 73b04853e9a2b84e49534f1c221addac93288791 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Fri, 20 Mar 2020 19:59:20 -0400
Subject: through sub_811D178

---
 include/pokemon_special_anim_internal.h | 51 +++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 include/pokemon_special_anim_internal.h

(limited to 'include')

diff --git a/include/pokemon_special_anim_internal.h b/include/pokemon_special_anim_internal.h
new file mode 100644
index 000000000..276168aa6
--- /dev/null
+++ b/include/pokemon_special_anim_internal.h
@@ -0,0 +1,51 @@
+#ifndef GUARD_POKEMON_SPECIAL_ANIM_INTERNAL_H
+#define GUARD_POKEMON_SPECIAL_ANIM_INTERNAL_H
+
+#include "pokemon_special_anim.h"
+
+struct PokemonSpecialAnim
+{
+    /*0x0000*/ u8 filler_0000[0x4];
+    /*0x0004*/ MainCallback savedCallback;
+    /*0x0008*/ struct Pokemon pokemon;
+    /*0x006c*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
+    /*0x0077*/ u8 nameOfMoveForgotten[13];
+    /*0x0084*/ u8 nameOfMoveToTeach[13];
+    /*0x0091*/ bool8 cancelDisabled;
+    /*0x0092*/ u16 state;
+    /*0x0094*/ u16 species;
+    /*0x0096*/ u16 itemId;
+    /*0x0098*/ u16 animType;
+    /*0x009a*/ u16 slotId;
+    /*0x009c*/ u16 closeness;
+    /*0x009e*/ u16 field_009e;
+    /*0x00a0*/ u32 personality;
+    /*0x00a4*/ u32 field_00a4;
+    /*0x00a8*/ u8 field_00a8[0x2834];
+}; // size=0x28dc
+
+void sub_811D184(u8 *buffer, u16 animType);
+bool8 sub_811D280(void);
+void sub_811D29C(void);
+void sub_811D2A8(void);
+void sub_811D2D0(void);
+void sub_811D2EC(u8 a0);
+void sub_811D4D4(void);
+bool8 sub_811D4EC(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 a0);
+void sub_811D948(u8 closeness);
+bool8 sub_811D9A8(void);
+void sub_811DC54(u16 itemId, u8 closeness, u8 a2);
+void sub_811DCF0(u16 itemId);
+bool8 sub_811DD90(void);
+void sub_811E040(void);
+
+#endif //GUARD_POKEMON_SPECIAL_ANIM_INTERNAL_H
-- 
cgit v1.2.3


From 47fe2cb9ce8b2aec7d40fe5f44c1248b090606d6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Fri, 20 Mar 2020 20:33:25 -0400
Subject: through sub_811D2D0

---
 include/pokemon_special_anim_internal.h | 13 +++++++++++--
 include/strings.h                       |  6 ++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/pokemon_special_anim_internal.h b/include/pokemon_special_anim_internal.h
index 276168aa6..048738ebe 100644
--- a/include/pokemon_special_anim_internal.h
+++ b/include/pokemon_special_anim_internal.h
@@ -3,6 +3,15 @@
 
 #include "pokemon_special_anim.h"
 
+struct PokemonSpecialAnimScene
+{
+    u8 filler_0000[0x914];
+    u8 field_0914[BG_SCREEN_SIZE];
+    u8 field_1114[BG_SCREEN_SIZE];
+    u8 field_1914[BG_SCREEN_SIZE];
+    u8 field_2114[0x720];
+}; // size=0x2834
+
 struct PokemonSpecialAnim
 {
     /*0x0000*/ u8 filler_0000[0x4];
@@ -21,10 +30,10 @@ struct PokemonSpecialAnim
     /*0x009e*/ u16 field_009e;
     /*0x00a0*/ u32 personality;
     /*0x00a4*/ u32 field_00a4;
-    /*0x00a8*/ u8 field_00a8[0x2834];
+    /*0x00a8*/ struct PokemonSpecialAnimScene field_00a8;
 }; // size=0x28dc
 
-void sub_811D184(u8 *buffer, u16 animType);
+void sub_811D184(struct PokemonSpecialAnimScene * buffer, u16 animType);
 bool8 sub_811D280(void);
 void sub_811D29C(void);
 void sub_811D2A8(void);
diff --git a/include/strings.h b/include/strings.h
index 6016dc3e3..82c35d552 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1441,4 +1441,10 @@ extern const u8 gPCText_Pokecenter[];
 extern const u8 gPCText_Machine[];
 extern const u8 gPCText_Simple[];
 
+// pokemon_special_anim
+
+extern const u8 gUnknown_841B2ED[];
+extern const u8 gUnknown_841B2F1[];
+extern const u8 gUnknown_841B2FF[];
+
 #endif //GUARD_STRINGS_H
-- 
cgit v1.2.3


From 218555e72ceeb55ad21c942c55796130cc3eb864 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sat, 21 Mar 2020 10:48:55 -0400
Subject: through sub_811D5C0

---
 include/constants/pokemon.h             |  1 -
 include/pokemon.h                       |  2 +-
 include/pokemon_special_anim_internal.h | 21 ++++++++++++++++++++-
 include/strings.h                       | 10 +++++++++-
 4 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index bc02bffdd..747bdea4c 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -211,7 +211,6 @@
 #define PARTY_SIZE 6
 #define MAX_TOTAL_EVS 510
 #define UNOWN_FORM_COUNT 28
-#define MAX_MON_LEVEL 100
 #define BOX_NAME_LENGTH 8
 
 #endif // GUARD_CONSTANTS_POKEMON_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 3cefcfcf2..3dd9c5052 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -322,7 +322,7 @@ extern const struct Evolution gEvolutionTable[][EVOS_PER_MON];
 extern const u8 gStatStageRatios[][2];
 extern struct SpriteTemplate gMultiuseSpriteTemplate;
 extern struct PokemonStorage* gPokemonStoragePtr;
-extern const u32 gExperienceTables[][MAX_MON_LEVEL + 1];
+extern const u32 gExperienceTables[][MAX_LEVEL + 1];
 extern const u16 *const gLevelUpLearnsets[];
 extern const u8 gFacilityClassToPicIndex[];
 extern const u8 gFacilityClassToTrainerClass[];
diff --git a/include/pokemon_special_anim_internal.h b/include/pokemon_special_anim_internal.h
index 048738ebe..07acd3443 100644
--- a/include/pokemon_special_anim_internal.h
+++ b/include/pokemon_special_anim_internal.h
@@ -5,7 +5,12 @@
 
 struct PokemonSpecialAnimScene
 {
-    u8 filler_0000[0x914];
+    u16 field_0000;
+    u8 filler_0002[2];
+    u16 field_0004;
+    u8 filler_0006[0xA];
+    struct Sprite * field_0010;
+    u8 field_0014[0x900];
     u8 field_0914[BG_SCREEN_SIZE];
     u8 field_1114[BG_SCREEN_SIZE];
     u8 field_1914[BG_SCREEN_SIZE];
@@ -33,6 +38,20 @@ struct PokemonSpecialAnim
     /*0x00a8*/ struct PokemonSpecialAnimScene field_00a8;
 }; // size=0x28dc
 
+struct PokemonSpecialAnim * sub_811D080(void);
+struct Pokemon * sub_811D094(void);
+struct PokemonSpecialAnimScene * sub_811D0A8(void);
+u16 sub_811D0B4(void);
+u8 *sub_811D0C4(void);
+u8 *sub_811D0D0(void);
+u8 *sub_811D0DC(u8 *dest);
+u8 *sub_811D0F4(void);
+u8 sub_811D100(void);
+u16 sub_811D110(void);
+u32 sub_811D120(void);
+void BufferMonStatsToTaskData(struct Pokemon * pokemon, u16 *data);
+bool32 sub_811D178(void);
+
 void sub_811D184(struct PokemonSpecialAnimScene * buffer, u16 animType);
 bool8 sub_811D280(void);
 void sub_811D29C(void);
diff --git a/include/strings.h b/include/strings.h
index 82c35d552..809a17d9d 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1442,9 +1442,17 @@ extern const u8 gPCText_Machine[];
 extern const u8 gPCText_Simple[];
 
 // pokemon_special_anim
-
 extern const u8 gUnknown_841B2ED[];
 extern const u8 gUnknown_841B2F1[];
 extern const u8 gUnknown_841B2FF[];
+extern const u8 gUnknown_841B285[];
+extern const u8 gUnknown_841B293[];
+extern const u8 gUnknown_841B295[];
+extern const u8 gUnknown_841B2A7[];
+extern const u8 gUnknown_841B32E[];
+extern const u8 gUnknown_841B306[];
+extern const u8 gUnknown_841B315[];
+extern const u8 gUnknown_841B31B[];
+extern const u8 gUnknown_841B329[];
 
 #endif //GUARD_STRINGS_H
-- 
cgit v1.2.3


From d0be58d07700df1e1f000e24176e210e2038f34e Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sat, 21 Mar 2020 16:55:56 -0400
Subject: through sub_811E040

---
 include/pokemon_special_anim_internal.h | 11 +++++++----
 include/strings.h                       |  6 ++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/pokemon_special_anim_internal.h b/include/pokemon_special_anim_internal.h
index 07acd3443..0777d492b 100644
--- a/include/pokemon_special_anim_internal.h
+++ b/include/pokemon_special_anim_internal.h
@@ -8,7 +8,10 @@ struct PokemonSpecialAnimScene
     u16 field_0000;
     u8 filler_0002[2];
     u16 field_0004;
-    u8 filler_0006[0xA];
+    u16 field_0006;
+    u16 field_0008;
+    u8 field_000a;
+    struct Sprite * field_000c;
     struct Sprite * field_0010;
     u8 field_0014[0x900];
     u8 field_0914[BG_SCREEN_SIZE];
@@ -57,7 +60,7 @@ bool8 sub_811D280(void);
 void sub_811D29C(void);
 void sub_811D2A8(void);
 void sub_811D2D0(void);
-void sub_811D2EC(u8 a0);
+void sub_811D2EC(u8 messageId);
 void sub_811D4D4(void);
 bool8 sub_811D4EC(void);
 void sub_811D4FC(void);
@@ -68,10 +71,10 @@ bool8 sub_811D5C0(void);
 void sub_811D6EC(void);
 bool8 sub_811D6FC(void);
 bool8 sub_811D754(void);
-void sub_811D830(u8 a0);
+void sub_811D830(u8 closeness);
 void sub_811D948(u8 closeness);
 bool8 sub_811D9A8(void);
-void sub_811DC54(u16 itemId, u8 closeness, u8 a2);
+void sub_811DC54(u16 itemId, u8 closeness, bool32 a2);
 void sub_811DCF0(u16 itemId);
 bool8 sub_811DD90(void);
 void sub_811E040(void);
diff --git a/include/strings.h b/include/strings.h
index 809a17d9d..3fd24516d 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1454,5 +1454,11 @@ extern const u8 gUnknown_841B306[];
 extern const u8 gUnknown_841B315[];
 extern const u8 gUnknown_841B31B[];
 extern const u8 gUnknown_841B329[];
+extern const u8 gUnknown_841B2A9[];
+extern const u8 gUnknown_841B2B7[];
+extern const u8 gUnknown_841B2BE[];
+extern const u8 gUnknown_841B2CC[];
+extern const u8 gUnknown_841B2D4[];
+extern const u8 gUnknown_841B2C6[];
 
 #endif //GUARD_STRINGS_H
-- 
cgit v1.2.3


From 41704d705448fb14d3b372a21fe42767ebc4a0a5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sat, 21 Mar 2020 19:46:43 -0400
Subject: Finish pokemon_special_anim_scene.s

---
 include/pokemon_special_anim_internal.h | 2 +-
 include/strings.h                       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/pokemon_special_anim_internal.h b/include/pokemon_special_anim_internal.h
index 0777d492b..3799b24c5 100644
--- a/include/pokemon_special_anim_internal.h
+++ b/include/pokemon_special_anim_internal.h
@@ -6,7 +6,7 @@
 struct PokemonSpecialAnimScene
 {
     u16 field_0000;
-    u8 filler_0002[2];
+    u16 field_0002;
     u16 field_0004;
     u16 field_0006;
     u16 field_0008;
diff --git a/include/strings.h b/include/strings.h
index 3fd24516d..e7f274abd 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1460,5 +1460,7 @@ extern const u8 gUnknown_841B2BE[];
 extern const u8 gUnknown_841B2CC[];
 extern const u8 gUnknown_841B2D4[];
 extern const u8 gUnknown_841B2C6[];
+extern const u8 gUnknown_841B2E5[];
+extern const u8 gUnknown_841B2DC[];
 
 #endif //GUARD_STRINGS_H
-- 
cgit v1.2.3


From faab53204c9d583f5180fb48a0594f66cf85f30e Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sat, 21 Mar 2020 20:52:44 -0400
Subject: Start doccing PSA

---
 include/pokemon_special_anim.h          | 10 ++---
 include/pokemon_special_anim_internal.h | 66 ++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 31 deletions(-)

(limited to 'include')

diff --git a/include/pokemon_special_anim.h b/include/pokemon_special_anim.h
index 5cc567580..c1d64f072 100644
--- a/include/pokemon_special_anim.h
+++ b/include/pokemon_special_anim.h
@@ -5,12 +5,12 @@
 
 void sub_811E5B8(u16, u16, u16, u16, u16, u16);
 bool8 sub_811E680(void);
-void BufferMonStatsToTaskData(struct Pokemon *mon, u16 *currStats);
+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 sub_811C540(u8 slotId, u16 itemId, MainCallback callback);
-void sub_811C5AC(u8 slotId, u16 itemId, MainCallback callback);
-u32 sub_811D178(void);
-void sub_811C568(u8 slotId, u16 itemId, u16 moveId, MainCallback callback);
+void StartUseItemAnim_Normal(u8 slotId, u16 itemId, MainCallback callback);
+void StartUseItemAnim_CantEvolve(u8 slotId, u16 itemId, MainCallback callback);
+u32 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 3799b24c5..f3f912fac 100644
--- a/include/pokemon_special_anim_internal.h
+++ b/include/pokemon_special_anim_internal.h
@@ -3,17 +3,31 @@
 
 #include "pokemon_special_anim.h"
 
+enum
+{
+    PSA_TEXT_ITEM_USED,
+    PSA_TEXT_LEVEL_ELEVATED,
+    PSA_TEXT_FORGET_1,
+    PSA_TEXT_FORGET_2_AND,
+    PSA_TEXT_FORGET_POOF,
+    PSA_TEXT_FORGET_FORGOT,
+    PSA_TEXT_FORGET_AND,
+    PSA_TEXT_MACHINE_SET,
+    PSA_TEXT_HUH,
+    PSA_TEXT_LEARNED_MOVE
+};
+
 struct PokemonSpecialAnimScene
 {
-    u16 field_0000;
+    u16 state;
     u16 field_0002;
     u16 field_0004;
     u16 field_0006;
     u16 field_0008;
     u8 field_000a;
-    struct Sprite * field_000c;
-    struct Sprite * field_0010;
-    u8 field_0014[0x900];
+    struct Sprite * monSprite;
+    struct Sprite * itemIconSprite;
+    u8 textBuf[0x900];
     u8 field_0914[BG_SCREEN_SIZE];
     u8 field_1114[BG_SCREEN_SIZE];
     u8 field_1914[BG_SCREEN_SIZE];
@@ -38,31 +52,31 @@ struct PokemonSpecialAnim
     /*0x009e*/ u16 field_009e;
     /*0x00a0*/ u32 personality;
     /*0x00a4*/ u32 field_00a4;
-    /*0x00a8*/ struct PokemonSpecialAnimScene field_00a8;
+    /*0x00a8*/ struct PokemonSpecialAnimScene sceneResources;
 }; // size=0x28dc
 
-struct PokemonSpecialAnim * sub_811D080(void);
-struct Pokemon * sub_811D094(void);
-struct PokemonSpecialAnimScene * sub_811D0A8(void);
-u16 sub_811D0B4(void);
-u8 *sub_811D0C4(void);
-u8 *sub_811D0D0(void);
-u8 *sub_811D0DC(u8 *dest);
-u8 *sub_811D0F4(void);
-u8 sub_811D100(void);
-u16 sub_811D110(void);
-u32 sub_811D120(void);
-void BufferMonStatsToTaskData(struct Pokemon * pokemon, u16 *data);
-bool32 sub_811D178(void);
+struct PokemonSpecialAnim * GetPSAStruct(void);
+struct Pokemon * PSA_GetPokemon(void);
+struct PokemonSpecialAnimScene * PSA_GetSceneWork(void);
+u16 PSA_GetItemId(void);
+u8 *PSA_GetNameOfMoveForgotten(void);
+u8 *PSA_GetNameOfMoveToTeach(void);
+u8 *PSA_CopyMonNickname(u8 *dest);
+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 sub_811D184(struct PokemonSpecialAnimScene * buffer, u16 animType);
-bool8 sub_811D280(void);
-void sub_811D29C(void);
+void InitPokemonSpecialAnimScene(struct PokemonSpecialAnimScene * buffer, u16 animType);
+bool8 PokemonSpecialAnimSceneInitIsNotFinished(void);
+void PSA_FreeWindowBuffers(void);
 void sub_811D2A8(void);
 void sub_811D2D0(void);
-void sub_811D2EC(u8 messageId);
+void PSA_PrintMessage(u8 messageId);
 void sub_811D4D4(void);
-bool8 sub_811D4EC(void);
+bool8 PSA_IsMessagePrintTaskActive(void);
 void sub_811D4FC(void);
 bool8 sub_811D530(void);
 void sub_811D5A0(void);
@@ -72,11 +86,11 @@ void sub_811D6EC(void);
 bool8 sub_811D6FC(void);
 bool8 sub_811D754(void);
 void sub_811D830(u8 closeness);
-void sub_811D948(u8 closeness);
+void PSA_SetUpZoomAnim(u8 closeness);
 bool8 sub_811D9A8(void);
-void sub_811DC54(u16 itemId, u8 closeness, bool32 a2);
+void PSA_SetUpZoomOutMonTask(u16 itemId, u8 closeness, bool32 a2);
 void sub_811DCF0(u16 itemId);
-bool8 sub_811DD90(void);
+bool8 PSA_IsZoomOutMonTaskRunning(void);
 void sub_811E040(void);
 
 #endif //GUARD_POKEMON_SPECIAL_ANIM_INTERNAL_H
-- 
cgit v1.2.3


From 77a6b8a820fe89af57585255e1c80ed9a3913be8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sun, 22 Mar 2020 14:26:44 -0400
Subject: Address review comments; doc round 2

---
 include/menu.h                          |  6 +++--
 include/pokemon_special_anim.h          |  6 ++---
 include/pokemon_special_anim_internal.h | 44 ++++++++++++++++-----------------
 3 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'include')

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
-- 
cgit v1.2.3


From cce652dc9b40f0c673432f55a757aae8c4d4064e Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sun, 22 Mar 2020 14:44:32 -0400
Subject: Remove partial define

---
 include/menu.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include')

diff --git a/include/menu.h b/include/menu.h
index 36a3cc942..83bdcb4f6 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -5,8 +5,6 @@
 #include "text.h"
 #include "window.h"
 
-#define MON_COORD_
-
 #define MENU_NOTHING_CHOSEN -2
 #define MENU_B_PRESSED -1
 
-- 
cgit v1.2.3