diff options
Diffstat (limited to 'engine/link')
| -rw-r--r-- | engine/link/link.asm | 38 | ||||
| -rw-r--r-- | engine/link/mystery_gift.asm | 80 |
2 files changed, 57 insertions, 61 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm index 9cb29801c..077b3a9f0 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -371,13 +371,13 @@ Gen2ToGen2LinkComms: jr z, .next sub $3 jr nc, .skip - farcall DeutenEnglischenPost + farcall ConvertEnglishMailToFrenchGerman jr .next .skip cp $2 jr nc, .next - farcall HandleSpanishItalianMail + farcall ConvertEnglishMailToSpanishItalian .next pop de @@ -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: @@ -876,13 +875,13 @@ Link_PrepPartyData_Gen2: jr z, .next sub $3 jr nc, .italian_spanish - farcall HandleFrenchGermanMail + farcall ConvertFrenchGermanMailToEnglish jr .next .italian_spanish cp $2 jr nc, .next - farcall HandleSpanishItalianMail + farcall ConvertSpanishItalianMailToEnglish .next pop de @@ -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: @@ -2092,7 +2088,7 @@ EnterTimeCapsule: call DelayFrames xor a ldh [hVBlank], a - inc a + inc a ; LINK_TIMECAPSULE ld [wLinkMode], a ret diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 041127abe..7c6ce7d7b 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -33,7 +33,7 @@ DoMysteryGift: pop de hlcoord 2, 8 ld a, d - ld de, .Text_LinkCanceled ; Link has been canceled + ld de, .MysteryGiftCanceledText ; Link has been canceled cp $10 jp z, .LinkCanceled cp $6c @@ -42,10 +42,10 @@ DoMysteryGift: cp 3 jr z, .skip_checks call .CheckAlreadyGotFiveGiftsToday - ld hl, .Text_MaxFiveGifts ; Only 5 gifts a day + ld hl, .MysteryGiftFiveADayText ; Only 5 gifts a day jp nc, .PrintTextAndExit call .CheckAlreadyGotAGiftFromThatPerson - ld hl, .Text_MaxOneGiftPerPerson ; Only one gift a day per person + ld hl, .MysteryGiftOneADayText ; Only one gift a day per person jp c, .PrintTextAndExit .skip_checks ld a, [wMysteryGiftPlayerBackupItem] @@ -82,7 +82,7 @@ DoMysteryGift: ld de, wStringBuffer1 ld bc, ITEM_NAME_LENGTH call CopyBytes - ld hl, .Text_SentToHome ; sent decoration to home + ld hl, .MysteryGiftSentHomeText ; sent decoration to home jr .PrintTextAndExit .item @@ -95,24 +95,24 @@ DoMysteryGift: ld [wNamedObjectIndexBuffer], a call CloseSRAM call GetItemName - ld hl, .Text_Sent ; sent item + ld hl, .MysteryGiftSentText ; sent item jr .PrintTextAndExit .LinkCanceled: - ld hl, .Text_LinkCanceled ; Link has been canceled + ld hl, .MysteryGiftCanceledText ; Link has been canceled jr .PrintTextAndExit .CommunicationError: - ld hl, .Text_CommunicationError ; Communication error + ld hl, .MysteryGiftCommErrorText ; Communication error call PrintText jp DoMysteryGift .GiftWaiting: - ld hl, .Text_ReceiveGiftAtCounter ; receive gift at counter + ld hl, .RetrieveMysteryGiftText ; receive gift at counter jr .PrintTextAndExit .FriendNotReady: - ld hl, .Text_FriendNotReady ; friend not ready + ld hl, .YourFriendIsNotReadyText ; friend not ready .PrintTextAndExit: call PrintText @@ -127,36 +127,36 @@ DoMysteryGift: next "cancel it." db "@" -.Text_LinkCanceled: - text_far UnknownText_0x1c0436 +.MysteryGiftCanceledText: + text_far _MysteryGiftCanceledText text_end -.Text_CommunicationError: - text_far UnknownText_0x1c0454 +.MysteryGiftCommErrorText: + text_far _MysteryGiftCommErrorText text_end -.Text_ReceiveGiftAtCounter: - text_far UnknownText_0x1c046a +.RetrieveMysteryGiftText: + text_far _RetrieveMysteryGiftText text_end -.Text_FriendNotReady: - text_far UnknownText_0x1c048e +.YourFriendIsNotReadyText: + text_far _YourFriendIsNotReadyText text_end -.Text_MaxFiveGifts: - text_far UnknownText_0x1c04a7 +.MysteryGiftFiveADayText: + text_far _MysteryGiftFiveADayText text_end -.Text_MaxOneGiftPerPerson: - text_far UnknownText_0x1c04c6 +.MysteryGiftOneADayText: + text_far _MysteryGiftOneADayText text_end -.Text_Sent: - text_far UnknownText_0x1c04e9 +.MysteryGiftSentText: + text_far _MysteryGiftSentText text_end -.Text_SentToHome: - text_far UnknownText_0x1c04fa +.MysteryGiftSentHomeText: + text_far _MysteryGiftSentHomeText text_end .CheckAlreadyGotFiveGiftsToday: @@ -1425,15 +1425,15 @@ Function105688: ld c, 60 call DelayFrames call Function105777 - ld hl, Text_ReceivedCard + ld hl, MysteryGiftReceivedCardText call PrintText ld de, wMysteryGiftTrainerData farcall Function8ac70 ld a, c ld [wDeciramBuffer], a - ld hl, Text_CardNotRegistered + ld hl, MysteryGiftNotRegisteredCardText jr c, PrintTextAndExit_JP - ld hl, Text_ListedCardAsNumber + ld hl, MysteryGiftListedCardText jr PrintTextAndExit_JP Function1056eb: @@ -1467,12 +1467,12 @@ endr Function105712: call Function105777 - ld hl, Text_MGLinkCanceled + ld hl, MysteryGiftLinkCancelledText jr PrintTextAndExit_JP Function10571a: call Function105777 - ld hl, Text_MGCommError + ld hl, MysteryGiftLinkCommErrorText call PrintText jp Function105688 @@ -1489,24 +1489,24 @@ String_PressAToLink_BToCancel_JP: next "つうしん<WO>ちゅうし します" db "@" -Text_ReceivedCard: - text_far UnknownText_0x1c051a +MysteryGiftReceivedCardText: + text_far _MysteryGiftReceivedCardText text_end -Text_ListedCardAsNumber: - text_far UnknownText_0x1c0531 +MysteryGiftListedCardText: + text_far _MysteryGiftListedCardText text_end -Text_CardNotRegistered: - text_far UnknownText_0x1c0555 +MysteryGiftNotRegisteredCardText: + text_far _MysteryGiftNotRegisteredCardText text_end -Text_MGLinkCanceled: - text_far UnknownText_0x1c0573 +MysteryGiftLinkCancelledText: + text_far _MysteryGiftLinkCancelledText text_end -Text_MGCommError: - text_far UnknownText_0x1c0591 +MysteryGiftLinkCommErrorText: + text_far _MysteryGiftLinkCommErrorText text_end Function105777: |