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

Merge branch 'various_documentation' of github.com:PikalaxALT/pokefirered into various_documentation

Browse Source
This commit is contained in:
PikalaxALT
2020-04-06 18:00:47 -04:00
parent c78101535b c05ca373e0
commit 0394317ae4
43 changed files with 2296 additions and 2240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/map_types.h
+5 -5
View File
@@ -3,14 +3,14 @@
#define MAP_TYPE_NONE 0
#define MAP_TYPE_TOWN 1
#define MAP_TYPE_CITY 2 // Unused. RSE use this map type to distinguish Town and City. FRLG make no distinction
#define MAP_TYPE_CITY 2 // Not used by any map. RSE use this map type to distinguish Town and City. FRLG make no distinction
#define MAP_TYPE_ROUTE 3
#define MAP_TYPE_UNDERGROUND 4
#define MAP_TYPE_UNDERWATER 5 // Unused
#define MAP_TYPE_OCEAN_ROUTE 6 // Unused
#define MAP_TYPE_UNKNOWN 7 // Unused
#define MAP_TYPE_UNDERWATER 5 // Not used by any map.
#define MAP_TYPE_OCEAN_ROUTE 6 // Not used by any map.
#define MAP_TYPE_UNKNOWN 7 // Not used by any map.
#define MAP_TYPE_INDOOR 8
#define MAP_TYPE_SECRET_BASE 9 // Unused
#define MAP_TYPE_SECRET_BASE 9 // Not used by any map.
#define MAP_BATTLE_SCENE_NORMAL 0
#define MAP_BATTLE_SCENE_GYM 1
include/constants/region_map_sections.h
+3 -2
View File
@@ -103,8 +103,8 @@
#define MAPSEC_CINNABAR_ISLAND 0x60
#define MAPSEC_INDIGO_PLATEAU 0x61
#define MAPSEC_SAFFRON_CITY 0x62
#define MAPSEC_ROUTE_4_FLYDUP 0x63
#define MAPSEC_ROUTE_10_FLYDUP 0x64
#define MAPSEC_ROUTE_4_POKECENTER 0x63
#define MAPSEC_ROUTE_10_POKECENTER 0x64
#define MAPSEC_ROUTE_1 0x65
#define MAPSEC_ROUTE_2 0x66
#define MAPSEC_ROUTE_3 0x67
@@ -205,6 +205,7 @@
#define MAPSEC_EMBER_SPA 0xC3
#define MAPSEC_SPECIAL_AREA 0xC4
#define MAPSEC_NONE 0xC5
#define MAPSEC_COUNT 0xC6
#define METLOC_SPECIAL_EGG 0xFD
#define METLOC_IN_GAME_TRADE 0xFE
include/region_map.h
+8 -37
View File
@@ -2,48 +2,19 @@
#define GUARD_REGION_MAP_H
#include "global.h"
#include "bg.h"
// Exported type declarations
enum
{
INPUT_EVENT_NONE,
INPUT_EVENT_MOVE_START,
INPUT_EVENT_MOVE_CONT,
INPUT_EVENT_MOVE_END,
INPUT_EVENT_A_BUTTON,
INPUT_EVENT_B_BUTTON,
};
enum {
MAPSECTYPE_NONE,
MAPSECTYPE_PLAIN,
MAPSECTYPE_CITY_CANFLY,
MAPSECTYPE_CITY_CANTFLY,
REGIONMAP_TYPE_NORMAL,
REGIONMAP_TYPE_WALL,
REGIONMAP_TYPE_FLY,
REGIONMAP_TYPE_COUNT
};
enum {
MAPPERM_0,
MAPPERM_1,
MAPPERM_2,
MAPPERM_3
};
enum {
REGIONMAP_KANTO,
REGIONMAP_SEVII123,
REGIONMAP_SEVII45,
REGIONMAP_SEVII67
};
// Exported RAM declarations
// Exported ROM declarations
u8 *GetMapName(u8 *dest, u16 mapsec, u16 fill);
u8 *GetMapNameGeneric(u8 *dest, u16 mapsec);
void sub_80BFF50(u8 a0, void (*a1)(void));
void MCB2_FlyMap(void);
u8 *GetMapNameGeneric_(u8 *dest, u16 mapsec);
void InitRegionMapWithExitCB(u8 a0, void (*a1)(void));
void CB2_OpenFlyMap(void);
#endif //GUARD_REGION_MAP_H
#endif // GUARD_REGION_MAP_H