diff options
Diffstat (limited to 'data/maps/objects/Haiteku.asm')
| -rw-r--r-- | data/maps/objects/Haiteku.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/objects/Haiteku.asm b/data/maps/objects/Haiteku.asm index 1207b6a..e2ce022 100644 --- a/data/maps/objects/Haiteku.asm +++ b/data/maps/objects/Haiteku.asm @@ -8,19 +8,19 @@ SECTION "data/maps/objects/Haiteku.asm", ROMX Haiteku_MapEvents:: dw $4000 ; unknown - db 9 ; warp events - warp_event 31, 10, 1, HAITEKU_POKECENTER_1F, wOverworldMapBlocks + 172 - warp_event 10, 11, 1, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 162 - warp_event 11, 11, 2, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 162 - warp_event 31, 16, 1, HAITEKU_MART, wOverworldMapBlocks + 250 - warp_event 7, 17, 1, HAITEKU_HOUSE_1, wOverworldMapBlocks + 238 - warp_event 15, 17, 1, HAITEKU_HOUSE_2, wOverworldMapBlocks + 242 - warp_event 33, 20, 1, HAITEKU_IMPOSTER_OAK_HOUSE, wOverworldMapBlocks + 303 - warp_event 6, 27, 1, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 368 - warp_event 7, 27, 2, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 368 + def_warp_events + warp_event 31, 10, HAITEKU_POKECENTER_1F, 1, 172 + warp_event 10, 11, HAITEKU_LEAGUE_1F, 1, 162 + warp_event 11, 11, HAITEKU_LEAGUE_1F, 2, 162 + warp_event 31, 16, HAITEKU_MART, 1, 250 + warp_event 7, 17, HAITEKU_HOUSE_1, 1, 238 + warp_event 15, 17, HAITEKU_HOUSE_2, 1, 242 + warp_event 33, 20, HAITEKU_IMPOSTER_OAK_HOUSE, 1, 303 + warp_event 6, 27, HAITEKU_AQUARIUM_1F, 1, 368 + warp_event 7, 27, HAITEKU_AQUARIUM_1F, 2, 368 - db 8 ; bg events - bg_event 24, 7, 0, 1 + def_bg_events + bg_event 24, 7, 0, 1 bg_event 12, 12, 0, 2 bg_event 32, 10, 0, 3 bg_event 10, 17, 0, 4 @@ -29,7 +29,7 @@ Haiteku_MapEvents:: bg_event 30, 25, 0, 7 bg_event 24, 28, 0, 8 - db 5 ; person events + def_object_events object_event 22, 15, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 23, 14, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 23, 24, SPRITE_SAILOR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 |