diff options
Diffstat (limited to 'engine/namingscreen.asm')
| -rwxr-xr-x | engine/namingscreen.asm | 81 |
1 files changed, 18 insertions, 63 deletions
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index 4a7ca301a..484bbe753 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -103,7 +103,7 @@ NamingScreen: ; 116c1 inc de hlcoord 5, 4 call PlaceString - callba GetGender + farcall GetGender jr c, .genderless ld a, "♂" jr nz, .place_gender @@ -124,7 +124,7 @@ NamingScreen: ; 116c1 ; 1178d .Player: ; 1178d (4:578d) - callba GetPlayerIcon + farcall GetPlayerIcon call .LoadSprite hlcoord 5, 2 ld de, .PlayerNameString @@ -352,14 +352,14 @@ NamingScreenJoypadLoop: ; 11915 bit 7, a jr nz, .quit call .RunJumptable - callba PlaySpriteAnimationsAndDelayFrame + farcall PlaySpriteAnimationsAndDelayFrame call .UpdateStringEntry call DelayFrame and a ret .quit - callab ClearSpriteAnims + callfar ClearSpriteAnims call ClearSprites xor a ld [hSCX], a @@ -419,7 +419,7 @@ NamingScreenJoypadLoop: ; 11915 jr nz, .got_cursor_position ld d, 8 * 8 .got_cursor_position - ld a, SPRITE_ANIM_INDEX_02 + ld a, SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR call _InitSpriteAnimStruct ld a, c ld [wNamingScreenCursorObjectPointer], a @@ -900,7 +900,7 @@ NamingScreen_GetLastCharacter: ; 11c11 (4:5c11) LoadNamingScreenGFX: ; 11c51 call ClearSprites - callab ClearSpriteAnims + callfar ClearSpriteAnims call LoadStandardFont call LoadFontsExtra @@ -946,55 +946,26 @@ LoadNamingScreenGFX: ; 11c51 ; 11cb7 NamingScreenGFX_Border: ; 11cb7 -INCBIN "gfx/unknown/011cb7.2bpp" +INCBIN "gfx/namingscreen/border.2bpp" ; 11cc7 NamingScreenGFX_Cursor: ; 11cc7 -INCBIN "gfx/unknown/011cc7.2bpp" +INCBIN "gfx/namingscreen/cursor.2bpp" ; 11ce7 -NameInputLower: - db "a b c d e f g h i" - db "j k l m n o p q r" - db "s t u v w x y z " - db "× ( ) : ; [ ] <PK> <MN>" - db "UPPER DEL END " - -BoxNameInputLower: - db "a b c d e f g h i" - db "j k l m n o p q r" - db "s t u v w x y z " - db "é 'd 'l 'm 'r 's 't 'v 0" - db "1 2 3 4 5 6 7 8 9" - db "UPPER DEL END " - -NameInputUpper: - db "A B C D E F G H I" - db "J K L M N O P Q R" - db "S T U V W X Y Z " - db "- ? ! / . , " - db "lower DEL END " - -BoxNameInputUpper: - db "A B C D E F G H I" - db "J K L M N O P Q R" - db "S T U V W X Y Z " - db "× ( ) : ; [ ] <PK> <MN>" - db "- ? ! ♂ ♀ / . , &" - db "lower DEL END " - +INCLUDE "data/name_input_chars.asm" ; 11e5d -GFX_11e5d: ; ???? -INCBIN "gfx/unknown/011e5d.1bpp" +NamingScreenGFX_End: ; unused +INCBIN "gfx/namingscreen/end.1bpp" ; 11e6d NamingScreenGFX_MiddleLine: -INCBIN "gfx/unknown/011e65.1bpp" +INCBIN "gfx/namingscreen/middle_line.1bpp" ; 11e6d NamingScreenGFX_UnderLine: ; 11e6d -INCBIN "gfx/unknown/011e6d.1bpp" +INCBIN "gfx/namingscreen/underline.1bpp" ; 11e75 _ComposeMailMessage: ; 11e75 (mail?) @@ -1039,7 +1010,7 @@ _ComposeMailMessage: ; 11e75 (mail?) ; init mail icon depixel 3, 2 - ld a, SPRITE_ANIM_INDEX_00 + ld a, SPRITE_ANIM_INDEX_PARTY_MON call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID @@ -1125,14 +1096,14 @@ INCBIN "gfx/icon/mail2.2bpp" bit 7, a jr nz, .exit_mail call .DoJumptable - callba PlaySpriteAnimationsAndDelayFrame + farcall PlaySpriteAnimationsAndDelayFrame call .Update call DelayFrame and a ret .exit_mail - callab ClearSpriteAnims + callfar ClearSpriteAnims call ClearSprites xor a ld [hSCX], a @@ -1174,7 +1145,7 @@ INCBIN "gfx/icon/mail2.2bpp" .init_blinking_cursor ; 1201b (4:601b) depixel 9, 2 - ld a, SPRITE_ANIM_INDEX_09 + ld a, SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR call _InitSpriteAnimStruct ld a, c ld [wNamingScreenCursorObjectPointer], a @@ -1499,22 +1470,6 @@ MailComposition_TryAddLastCharacter: ; 121ac (4:61ac) ; 121dd -MailEntry_Uppercase: ; 122dd - db "A B C D E F G H I J" - db "K L M N O P Q R S T" - db "U V W X Y Z , ? !" - db "1 2 3 4 5 6 7 8 9 0" - db "<PK> <MN> <PO> <KE> é ♂ ♀ ¥ … ×" - db "lower DEL END " - -; 1224f - -MailEntry_Lowercase: ; 1224f - db "a b c d e f g h i j" - db "k l m n o p q r s t" - db "u v w x y z . - /" - db "'d 'l 'm 'r 's 't 'v & ( )" - db "<``> <''> [ ] ' : ; " - db "UPPER DEL END " +INCLUDE "data/mail_input_chars.asm" ; 122c1 |