diff options
Diffstat (limited to 'maps/ElmsLab.asm')
| -rw-r--r-- | maps/ElmsLab.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index ea153303..17b460dd 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ELMSLAB_ELM const ELMSLAB_ELMS_AIDE const ELMSLAB_POKE_BALL1 @@ -7,7 +7,7 @@ const ELMSLAB_OFFICER ElmsLab_MapScripts: - db 6 ; scene scripts + def_scene_scripts scene_script .MeetElm ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_ELMSLAB_CANT_LEAVE scene_script .DummyScene2 ; SCENE_ELMSLAB_NOTHING @@ -15,7 +15,7 @@ ElmsLab_MapScripts: scene_script .DummyScene4 ; SCENE_ELMSLAB_UNUSED scene_script .DummyScene5 ; SCENE_ELMSLAB_AIDE_GIVES_POTION - db 0 ; callbacks + def_callbacks .MeetElm: prioritysjump .WalkUpToElm @@ -1218,11 +1218,11 @@ ElmsLabTrashcanText: ElmsLab_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 11, NEW_BARK_TOWN, 1 warp_event 5, 11, NEW_BARK_TOWN, 1 - db 8 ; coord events + def_coord_events coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript coord_event 5, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript coord_event 4, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript @@ -1232,7 +1232,7 @@ ElmsLab_MapEvents: coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1 coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2 - db 15 ; bg events + def_bg_events bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf @@ -1249,7 +1249,7 @@ ElmsLab_MapEvents: bg_event 9, 3, BGEVENT_READ, ElmsLabTrashcan bg_event 5, 0, BGEVENT_READ, ElmsLabWindow - db 6 ; object events + def_object_events object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1 object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB |