diff options
| author | dannye <33dannye@gmail.com> | 2021-05-31 16:43:31 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-05-31 16:51:45 -0500 |
| commit | 7a23e2a635318754b56923824d5949bcff3815bf (patch) | |
| tree | 6e57c5b6762b76ce8e18e8b08dace841f640a01d /engine/overworld | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| parent | Merge pull request #325 from CelestialAmber/master (diff) | |
| download | pokeyellow-7a23e2a635318754b56923824d5949bcff3815bf.tar.gz pokeyellow-7a23e2a635318754b56923824d5949bcff3815bf.tar.xz pokeyellow-7a23e2a635318754b56923824d5949bcff3815bf.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/dust_smoke.asm | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm index 773def96..ed016107 100644 --- a/engine/overworld/dust_smoke.asm +++ b/engine/overworld/dust_smoke.asm @@ -53,22 +53,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 |