Merge remote-tracking branch 'origin/master' into battle-1

1 files changed, 31 insertions, 0 deletions

diff --git a/include/mon_markings.h b/include/mon_markings.h
new file mode 100644
index 000000000..d06264865
--- /dev/null
+++ b/include/mon_markings.h
@@ -0,0 +1,31 @@
+#ifndef POKERUBY_MON_MARKINGS_H
+#define POKERUBY_MON_MARKINGS_H
+
+struct PokemonMarkMenu
+{
+    /*0x0000*/ u16 baseTileTag;
+    /*0x0002*/ u16 basePaletteTag;
+    /*0x0004*/ u8 markings; // bit flags
+    /*0x0005*/ s8 cursorPos;
+    /*0x0006*/ bool8 markingsArray[4];
+    /*0x000A*/ u8 cursorBaseY;
+    /*0x000B*/ bool8 spriteSheetLoadRequired;
+    /*0x000C*/ struct Sprite *menuWindowSprites[2]; // upper and lower halves of menu window
+    /*0x0014*/ struct Sprite *menuMarkingSprites[4];
+    /*0x0024*/ struct Sprite *menuTextSprite;
+    /*0x0028*/ const u8 *frameTiles;
+    /*0x002C*/ const u16 *framePalette;
+    /*0x0030*/ u8 menuWindowSpriteTiles[0x1000];
+    /*0x1030*/ u8 filler1030[0x80];
+    /*0x10B0*/ u8 tileLoadState;
+}; // 10b4
+
+void sub_80F727C(struct PokemonMarkMenu *ptr);
+void sub_80F7404(void);
+void sub_80F7418(u8 markings, s16 x, s16 y);
+void sub_80F7470(void);
+bool8 sub_80F7500(void);
+struct Sprite *sub_80F7940(u16 tileTag, u16 paletteTag, const u16 *palette);
+void sub_80F7A10(u8 markings, void *dest);
+
+#endif //POKERUBY_MON_MARKINGS_H