diff options
Diffstat (limited to 'engine/menu/naming_screen.asm')
| -rwxr-xr-x | engine/menu/naming_screen.asm | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 2628da48..23cef72d 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -324,12 +324,15 @@ DisplayNamingScreen: jp EraseMenuCursor LoadEDTile: - ld de, ED_Tile - ld hl, vFont + $700 - ld bc, (ED_TileEnd - ED_Tile) / $8 + call DisableLCD + ld de, vFont + $700 + ld hl, ED_Tile + ld bc, (ED_TileEnd - ED_Tile) ; to fix the graphical bug on poor emulators - ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8 - jp CopyVideoDataDouble + ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) + ld a,$01 + call FarCopyDataDouble + jp EnableLCD ED_Tile: INCBIN "gfx/ED_tile.1bpp" @@ -365,6 +368,7 @@ PrintAlphabet: ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 +<<<<<<< 25c27785aa83a12330ea58e1e35b2fec90dd84f4 LowerCaseAlphabet: db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@" @@ -372,6 +376,15 @@ UpperCaseAlphabet: db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@" PrintNicknameAndUnderscores: +======= +LowerCaseAlphabet: ; 6841 (1:6841) + db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥MAJUSCULES@" + +UpperCaseAlphabet: ; 6879 (1:6879) + db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥minuscules@" + +PrintNicknameAndUnderscores: ; 68b1 (1:68b1) +>>>>>>> Initial decompilation of FR Red call CalcStringLength ld a, c ld [wNamingScreenNameLength], a @@ -467,15 +480,19 @@ CalcStringLength: inc c jr .loop +<<<<<<< 25c27785aa83a12330ea58e1e35b2fec90dd84f4 PrintNamingText: +======= +PrintNamingText: ; 699b (1:699b) +>>>>>>> Initial decompilation of FR Red coord hl, 0, 1 ld a, [wNamingScreenType] ld de, YourTextString and a - jr z, .notNickname + jr z, .placeString ld de, RivalsTextString dec a - jr z, .notNickname + jr z, .placeString ld a, [wcf91] ld [wMonPartySpriteSpecies], a push af @@ -485,28 +502,21 @@ PrintNamingText: call GetMonName coord hl, 4, 1 call PlaceString - ld hl, $1 - add hl, bc - ld [hl], $c9 - coord hl, 1, 3 - ld de, NicknameTextString + ld hl, $C3DD + ld de, $69F2 jr .placeString -.notNickname - call PlaceString - ld l, c - ld h, b - ld de, NameTextString + .placeString jp PlaceString YourTextString: - db "YOUR @" + db "VOTRE NOM?@" RivalsTextString: - db "RIVAL's @" + db "NOM DU RIVAL?@" NameTextString: - db "NAME?@" + db "NOM?@" NicknameTextString: - db "NICKNAME?@" + db "SURNOM?@" |