diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-26 16:31:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 16:31:02 -0400 |
| commit | 553cb9bc82e751da5fa940d797aaf474d998f8a4 (patch) | |
| tree | c3a35971e9c5bbd274d61728f2cf4882eb65e40c /maps/OaksLab.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
| parent | 35821ec58c244be1f5cb670e07873e8a875c10a5 (diff) | |
Merge pull request #754 from Rangi42/master
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/OaksLab.asm')
| -rw-r--r-- | maps/OaksLab.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index a6a2539e6..06d2345f5 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const OAKSLAB_OAK const OAKSLAB_SCIENTIST1 const OAKSLAB_SCIENTIST2 const OAKSLAB_SCIENTIST3 OaksLab_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -257,13 +257,13 @@ OaksLabPCText: OaksLab_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 11, PALLET_TOWN, 3 warp_event 5, 11, PALLET_TOWN, 3 - db 0 ; coord events + def_coord_events - db 16 ; bg events + def_bg_events bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf @@ -281,7 +281,7 @@ OaksLab_MapEvents: bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan bg_event 0, 1, BGEVENT_READ, OaksLabPC - db 4 ; object events + def_object_events object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 |