ref: b6277408a09b24cecd9d982cce8ff98251752f93
parent: 309079524bd5d28883ad7aa707007673180103ae
author: mid-kid <esteve.varela@gmail.com>
date: Tue Jun 4 09:31:22 EDT 2019
Misc fixes
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -414,9 +414,8 @@
text "<TARGET>"
line "became confused!"
prompt
-; ItemHealedConfusion
-BattleText_ItemHealedConfusion: ; ItemHealedConfusion
+BattleText_ItemHealedConfusion:
text "A @"
text_ram wStringBuffer1
text " rid"
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -815,7 +815,7 @@
UnknownText_0x1c0e24::
text "It's @"
- text_ram wBreedMon1
+ text_ram wBreedMon1Nick
text_start
line "that was left with"
cont "the DAY-CARE MAN."
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -241,16 +241,16 @@
Unreferenced_BillsPCClearThreeBoxes:
hlcoord 0, 0
- ld b, 4
- ld c, 8
+ ld b, 4
+ ld c, 8
call ClearBox
hlcoord 0, 4
ld b, 10
- ld c, 9
+ ld c, 9
call ClearBox
hlcoord 0, 14
- ld b, 2
- ld c, 8
+ ld b, 2
+ ld c, 8
call ClearBox
ret
@@ -1854,7 +1854,7 @@
ld h, b
ld de, wStringBuffer1
call PlaceString
- ld a, $e7
+ ld a, "!"
ld [bc], a
ld c, 50
call DelayFrames
@@ -1913,7 +1913,7 @@
call PlaceString
ld l, c
ld h, b
- ld [hl], $e7
+ ld [hl], "!"
ld c, 50
call DelayFrames
ret
--- a/home/string.asm
+++ b/home/string.asm
@@ -6,7 +6,7 @@
InitName::
; Intended for names, so this function is limited to ten characters.
push hl
- ld c, 10
+ ld c, NAME_LENGTH - 1
_InitString::
; 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.
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -3796,9 +3796,9 @@
call BattleTowerRoomMenu_IncrementJumptable
BattleTowerRoomMenu_DelayRestartMenu:
- ; Loops while (--[wcd50] != 0),
- ; to create some sort of "delay" after the message is written on the screen,
- ; before starting the menu again.
+ ; Loops while (--[wcd50] != 0),
+ ; to create some sort of "delay" after the message is written on the screen,
+ ; before starting the menu again.
ld hl, wcd50
dec [hl]
ret nz