diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/items/item_effects.asm | 3 | ||||
| -rw-r--r-- | engine/overworld/dust_smoke.asm | 24 |
3 files changed, 12 insertions, 17 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 5cb4fa13..8eee39d2 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6308,7 +6308,7 @@ LoadPlayerBackPic: ld de, OldManPicBack .next ld a, BANK(RedPicBack) - assert BANK(RedPicBack) == BANK(OldManPicBack) + ASSERT BANK(RedPicBack) == BANK(OldManPicBack) call UncompressSpriteFromDE predef ScaleSpriteByTwo ld hl, wOAMBuffer diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 38ea37c0..8114db2b 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -2614,9 +2614,10 @@ IsKeyItem_:: jr nc, .checkIfItemIsHM ; if the item is not an HM or TM push af - ld hl, KeyItemBitfield + ld hl, KeyItemFlags ld de, wBuffer ld bc, 15 ; only 11 bytes are actually used + ASSERT 15 >= (NUM_ITEMS + 7) / 8 call CopyData pop af dec a diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm index a20a0591..bb291567 100644 --- a/engine/overworld/dust_smoke.asm +++ b/engine/overworld/dust_smoke.asm @@ -51,22 +51,16 @@ GetMoveBoulderDustFunctionPointer: pop hl ret -MoveBoulderDustFunctionPointerTable: -; facing down - db $FF,$00 - dw AdjustOAMBlockYPos - -; facing up - db $01,$00 - dw AdjustOAMBlockYPos +boulder_dust_adjust: MACRO + db \1, \2 ; coords + dw \3 ; function +ENDM -; facing left - db $01,$01 - dw AdjustOAMBlockXPos - -; facing right - db $FF,$01 - dw AdjustOAMBlockXPos +MoveBoulderDustFunctionPointerTable: + boulder_dust_adjust -1, 0, AdjustOAMBlockYPos ; down + boulder_dust_adjust 1, 0, AdjustOAMBlockYPos ; up + boulder_dust_adjust 1, 1, AdjustOAMBlockXPos ; left + boulder_dust_adjust -1, 1, AdjustOAMBlockXPos ; right LoadSmokeTileFourTimes:: ld hl, vChars1 tile $7c |