From 031da44cab0d99210aff87533333d59a71a0b85f Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sun, 28 Feb 2021 17:22:26 -0500
Subject: Document mon markings

---
 include/mon_markings.h | 59 +++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

(limited to 'include/mon_markings.h')

diff --git a/include/mon_markings.h b/include/mon_markings.h
index 3cb04ad48..7ac88d8d2 100644
--- a/include/mon_markings.h
+++ b/include/mon_markings.h
@@ -1,37 +1,36 @@
-#ifndef POKEEMERALD_MON_MARKINGS_H
-#define POKEEMERALD_MON_MARKINGS_H
+#ifndef MON_MARKINGS_H
+#define MON_MARKINGS_H
 
 #define NUM_MON_MARKINGS 4
 
 struct PokemonMarkMenu
 {
-    /*0x0000*/ u16 baseTileTag;
-    /*0x0002*/ u16 basePaletteTag;
-    /*0x0004*/ u8 markings; // bit flags
-    /*0x0005*/ s8 cursorPos;
-    /*0x0006*/ bool8 markingsArray[NUM_MON_MARKINGS];
-    /*0x000A*/ u8 cursorBaseY;
-    /*0x000B*/ bool8 spriteSheetLoadRequired;
-    /*0x000C*/ struct Sprite *menuWindowSprites[2]; // upper and lower halves of menu window
-    /*0x0014*/ struct Sprite *menuMarkingSprites[NUM_MON_MARKINGS];
-    /*0x0024*/ struct Sprite *unkSprite;
-    /*0x0028*/ struct Sprite *menuTextSprite;
-    /*0x002C*/ const u8 *frameTiles;
-    /*0x0030*/ const u16 *framePalette;
-    /*0x0034*/ u8 menuWindowSpriteTiles[0x1000];
-    /*0x1034*/ u8 filler1030[0x80];
-    /*0x10B4*/ u8 tileLoadState;
-}; // 10b8
+    u16 baseTileTag;
+    u16 basePaletteTag;
+    u8 markings; // bit flags
+    s8 cursorPos;
+    bool8 markingsArray[NUM_MON_MARKINGS];
+    u8 cursorBaseY;
+    bool8 spriteSheetLoadRequired;
+    struct Sprite *windowSprites[2]; // upper and lower halves of menu window
+    struct Sprite *markingSprites[NUM_MON_MARKINGS];
+    struct Sprite *cursorSprite;
+    struct Sprite *textSprite;
+    const u8 *frameTiles;
+    const u16 *framePalette;
+    u8 windowSpriteTiles[0x1000];
+    u8 unused[0x80];
+    u8 tileLoadState;
+};
 
-void sub_811F90C(struct PokemonMarkMenu *ptr);
-void sub_811F918(void);
-bool8 sub_811F960(void);
-void sub_811FA90(void);
-void sub_811FAA4(u8 markings, s16 x, s16 y);
-void sub_811FAF8(void);
-bool8 MonMarkingsMenuHandleInput(void);
-struct Sprite *CreateMonMarkingsSpriteWithPal(u16 tileTag, u16 paletteTag, const u16 *palette);
-struct Sprite *sub_811FFB4(u16 tileTag, u16 paletteTag, const u16 *palette);
-void sub_8120084(u8 markings, void *dest);
+void InitMonMarkingsMenu(struct PokemonMarkMenu *ptr);
+void BufferMonMarkingsMenuWindowTiles(void);
+void BufferMonMarkingsMenuTiles(void);
+void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y);
+void FreeMonMarkingsMenu(void);
+bool8 HandleMonMarkingsMenuInput(void);
+struct Sprite *CreateMonMarkingAllCombosSprite(u16 tileTag, u16 paletteTag, const u16 *palette);
+struct Sprite *CreateMonMarkingComboSprite(u16 tileTag, u16 paletteTag, const u16 *palette);
+void UpdateMonMarkingTiles(u8 markings, void *dest);
 
-#endif //POKEEMERALD_MON_MARKINGS_H
+#endif //MON_MARKINGS_H
-- 
cgit v1.2.3


From ed0347476c73122ec9fb36a14b47ab3850c00231 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sun, 28 Feb 2021 17:39:21 -0500
Subject: Remove old declaration and define

---
 include/mon_markings.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include/mon_markings.h')

diff --git a/include/mon_markings.h b/include/mon_markings.h
index 7ac88d8d2..4053c5f68 100644
--- a/include/mon_markings.h
+++ b/include/mon_markings.h
@@ -24,7 +24,6 @@ struct PokemonMarkMenu
 };
 
 void InitMonMarkingsMenu(struct PokemonMarkMenu *ptr);
-void BufferMonMarkingsMenuWindowTiles(void);
 void BufferMonMarkingsMenuTiles(void);
 void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y);
 void FreeMonMarkingsMenu(void);
-- 
cgit v1.2.3


From 91ab30fa71dfe800215e9e7b3309f366ccc6173e Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sun, 28 Feb 2021 17:42:11 -0500
Subject: Rename mon markings struct

---
 include/mon_markings.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/mon_markings.h')

diff --git a/include/mon_markings.h b/include/mon_markings.h
index 4053c5f68..fda7ad563 100644
--- a/include/mon_markings.h
+++ b/include/mon_markings.h
@@ -3,7 +3,7 @@
 
 #define NUM_MON_MARKINGS 4
 
-struct PokemonMarkMenu
+struct MonMarkingsMenu
 {
     u16 baseTileTag;
     u16 basePaletteTag;
@@ -23,7 +23,7 @@ struct PokemonMarkMenu
     u8 tileLoadState;
 };
 
-void InitMonMarkingsMenu(struct PokemonMarkMenu *ptr);
+void InitMonMarkingsMenu(struct MonMarkingsMenu *ptr);
 void BufferMonMarkingsMenuTiles(void);
 void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y);
 void FreeMonMarkingsMenu(void);
-- 
cgit v1.2.3