ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from DizzyEggg/fix_static_names

Browse Source 
Add Save Location header and fix static names
This commit is contained in:
Diegoisawesome 2017-10-09 18:17:04 -05:00 committed by GitHub
commit 8914645231
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/save_location.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef GUARD_SAVE_LOCATION_H
#define GUARD_SAVE_LOCATION_H
bool32 sub_81AFCEC(void);
void TrySetMapSaveWarpStatus(void);
void sub_81AFDA0(void);
void sub_81AFDD0(void);
#endif // GUARD_SAVE_LOCATION_H

13
src/save_location.c
View File

@ -1,4 +1,5 @@
#include "global.h" #include "global.h"
#include "save_location.h"
#include "map_constants.h" #include "map_constants.h"
// used to make the list defines a little less ugly. // used to make the list defines a little less ugly.
@ -26,7 +27,7 @@ static bool32 IsCurMapInLocationList(const u16 *list)
} }
// TODO: Not require a packed u16 array for these lists // TODO: Not require a packed u16 array for these lists
static const u16 gSaveLocationPokeCenterList[] = static const u16 sSaveLocationPokeCenterList[] =
{ {
MAP(OLDALE_TOWN_POKEMON_CENTER_1F), MAP(OLDALE_TOWN_POKEMON_CENTER_1F),
MAP(OLDALE_TOWN_POKEMON_CENTER_2F), MAP(OLDALE_TOWN_POKEMON_CENTER_2F),
@ -71,10 +72,10 @@ static const u16 gSaveLocationPokeCenterList[] =
static bool32 IsCurMapPokeCenter(void) static bool32 IsCurMapPokeCenter(void)
{ {
return IsCurMapInLocationList(gSaveLocationPokeCenterList); return IsCurMapInLocationList(sSaveLocationPokeCenterList);
} }
static const u16 gSaveLocationReloadLocList[] = // there's only 1 location, and it's presumed its for the save reload feature for battle tower static const u16 sSaveLocationReloadLocList[] = // there's only 1 location, and it's presumed its for the save reload feature for battle tower
{ {
MAP(BATTLE_TOWER_LOBBY), MAP(BATTLE_TOWER_LOBBY),
0xFFFF, 0xFFFF,
@ -82,18 +83,18 @@ static const u16 gSaveLocationReloadLocList[] = // there's only 1 location, and
static bool32 IsCurMapReloadLocation(void) static bool32 IsCurMapReloadLocation(void)
{ {
return IsCurMapInLocationList(gSaveLocationReloadLocList); return IsCurMapInLocationList(sSaveLocationReloadLocList);
} }
// nulled out list. unknown what this would have been // nulled out list. unknown what this would have been
static const u16 gUnknown_0861440E[] = static const u16 sUnknown_0861440E[] =
{ {
0xFFFF, 0xFFFF,
}; };
bool32 sub_81AFCEC(void) bool32 sub_81AFCEC(void)
{ {
return IsCurMapInLocationList(gUnknown_0861440E); return IsCurMapInLocationList(sUnknown_0861440E);
} }
static void TrySetPokeCenterWarpStatus(void) static void TrySetPokeCenterWarpStatus(void)