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 /mobile/mobile_12.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 'mobile/mobile_12.asm')
| -rwxr-xr-x | mobile/mobile_12.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 934afb457..c7db74e70 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -38,11 +38,11 @@ InitMobileProfile: ; 4802f (12:402f) jr .asm_480d7 .asm_4808a ld a, $5 - ld [MusicFade], a + ld [wMusicFade], a ld a, LOW(MUSIC_MOBILE_ADAPTER_MENU) - ld [MusicFadeID], a + ld [wMusicFadeID], a ld a, HIGH(MUSIC_MOBILE_ADAPTER_MENU) - ld [MusicFadeID + 1], a + ld [wMusicFadeID + 1], a ld c, 20 call DelayFrames ld b, $1 @@ -459,7 +459,7 @@ Function483bb: ; 483bb (12:43bb) Function483e8: ; 483e8 push de ld hl, Prefectures - ld a, [MenuSelection] + ld a, [wMenuSelection] cp $ff jr nz, .asm_483f8 ld hl, Wakayama ; last string @@ -1681,7 +1681,7 @@ Function48cdc: ; 48cdc (12:4cdc) call Function48cfd pop hl pop bc - ld de, AttrMap - TileMap + ld de, wAttrMap - wTileMap add hl, de inc b inc b |