diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
| commit | d24f1c71149b59c50dba57e500f30b223a54a25f (patch) | |
| tree | 140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/UnionCaveB2F.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/UnionCaveB2F.asm')
| -rw-r--r-- | maps/UnionCaveB2F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 59a3cd02..78ada5bf 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const UNIONCAVEB2F_ROCKER const UNIONCAVEB2F_COOLTRAINER_F1 const UNIONCAVEB2F_COOLTRAINER_F2 @@ -7,9 +7,9 @@ const UNIONCAVEB2F_LAPRAS UnionCaveB2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .Lapras .Lapras: @@ -142,14 +142,14 @@ CooltrainerfEmmaAfterBattleText: UnionCaveB2F_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 5, 3, UNION_CAVE_B1F, 5 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 6 ; object events + def_object_events object_event 17, 23, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermNick, -1 object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 object_event 3, 28, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfEmma, -1 |