diff options
Diffstat (limited to 'maps/CinnabarIsland.asm')
| -rw-r--r-- | maps/CinnabarIsland.asm | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index ed4765d18..54656768b 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const CINNABARISLAND_BLUE CinnabarIsland_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -35,7 +33,7 @@ CinnabarIslandPokecenterSign: jumpstd pokecentersign CinnabarIslandHiddenRareCandy: - hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY CinnabarIslandBlueTeleport: teleport_from @@ -128,23 +126,18 @@ CinnabarIslandSignText: done CinnabarIsland_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 11, 11, 1, CINNABAR_POKECENTER_1F + db 1 ; warp events + warp_event 11, 11, CINNABAR_POKECENTER_1F, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 12, 11, BGEVENT_READ, CinnabarIslandPokecenterSign - bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign - bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign - bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy + bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign + bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign + bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy -.ObjectEvents: - db 1 - object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR + db 1 ; object events + object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR |