aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/powerplant.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
commitd271d6917549074e721f3e5064b77e1ad1dbe44a (patch)
treecee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/powerplant.asm
parentAdd pokegold and pokefirered. (diff)
downloadpokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.gz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.xz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.zip
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/powerplant.asm')
-rwxr-xr-xdata/mapObjects/powerplant.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm
index a04cb657..01fc94c7 100755
--- a/data/mapObjects/powerplant.asm
+++ b/data/mapObjects/powerplant.asm
@@ -2,9 +2,9 @@ PowerPlantObject:
db $2e ; border block
db $3 ; warps
- db $23, $4, $3, $ff
- db $23, $5, $3, $ff
- db $b, $0, $3, $ff
+ warp $4, $23, $3, $ff
+ warp $5, $23, $3, $ff
+ warp $0, $b, $3, $ff
db $0 ; signs
@@ -25,6 +25,6 @@ PowerPlantObject:
object SPRITE_BALL, $14, $20, STAY, NONE, $e, TM_33
; warp-to
- EVENT_DISP POWER_PLANT_WIDTH, $23, $4
- EVENT_DISP POWER_PLANT_WIDTH, $23, $5
- EVENT_DISP POWER_PLANT_WIDTH, $b, $0
+ warp_to $4, $23, POWER_PLANT_WIDTH
+ warp_to $5, $23, POWER_PLANT_WIDTH
+ warp_to $0, $b, POWER_PLANT_WIDTH