diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 17:32:11 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 17:32:11 -0400 |
| commit | 03e93e5a702448f4ffd0065b5f0f92bc2c89ba4b (patch) | |
| tree | e45eeedbb6ea3d7c0725e7a1188e7b2c3ec027a1 /maps | |
| parent | 42c5aab5e3a63c1928806dd33df0680b0f273931 (diff) | |
WiseTriosRoom -> EcruteakTinTowerBackEntrance
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/EcruteakCity.asm | 4 | ||||
| -rw-r--r-- | maps/EcruteakTinTowerBackEntrance.asm (renamed from maps/WiseTriosRoom.asm) | 4 | ||||
| -rw-r--r-- | maps/EcruteakTinTowerBackEntrance.blk (renamed from maps/WiseTriosRoom.blk) | 0 | ||||
| -rw-r--r-- | maps/EcruteakTinTowerEntrance.asm | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 25be03ba..e7dc703d 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -230,8 +230,8 @@ EcruteakCity_MapEvents: warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1 warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2 warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1 - warp_event 20, 2, WISE_TRIOS_ROOM, 1 - warp_event 20, 3, WISE_TRIOS_ROOM, 2 + warp_event 20, 2, ECRUTEAK_TIN_TOWER_BACK_ENTRANCE, 1 + warp_event 20, 3, ECRUTEAK_TIN_TOWER_BACK_ENTRANCE, 2 warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1 warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1 warp_event 23, 21, DANCE_THEATRE, 1 diff --git a/maps/WiseTriosRoom.asm b/maps/EcruteakTinTowerBackEntrance.asm index 53f2ec88..57ffcbbc 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/EcruteakTinTowerBackEntrance.asm @@ -1,9 +1,9 @@ -WiseTriosRoom_MapScripts: +EcruteakTinTowerBackEntrance_MapScripts: db 0 ; scene scripts db 0 ; callbacks -WiseTriosRoom_MapEvents: +EcruteakTinTowerBackEntrance_MapEvents: db 0, 0 ; filler db 3 ; warp events diff --git a/maps/WiseTriosRoom.blk b/maps/EcruteakTinTowerBackEntrance.blk index c97f603f..c97f603f 100644 --- a/maps/WiseTriosRoom.blk +++ b/maps/EcruteakTinTowerBackEntrance.blk diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 49d99157..88db0b36 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -149,7 +149,7 @@ EcruteakTinTowerEntrance_MapEvents: warp_event 5, 17, ECRUTEAK_CITY, 3 warp_event 5, 3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4 warp_event 17, 15, ECRUTEAK_TIN_TOWER_ENTRANCE, 3 - warp_event 17, 3, WISE_TRIOS_ROOM, 3 + warp_event 17, 3, ECRUTEAK_TIN_TOWER_BACK_ENTRANCE, 3 db 2 ; coord events coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1 |