diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
| commit | 6bd6cfcac7ae76806c8c9d940163dc3ece6a9acf (patch) | |
| tree | f71ad889881572488c2a2be299c50fc09393e1a2 /include/global.fieldmap.h | |
| parent | 0e8d6645f84057a9eaf9e60ac9312bc259f15be1 (diff) | |
| parent | 4554b546ef1699d4b3bde9ef27e7477e620d38d9 (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index ed5054b7d..3e9f13523 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -39,7 +39,7 @@ enum MAP_BATTLE_SCENE_PHOEBE, // 5 MAP_BATTLE_SCENE_GLACIA, // 6 MAP_BATTLE_SCENE_DRAKE, // 7 - MAP_BATTLE_SCENE_BATTLE_TOWER, // 8 + MAP_BATTLE_SCENE_FRONTIER, // 8 }; typedef void (*TilesetCB)(void); @@ -224,7 +224,7 @@ struct MapObject /*0x0C*/ struct Coords16 coords1; /*0x10*/ struct Coords16 coords2; /*0x14*/ struct Coords16 coords3; - /*0x18*/ u8 mapobj_unk_18:4; //current direction? + /*0x18*/ u8 mapobj_unk_18:4; // current direction? /*0x18*/ u8 placeholder18:4; /*0x19*/ union __attribute__((packed)) { u8 as_byte; |