summaryrefslogtreecommitdiff
path: root/data/maps/objects/SSAnneB1F.asm
diff options
context:
space:
mode:
authorYoann Fievez <yoann.fievez@gmail.com>2021-09-27 04:56:09 +0200
committerGitHub <noreply@github.com>2021-09-26 21:56:09 -0500
commit2c4f35848b786864822a3f211df91de30a2857c9 (patch)
treefcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/SSAnneB1F.asm
parentf1285f8584ce7ff50ceb5e3134c0efc867209096 (diff)
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289 * Rename warp to warp_event * Replace object to object_event * Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
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