diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-11-04 19:40:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-04 19:40:58 -0500 |
| commit | 9ebe549347aa16ae3f10d3261242bb1e7bbb6ca6 (patch) | |
| tree | 521a897c2da997534abd6f6adc1625968bc4603a /data/maps | |
| parent | c9563d5c5e8e3612ac40d70d6f6f5e03ba231f16 (diff) | |
| parent | d076159745e688bd58f1e512c4e0fcdd942161e9 (diff) | |
Merge pull request #654 from Rangi42/master
Miscellaneous cleanup issues
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/maps.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 1cc528738..268c4be8d 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -416,10 +416,10 @@ MapGroup_Cianwood: map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTower1F, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerBattleRoom, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerElevator, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerHallway, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE |