Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix triple newlines left over from removing address comments

Browse Source
This commit is contained in:
Rangi
2018-06-24 23:22:50 -04:00
parent 91f914718a
commit 67d1364c7a
193 changed files with 3 additions and 1965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
engine/menus/naming_screen.asm
View File

@@ -10,7 +10,6 @@ _NamingScreen:
call ReturnToMapWithSpeechTextbox
ret
NamingScreen:
ld hl, wNamingScreenDestinationPointer
ld [hl], e
@@ -44,7 +43,6 @@ NamingScreen:
call ClearJoypad
ret
.SetUpNamingScreen:
call ClearBGPalettes
ld b, SCGB_DIPLOMA
@@ -61,7 +59,6 @@ NamingScreen:
call NamingScreen_InitNameEntry
ret
.GetNamingScreenSetup:
ld a, [wNamingScreenType]
and 7
@@ -75,7 +72,6 @@ NamingScreen:
ld l, a
jp hl
.Jumptable:
dw .Pokemon
dw .Player
@@ -117,12 +113,10 @@ NamingScreen:
call .StoreMonIconParams
ret
.NicknameStrings:
db "'S@"
db "NICKNAME?@"
.Player:
farcall GetPlayerIcon
call .LoadSprite
@@ -132,11 +126,9 @@ NamingScreen:
call .StoreSpriteIconParams
ret
.PlayerNameString:
db "YOUR NAME?@"
.Rival:
ld de, SilverSpriteGFX
ld b, BANK(SilverSpriteGFX)
@@ -147,11 +139,9 @@ NamingScreen:
call .StoreSpriteIconParams
ret
.RivalNameString:
db "RIVAL'S NAME?@"
.Mom:
ld de, MomSpriteGFX
ld b, BANK(MomSpriteGFX)
@@ -162,11 +152,9 @@ NamingScreen:
call .StoreSpriteIconParams
ret
.MomNameString:
db "MOTHER'S NAME?@"
.Box:
ld de, PokeBallSpriteGFX
ld hl, vTiles0 tile $00
@@ -188,11 +176,9 @@ NamingScreen:
call .StoreBoxIconParams
ret
.BoxNameString:
db "BOX NAME?@"
.Tomodachi:
hlcoord 3, 2
ld de, .oTomodachi_no_namae_sutoringu
@@ -200,11 +186,9 @@ NamingScreen:
call .StoreSpriteIconParams
ret
.oTomodachi_no_namae_sutoringu
db "おともだち　の　なまえは？@"
.LoadSprite:
push de
ld hl, vTiles0 tile $00
@@ -271,7 +255,6 @@ NamingScreen_IsTargetBox:
pop bc
ret
NamingScreen_InitText:
call WaitTop
hlcoord 0, 0
@@ -333,7 +316,6 @@ NamingScreen_ApplyTextInputMode:
jr nz, .row
ret
NamingScreenJoypadLoop:
call JoyTextDelay
ld a, [wJumptableIndex]
@@ -355,7 +337,6 @@ NamingScreenJoypadLoop:
scf
ret
.UpdateStringEntry:
xor a
ld [hBGMapMode], a
@@ -380,7 +361,6 @@ NamingScreenJoypadLoop:
ld [hBGMapMode], a
ret
.RunJumptable:
ld a, [wJumptableIndex]
ld e, a
@@ -393,7 +373,6 @@ NamingScreenJoypadLoop:
ld l, a
jp hl
.Jumptable:
dw .InitCursor
dw .ReadButtons
@@ -569,14 +548,12 @@ NamingScreen_AnimateCursor:
ld [hl], a
ret
.LetterEntries:
db $00, $10, $20, $30, $40, $50, $60, $70, $80
.CaseDelEnd:
db $00, $00, $00, $30, $30, $30, $60, $60, $60
.GetDPad:
ld hl, hJoyLast
ld a, [hl]
@@ -720,7 +697,6 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
scf
ret
; unused
ld a, [wNamingScreenCurrNameLength]
and a
@@ -745,10 +721,8 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
ld a, [hl]
jr NamingScreen_LoadNextCharacter
INCLUDE "data/text/unused_dakutens.asm"
NamingScreen_DeleteCharacter:
ld hl, wNamingScreenCurrNameLength
ld a, [hl]
@@ -777,7 +751,6 @@ NamingScreen_GetTextCursorPosition:
pop af
ret
NamingScreen_InitNameEntry:
; load NAMINGSCREEN_UNDERLINE, (NAMINGSCREEN_MIDDLELINE * [wNamingScreenMaxNameLength]), "@" into the dw address at wNamingScreenDestinationPointer
ld hl, wNamingScreenDestinationPointer
@@ -797,7 +770,6 @@ NamingScreen_InitNameEntry:
ld [hl], "@"
ret
NamingScreen_StoreEntry:
ld hl, wNamingScreenDestinationPointer
ld a, [hli]
@@ -907,7 +879,6 @@ LoadNamingScreenGFX:
ld [hWX], a
ret
NamingScreenGFX_Border:
INCBIN "gfx/naming_screen/border.2bpp"
@@ -995,7 +966,6 @@ _ComposeMailMessage:
ld [hl], "<NEXT>"
ret
.MailIcon:
INCBIN "gfx/icons/mail_big.2bpp"
@@ -1004,11 +974,9 @@ INCBIN "gfx/icons/mail_big.2bpp"
ld [wNamingScreenMaxNameLength], a
ret
.UnusedString11f7a:
db "メールを　かいてね@"
.InitCharset:
call WaitTop
hlcoord 0, 0
@@ -1235,14 +1203,12 @@ ComposeMail_AnimateCursor:
ld [hl], a
ret
.LetterEntries:
db $00, $10, $20, $30, $40, $50, $60, $70, $80, $90
.CaseDelEnd:
db $00, $00, $00, $30, $30, $30, $60, $60, $60, $60
.GetDPad:
ld hl, hJoyLast
ld a, [hl]
@@ -1383,7 +1349,6 @@ MailComposition_TryAddLastCharacter:
ld a, [wNamingScreenLastCharacter]
jp MailComposition_TryAddCharacter
; unused
ld a, [wNamingScreenCurrNameLength]
and a
@@ -1418,6 +1383,5 @@ MailComposition_TryAddLastCharacter:
ld a, [hl]
jp NamingScreen_LoadNextCharacter
INCLUDE "data/text/mail_input_chars.asm"