mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Rename TILESET_BATTLE_TOWER to TILESET_BATTLE_TOWER_INSIDE
This commit is contained in:
parent
86061d37d2
commit
01f68fcc6a
@ -21,7 +21,7 @@
|
||||
const TILESET_LIGHTHOUSE ; 13
|
||||
const TILESET_PLAYERS_ROOM ; 14
|
||||
const TILESET_POKECOM_CENTER ; 15
|
||||
const TILESET_BATTLE_TOWER ; 16
|
||||
const TILESET_BATTLE_TOWER_INSIDE ; 16
|
||||
const TILESET_TOWER ; 17
|
||||
const TILESET_CAVE ; 18
|
||||
const TILESET_PARK ; 19
|
||||
|
@ -416,10 +416,10 @@ MapGroup_Cianwood:
|
||||
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 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 BattleTowerBattleRoom, TILESET_BATTLE_TOWER, 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 BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, 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_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, 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_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 BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
|
||||
|
||||
|
@ -34,7 +34,7 @@ Tilesets::
|
||||
tileset TilesetLighthouse
|
||||
tileset TilesetPlayersRoom
|
||||
tileset TilesetPokeComCenter
|
||||
tileset TilesetBattleTower
|
||||
tileset TilesetBattleTowerInside
|
||||
tileset TilesetTower
|
||||
tileset TilesetCave
|
||||
tileset TilesetPark
|
||||
|
@ -259,7 +259,7 @@ TilesetChampionsRoomAnim:
|
||||
TilesetLighthouseAnim:
|
||||
TilesetPlayersRoomAnim:
|
||||
TilesetPokeComCenterAnim:
|
||||
TilesetBattleTowerAnim:
|
||||
TilesetBattleTowerInsideAnim:
|
||||
TilesetRuinsOfAlphAnim:
|
||||
TilesetRadioTowerAnim:
|
||||
TilesetUndergroundAnim:
|
||||
|
@ -2,8 +2,8 @@ LoadSpecialMapPalette:
|
||||
ld a, [wMapTileset]
|
||||
cp TILESET_POKECOM_CENTER
|
||||
jr z, .pokecom_2f
|
||||
cp TILESET_BATTLE_TOWER
|
||||
jr z, .battle_tower
|
||||
cp TILESET_BATTLE_TOWER_INSIDE
|
||||
jr z, .battle_tower_inside
|
||||
cp TILESET_ICE_PATH
|
||||
jr z, .ice_path
|
||||
cp TILESET_HOUSE
|
||||
@ -14,17 +14,17 @@ LoadSpecialMapPalette:
|
||||
jr z, .mansion_mobile
|
||||
jr .do_nothing
|
||||
|
||||
.pokecom_2f
|
||||
.pokecom_2f:
|
||||
call LoadPokeComPalette
|
||||
scf
|
||||
ret
|
||||
|
||||
.battle_tower
|
||||
call LoadBattleTowerPalette
|
||||
.battle_tower_inside:
|
||||
call LoadBattleTowerInsidePalette
|
||||
scf
|
||||
ret
|
||||
|
||||
.ice_path
|
||||
.ice_path:
|
||||
ld a, [wEnvironment]
|
||||
and $7
|
||||
cp INDOOR ; Hall of Fame
|
||||
@ -33,22 +33,22 @@ LoadSpecialMapPalette:
|
||||
scf
|
||||
ret
|
||||
|
||||
.house
|
||||
.house:
|
||||
call LoadHousePalette
|
||||
scf
|
||||
ret
|
||||
|
||||
.radio_tower
|
||||
.radio_tower:
|
||||
call LoadRadioTowerPalette
|
||||
scf
|
||||
ret
|
||||
|
||||
.mansion_mobile
|
||||
.mansion_mobile:
|
||||
call LoadMansionPalette
|
||||
scf
|
||||
ret
|
||||
|
||||
.do_nothing
|
||||
.do_nothing:
|
||||
and a
|
||||
ret
|
||||
|
||||
@ -63,16 +63,16 @@ LoadPokeComPalette:
|
||||
PokeComPalette:
|
||||
INCLUDE "gfx/tilesets/pokecom_center.pal"
|
||||
|
||||
LoadBattleTowerPalette:
|
||||
LoadBattleTowerInsidePalette:
|
||||
ld a, BANK(wBGPals1)
|
||||
ld de, wBGPals1
|
||||
ld hl, BattleTowerPalette
|
||||
ld hl, BattleTowerInsidePalette
|
||||
ld bc, 8 palettes
|
||||
call FarCopyWRAM
|
||||
ret
|
||||
|
||||
BattleTowerPalette:
|
||||
INCLUDE "gfx/tilesets/battle_tower.pal"
|
||||
BattleTowerInsidePalette:
|
||||
INCLUDE "gfx/tilesets/battle_tower_inside.pal"
|
||||
|
||||
LoadIcePathPalette:
|
||||
ld a, BANK(wBGPals1)
|
||||
|
@ -103,8 +103,8 @@ INCLUDE "gfx/tilesets/forest_palette_map.asm"
|
||||
TilesetPokeComCenterPalMap:
|
||||
INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm"
|
||||
|
||||
TilesetBattleTowerPalMap:
|
||||
INCLUDE "gfx/tilesets/battle_tower_palette_map.asm"
|
||||
TilesetBattleTowerInsidePalMap:
|
||||
INCLUDE "gfx/tilesets/battle_tower_inside_palette_map.asm"
|
||||
|
||||
TilesetBattleTowerOutsidePalMap:
|
||||
INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
|
||||
|
@ -206,14 +206,14 @@ INCBIN "data/tilesets/pokecom_center_metatiles.bin"
|
||||
TilesetPokeComCenterColl:
|
||||
INCLUDE "data/tilesets/pokecom_center_collision.asm"
|
||||
|
||||
TilesetBattleTowerGFX:
|
||||
INCBIN "gfx/tilesets/battle_tower.2bpp.lz"
|
||||
TilesetBattleTowerInsideGFX:
|
||||
INCBIN "gfx/tilesets/battle_tower_inside.2bpp.lz"
|
||||
|
||||
TilesetBattleTowerMeta:
|
||||
INCBIN "data/tilesets/battle_tower_metatiles.bin"
|
||||
TilesetBattleTowerInsideMeta:
|
||||
INCBIN "data/tilesets/battle_tower_inside_metatiles.bin"
|
||||
|
||||
TilesetBattleTowerColl:
|
||||
INCLUDE "data/tilesets/battle_tower_collision.asm"
|
||||
TilesetBattleTowerInsideColl:
|
||||
INCLUDE "data/tilesets/battle_tower_inside_collision.asm"
|
||||
|
||||
TilesetGateGFX:
|
||||
INCBIN "gfx/tilesets/gate.2bpp.lz"
|
||||
|
Before Width: | Height: | Size: 1004 B After Width: | Height: | Size: 1004 B |
Loading…
Reference in New Issue
Block a user