ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

sRegionMapCursorSpriteTemplate

Browse Source
This commit is contained in:
PikalaxALT 2017-11-01 22:26:54 -04:00
parent 2e0b1700f4
commit 30d68db0dc
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/region_map.s
View File

@ -4,15 +4,6 @@
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_085A1BD0:: @ 85A1BCC
.incbin "baserom.gba", 0x5a1bd0, 0x30
gUnknown_085A1C00:: @ 85A1C00
.incbin "baserom.gba", 0x5a1c00, 0x8
gUnknown_085A1C08:: @ 85A1C08
.incbin "baserom.gba", 0x5a1c08, 0x18
gUnknown_085A1C20:: @ 85A1C20 gUnknown_085A1C20:: @ 85A1C20
.incbin "baserom.gba", 0x5a1c20, 0x10 .incbin "baserom.gba", 0x5a1c20, 0x10

42
src/region_map.c
View File

@ -75,6 +75,7 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y);
static bool32 RegionMap_IsPlayerInCave(u8 mapSecId); static bool32 RegionMap_IsPlayerInCave(u8 mapSecId);
static void RegionMap_GetPositionOfCursorWithinMapSection(void); static void RegionMap_GetPositionOfCursorWithinMapSection(void);
static bool8 RegionMap_IsMapSecIdInNextRow(u16 y); static bool8 RegionMap_IsMapSecIdInNextRow(u16 y);
static void SpriteCallback_CursorFull(struct Sprite *sprite);
static void FreeRegionMapCursorSprite(void); static void FreeRegionMapCursorSprite(void);
static void HideRegionMapPlayerIcon(void); static void HideRegionMapPlayerIcon(void);
static void UnhideRegionMapPlayerIcon(void); static void UnhideRegionMapPlayerIcon(void);
@ -193,8 +194,41 @@ static const u8 sRegionMap_MapSecAquaHideoutOld[] = {
MAPSEC_AQUA_HIDEOUT_OLD MAPSEC_AQUA_HIDEOUT_OLD
}; };
extern const struct SpritePalette gUnknown_085A1C00; static const struct OamData sRegionMapCursorOam = {
extern const struct SpriteTemplate gUnknown_085A1C08; .size = 1, .priority = 1
};
static const union AnimCmd sRegionMapCursorAnim1[] = {
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(4, 20),
ANIMCMD_JUMP(0)
};
static const union AnimCmd sRegionMapCursorAnim2[] = {
ANIMCMD_FRAME( 0, 10),
ANIMCMD_FRAME(16, 10),
ANIMCMD_FRAME(32, 10),
ANIMCMD_FRAME(16, 10),
ANIMCMD_JUMP(0)
};
static const union AnimCmd *const sRegionMapCursorAnimTable[] = {
sRegionMapCursorAnim1,
sRegionMapCursorAnim2
};
static const struct SpritePalette sRegionMapCursorSpritePalette = { sRegionMapCursorPal, 0 };
static const struct SpriteTemplate sRegionMapCursorSpriteTemplate = {
0,
0,
&sRegionMapCursorOam,
sRegionMapCursorAnimTable,
NULL,
gDummySpriteAffineAnimTable,
SpriteCallback_CursorFull
};
extern const struct OamData gUnknown_085A1C20; extern const struct OamData gUnknown_085A1C20;
extern const union AnimCmd *const gUnknown_085A1C30[]; extern const union AnimCmd *const gUnknown_085A1C30[];
extern const u8 gUnknown_085A1C34[]; extern const u8 gUnknown_085A1C34[];
@ -1117,8 +1151,8 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
struct SpritePalette palette; struct SpritePalette palette;
struct SpriteSheet sheet; struct SpriteSheet sheet;
palette = gUnknown_085A1C00; palette = sRegionMapCursorSpritePalette;
template = gUnknown_085A1C08; template = sRegionMapCursorSpriteTemplate;
sheet.tag = tileTag; sheet.tag = tileTag;
template.tileTag = tileTag; template.tileTag = tileTag;
gRegionMap->cursorTileTag = tileTag; gRegionMap->cursorTileTag = tileTag;