From 3fb87cc7dbb09280130ace380690603a74eba1b2 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sat, 7 Jan 2012 15:43:36 -0600 Subject: fix map files for cinnibar -> cinnabar hg-commit-id: 8d9cd5c5d165 --- maps/cinnabargym.blk | 1 + maps/cinnabarmart.blk | 1 + maps/cinnabarpokecenter.blk | 2 ++ maps/cinnibargym.blk | 1 - maps/cinnibarmart.blk | 1 - maps/cinnibarpokecenter.blk | 2 -- pokered.asm | 3 +-- 7 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 maps/cinnabargym.blk create mode 100644 maps/cinnabarmart.blk create mode 100644 maps/cinnabarpokecenter.blk delete mode 100644 maps/cinnibargym.blk delete mode 100644 maps/cinnibarmart.blk delete mode 100644 maps/cinnibarpokecenter.blk diff --git a/maps/cinnabargym.blk b/maps/cinnabargym.blk new file mode 100644 index 00000000..ab8de94a --- /dev/null +++ b/maps/cinnabargym.blk @@ -0,0 +1 @@ +@aa@@aAAAADDDYDDDDkcDkckcDDDDDDDPXkcDkcDEDHUDDD, \ No newline at end of file diff --git a/maps/cinnabarmart.blk b/maps/cinnabarmart.blk new file mode 100644 index 00000000..1da8fffc --- /dev/null +++ b/maps/cinnabarmart.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/cinnabarpokecenter.blk b/maps/cinnabarpokecenter.blk new file mode 100644 index 00000000..9641efe4 --- /dev/null +++ b/maps/cinnabarpokecenter.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/maps/cinnibargym.blk b/maps/cinnibargym.blk deleted file mode 100644 index ab8de94a..00000000 --- a/maps/cinnibargym.blk +++ /dev/null @@ -1 +0,0 @@ -@aa@@aAAAADDDYDDDDkcDkckcDDDDDDDPXkcDkcDEDHUDDD, \ No newline at end of file diff --git a/maps/cinnibarmart.blk b/maps/cinnibarmart.blk deleted file mode 100644 index 1da8fffc..00000000 --- a/maps/cinnibarmart.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/cinnibarpokecenter.blk b/maps/cinnibarpokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/cinnibarpokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/pokered.asm b/pokered.asm index 7d4603a7..099373de 100644 --- a/pokered.asm +++ b/pokered.asm @@ -21762,9 +21762,8 @@ CinnabarGymObject: ; 0x75acc (size=90) EVENT_DISP $a, $11, $10 EVENT_DISP $a, $11, $11 - CinnabarGymBlocks: ; 90 - INCBIN "maps/cinnibargym.blk" + INCBIN "maps/cinnabargym.blk" Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167) db $14 ; tileset -- cgit v1.3.1-sl0p