ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix typo in tileset name

Browse Source
This commit is contained in:
YamaArashi 2015-11-22 17:04:54 -08:00
parent 3e95160b25
commit 22d87f81d7
20 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/graphics/tilesets/metatiles.s
View File

@ -630,12 +630,12 @@ gMetatileAttributes_MossdeepGameCorner: ; 83D71FE
.align 1, 0 .align 1, 0
gMetatiles_IslandHabor: ; 83D7268 gMetatiles_IslandHarbor: ; 83D7268
.incbin "base_emerald.gba", 0x3d7268, 0x1d60 .incbin "base_emerald.gba", 0x3d7268, 0x1d60
.align 1, 0 .align 1, 0
gMetatileAttributes_IslandHabor: ; 83D8FC8 gMetatileAttributes_IslandHarbor: ; 83D8FC8
.incbin "base_emerald.gba", 0x3d8fc8, 0x3ac .incbin "base_emerald.gba", 0x3d8fc8, 0x3ac
.align 1, 0 .align 1, 0

0
data/graphics/tilesets/secondary/island_habor/palettes/00.pal → data/graphics/tilesets/secondary/island_harbor/palettes/00.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/01.pal → data/graphics/tilesets/secondary/island_harbor/palettes/01.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/02.pal → data/graphics/tilesets/secondary/island_harbor/palettes/02.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/03.pal → data/graphics/tilesets/secondary/island_harbor/palettes/03.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/04.pal → data/graphics/tilesets/secondary/island_harbor/palettes/04.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/05.pal → data/graphics/tilesets/secondary/island_harbor/palettes/05.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/06.pal → data/graphics/tilesets/secondary/island_harbor/palettes/06.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/07.pal → data/graphics/tilesets/secondary/island_harbor/palettes/07.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/08.pal → data/graphics/tilesets/secondary/island_harbor/palettes/08.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/09.pal → data/graphics/tilesets/secondary/island_harbor/palettes/09.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/10.pal → data/graphics/tilesets/secondary/island_harbor/palettes/10.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/11.pal → data/graphics/tilesets/secondary/island_harbor/palettes/11.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/12.pal → data/graphics/tilesets/secondary/island_harbor/palettes/12.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/13.pal → data/graphics/tilesets/secondary/island_harbor/palettes/13.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/14.pal → data/graphics/tilesets/secondary/island_harbor/palettes/14.pal
View File

0
data/graphics/tilesets/secondary/island_habor/palettes/15.pal → data/graphics/tilesets/secondary/island_harbor/palettes/15.pal
View File

0
data/graphics/tilesets/secondary/island_habor/tiles.png → data/graphics/tilesets/secondary/island_harbor/tiles.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

38
data/graphics/tilesets/tileset_graphics.s
View File

@ -1713,28 +1713,28 @@ gTilesetPalettes_MossdeepGameCorner: ; 838D604
.align 2, 0 .align 2, 0
gTilesetTiles_IslandHabor: ; 838D804 gTilesetTiles_IslandHarbor: ; 838D804
.incbin "data/graphics/tilesets/secondary/island_habor/tiles.4bpp.lz" .incbin "data/graphics/tilesets/secondary/island_harbor/tiles.4bpp.lz"
.align 2, 0 .align 2, 0
gTilesetPalettes_IslandHabor: ; 838F1D4 gTilesetPalettes_IslandHarbor: ; 838F1D4
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/00.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/01.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/02.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/02.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/03.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/03.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/04.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/04.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/05.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/05.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/06.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/06.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/07.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/07.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/08.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/08.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/09.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/09.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/10.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/10.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/11.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/11.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/12.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/12.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/13.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/13.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/14.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/14.gbapal"
.incbin "data/graphics/tilesets/secondary/island_habor/palettes/15.gbapal" .incbin "data/graphics/tilesets/secondary/island_harbor/palettes/15.gbapal"
.align 2, 0 .align 2, 0

10
data/graphics/tilesets/tilesets.s
View File

@ -826,14 +826,14 @@ gTileset_MossdeepGameCorner: ; 83DFD54
.align 2, 0 .align 2, 0
gTileset_IslandHabor: ; 83DFD6C gTileset_IslandHarbor: ; 83DFD6C
.byte TRUE ; is compressed .byte TRUE ; is compressed
.byte TRUE ; is secondary tileset .byte TRUE ; is secondary tileset
.2byte 0 ; padding .2byte 0 ; padding
.4byte gTilesetTiles_IslandHabor .4byte gTilesetTiles_IslandHarbor
.4byte gTilesetPalettes_IslandHabor .4byte gTilesetPalettes_IslandHarbor
.4byte gMetatiles_IslandHabor .4byte gMetatiles_IslandHarbor
.4byte gMetatileAttributes_IslandHabor .4byte gMetatileAttributes_IslandHarbor
.4byte NULL ; animation callback .4byte NULL ; animation callback
.align 2, 0 .align 2, 0