From c8e9a82190fcb8687e3e48c1268f4b888e536f57 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Thu, 30 Mar 2023 05:15:35 +0200 Subject: [PATCH] Make wMysteryGift*GameVersion constants consistent --- engine/link/mystery_gift.asm | 12 ++++++------ ram/wram.asm | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index abbc72c1f..6786dc35b 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -76,7 +76,7 @@ endc jp z, .LinkCanceled cp MG_OKAY jp nz, .CommunicationError - ld a, [wMysteryGiftGameVersion] + ld a, [wMysteryGiftPartnerGameVersion] cp POKEMON_PIKACHU_2_VERSION jr z, .skip_checks call .CheckAlreadyGotFiveGiftsToday @@ -92,11 +92,11 @@ endc ld a, [wMysteryGiftPartnerBackupItem] and a jp nz, .FriendNotReady - ld a, [wMysteryGiftGameVersion] + ld a, [wMysteryGiftPartnerGameVersion] cp POKEMON_PIKACHU_2_VERSION jr z, .skip_append_save call .AddMysteryGiftPartnerID - ld a, [wMysteryGiftGameVersion] + ld a, [wMysteryGiftPartnerGameVersion] cp RESERVED_GAME_VERSION jr z, .skip_append_save call .SaveMysteryGiftTrainerName @@ -307,7 +307,7 @@ endc ldh a, [hMGRole] cp IR_SENDER jr z, SenderExchangeMysteryGiftDataPayloads -; receiver + ld hl, hMGExchangedByte ld b, 1 call TryReceivingIRDataBlock @@ -522,7 +522,7 @@ EndOrContinueMysteryGiftIRCommunication: ldh a, [hMGRole] cp IR_SENDER jr z, .sender -; receiver + call BeginReceivingIRCommunication jr nz, EndOrContinueMysteryGiftIRCommunication jp ReceiverExchangeMysteryGiftDataPayloads @@ -563,7 +563,7 @@ ExchangeNameCardData: ldh a, [hMGRole] cp IR_SENDER jr z, .sender -; receiver + ; Receive the data payload call ReceiveNameCardDataPayload jp nz, EndNameCardIRCommunication diff --git a/ram/wram.asm b/ram/wram.asm index b0f39ecc7..70157f434 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1073,7 +1073,7 @@ ENDU ds 138 wMysteryGiftPartnerData:: -wMysteryGiftGameVersion:: db +wMysteryGiftPartnerGameVersion:: db wMysteryGiftPartnerID:: dw wMysteryGiftPartnerName:: ds NAME_LENGTH wMysteryGiftPartnerDexCaught:: db @@ -1087,7 +1087,7 @@ wMysteryGiftPartnerDataEnd:: ds 60 wMysteryGiftPlayerData:: - ds 1 +wMysteryGiftPlayerGameVersion:: db wMysteryGiftPlayerID:: dw wMysteryGiftPlayerName:: ds NAME_LENGTH wMysteryGiftPlayerDexCaught:: db