pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Make wMysteryGift*GameVersion constants consistent

Browse Source
This commit is contained in:
mid-kid 2023-03-30 05:15:35 +02:00
parent a6ac67dea2
commit c8e9a82190
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/link/mystery_gift.asm
View File

@ -76,7 +76,7 @@ endc
jp z, .LinkCanceled jp z, .LinkCanceled
cp MG_OKAY cp MG_OKAY
jp nz, .CommunicationError jp nz, .CommunicationError
ld a, [wMysteryGiftGameVersion] ld a, [wMysteryGiftPartnerGameVersion]
cp POKEMON_PIKACHU_2_VERSION cp POKEMON_PIKACHU_2_VERSION
jr z, .skip_checks jr z, .skip_checks
call .CheckAlreadyGotFiveGiftsToday call .CheckAlreadyGotFiveGiftsToday
@ -92,11 +92,11 @@ endc
ld a, [wMysteryGiftPartnerBackupItem] ld a, [wMysteryGiftPartnerBackupItem]
and a and a
jp nz, .FriendNotReady jp nz, .FriendNotReady
ld a, [wMysteryGiftGameVersion] ld a, [wMysteryGiftPartnerGameVersion]
cp POKEMON_PIKACHU_2_VERSION cp POKEMON_PIKACHU_2_VERSION
jr z, .skip_append_save jr z, .skip_append_save
call .AddMysteryGiftPartnerID call .AddMysteryGiftPartnerID
ld a, [wMysteryGiftGameVersion] ld a, [wMysteryGiftPartnerGameVersion]
cp RESERVED_GAME_VERSION cp RESERVED_GAME_VERSION
jr z, .skip_append_save jr z, .skip_append_save
call .SaveMysteryGiftTrainerName call .SaveMysteryGiftTrainerName
@ -307,7 +307,7 @@ endc
ldh a, [hMGRole] ldh a, [hMGRole]
cp IR_SENDER cp IR_SENDER
jr z, SenderExchangeMysteryGiftDataPayloads jr z, SenderExchangeMysteryGiftDataPayloads
; receiver
ld hl, hMGExchangedByte ld hl, hMGExchangedByte
ld b, 1 ld b, 1
call TryReceivingIRDataBlock call TryReceivingIRDataBlock
@ -522,7 +522,7 @@ EndOrContinueMysteryGiftIRCommunication:
ldh a, [hMGRole] ldh a, [hMGRole]
cp IR_SENDER cp IR_SENDER
jr z, .sender jr z, .sender
; receiver
call BeginReceivingIRCommunication call BeginReceivingIRCommunication
jr nz, EndOrContinueMysteryGiftIRCommunication jr nz, EndOrContinueMysteryGiftIRCommunication
jp ReceiverExchangeMysteryGiftDataPayloads jp ReceiverExchangeMysteryGiftDataPayloads
@ -563,7 +563,7 @@ ExchangeNameCardData:
ldh a, [hMGRole] ldh a, [hMGRole]
cp IR_SENDER cp IR_SENDER
jr z, .sender jr z, .sender
; receiver
; Receive the data payload ; Receive the data payload
call ReceiveNameCardDataPayload call ReceiveNameCardDataPayload
jp nz, EndNameCardIRCommunication jp nz, EndNameCardIRCommunication

4
ram/wram.asm
View File

@ -1073,7 +1073,7 @@ ENDU
ds 138 ds 138
wMysteryGiftPartnerData:: wMysteryGiftPartnerData::
wMysteryGiftGameVersion:: db wMysteryGiftPartnerGameVersion:: db
wMysteryGiftPartnerID:: dw wMysteryGiftPartnerID:: dw
wMysteryGiftPartnerName:: ds NAME_LENGTH wMysteryGiftPartnerName:: ds NAME_LENGTH
wMysteryGiftPartnerDexCaught:: db wMysteryGiftPartnerDexCaught:: db
@ -1087,7 +1087,7 @@ wMysteryGiftPartnerDataEnd::
ds 60 ds 60
wMysteryGiftPlayerData:: wMysteryGiftPlayerData::
ds 1 wMysteryGiftPlayerGameVersion:: db
wMysteryGiftPlayerID:: dw wMysteryGiftPlayerID:: dw
wMysteryGiftPlayerName:: ds NAME_LENGTH wMysteryGiftPlayerName:: ds NAME_LENGTH
wMysteryGiftPlayerDexCaught:: db wMysteryGiftPlayerDexCaught:: db