pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Misc fixes

Browse Source
This commit is contained in:
mid-kid 2019-06-04 13:31:22 +02:00
parent 309079524b
commit b6277408a0
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/text/battle.asm
View File

@ -414,9 +414,8 @@ BecameConfusedText:
text "<TARGET>" text "<TARGET>"
line "became confused!" line "became confused!"
prompt prompt
; ItemHealedConfusion
BattleText_ItemHealedConfusion: ; ItemHealedConfusion BattleText_ItemHealedConfusion:
text "A @" text "A @"
text_ram wStringBuffer1 text_ram wStringBuffer1
text " rid" text " rid"

2
data/text/common_2.asm
View File

@ -815,7 +815,7 @@ UnknownText_0x1c0df3::
UnknownText_0x1c0e24:: UnknownText_0x1c0e24::
text "It's @" text "It's @"
text_ram wBreedMon1 text_ram wBreedMon1Nick
text_start text_start
line "that was left with" line "that was left with"
cont "the DAY-CARE MAN." cont "the DAY-CARE MAN."

4
engine/pokemon/bills_pc.asm
View File

@ -1854,7 +1854,7 @@ TryWithdrawPokemon:
ld h, b ld h, b
ld de, wStringBuffer1 ld de, wStringBuffer1
call PlaceString call PlaceString
ld a, $e7 ld a, "!"
ld [bc], a ld [bc], a
ld c, 50 ld c, 50
call DelayFrames call DelayFrames
@ -1913,7 +1913,7 @@ ReleasePKMN_ByePKMN:
call PlaceString call PlaceString
ld l, c ld l, c
ld h, b ld h, b
ld [hl], $e7 ld [hl], "!"
ld c, 50 ld c, 50
call DelayFrames call DelayFrames
ret ret

2
home/string.asm
View File

@ -6,7 +6,7 @@ InitString::
InitName:: InitName::
; Intended for names, so this function is limited to ten characters. ; Intended for names, so this function is limited to ten characters.
push hl push hl
ld c, 10 ld c, NAME_LENGTH - 1
_InitString:: _InitString::
; if the string pointed to by hl is empty (defined as "zero or more spaces ; if the string pointed to by hl is empty (defined as "zero or more spaces
; followed by a null"), then initialize it to the string pointed to by de. ; followed by a null"), then initialize it to the string pointed to by de.