#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
This commit is contained in:
mid-kid
2019-10-20 22:24:17 +00:00
committed by Rangi
parent 3fc2ba41f7
commit e3e0bcd653
203 changed files with 4077 additions and 4598 deletions

View File

@@ -235,13 +235,12 @@ Function4a94e:
.asm_4a9b0
ld de, SFX_WRONG
call PlaySFX
ld hl, UnknownText_0x4a9be
ld hl, MobilePickThreeMonForBattle
call PrintText
jr .asm_4a974
UnknownText_0x4a9be:
; Pick three #MON for battle.
text_far UnknownText_0x1c51d7
MobilePickThreeMonForBattle:
text_far _MobilePickThreeMonForBattle
text_end
Function4a9c3:
@@ -287,14 +286,13 @@ Function4a9d7:
ld de, wd012
ld bc, 6
call CopyBytes
ld hl, UnknownText_0x4aa1d
ld hl, MobileUseTheseThreeMonText
call PrintText
call YesNoBox
ret
UnknownText_0x4aa1d:
; , @ and @ . Use these three?
text_far UnknownText_0x1c51f4
MobileUseTheseThreeMonText:
text_far _MobileUseTheseThreeMonText
text_end
Function4aa22:
@@ -772,7 +770,7 @@ Function4ad17:
jr z, .asm_4ad39
ld de, SFX_WRONG
call WaitPlaySFX
ld hl, UnknownText_0x4ad51
ld hl, MobileOnlyThreeMonMayEnterText
call PrintText
ret
@@ -792,9 +790,8 @@ Function4ad17:
call Function4adc2
ret
UnknownText_0x4ad51:
; Only three #MON may enter.
text_far UnknownText_0x1c521c
MobileOnlyThreeMonMayEnterText:
text_far _MobileOnlyThreeMonMayEnterText
text_end
Function4ad56: