pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename TILESET_BATTLE_TOWER to TILESET_BATTLE_TOWER_INSIDE

Browse Source
This commit is contained in:
Rangi 2019-11-03 12:03:37 -05:00
parent 86061d37d2
commit 01f68fcc6a
13 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/tileset_constants.asm
View File

@ -21,7 +21,7 @@
const TILESET_LIGHTHOUSE ; 13 const TILESET_LIGHTHOUSE ; 13
const TILESET_PLAYERS_ROOM ; 14 const TILESET_PLAYERS_ROOM ; 14
const TILESET_POKECOM_CENTER ; 15 const TILESET_POKECOM_CENTER ; 15
const TILESET_BATTLE_TOWER ; 16 const TILESET_BATTLE_TOWER_INSIDE ; 16
const TILESET_TOWER ; 17 const TILESET_TOWER ; 17
const TILESET_CAVE ; 18 const TILESET_CAVE ; 18
const TILESET_PARK ; 19 const TILESET_PARK ; 19

8
data/maps/maps.asm
View File

@ -416,10 +416,10 @@ MapGroup_Cianwood:
map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BattleTower1F, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerBattleRoom, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerElevator, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerHallway, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

2
data/tilesets.asm
View File

@ -34,7 +34,7 @@ Tilesets::
tileset TilesetLighthouse tileset TilesetLighthouse
tileset TilesetPlayersRoom tileset TilesetPlayersRoom
tileset TilesetPokeComCenter tileset TilesetPokeComCenter
tileset TilesetBattleTower tileset TilesetBattleTowerInside
tileset TilesetTower tileset TilesetTower
tileset TilesetCave tileset TilesetCave
tileset TilesetPark tileset TilesetPark

0
data/tilesets/battle_tower_collision.asm → data/tilesets/battle_tower_inside_collision.asm
View File

0
data/tilesets/battle_tower_metatiles.bin → data/tilesets/battle_tower_inside_metatiles.bin
View File

2
engine/tilesets/tileset_anims.asm
View File

@ -259,7 +259,7 @@ TilesetChampionsRoomAnim:
TilesetLighthouseAnim: TilesetLighthouseAnim:
TilesetPlayersRoomAnim: TilesetPlayersRoomAnim:
TilesetPokeComCenterAnim: TilesetPokeComCenterAnim:
TilesetBattleTowerAnim: TilesetBattleTowerInsideAnim:
TilesetRuinsOfAlphAnim: TilesetRuinsOfAlphAnim:
TilesetRadioTowerAnim: TilesetRadioTowerAnim:
TilesetUndergroundAnim: TilesetUndergroundAnim:

28
engine/tilesets/tileset_palettes.asm
View File

@ -2,8 +2,8 @@ LoadSpecialMapPalette:
ld a, [wMapTileset] ld a, [wMapTileset]
cp TILESET_POKECOM_CENTER cp TILESET_POKECOM_CENTER
jr z, .pokecom_2f jr z, .pokecom_2f
cp TILESET_BATTLE_TOWER cp TILESET_BATTLE_TOWER_INSIDE
jr z, .battle_tower jr z, .battle_tower_inside
cp TILESET_ICE_PATH cp TILESET_ICE_PATH
jr z, .ice_path jr z, .ice_path
cp TILESET_HOUSE cp TILESET_HOUSE
@ -14,17 +14,17 @@ LoadSpecialMapPalette:
jr z, .mansion_mobile jr z, .mansion_mobile
jr .do_nothing jr .do_nothing
.pokecom_2f .pokecom_2f:
call LoadPokeComPalette call LoadPokeComPalette
scf scf
ret ret
.battle_tower .battle_tower_inside:
call LoadBattleTowerPalette call LoadBattleTowerInsidePalette
scf scf
ret ret
.ice_path .ice_path:
ld a, [wEnvironment] ld a, [wEnvironment]
and $7 and $7
cp INDOOR ; Hall of Fame cp INDOOR ; Hall of Fame
@ -33,22 +33,22 @@ LoadSpecialMapPalette:
scf scf
ret ret
.house .house:
call LoadHousePalette call LoadHousePalette
scf scf
ret ret
.radio_tower .radio_tower:
call LoadRadioTowerPalette call LoadRadioTowerPalette
scf scf
ret ret
.mansion_mobile .mansion_mobile:
call LoadMansionPalette call LoadMansionPalette
scf scf
ret ret
.do_nothing .do_nothing:
and a and a
ret ret
@ -63,16 +63,16 @@ LoadPokeComPalette:
PokeComPalette: PokeComPalette:
INCLUDE "gfx/tilesets/pokecom_center.pal" INCLUDE "gfx/tilesets/pokecom_center.pal"
LoadBattleTowerPalette: LoadBattleTowerInsidePalette:
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
ld de, wBGPals1 ld de, wBGPals1
ld hl, BattleTowerPalette ld hl, BattleTowerInsidePalette
ld bc, 8 palettes ld bc, 8 palettes
call FarCopyWRAM call FarCopyWRAM
ret ret
BattleTowerPalette: BattleTowerInsidePalette:
INCLUDE "gfx/tilesets/battle_tower.pal" INCLUDE "gfx/tilesets/battle_tower_inside.pal"
LoadIcePathPalette: LoadIcePathPalette:
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)

4
gfx/tileset_palette_maps.asm
View File

@ -103,8 +103,8 @@ INCLUDE "gfx/tilesets/forest_palette_map.asm"
TilesetPokeComCenterPalMap: TilesetPokeComCenterPalMap:
INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm" INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm"
TilesetBattleTowerPalMap: TilesetBattleTowerInsidePalMap:
INCLUDE "gfx/tilesets/battle_tower_palette_map.asm" INCLUDE "gfx/tilesets/battle_tower_inside_palette_map.asm"
TilesetBattleTowerOutsidePalMap: TilesetBattleTowerOutsidePalMap:
INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm" INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"

12
gfx/tilesets.asm
View File

@ -206,14 +206,14 @@ INCBIN "data/tilesets/pokecom_center_metatiles.bin"
TilesetPokeComCenterColl: TilesetPokeComCenterColl:
INCLUDE "data/tilesets/pokecom_center_collision.asm" INCLUDE "data/tilesets/pokecom_center_collision.asm"
TilesetBattleTowerGFX: TilesetBattleTowerInsideGFX:
INCBIN "gfx/tilesets/battle_tower.2bpp.lz" INCBIN "gfx/tilesets/battle_tower_inside.2bpp.lz"
TilesetBattleTowerMeta: TilesetBattleTowerInsideMeta:
INCBIN "data/tilesets/battle_tower_metatiles.bin" INCBIN "data/tilesets/battle_tower_inside_metatiles.bin"
TilesetBattleTowerColl: TilesetBattleTowerInsideColl:
INCLUDE "data/tilesets/battle_tower_collision.asm" INCLUDE "data/tilesets/battle_tower_inside_collision.asm"
TilesetGateGFX: TilesetGateGFX:
INCBIN "gfx/tilesets/gate.2bpp.lz" INCBIN "gfx/tilesets/gate.2bpp.lz"

0
gfx/tilesets/battle_tower.2bpp.lz.467b6a2d → gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d
View File

0
gfx/tilesets/battle_tower.pal → gfx/tilesets/battle_tower_inside.pal
View File

0
gfx/tilesets/battle_tower.png → gfx/tilesets/battle_tower_inside.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1004 B

After

Width:  |  Height:  |  Size: 1004 B

0
gfx/tilesets/battle_tower_palette_map.asm → gfx/tilesets/battle_tower_inside_palette_map.asm
View File