diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-10-01 14:51:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-01 14:51:04 -0500 |
| commit | 9ba9993be18af162239838cfefe23f535e291ac0 (patch) | |
| tree | be25184d91d099fe769ba5eda55f4898f128ce9c /include/global.h | |
| parent | 83efcc9c3d1e81b78c2cd9ceab3ac6420a5f4070 (diff) | |
| parent | ab3c40fbf6dd7e32d63ef8146edea900d10681d6 (diff) | |
Merge pull request #436 from camthesaxman/script_cmd_renaming
Rename script commands
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h index 5ca331bf1..f017612f0 100644 --- a/include/global.h +++ b/include/global.h @@ -625,9 +625,9 @@ struct SaveBlock1 /* 0x02025734 */ /*0x04*/ struct WarpData location; /*0x0C*/ struct WarpData warp1; /*0x14*/ struct WarpData warp2; - /*0x1C*/ struct WarpData warp3; + /*0x1C*/ struct WarpData lastHealLocation; /*0x24*/ struct WarpData warp4; - /*0x2C*/ u16 battleMusic; + /*0x2C*/ u16 savedMusic; /*0x2E*/ u8 weather; /*0x2F*/ u8 filler_2F; /*0x30*/ u8 flashLevel; // flash level on current map, 0 being normal and 4 being the darkest |