diff options
Diffstat (limited to 'engine/menu/naming_screen.asm')
| -rwxr-xr-x | engine/menu/naming_screen.asm | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 4597b794..7835be97 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -1,4 +1,4 @@ -AskName: ; 64eb (1:64eb) +AskName: call SaveScreenTilesToBuffer1 call GetPredefRegisters push hl @@ -7,7 +7,7 @@ AskName: ; 64eb (1:64eb) coord hl, 0, 0 ld b, 4 ld c, 11 - call z, ClearScreenArea ; only if in wild batle + call z, ClearScreenArea ; only if in wild battle ld a, [wcf91] ld [wd11e], a call GetMonName @@ -40,7 +40,7 @@ AskName: ; 64eb (1:64eb) pop af ld [wUpdateSpritesEnabled], a ld a, [wcf50] - cp $50 + cp "@" ret nz .declinedNickname ld d, h @@ -49,11 +49,11 @@ AskName: ; 64eb (1:64eb) ld bc, NAME_LENGTH jp CopyData -DoYouWantToNicknameText: ; 0x6557 +DoYouWantToNicknameText: TX_FAR _DoYouWantToNicknameText db "@" -DisplayNameRaterScreen: ; 655c (1:655c) +DisplayNameRaterScreen: ld hl, wBuffer xor a ld [wUpdateSpritesEnabled], a @@ -81,7 +81,7 @@ DisplayNameRaterScreen: ; 655c (1:655c) scf ret -DisplayNamingScreen: ; 6596 (1:6596) +DisplayNamingScreen: push hl ld hl, wd730 set 6, [hl] @@ -108,7 +108,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld [wMenuWatchedKeys], a ld a, 7 ld [wMaxMenuItem], a - ld a, $50 + ld a, "@" ld [wcf50], a xor a ld hl, wNamingScreenSubmitName @@ -153,7 +153,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld h, [hl] ld l, a push de - jp [hl] + jp hl .submitNickname pop de @@ -259,7 +259,7 @@ DisplayNamingScreen: ; 6596 (1:6596) .addLetter ld a, [wNamingScreenLetter] ld [hli], a - ld [hl], $50 + ld [hl], "@" ld a, SFX_PRESS_AB call PlaySound ret @@ -323,7 +323,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld [wTopMenuItemX], a jp EraseMenuCursor -LoadEDTile: ; 67f6 (1:67f6) +LoadEDTile: call DisableLCD ld de, vFont + $700 ld hl, ED_Tile @@ -334,11 +334,11 @@ LoadEDTile: ; 67f6 (1:67f6) call FarCopyDataDouble jp EnableLCD -ED_Tile: ; 6767 (1:6767) +ED_Tile: INCBIN "gfx/ED_tile.1bpp" ED_TileEnd: -PrintAlphabet: ; 676f (1:676f) +PrintAlphabet: xor a ld [H_AUTOBGTRANSFERENABLED], a ld a, [wAlphabetCase] @@ -368,13 +368,13 @@ PrintAlphabet: ; 676f (1:676f) ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 -LowerCaseAlphabet: ; 6841 (1:6841) - db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥MAJUSCULES@" +LowerCaseAlphabet: + db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥MAJUSCULES@" -UpperCaseAlphabet: ; 6879 (1:6879) - db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥minuscules@" +UpperCaseAlphabet: + db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥minuscules@" -PrintNicknameAndUnderscores: ; 68b1 (1:68b1) +PrintNicknameAndUnderscores: call CalcStringLength ld a, c ld [wNamingScreenNameLength], a @@ -428,7 +428,7 @@ PrintNicknameAndUnderscores: ; 68b1 (1:68b1) ld [hl], $77 ; raised underscore tile id ret -DakutensAndHandakutens: ; 6871 (1:6871) +DakutensAndHandakutens: push de call CalcStringLength dec hl @@ -442,7 +442,7 @@ DakutensAndHandakutens: ; 6871 (1:6871) ld [wNamingScreenLetter], a ret -Dakutens: ; 6885 (1:6885) +Dakutens: db "かが", "きぎ", "くぐ", "けげ", "こご" db "さざ", "しじ", "すず", "せぜ", "そぞ" db "ただ", "ちぢ", "つづ", "てで", "とど" @@ -453,13 +453,13 @@ Dakutens: ; 6885 (1:6885) db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" db $ff -Handakutens: ; 68d6 (1:68d6) +Handakutens: db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" db $ff ; calculates the length of the string at wcf50 and stores it in c -CalcStringLength: ; 68eb (1:68eb) +CalcStringLength: ld hl, wcf50 ld c, $0 .loop @@ -470,7 +470,7 @@ CalcStringLength: ; 68eb (1:68eb) inc c jr .loop -PrintNamingText: ; 699b (1:699b) +PrintNamingText: coord hl, 0, 1 ld a, [wNamingScreenType] ld de, YourTextString @@ -495,14 +495,14 @@ PrintNamingText: ; 699b (1:699b) .placeString jp PlaceString -YourTextString: ; 693f (1:693f) +YourTextString: db "VOTRE NOM?@" -RivalsTextString: ; 6945 (1:6945) +RivalsTextString: db "NOM DU RIVAL?@" -NameTextString: ; 694d (1:694d) +NameTextString: db "NOM?@" -NicknameTextString: ; 6953 (1:6953) +NicknameTextString: db "SURNOM?@" |