diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 13:12:56 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 13:12:56 -0400 |
| commit | 9f01e33a0428f8a8c206b3f6018f526a41d65b43 (patch) | |
| tree | 7f3c8606ebbe0f882955761a899ec9f819412c17 /engine/link | |
| parent | 0bc1e91d217fb1a724c08ed6c5826c2379f10507 (diff) | |
Port miscellaneous recent updates from pokecrystal
Diffstat (limited to 'engine/link')
| -rw-r--r-- | engine/link/link.asm | 4 | ||||
| -rw-r--r-- | engine/link/mystery_gift.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm index 11657f4e..79571fa4 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -1427,10 +1427,10 @@ Function28a16: ld bc, SCREEN_WIDTH - 2 call ByteFill hlcoord 2, 16 - ld de, .Cancel + ld de, .CancelString jp PlaceString -.Cancel: +.CancelString: db "CANCEL@" Function28a3c: diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 55a35982..92f67093 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -979,7 +979,7 @@ MysteryGift_CheckAndSetDecorationAlreadyReceived: ld d, $0 ld b, CHECK_FLAG ld hl, sMysteryGiftDecorationsReceived - predef_id SmallFarFlagAction + lda_predef SmallFarFlagAction push hl push bc call Predef |