diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-10 17:08:43 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-10 17:08:43 -0400 |
commit | 9ab257572793d5cdcd8156ca9e1566613ab72814 (patch) | |
tree | 022ac10e3e51bf17c5d3e3ccfc851a7e26416ec2 | |
parent | cdafd41ef058186c41fced65f76285378213dfb8 (diff) |
predef_id -> lda_predef, for consistency with lda_coord and map_id
-rw-r--r-- | engine/link/mystery_gift.asm | 2 | ||||
-rw-r--r-- | macros/predef.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 83c5a06de..5f09cd2a0 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -1107,7 +1107,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 diff --git a/macros/predef.asm b/macros/predef.asm index 7850350a7..a1c43bb51 100644 --- a/macros/predef.asm +++ b/macros/predef.asm @@ -1,15 +1,15 @@ -predef_id: MACRO +lda_predef: MACRO ; Some functions load the predef id ; without immediately calling Predef. ld a, (\1Predef - PredefPointers) / 3 ENDM predef: MACRO - predef_id \1 + lda_predef \1 call Predef ENDM predef_jump: MACRO - predef_id \1 + lda_predef \1 jp Predef ENDM |