diff options
Diffstat (limited to 'maps/RuinsOfAlphInnerChamber.asm')
| -rw-r--r-- | maps/RuinsOfAlphInnerChamber.asm | 93 |
1 files changed, 43 insertions, 50 deletions
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 27e696a85..7f5348633 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHINNERCHAMBER_FISHER const RUINSOFALPHINNERCHAMBER_TEACHER const RUINSOFALPHINNERCHAMBER_GRAMPS RuinsOfAlphInnerChamber_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .UnownAppear + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_RUINSOFALPHINNERCHAMBER_NOTHING + scene_script .UnownAppear ; SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -24,7 +22,7 @@ RuinsOfAlphInnerChamber_MapScripts: writetext RuinsOfAlphStrangePresenceText waitbutton closetext - setscene 0 + setscene SCENE_RUINSOFALPHINNERCHAMBER_NOTHING setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER end @@ -77,55 +75,50 @@ RuinsOfAlphInnerChamberStatueText: done RuinsOfAlphInnerChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 10, 13, 5, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER - -.CoordEvents: - db 0 - -.BGEvents: - db 26 - bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 11, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 14, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 17, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 11, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 14, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 17, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + db 0, 0 ; filler + + db 9 ; warp events + warp_event 10, 13, RUINS_OF_ALPH_OUTSIDE, 5 + warp_event 3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3 + warp_event 4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4 + warp_event 15, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 3 + warp_event 16, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 4 + warp_event 3, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 3 + warp_event 4, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 4 + warp_event 15, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 3 + warp_event 16, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4 + + db 0 ; coord events + + db 26 ; bg events + bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 11, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 14, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 17, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 11, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 14, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 17, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 11, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 14, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 11, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue -.ObjectEvents: - db 3 - object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + db 3 ; object events + object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS |