dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Move region map layout to C

Browse Source
This commit is contained in:
GriffinR
2022-02-22 18:12:21 -05:00
parent eca5233abe
commit a0c127f72c
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/region_map.c
View File

@@ -53,8 +53,6 @@ enum {
TAG_FLY_ICON,
};
// Static type declarations
struct MultiNameFlyDest
{
const u8 *const *name;
@@ -62,8 +60,6 @@ struct MultiNameFlyDest
u16 flag;
};
// Static RAM declarations
static EWRAM_DATA struct RegionMap *gRegionMap = NULL;
static EWRAM_DATA struct {
@@ -78,8 +74,6 @@ static EWRAM_DATA struct {
static bool32 sDrawFlyDestTextWindow;
// Static ROM declarations
static u8 ProcessRegionMapInput_Full(void);
static u8 MoveRegionMapCursor_Full(void);
static u8 ProcessRegionMapInput_Zoomed(void);
@@ -127,8 +121,8 @@ static const u16 sRegionMapPlayerIcon_BrendanPal[] = INCBIN_U16("graphics/pokena
static const u8 sRegionMapPlayerIcon_BrendanGfx[] = INCBIN_U8("graphics/pokenav/region_map/brendan_icon.4bpp");
static const u16 sRegionMapPlayerIcon_MayPal[] = INCBIN_U16("graphics/pokenav/region_map/may_icon.gbapal");
static const u8 sRegionMapPlayerIcon_MayGfx[] = INCBIN_U8("graphics/pokenav/region_map/may_icon.4bpp");
static const u8 sRegionMap_MapSectionLayout[] = INCBIN_U8("graphics/pokenav/region_map_section_layout.bin");
#include "data/region_map/region_map_layout.h"
#include "data/region_map/region_map_entries.h"
static const u16 sRegionMap_SpecialPlaceLocations[][2] =
@@ -506,8 +500,6 @@ static const struct SpriteTemplate sFlyDestIconSpriteTemplate =
.callback = SpriteCallbackDummy
};
// .text
void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed)
{
InitRegionMapData(regionMap, NULL, zoomed);