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_menu.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_menu.asm')
| -rwxr-xr-x | mobile/mobile_menu.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 8c5786eb0..8de1f0f5e 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -190,8 +190,8 @@ Function4a0c2: ; 4a0c2 (12:60c2) call MenuClickSound ld a, BANK(sPlayerData) call GetSRAMBank - ld hl, sPlayerData + PlayerName - wPlayerData - ld de, PlayerName + ld hl, sPlayerData + wPlayerName - wPlayerData + ld de, wPlayerName ld bc, NAME_LENGTH_JAPANESE call CopyBytes call CloseSRAM @@ -637,13 +637,13 @@ Function4a492: ; 4a492 (12:6492) MainMenu_MobileStudium: ; 4a496 - ld a, [StartDay] + ld a, [wStartDay] ld b, a - ld a, [StartHour] + ld a, [wStartHour] ld c, a - ld a, [StartMinute] + ld a, [wStartMinute] ld d, a - ld a, [StartSecond] + ld a, [wStartSecond] ld e, a push bc push de @@ -652,13 +652,13 @@ MainMenu_MobileStudium: ; 4a496 pop de pop bc ld a, b - ld [StartDay], a + ld [wStartDay], a ld a, c - ld [StartHour], a + ld [wStartHour], a ld a, d - ld [StartMinute], a + ld [wStartMinute], a ld a, e - ld [StartSecond], a + ld [wStartSecond], a ret ; 4a4c4 @@ -852,11 +852,11 @@ Function4a6ab: ; 4a6ab (12:66ab) Function4a6c5: ; 4a6c5 (12:66c5) ld a, $5 - ld [MusicFade], a + ld [wMusicFade], a ld a, e - ld [MusicFadeID], a + ld [wMusicFadeID], a ld a, d - ld [MusicFadeID + 1], a + ld [wMusicFadeID + 1], a ld c, 22 call DelayFrames ret |