diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /engine/oak_speech2.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'engine/oak_speech2.asm')
| -rwxr-xr-x | engine/oak_speech2.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 50e3708c..9b5622b8 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -40,11 +40,11 @@ ChooseRivalName: ; 69a4 (1:69a4) jr z, .customName ld hl, DefaultNamesRivalList call GetDefaultName - ld de, W_RIVALNAME + ld de, wRivalName call OakSpeechSlidePicLeft jr .done .customName - ld hl, W_RIVALNAME + ld hl, wRivalName ld a, NAME_RIVAL_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen @@ -73,7 +73,7 @@ OakSpeechSlidePicLeft: ; 69ec (1:69ec) call DelayFrames pop de ld hl, wcd6d - ld bc, 11 + ld bc, NAME_LENGTH call CopyData call Delay3 coord hl, 12, 4 @@ -177,7 +177,7 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c) ld [wLastMenuItem], a inc a ld [wTopMenuItemX], a - ld [wMenuWatchedKeys], a + ld [wMenuWatchedKeys], a ; A_BUTTON inc a ld [wTopMenuItemY], a inc a |