dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some struct DECL location

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-07 00:45:51 +08:00
parent 050bb93753
commit 01b375ab9a
2 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/menu_indicators.h
-41
View File
@@ -3,22 +3,6 @@
#include "global.h" #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 struct ScrollArrowsTemplate
{ {
u8 firstArrowType; u8 firstArrowType;
@@ -34,14 +18,6 @@ struct ScrollArrowsTemplate
u8 palNum; u8 palNum;
}; };
struct ScrollIndicatorTemplate
{
u8 animNum:4;
u8 bounceDir:4;
u8 multiplier;
s16 frequency;
};
struct CursorStruct struct CursorStruct
{ {
u8 left; u8 left;
@@ -53,23 +29,6 @@ struct CursorStruct
u8 palNum; 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 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); u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate * template, u16 * a1);
void RemoveScrollIndicatorArrowPair(u8); void RemoveScrollIndicatorArrowPair(u8);
src/menu_indicators.c
+36
View File
@@ -9,6 +9,42 @@
#include "list_menu.h" #include "list_menu.h"
#include "menu_indicators.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 EWRAM_DATA struct ScrollArrowsTemplate sTempScrollArrowTemplate = {0};
static void SpriteCallback_ScrollIndicatorArrow(struct Sprite *sprite); static void SpriteCallback_ScrollIndicatorArrow(struct Sprite *sprite);