summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-11-22 17:04:54 -0800
committerYamaArashi <shadow962@live.com>2015-11-22 17:04:54 -0800
commit22d87f81d7097f9d2eb79bd0c784f9c74d44a79c (patch)
treeea36b25f55178569468d8f9ca86c7ac3cdad850a
parent3e95160b25c59e2e73f9872dd713ea9859bab0c4 (diff)
fix typo in tileset name
-rw-r--r--data/graphics/tilesets/metatiles.s4
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/00.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/00.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/01.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/01.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/02.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/02.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/03.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/03.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/04.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/04.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/05.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/05.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/06.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/06.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/07.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/07.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/08.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/08.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/09.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/09.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/10.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/10.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/11.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/11.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/12.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/12.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/13.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/13.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/14.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/14.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/palettes/15.pal (renamed from data/graphics/tilesets/secondary/island_habor/palettes/15.pal)0
-rw-r--r--data/graphics/tilesets/secondary/island_harbor/tiles.png (renamed from data/graphics/tilesets/secondary/island_habor/tiles.png)bin5093 -> 5093 bytes
-rw-r--r--data/graphics/tilesets/tileset_graphics.s44
-rw-r--r--data/graphics/tilesets/tilesets.s10
20 files changed, 29 insertions, 29 deletions
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_harbor/palettes/00.pal
index 0fd74602e..0fd74602e 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/00.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/00.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/01.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/01.pal
index 3c6e40c2e..3c6e40c2e 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/01.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/01.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/02.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/02.pal
index 4c41030f6..4c41030f6 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/02.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/02.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/03.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/03.pal
index 5665ddc22..5665ddc22 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/03.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/03.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/04.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/04.pal
index d8051b7ba..d8051b7ba 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/04.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/04.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/05.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/05.pal
index 4e684594c..4e684594c 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/05.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/05.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/06.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/06.pal
index 5caa038ad..5caa038ad 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/06.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/06.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/07.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/07.pal
index 2064b3bd2..2064b3bd2 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/07.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/07.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/08.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/08.pal
index 42a3483c0..42a3483c0 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/08.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/08.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/09.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/09.pal
index b06dfbda7..b06dfbda7 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/09.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/09.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/10.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/10.pal
index cd86ca4ae..cd86ca4ae 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/10.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/10.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/11.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/11.pal
index ec8e2f42d..ec8e2f42d 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/11.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/11.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/12.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/12.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/12.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/13.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/13.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/13.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/14.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/14.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/14.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/palettes/15.pal b/data/graphics/tilesets/secondary/island_harbor/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/graphics/tilesets/secondary/island_habor/palettes/15.pal
+++ b/data/graphics/tilesets/secondary/island_harbor/palettes/15.pal
diff --git a/data/graphics/tilesets/secondary/island_habor/tiles.png b/data/graphics/tilesets/secondary/island_harbor/tiles.png
index e70a72977..e70a72977 100644
--- a/data/graphics/tilesets/secondary/island_habor/tiles.png
+++ b/data/graphics/tilesets/secondary/island_harbor/tiles.png
Binary files 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