From 22d87f81d7097f9d2eb79bd0c784f9c74d44a79c Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 22 Nov 2015 17:04:54 -0800 Subject: fix typo in tileset name --- data/graphics/tilesets/metatiles.s | 4 +- .../secondary/island_habor/palettes/00.pal | 19 --------- .../secondary/island_habor/palettes/01.pal | 19 --------- .../secondary/island_habor/palettes/02.pal | 19 --------- .../secondary/island_habor/palettes/03.pal | 19 --------- .../secondary/island_habor/palettes/04.pal | 19 --------- .../secondary/island_habor/palettes/05.pal | 19 --------- .../secondary/island_habor/palettes/06.pal | 19 --------- .../secondary/island_habor/palettes/07.pal | 19 --------- .../secondary/island_habor/palettes/08.pal | 19 --------- .../secondary/island_habor/palettes/09.pal | 19 --------- .../secondary/island_habor/palettes/10.pal | 19 --------- .../secondary/island_habor/palettes/11.pal | 19 --------- .../secondary/island_habor/palettes/12.pal | 19 --------- .../secondary/island_habor/palettes/13.pal | 19 --------- .../secondary/island_habor/palettes/14.pal | 19 --------- .../secondary/island_habor/palettes/15.pal | 19 --------- .../tilesets/secondary/island_habor/tiles.png | Bin 5093 -> 0 bytes .../secondary/island_harbor/palettes/00.pal | 19 +++++++++ .../secondary/island_harbor/palettes/01.pal | 19 +++++++++ .../secondary/island_harbor/palettes/02.pal | 19 +++++++++ .../secondary/island_harbor/palettes/03.pal | 19 +++++++++ .../secondary/island_harbor/palettes/04.pal | 19 +++++++++ .../secondary/island_harbor/palettes/05.pal | 19 +++++++++ .../secondary/island_harbor/palettes/06.pal | 19 +++++++++ .../secondary/island_harbor/palettes/07.pal | 19 +++++++++ .../secondary/island_harbor/palettes/08.pal | 19 +++++++++ .../secondary/island_harbor/palettes/09.pal | 19 +++++++++ .../secondary/island_harbor/palettes/10.pal | 19 +++++++++ .../secondary/island_harbor/palettes/11.pal | 19 +++++++++ .../secondary/island_harbor/palettes/12.pal | 19 +++++++++ .../secondary/island_harbor/palettes/13.pal | 19 +++++++++ .../secondary/island_harbor/palettes/14.pal | 19 +++++++++ .../secondary/island_harbor/palettes/15.pal | 19 +++++++++ .../tilesets/secondary/island_harbor/tiles.png | Bin 0 -> 5093 bytes data/graphics/tilesets/tileset_graphics.s | 44 ++++++++++----------- data/graphics/tilesets/tilesets.s | 10 ++--- 37 files changed, 333 insertions(+), 333 deletions(-) delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/00.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/01.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/02.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/03.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/04.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/05.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/06.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/07.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/08.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/09.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/10.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/11.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/12.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/13.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/14.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/palettes/15.pal delete mode 100644 data/graphics/tilesets/secondary/island_habor/tiles.png create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/00.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/01.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/02.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/03.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/04.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/05.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/06.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/07.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/08.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/09.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/10.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/11.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/12.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/13.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/14.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/palettes/15.pal create mode 100644 data/graphics/tilesets/secondary/island_harbor/tiles.png (limited to 'data') diff --git a/data/graphics/tilesets/metatiles.s b/data/graphics/tilesets/metatiles.s index b90680980..d805a1d74 100644 --- a/data/graphics/tilesets/metatiles.s +++ b/data/graphics/tilesets/metatiles.s @@ -630,12 +630,12 @@ gMetatileAttributes_MossdeepGameCorner: ; 83D71FE .align 1, 0 -gMetatiles_IslandHabor: ; 83D7268 +gMetatiles_IslandHarbor: ; 83D7268 .incbin "base_emerald.gba", 0x3d7268, 0x1d60 .align 1, 0 -gMetatileAttributes_IslandHabor: ; 83D8FC8 +gMetatileAttributes_IslandHarbor: ; 83D8FC8 .incbin "base_emerald.gba", 0x3d8fc8, 0x3ac .align 1, 0 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/00.pal b/data/graphics/tilesets/secondary/island_habor/palettes/00.pal deleted file mode 100644 index 0fd74602e..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/00.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -189 189 131 -115 189 246 -98 172 238 -115 189 246 -98 164 222 -82 139 197 -74 115 172 -115 197 164 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/01.pal b/data/graphics/tilesets/secondary/island_habor/palettes/01.pal deleted file mode 100644 index 3c6e40c2e..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/01.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -115 189 246 -98 172 238 -255 189 131 -238 148 115 -222 106 98 -205 65 82 -115 197 164 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/02.pal b/data/graphics/tilesets/secondary/island_habor/palettes/02.pal deleted file mode 100644 index 4c41030f6..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/02.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -180 255 131 -131 197 98 -57 139 49 -57 82 0 -222 148 115 -106 90 90 -164 98 90 -65 57 49 -255 197 148 -222 106 98 -205 65 82 -164 213 197 -115 197 164 -65 180 131 -24 164 106 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/03.pal b/data/graphics/tilesets/secondary/island_habor/palettes/03.pal deleted file mode 100644 index 5665ddc22..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/03.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -213 213 213 -189 189 189 -164 164 164 -131 131 139 -65 180 131 -164 213 197 -65 49 65 -238 213 205 -222 180 164 -189 148 139 -156 115 115 -131 90 90 -98 65 82 -115 197 164 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/04.pal b/data/graphics/tilesets/secondary/island_habor/palettes/04.pal deleted file mode 100644 index d8051b7ba..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/04.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -255 0 255 -255 0 255 -255 0 255 -156 164 189 -82 106 213 -65 90 189 -57 82 156 -41 65 139 -172 197 230 -139 164 222 -106 131 213 -82 106 213 -115 197 164 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/05.pal b/data/graphics/tilesets/secondary/island_habor/palettes/05.pal deleted file mode 100644 index 4e684594c..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/05.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -131 197 246 -106 180 222 -238 230 164 -222 205 131 -213 180 106 -205 156 82 -115 197 164 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/06.pal b/data/graphics/tilesets/secondary/island_habor/palettes/06.pal deleted file mode 100644 index 5caa038ad..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/06.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -213 222 246 -164 172 222 -98 98 123 -65 74 106 -238 213 205 -222 172 164 -205 131 123 -189 98 82 -222 222 222 -172 180 189 -139 148 164 -106 123 123 -222 74 0 -213 213 57 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/07.pal b/data/graphics/tilesets/secondary/island_habor/palettes/07.pal deleted file mode 100644 index 2064b3bd2..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/07.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -238 222 172 -230 156 98 -197 90 65 -65 74 106 -106 106 123 -131 90 49 -90 65 49 -57 57 57 -222 222 197 -172 180 148 -131 148 115 -106 123 65 -156 205 230 -156 156 156 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/08.pal b/data/graphics/tilesets/secondary/island_habor/palettes/08.pal deleted file mode 100644 index 42a3483c0..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/08.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -213 222 246 -131 131 139 -98 98 123 -65 74 106 -164 205 189 -139 180 172 -115 156 139 -98 139 131 -189 172 180 -156 139 148 -230 106 57 -205 49 24 -148 57 24 -0 0 0 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/09.pal b/data/graphics/tilesets/secondary/island_habor/palettes/09.pal deleted file mode 100644 index b06dfbda7..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/09.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 255 255 -213 222 246 -164 172 222 -98 98 123 -65 74 106 -98 98 123 -65 74 106 -115 123 164 -49 49 74 -189 238 180 -106 222 115 -74 180 98 -57 131 82 -131 197 230 -98 156 172 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/10.pal b/data/graphics/tilesets/secondary/island_habor/palettes/10.pal deleted file mode 100644 index cd86ca4ae..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -82 82 106 -148 148 164 -205 189 197 -255 255 255 -222 213 230 -189 172 180 -255 205 106 -230 189 106 -205 156 82 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -57 139 49 -106 106 123 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/11.pal b/data/graphics/tilesets/secondary/island_habor/palettes/11.pal deleted file mode 100644 index ec8e2f42d..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -74 74 98 -106 106 115 -0 0 0 -0 0 0 -148 106 57 -189 139 57 -213 189 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/12.pal b/data/graphics/tilesets/secondary/island_habor/palettes/12.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/12.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/13.pal b/data/graphics/tilesets/secondary/island_habor/palettes/13.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/14.pal b/data/graphics/tilesets/secondary/island_habor/palettes/14.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/14.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/15.pal b/data/graphics/tilesets/secondary/island_habor/palettes/15.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/graphics/tilesets/secondary/island_habor/palettes/15.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/graphics/tilesets/secondary/island_habor/tiles.png b/data/graphics/tilesets/secondary/island_habor/tiles.png deleted file mode 100644 index e70a72977..000000000 Binary files a/data/graphics/tilesets/secondary/island_habor/tiles.png and /dev/null differ diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/00.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/00.pal new file mode 100644 index 000000000..0fd74602e --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +189 189 131 +115 189 246 +98 172 238 +115 189 246 +98 164 222 +82 139 197 +74 115 172 +115 197 164 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/01.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/01.pal new file mode 100644 index 000000000..3c6e40c2e --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/01.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +115 189 246 +98 172 238 +255 189 131 +238 148 115 +222 106 98 +205 65 82 +115 197 164 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/02.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/02.pal new file mode 100644 index 000000000..4c41030f6 --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/02.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +180 255 131 +131 197 98 +57 139 49 +57 82 0 +222 148 115 +106 90 90 +164 98 90 +65 57 49 +255 197 148 +222 106 98 +205 65 82 +164 213 197 +115 197 164 +65 180 131 +24 164 106 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/03.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/03.pal new file mode 100644 index 000000000..5665ddc22 --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/03.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +213 213 213 +189 189 189 +164 164 164 +131 131 139 +65 180 131 +164 213 197 +65 49 65 +238 213 205 +222 180 164 +189 148 139 +156 115 115 +131 90 90 +98 65 82 +115 197 164 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/04.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/04.pal new file mode 100644 index 000000000..d8051b7ba --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +255 0 255 +255 0 255 +255 0 255 +156 164 189 +82 106 213 +65 90 189 +57 82 156 +41 65 139 +172 197 230 +139 164 222 +106 131 213 +82 106 213 +115 197 164 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/05.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/05.pal new file mode 100644 index 000000000..4e684594c --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/05.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +131 197 246 +106 180 222 +238 230 164 +222 205 131 +213 180 106 +205 156 82 +115 197 164 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/06.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/06.pal new file mode 100644 index 000000000..5caa038ad --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/06.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +213 222 246 +164 172 222 +98 98 123 +65 74 106 +238 213 205 +222 172 164 +205 131 123 +189 98 82 +222 222 222 +172 180 189 +139 148 164 +106 123 123 +222 74 0 +213 213 57 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/07.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/07.pal new file mode 100644 index 000000000..2064b3bd2 --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/07.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +238 222 172 +230 156 98 +197 90 65 +65 74 106 +106 106 123 +131 90 49 +90 65 49 +57 57 57 +222 222 197 +172 180 148 +131 148 115 +106 123 65 +156 205 230 +156 156 156 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/08.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/08.pal new file mode 100644 index 000000000..42a3483c0 --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +213 222 246 +131 131 139 +98 98 123 +65 74 106 +164 205 189 +139 180 172 +115 156 139 +98 139 131 +189 172 180 +156 139 148 +230 106 57 +205 49 24 +148 57 24 +0 0 0 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/09.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/09.pal new file mode 100644 index 000000000..b06dfbda7 --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +213 222 246 +164 172 222 +98 98 123 +65 74 106 +98 98 123 +65 74 106 +115 123 164 +49 49 74 +189 238 180 +106 222 115 +74 180 98 +57 131 82 +131 197 230 +98 156 172 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/10.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/10.pal new file mode 100644 index 000000000..cd86ca4ae --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +82 82 106 +148 148 164 +205 189 197 +255 255 255 +222 213 230 +189 172 180 +255 205 106 +230 189 106 +205 156 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +57 139 49 +106 106 123 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/11.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/11.pal new file mode 100644 index 000000000..ec8e2f42d --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 74 98 +106 106 115 +0 0 0 +0 0 0 +148 106 57 +189 139 57 +213 189 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/12.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/12.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/13.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/14.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/graphics/tilesets/secondary/island_harbor/palettes/15.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/graphics/tilesets/secondary/island_harbor/palettes/15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/graphics/tilesets/secondary/island_harbor/tiles.png b/data/graphics/tilesets/secondary/island_harbor/tiles.png new file mode 100644 index 000000000..e70a72977 Binary files /dev/null and b/data/graphics/tilesets/secondary/island_harbor/tiles.png differ diff --git a/data/graphics/tilesets/tileset_graphics.s b/data/graphics/tilesets/tileset_graphics.s index 24f1e9dc1..9306f4f61 100644 --- a/data/graphics/tilesets/tileset_graphics.s +++ b/data/graphics/tilesets/tileset_graphics.s @@ -1713,28 +1713,28 @@ gTilesetPalettes_MossdeepGameCorner: ; 838D604 .align 2, 0 -gTilesetTiles_IslandHabor: ; 838D804 - .incbin "data/graphics/tilesets/secondary/island_habor/tiles.4bpp.lz" - - .align 2, 0 - -gTilesetPalettes_IslandHabor: ; 838F1D4 - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/00.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/01.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/02.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/03.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/04.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/05.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/06.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/07.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/08.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/09.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/10.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/11.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/12.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/13.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/14.gbapal" - .incbin "data/graphics/tilesets/secondary/island_habor/palettes/15.gbapal" +gTilesetTiles_IslandHarbor: ; 838D804 + .incbin "data/graphics/tilesets/secondary/island_harbor/tiles.4bpp.lz" + + .align 2, 0 + +gTilesetPalettes_IslandHarbor: ; 838F1D4 + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/00.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/01.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/02.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/03.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/04.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/05.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/06.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/07.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/08.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/09.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/10.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/11.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/12.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/13.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/14.gbapal" + .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/15.gbapal" .align 2, 0 diff --git a/data/graphics/tilesets/tilesets.s b/data/graphics/tilesets/tilesets.s index cee1ca09f..4f95aca39 100644 --- a/data/graphics/tilesets/tilesets.s +++ b/data/graphics/tilesets/tilesets.s @@ -826,14 +826,14 @@ gTileset_MossdeepGameCorner: ; 83DFD54 .align 2, 0 -gTileset_IslandHabor: ; 83DFD6C +gTileset_IslandHarbor: ; 83DFD6C .byte TRUE ; is compressed .byte TRUE ; is secondary tileset .2byte 0 ; padding - .4byte gTilesetTiles_IslandHabor - .4byte gTilesetPalettes_IslandHabor - .4byte gMetatiles_IslandHabor - .4byte gMetatileAttributes_IslandHabor + .4byte gTilesetTiles_IslandHarbor + .4byte gTilesetPalettes_IslandHarbor + .4byte gMetatiles_IslandHarbor + .4byte gMetatileAttributes_IslandHarbor .4byte NULL ; animation callback .align 2, 0 -- cgit v1.2.3