diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-01-02 04:27:51 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-02 01:27:51 -0800 |
| commit | 98062c69d613fb1b9e2345924dd34d0bbdcfcc90 (patch) | |
| tree | 9fce5941c31e76acd873ce4610e1bd59bc865d90 /include/global.fieldmap.h | |
| parent | e1120f3a62097abb80bfa2f910d98ef53f1e5671 (diff) | |
label and document berry.c, decompress.c, item_use.c and label gBattleTypeFlags (#146)
* make ROM match again
* clean up item_use.c labels and clarify functions.
* label and clarify some functions in decompress.c
* label and clarify berry.c
* rename 20239F8 to gBattleTypeFlags
* formatting
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index caef5855f..95ccf2614 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -11,6 +11,35 @@ enum CONNECTION_EMERGE }; +// map types +enum +{ + MAP_TYPE_0, + MAP_TYPE_TOWN, + MAP_TYPE_CITY, + MAP_TYPE_ROUTE, + MAP_TYPE_UNDERGROUND, + MAP_TYPE_UNDERWATER, + MAP_TYPE_6, + MAP_TYPE_7, + MAP_TYPE_INDOOR, + MAP_TYPE_SECRET_BASE +}; + +// map battle scenes +enum +{ + MAP_BATTLE_SCENE_NORMAL, // 0 + MAP_BATTLE_SCENE_GYM, // 1 + MAP_BATTLE_SCENE_MAGMA, // 2 + MAP_BATTLE_SCENE_AQUA, // 3 + MAP_BATTLE_SCENE_SIDNEY, // 4 + MAP_BATTLE_SCENE_PHOEBE, // 5 + MAP_BATTLE_SCENE_GLACIA, // 6 + MAP_BATTLE_SCENE_DRAKE, // 7 + MAP_BATTLE_SCENE_BATTLE_TOWER, // 8 +}; + typedef void (*TilesetCB)(void); struct Tileset @@ -113,7 +142,7 @@ struct MapHeader u8 name; u8 cave; u8 weather; - /* 0x17 */ u8 light; + /* 0x17 */ u8 mapType; u8 filler_18; u8 escapeRope; u8 flags; |