diff options
Diffstat (limited to 'maps/OaksLab.asm')
| -rw-r--r-- | maps/OaksLab.asm | 81 |
1 files changed, 37 insertions, 44 deletions
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index d78641c28..1931747e5 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const OAKSLAB_OAK const OAKSLAB_SCIENTIST1 const OAKSLAB_SCIENTIST2 const OAKSLAB_SCIENTIST3 OaksLab_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -26,14 +24,14 @@ Oak: setevent EVENT_TALKED_TO_OAK_IN_KANTO .CheckBadges: checkcode VAR_BADGES - if_equal NUM_BADGES, .OpenMtSilver - if_equal NUM_JOHTO_BADGES, .Complain + ifequal NUM_BADGES, .OpenMtSilver + ifequal NUM_JOHTO_BADGES, .Complain jump .AhGood .CheckPokedex: writetext OakLabDexCheckText waitbutton - special Special_ProfOaksPCBoot + special ProfOaksPCBoot writetext OakLabGoodbyeText waitbutton closetext @@ -257,39 +255,34 @@ OaksLabPCText: done OaksLab_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 11, 3, PALLET_TOWN - warp_def 5, 11, 3, PALLET_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 16 - bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 9, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 0, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 2, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 3, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 6, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 8, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 9, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 4, 0, BGEVENT_READ, OaksLabPoster1 - bg_event 5, 0, BGEVENT_READ, OaksLabPoster2 - bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan - bg_event 0, 1, BGEVENT_READ, OaksLabPC - -.ObjectEvents: - db 4 - 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 - object_event 1, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 11, PALLET_TOWN, 3 + warp_event 5, 11, PALLET_TOWN, 3 + + db 0 ; coord events + + db 16 ; bg events + bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 9, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 0, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 2, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 3, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 6, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 8, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 9, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 4, 0, BGEVENT_READ, OaksLabPoster1 + bg_event 5, 0, BGEVENT_READ, OaksLabPoster2 + bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan + bg_event 0, 1, BGEVENT_READ, OaksLabPC + + db 4 ; 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 + object_event 1, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1 |