diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/landmarks.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/landmarks.asm')
| -rw-r--r-- | engine/landmarks.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/landmarks.asm b/engine/landmarks.asm index 452bd2e92..f16f48e67 100644 --- a/engine/landmarks.asm +++ b/engine/landmarks.asm @@ -16,7 +16,7 @@ GetLandmarkCoords: ; 0x1ca896 GetLandmarkName:: ; 0x1ca8a5 -; Copy the name of landmark e to StringBuffer1. +; Copy the name of landmark e to wStringBuffer1. push hl push de push bc @@ -31,7 +31,7 @@ GetLandmarkName:: ; 0x1ca8a5 ld h, [hl] ld l, a - ld de, StringBuffer1 + ld de, wStringBuffer1 ld c, 18 .copy ld a, [hli] @@ -54,9 +54,9 @@ RegionCheck: ; 0x1caea1 ; Checks if the player is in Kanto or Johto. ; If in Johto, returns 0 in e. ; If in Kanto, returns 1 in e. - ld a, [MapGroup] + ld a, [wMapGroup] ld b, a - ld a, [MapNumber] + ld a, [wMapNumber] ld c, a call GetWorldMapLocation cp FAST_SHIP ; S.S. Aqua @@ -65,9 +65,9 @@ RegionCheck: ; 0x1caea1 jr nz, .checkagain ; In a special map, get the backup map group / map id - ld a, [BackupMapGroup] + ld a, [wBackupMapGroup] ld b, a - ld a, [BackupMapNumber] + ld a, [wBackupMapNumber] ld c, a call GetWorldMapLocation |