diff options
Diffstat (limited to 'data/maps/objects/Stand.asm')
| -rw-r--r-- | data/maps/objects/Stand.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/maps/objects/Stand.asm b/data/maps/objects/Stand.asm index 029a4b1..b40dd40 100644 --- a/data/maps/objects/Stand.asm +++ b/data/maps/objects/Stand.asm @@ -9,21 +9,21 @@ SECTION "data/maps/objects/Stand.asm", ROMX Stand_MapEvents:: dw $4000 ; unknown - db 10 ; warp events - warp_event 24, 17, 1, STAND_LAB, wOverworldMapBlocks + 247 - warp_event 33, 20, 1, STAND_POKECENTER_1F, wOverworldMapBlocks + 303 - warp_event 16, 21, 1, STAND_OFFICE, wOverworldMapBlocks + 295 - warp_event 35, 26, 1, STAND_MART, wOverworldMapBlocks + 382 - warp_event 26, 29, 1, STAND_HOUSE, wOverworldMapBlocks + 404 - warp_event 17, 31, 1, STAND_ROCKET_HOUSE_1F, wOverworldMapBlocks + 425 - warp_event 34, 31, 1, STAND_LEAGUE_1F, wOverworldMapBlocks + 434 - warp_event 35, 31, 2, STAND_LEAGUE_1F, wOverworldMapBlocks + 434 - warp_event 30, 13, 1, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 198 - warp_event 31, 13, 2, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 198 + def_warp_events + warp_event 24, 17, STAND_LAB, 1, 247 + warp_event 33, 20, STAND_POKECENTER_1F, 1, 303 + warp_event 16, 21, STAND_OFFICE, 1, 295 + warp_event 35, 26, STAND_MART, 1, 382 + warp_event 26, 29, STAND_HOUSE, 1, 404 + warp_event 17, 31, STAND_ROCKET_HOUSE_1F, 1, 425 + warp_event 34, 31, STAND_LEAGUE_1F, 1, 434 + warp_event 35, 31, STAND_LEAGUE_1F, 2, 434 + warp_event 30, 13, BULL_FOREST_ROUTE_GATE_STAND, 1, 198 + warp_event 31, 13, BULL_FOREST_ROUTE_GATE_STAND, 2, 198 - db 10 ; bg events - bg_event 8, 8, 0, 1 - bg_event 14, 8, 0, 2 + def_bg_events + bg_event 8, 8, 0, 1 + bg_event 14, 8, 0, 2 bg_event 20, 10, 0, 3 bg_event 16, 16, 0, 4 bg_event 10, 20, 0, 5 @@ -33,16 +33,16 @@ Stand_MapEvents:: bg_event 36, 26, 0, 9 bg_event 32, 35, 0, 10 - db 9 ; person events + def_object_events object_event 10, 10, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 17, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 28, 19, SPRITE_ROCKER, FACE_RIGHT, 0, 3, -1, -1, 0, 0, 0, 0, 0, 0 object_event 30, 31, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 21, 8, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 6, SPRITE_PIPPI, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 21, 8, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 6, SPRITE_PIPPI, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 15, SPRITE_POPPO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 21, SPRITE_SIDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 21, SPRITE_SIDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 Stand_Blocks:: INCBIN "maps/Stand.blk" |