#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

@@ -475,7 +475,7 @@ Gen2ToGen2LinkComms:
jp InitTradeMenuDisplay
LinkTimeout:
ld de, .TooMuchTimeHasElapsed
ld de, .LinkTimeoutText
ld b, 10
.loop
call DelayFrame
@@ -505,9 +505,8 @@ LinkTimeout:
call WaitBGMap2
ret
.TooMuchTimeHasElapsed:
; Too much time has elapsed. Please try again.
text_far UnknownText_0x1c4183
.LinkTimeoutText:
text_far _LinkTimeoutText
text_end
ExchangeBytes:
@@ -1446,7 +1445,7 @@ Function28926:
ld c, 18
call LinkTextboxAtHL
farcall Link_WaitBGMap
ld hl, .Text_CantTradeLastMon
ld hl, .LinkTradeCantBattleText
bccoord 1, 14
call PlaceHLTextAtBC
jr .cancel_trade
@@ -1468,7 +1467,7 @@ Function28926:
ld c, 18
call LinkTextboxAtHL
farcall Link_WaitBGMap
ld hl, .Text_Abnormal
ld hl, .LinkAbnormalMonText
bccoord 1, 14
call PlaceHLTextAtBC
@@ -1487,17 +1486,15 @@ Function28926:
call DelayFrames
jp InitTradeMenuDisplay
.Text_CantTradeLastMon:
; If you trade that #MON, you won't be able to battle.
text_far UnknownText_0x1c41b1
.LinkTradeCantBattleText:
text_far _LinkTradeCantBattleText
text_end
.String_Stats_Trade:
db "STATS TRADE@"
.Text_Abnormal:
; Your friend's @ appears to be abnormal!
text_far UnknownText_0x1c41e6
.LinkAbnormalMonText:
text_far _LinkAbnormalMonText
text_end
Function28ac9:
@@ -1633,7 +1630,7 @@ LinkTrade:
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, UnknownText_0x28eb8
ld hl, LinkAskTradeForText
bccoord 1, 14
call PlaceHLTextAtBC
call LoadStandardMenuHeader
@@ -1948,9 +1945,8 @@ String28eab:
db "TRADE"
next "CANCEL@"
UnknownText_0x28eb8:
; Trade @ for @ ?
text_far UnknownText_0x1c4212
LinkAskTradeForText:
text_far _LinkAskTradeForText
text_end
String28ebd: