diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
| commit | a1951cefc09035e11077a433b28ec8c66b3b03db (patch) | |
| tree | 4de98db5a6edb6d74192028d50893da2b764421f /engine/landmarks.asm | |
| parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) | |
Prefix wram labels with w, part 2.
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 |