From e5f9fddb86cd005d0dbcbb0fd1d4a04d3e6fee45 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Wed, 22 Nov 2017 00:34:37 +0100 Subject: PewterPokeCEnter2FBeta -> PewterPokeCenter2FBeta Probably a typo. --- maps.asm | 2 +- maps/PewterPokeCEnter2FBeta.asm | 23 ----------------------- maps/PewterPokeCenter2FBeta.asm | 23 +++++++++++++++++++++++ maps/blockdata_1.asm | 2 +- maps/map_headers.asm | 2 +- maps/second_map_headers.asm | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 maps/PewterPokeCEnter2FBeta.asm create mode 100644 maps/PewterPokeCenter2FBeta.asm diff --git a/maps.asm b/maps.asm index 8b0d0b007..f4957b920 100644 --- a/maps.asm +++ b/maps.asm @@ -444,7 +444,7 @@ INCLUDE "maps/PewterNidoranSpeechHouse.asm" INCLUDE "maps/PewterGym.asm" INCLUDE "maps/PewterMart.asm" INCLUDE "maps/PewterPokeCenter1F.asm" -INCLUDE "maps/PewterPokeCEnter2FBeta.asm" +INCLUDE "maps/PewterPokeCenter2FBeta.asm" INCLUDE "maps/PewterSnoozeSpeechHouse.asm" diff --git a/maps/PewterPokeCEnter2FBeta.asm b/maps/PewterPokeCEnter2FBeta.asm deleted file mode 100644 index 74bd290ff..000000000 --- a/maps/PewterPokeCEnter2FBeta.asm +++ /dev/null @@ -1,23 +0,0 @@ -PewterPokeCEnter2FBeta_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -PewterPokeCEnter2FBeta_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def $7, $0, 3, PEWTER_POKECENTER_1F - -.XYTriggers: - db 0 - -.Signposts: - db 0 - -.PersonEvents: - db 0 diff --git a/maps/PewterPokeCenter2FBeta.asm b/maps/PewterPokeCenter2FBeta.asm new file mode 100644 index 000000000..b2530ed8b --- /dev/null +++ b/maps/PewterPokeCenter2FBeta.asm @@ -0,0 +1,23 @@ +PewterPokeCenter2FBeta_MapScriptHeader: +.MapTriggers: + db 0 + +.MapCallbacks: + db 0 + +PewterPokeCenter2FBeta_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 1 + warp_def $7, $0, 3, PEWTER_POKECENTER_1F + +.XYTriggers: + db 0 + +.Signposts: + db 0 + +.PersonEvents: + db 0 diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm index 0a8fa0a8b..be9abbcc1 100644 --- a/maps/blockdata_1.asm +++ b/maps/blockdata_1.asm @@ -57,7 +57,7 @@ CinnabarPokeCenter2FBeta_BlockData: CeruleanPokeCenter2FBeta_BlockData: Route10PokeCenter2FBeta_BlockData: VermilionPokeCenter2FBeta_BlockData: -PewterPokeCEnter2FBeta_BlockData: +PewterPokeCenter2FBeta_BlockData: FuchsiaPokeCenter2FBeta_BlockData: LavenderPokeCenter2FBeta_BlockData: CeladonPokeCenter2FBeta_BlockData: diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 32be86ac0..95909baa8 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -303,7 +303,7 @@ MapGroup14: map_header PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PewterPokeCenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterPokeCEnter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header PewterPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 895f99dae..1bf8b80a2 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -474,7 +474,7 @@ map_header_2 PewterGym, PEWTER_GYM, $0, 0 map_header_2 PewterMart, PEWTER_MART, $0, 0 map_header_2 PewterPokeCenter1F, PEWTER_POKECENTER_1F, $0, 0 - map_header_2 PewterPokeCEnter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0 + map_header_2 PewterPokeCenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0 map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, 0 map_header_2 OlivinePort, OLIVINE_PORT, $a, 0 map_header_2 VermilionPort, VERMILION_PORT, $a, 0 -- cgit v1.2.3