From 22d87f81d7097f9d2eb79bd0c784f9c74d44a79c Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 22 Nov 2015 17:04:54 -0800 Subject: [PATCH] fix typo in tileset name --- data/graphics/tilesets/metatiles.s | 4 +- .../palettes/00.pal | 0 .../palettes/01.pal | 0 .../palettes/02.pal | 0 .../palettes/03.pal | 0 .../palettes/04.pal | 0 .../palettes/05.pal | 0 .../palettes/06.pal | 0 .../palettes/07.pal | 0 .../palettes/08.pal | 0 .../palettes/09.pal | 0 .../palettes/10.pal | 0 .../palettes/11.pal | 0 .../palettes/12.pal | 0 .../palettes/13.pal | 0 .../palettes/14.pal | 0 .../palettes/15.pal | 0 .../{island_habor => island_harbor}/tiles.png | Bin data/graphics/tilesets/tileset_graphics.s | 38 +++++++++--------- data/graphics/tilesets/tilesets.s | 10 ++--- 20 files changed, 26 insertions(+), 26 deletions(-) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/00.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/01.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/02.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/03.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/04.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/05.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/06.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/07.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/08.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/09.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/10.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/11.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/12.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/13.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/14.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/palettes/15.pal (100%) rename data/graphics/tilesets/secondary/{island_habor => island_harbor}/tiles.png (100%) 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/00.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/01.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/02.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/03.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/04.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/05.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/06.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/07.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/08.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/09.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/10.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/11.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/12.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/13.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/14.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/palettes/15.pal rename to 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 similarity index 100% rename from data/graphics/tilesets/secondary/island_habor/tiles.png rename to data/graphics/tilesets/secondary/island_harbor/tiles.png 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" +gTilesetTiles_IslandHarbor: ; 838D804 + .incbin "data/graphics/tilesets/secondary/island_harbor/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" +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