diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-01 21:45:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 21:45:36 -0400 |
| commit | 74d771ef90a3189bd2da1b35f6b42a1fa8f51e67 (patch) | |
| tree | 96c754aee40f16956fb0958ecb31bd806bd99642 /include/global.h | |
| parent | 7f06718571de81609208a5fa402a93da63cfa8bf (diff) | |
| parent | 062238aa12cb4f54f70b73459ff5b5d775f69a54 (diff) | |
Merge pull request #76 from jiangzhengwenjz/misc
new_menu_helpers, multiboot, hof_pc, play_time, decompress, reset_save_heap, save_location, mail_data, fldeff_*
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h index 050c311e4..e1f63213a 100644 --- a/include/global.h +++ b/include/global.h @@ -209,7 +209,7 @@ struct SaveBlock2 { /*0x000*/ u8 playerName[PLAYER_NAME_LENGTH]; /*0x008*/ u8 playerGender; // MALE, FEMALE - /*0x009*/ u8 specialSaveWarp; + /*0x009*/ u8 specialSaveWarpFlags; /*0x00A*/ u8 playerTrainerId[4]; /*0x00E*/ u16 playTimeHours; /*0x010*/ u8 playTimeMinutes; @@ -726,8 +726,14 @@ struct SaveBlock1 /*0x3D38*/ struct TrainerTowerLog unkArray[4]; }; -extern struct SaveBlock1* gSaveBlock1Ptr; +struct MapPosition +{ + s16 x; + s16 y; + s8 height; +}; +extern struct SaveBlock1* gSaveBlock1Ptr; extern u8 gReservedSpritePaletteCount; #endif // GUARD_GLOBAL_H |