diff options
Diffstat (limited to 'engine/menus/naming_screen.asm')
| -rw-r--r-- | engine/menus/naming_screen.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 7969cdda..9d477b34 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -7,8 +7,8 @@ AskName: hlcoord 0, 0 lb bc, 4, 11 call z, ClearScreenArea ; only if in wild battle - ld a, [wcf91] - ld [wd11e], a + ld a, [wCurPartySpecies] + ld [wNamedObjectIndex], a call GetMonName ld hl, DoYouWantToNicknameText call PrintText @@ -44,7 +44,7 @@ AskName: .declinedNickname ld d, h ld e, l - ld hl, wcd6d + ld hl, wNameBuffer ld bc, NAME_LENGTH jp CopyData @@ -82,8 +82,8 @@ DisplayNameRaterScreen:: DisplayNamingScreen: push hl - ld hl, wd730 - set 6, [hl] + ld hl, wStatusFlags5 + set BIT_NO_TEXT_DELAY, [hl] call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites @@ -165,8 +165,8 @@ DisplayNamingScreen: call GBPalNormal xor a ld [wAnimCounter], a - ld hl, wd730 - res 6, [hl] + ld hl, wStatusFlags5 + res BIT_NO_TEXT_DELAY, [hl] ld a, [wIsInBattle] and a jp z, LoadTextBoxTilePatterns @@ -472,12 +472,12 @@ PrintNamingText: ld de, RivalsTextString dec a jr z, .notNickname - ld a, [wcf91] + ld a, [wCurPartySpecies] ld [wMonPartySpriteSpecies], a push af farcall WriteMonPartySpriteOAMBySpecies pop af - ld [wd11e], a + ld [wNamedObjectIndex], a call GetMonName hlcoord 4, 1 call PlaceString |