diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /engine/save.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'engine/save.asm')
| -rw-r--r-- | engine/save.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/save.asm b/engine/save.asm index 69bbaee82..af24b4d2f 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -691,8 +691,8 @@ TryLoadSaveData: ; 14f1c ld de, StartDay ld bc, 8 call CopyBytes - ld hl, sPlayerData + StatusFlags - wPlayerData - ld de, StatusFlags + ld hl, sPlayerData + wStatusFlags - wPlayerData + ld de, wStatusFlags ld a, [hl] ld [de], a call CloseSRAM @@ -710,8 +710,8 @@ TryLoadSaveData: ; 14f1c ld de, StartDay ld bc, 8 call CopyBytes - ld hl, sBackupPlayerData + StatusFlags - wPlayerData - ld de, StatusFlags + ld hl, sBackupPlayerData + wStatusFlags - wPlayerData + ld de, wStatusFlags ld a, [hl] ld [de], a call CloseSRAM |