diff options
| -rw-r--r-- | data/maps/objects/BluesHouse.asm | 6 | ||||
| -rw-r--r-- | data/maps/objects/CeladonCity.asm | 2 | ||||
| -rw-r--r-- | data/maps/objects/RedsHouse1F.asm | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 49f76276..36653b6b 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -8,8 +8,8 @@ BluesHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 ; Daisy, sitting by map - object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around - object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table + object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 + object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 + object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 def_warps_to BLUES_HOUSE diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 25a2ce32..5f514653 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -10,7 +10,7 @@ CeladonCity_Object: warp_event 41, 9, CELADON_POKECENTER, 0 warp_event 12, 27, CELADON_GYM, 0 warp_event 28, 19, GAME_CORNER, 0 - warp_event 39, 19, CELADON_MART_5F, 0 ; beta warp_event! no longer used + warp_event 39, 19, CELADON_MART_5F, 0 warp_event 33, 19, GAME_CORNER_PRIZE_ROOM, 0 warp_event 31, 27, CELADON_DINER, 0 warp_event 35, 27, CELADON_CHIEF_HOUSE, 0 diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index ce0f8c24..ef1f7c07 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -2,14 +2,14 @@ RedsHouse1F_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 ; exit1 - warp_event 3, 7, LAST_MAP, 0 ; exit2 - warp_event 7, 1, REDS_HOUSE_2F, 0 ; staircase + warp_event 2, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 0 + warp_event 7, 1, REDS_HOUSE_2F, 0 def_bg_events - bg_event 3, 1, 2 ; TV + bg_event 3, 1, 2 ; RedsHouse1FTVText def_object_events - object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 ; Mom + object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 def_warps_to REDS_HOUSE_1F |