diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-15 12:26:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 12:26:16 -0400 |
| commit | e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch) | |
| tree | d8a157ae5aa323a00873efe79eb4693327b8bb70 /data/predef_pointers.asm | |
| parent | aa97e196dd5b37e89db5ddf154dc7aea9b02a045 (diff) | |
| parent | 93d0697f37aca8ed7a21298a980876af6d43268b (diff) | |
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/predef_pointers.asm')
| -rw-r--r-- | data/predef_pointers.asm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 9d206a48..3c74050d 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -1,7 +1,10 @@ add_predef: MACRO \1Predef:: - db BANK(\1) - dw \1 +IF _NARG == 1 + dba \1 +ELSE + dbw \2, \1 +ENDC ENDM PredefPointers:: @@ -13,7 +16,7 @@ PredefPointers:: add_predef ScaleSpriteByTwo add_predef LoadMonBackPic add_predef CopyDownscaledMonTiles - dbw $03,JumpMoveEffect ; wrong bank + add_predef JumpMoveEffect, $03 ; wrong bank add_predef HealParty add_predef MoveAnimation add_predef DivideBCDPredef @@ -36,8 +39,8 @@ PredefPointers:: add_predef LearnMoveFromLevelUp add_predef LearnMove add_predef GetQuantityOfItemInBag - dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; home bank - dbw $03,GiveItem ; home bank + add_predef CheckForHiddenObjectOrBookshelfOrCardKeyDoor, $03 ; home bank + add_predef GiveItem, $03 ; home bank add_predef ChangeBGPalColor0_4Frames add_predef FindPathToPlayer add_predef PredefShakeScreenVertically @@ -94,8 +97,8 @@ PredefPointers:: add_predef DoInGameTradeDialogue add_predef HallOfFamePC add_predef DisplayDexRating - dbw $1E, _LeaveMapAnim ; wrong bank - dbw $1E, EnterMapAnim ; wrong bank + add_predef _LeaveMapAnim, $1E ; wrong bank + add_predef EnterMapAnim, $1E ; wrong bank add_predef GetTileTwoStepsInFrontOfPlayer add_predef CheckForCollisionWhenPushingBoulder add_predef PrintStrengthTxt |