summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-07 00:45:51 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-07 01:46:06 +0800
commit01b375ab9afc5f2646b84c0ddc81601d4fd83146 (patch)
tree01d8306016270b690ea51484ea787562c6bb8f54
parent050bb937533b98a6828f0b276bbe13608b7e2fb0 (diff)
fixed some struct DECL location
-rw-r--r--include/menu_indicators.h41
-rw-r--r--src/menu_indicators.c36
2 files changed, 36 insertions, 41 deletions
diff --git a/include/menu_indicators.h b/include/menu_indicators.h
index 156dcd694..fbcee2590 100644
--- a/include/menu_indicators.h
+++ b/include/menu_indicators.h
@@ -3,22 +3,6 @@
#include "global.h"
-// Exported type declarations
-
-// Exported RAM declarations
-
-struct ScrollIndicatorPair
-{
- u8 field_0;
- u16 *scrollOffset;
- u16 fullyUpThreshold;
- u16 fullyDownThreshold;
- u8 topSpriteId;
- u8 bottomSpriteId;
- u16 tileTag;
- u16 palTag;
-};
-
struct ScrollArrowsTemplate
{
u8 firstArrowType;
@@ -34,14 +18,6 @@ struct ScrollArrowsTemplate
u8 palNum;
};
-struct ScrollIndicatorTemplate
-{
- u8 animNum:4;
- u8 bounceDir:4;
- u8 multiplier;
- s16 frequency;
-};
-
struct CursorStruct
{
u8 left;
@@ -53,23 +29,6 @@ struct CursorStruct
u8 palNum;
};
-struct RedOutlineCursor
-{
- struct SubspriteTable subspriteTable;
- struct Subsprite *subspritesPtr;
- u8 spriteId;
- u16 tileTag;
- u16 palTag;
-};
-
-struct RedArrowCursor
-{
- u8 spriteId;
- u16 tileTag;
- u16 palTag;
-};
-
-// Exported ROM declarations
u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *scrollOffset);
u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate * template, u16 * a1);
void RemoveScrollIndicatorArrowPair(u8);
diff --git a/src/menu_indicators.c b/src/menu_indicators.c
index 7f38ece51..1d6589fb0 100644
--- a/src/menu_indicators.c
+++ b/src/menu_indicators.c
@@ -9,6 +9,42 @@
#include "list_menu.h"
#include "menu_indicators.h"
+struct ScrollIndicatorPair
+{
+ u8 field_0;
+ u16 *scrollOffset;
+ u16 fullyUpThreshold;
+ u16 fullyDownThreshold;
+ u8 topSpriteId;
+ u8 bottomSpriteId;
+ u16 tileTag;
+ u16 palTag;
+};
+
+struct RedOutlineCursor
+{
+ struct SubspriteTable subspriteTable;
+ struct Subsprite *subspritesPtr;
+ u8 spriteId;
+ u16 tileTag;
+ u16 palTag;
+};
+
+struct RedArrowCursor
+{
+ u8 spriteId;
+ u16 tileTag;
+ u16 palTag;
+};
+
+struct ScrollIndicatorTemplate
+{
+ u8 animNum:4;
+ u8 bounceDir:4;
+ u8 multiplier;
+ s16 frequency;
+};
+
static EWRAM_DATA struct ScrollArrowsTemplate sTempScrollArrowTemplate = {0};
static void SpriteCallback_ScrollIndicatorArrow(struct Sprite *sprite);