diff options
Diffstat (limited to 'maps/CeladonMansion2F.asm')
| -rw-r--r-- | maps/CeladonMansion2F.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index e463c5b07..f230404de 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,9 +1,7 @@ CeladonMansion2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonMansion2FComputer: jumptext CeladonMansion2FComputerText @@ -50,24 +48,19 @@ CeladonMansion2FSignText: done CeladonMansion2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 0, 4, CELADON_MANSION_1F - warp_def 1, 0, 2, CELADON_MANSION_3F - warp_def 6, 0, 3, CELADON_MANSION_3F - warp_def 7, 0, 5, CELADON_MANSION_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer - bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign - bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf - -.ObjectEvents: - db 0 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 0, CELADON_MANSION_1F, 4 + warp_event 1, 0, CELADON_MANSION_3F, 2 + warp_event 6, 0, CELADON_MANSION_3F, 3 + warp_event 7, 0, CELADON_MANSION_1F, 5 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer + bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign + bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf + + db 0 ; object events |