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/naming_screen.asm | |
| parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) | |
Prefix wram labels with w, part 2.
Diffstat (limited to 'engine/naming_screen.asm')
| -rwxr-xr-x | engine/naming_screen.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/naming_screen.asm b/engine/naming_screen.asm index b53a3b09d..859e7a515 100755 --- a/engine/naming_screen.asm +++ b/engine/naming_screen.asm @@ -19,7 +19,7 @@ NamingScreen: ; 116c1 ld [hl], d ld hl, wNamingScreenType ld [hl], b - ld hl, Options + ld hl, wOptions ld a, [hl] push af set NO_TEXT_SCROLL, [hl] @@ -41,7 +41,7 @@ NamingScreen: ; 116c1 pop af ld [hMapAnims], a pop af - ld [Options], a + ld [wOptions], a call ClearJoypad ret @@ -91,13 +91,13 @@ NamingScreen: ; 116c1 dw .Pokemon .Pokemon: ; 1173e (4:573e) - ld a, [CurPartySpecies] + ld a, [wCurPartySpecies] ld [wd265], a ld hl, LoadMenuMonIcon ld a, BANK(LoadMenuMonIcon) ld e, $1 rst FarCall ; ; indirect jump to LoadMenuMonIcon (8e83f (23:683f)) - ld a, [CurPartySpecies] + ld a, [wCurPartySpecies] ld [wd265], a call GetPokemonName hlcoord 5, 2 |