Skip to content

Commit

Permalink
Misc fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mid-kid committed Jun 4, 2019
1 parent 3090795 commit b627740
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
3 changes: 1 addition & 2 deletions data/text/battle.asm
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,8 @@ BecameConfusedText:
text "<TARGET>"
line "became confused!"
prompt
; ItemHealedConfusion

BattleText_ItemHealedConfusion: ; ItemHealedConfusion
BattleText_ItemHealedConfusion:
text "A @"
text_ram wStringBuffer1
text " rid"
Expand Down
2 changes: 1 addition & 1 deletion data/text/common_2.asm
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ UnknownText_0x1c0df3::

UnknownText_0x1c0e24::
text "It's @"
text_ram wBreedMon1
text_ram wBreedMon1Nick
text_start
line "that was left with"
cont "the DAY-CARE MAN."
Expand Down
14 changes: 7 additions & 7 deletions engine/pokemon/bills_pc.asm
Original file line number Diff line number Diff line change
Expand Up @@ -241,16 +241,16 @@ BillsPCDepositMenuHeader:

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

Expand Down Expand Up @@ -1854,7 +1854,7 @@ TryWithdrawPokemon:
ld h, b
ld de, wStringBuffer1
call PlaceString
ld a, $e7
ld a, "!"
ld [bc], a
ld c, 50
call DelayFrames
Expand Down Expand Up @@ -1913,7 +1913,7 @@ ReleasePKMN_ByePKMN:
call PlaceString
ld l, c
ld h, b
ld [hl], $e7
ld [hl], "!"
ld c, 50
call DelayFrames
ret
Expand Down
2 changes: 1 addition & 1 deletion home/string.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ InitString::
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.
Expand Down
6 changes: 3 additions & 3 deletions mobile/mobile_46.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3796,9 +3796,9 @@ BattleTowerRoomMenu_WaitForMessage:
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
Expand Down

0 comments on commit b627740

Please sign in to comment.