From e73ce5317dfc243474faa9187181ed323faf4ed5 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 30 May 2019 17:05:30 -0400 Subject: Parametrized to Parameterized --- include/menu_indicators.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/menu_indicators.h') diff --git a/include/menu_indicators.h b/include/menu_indicators.h index f195ceb6d..8c669aeef 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -24,7 +24,7 @@ struct ScrollIndicatorArrowPairTemplate }; // Exported ROM declarations -u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *); +u8 AddScrollIndicatorArrowPairParameterized(u8, u8, u8, u8, s32, u16, u16, u16 *); u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1); void RemoveScrollIndicatorArrowPair(u8); -- cgit v1.2.3 From c28365392e7f5f3f2101f48fd8b43d22f496fd1d Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 11 Jun 2019 05:44:21 +0800 Subject: struct ScrollArrowsTemplate --- include/menu_indicators.h | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'include/menu_indicators.h') diff --git a/include/menu_indicators.h b/include/menu_indicators.h index 8c669aeef..76f25224c 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -7,25 +7,24 @@ // Exported RAM declarations -struct ScrollIndicatorArrowPairTemplate +struct ScrollArrowsTemplate { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u8 unk_04; - u8 unk_05; - u16 unk_06; - u16 unk_08; - u16 unk_0a; - u16 unk_0c; - u16 unk_0e_0:4; - u16 unk_0e_4:12; + u8 firstArrowType; + u8 firstX; + u8 firstY; + u8 secondArrowType; + u8 secondX; + u8 secondY; + u16 fullyUpThreshold; + u16 fullyDownThreshold; + u16 tileTag; + u16 palTag; + u8 palNum; }; // Exported ROM declarations u8 AddScrollIndicatorArrowPairParameterized(u8, u8, u8, u8, s32, u16, u16, u16 *); -u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1); +u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate * template, u16 * a1); void RemoveScrollIndicatorArrowPair(u8); #endif //GUARD_MENU_INDICATORS_H -- cgit v1.2.3 From 503086bc7df2a832f49da321287e6b12b8e138fa Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 3 Jul 2019 12:40:04 +0800 Subject: finished menu_indicators --- include/menu_indicators.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'include/menu_indicators.h') diff --git a/include/menu_indicators.h b/include/menu_indicators.h index 76f25224c..fb6b65ecc 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -7,6 +7,18 @@ // 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; @@ -22,9 +34,48 @@ struct ScrollArrowsTemplate u8 palNum; }; +struct ScrollIndicatorTemplate +{ + u8 animNum:4; + u8 bounceDir:4; + u8 multiplier; + s16 frequency; +}; + +struct CursorStruct +{ + u8 left; + u8 top; + u16 rowWidth; + u16 rowHeight; + u16 tileTag; + u16 palTag; + 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(u8, u8, u8, u8, s32, u16, u16, u16 *); +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); +u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind); +u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor); +void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y); +void ListMenuRemoveRedOutlineCursorObject(u8 taskId); #endif //GUARD_MENU_INDICATORS_H -- cgit v1.2.3 From 050bb937533b98a6828f0b276bbe13608b7e2fb0 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 6 Jul 2019 16:45:21 +0800 Subject: finished list_menu --- include/menu_indicators.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/menu_indicators.h') diff --git a/include/menu_indicators.h b/include/menu_indicators.h index fb6b65ecc..156dcd694 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -77,5 +77,7 @@ u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind); u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor); void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y); void ListMenuRemoveRedOutlineCursorObject(u8 taskId); +void ListMenuRemoveCursorObject(u8 taskId, u32 cursorKind); +void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorKind); #endif //GUARD_MENU_INDICATORS_H -- cgit v1.2.3 From 01b375ab9afc5f2646b84c0ddc81601d4fd83146 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sun, 7 Jul 2019 00:45:51 +0800 Subject: fixed some struct DECL location --- include/menu_indicators.h | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'include/menu_indicators.h') 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); -- cgit v1.2.3