aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SSAnneB1F.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-09-26 22:38:47 -0500
committerdannye <33dannye@gmail.com>2021-09-26 22:43:09 -0500
commit501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch)
treec2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/SSAnneB1F.asm
parentSwitch from Travis CI to GitHub Actions (diff)
parentFix typos (#334) (diff)
downloadpokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz
pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz
pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/SSAnneB1F.asm')
-rw-r--r--data/maps/objects/SSAnneB1F.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm
index 619dd33c..a63caeb9 100644
--- a/data/maps/objects/SSAnneB1F.asm
+++ b/data/maps/objects/SSAnneB1F.asm
@@ -1,16 +1,16 @@
SSAnneB1F_Object:
db $c ; border block
- def_warps
- warp 23, 3, 8, SS_ANNE_B1F_ROOMS
- warp 19, 3, 6, SS_ANNE_B1F_ROOMS
- warp 15, 3, 4, SS_ANNE_B1F_ROOMS
- warp 11, 3, 2, SS_ANNE_B1F_ROOMS
- warp 7, 3, 0, SS_ANNE_B1F_ROOMS
- warp 27, 5, 9, SS_ANNE_1F
+ def_warp_events
+ warp_event 23, 3, SS_ANNE_B1F_ROOMS, 8
+ warp_event 19, 3, SS_ANNE_B1F_ROOMS, 6
+ warp_event 15, 3, SS_ANNE_B1F_ROOMS, 4
+ warp_event 11, 3, SS_ANNE_B1F_ROOMS, 2
+ warp_event 7, 3, SS_ANNE_B1F_ROOMS, 0
+ warp_event 27, 5, SS_ANNE_1F, 9
- def_signs
+ def_bg_events
- def_objects
+ def_object_events
def_warps_to SS_ANNE_B1F