summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-16 22:53:00 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-16 22:53:00 -0600
commit0db823f485b3cd505a74a7427fd30ea6509094f1 (patch)
treef577f807372c80d58c85c659c00e8e316b20d62d
parent4e1ac11dbdb553f3b7a6b08458d132813a1d3372 (diff)
revert tileset constants
hg-commit-id: 1f114203aa14
-rw-r--r--common.asm2
-rw-r--r--constants.asm26
2 files changed, 1 insertions, 27 deletions
diff --git a/common.asm b/common.asm
index de6f975e..6da20fb4 100644
--- a/common.asm
+++ b/common.asm
@@ -27620,7 +27620,7 @@ INCBIN "baserom.gbc",$52996,$54000 - $52996
SECTION "bank15",DATA,BANK[$15]
Route2_h:
- db TileSet_Outside; Tileset
+ db 00; Tileset
db Route2Height,Route2Width ;Height,Width blocks (1 block = 4x4 tiles)
dw $407E ;Map-Pointer
dw $54E6 ;Maps text pointer
diff --git a/constants.asm b/constants.asm
index 1e1ee613..656e97bc 100644
--- a/constants.asm
+++ b/constants.asm
@@ -2167,29 +2167,3 @@ BrunoWidth EQU $05
; Agatha_h map_id=247
AgathaHeight EQU $06
AgathaWidth EQU $05
-
-;Tilesets
-TileSet_Outside equ $0
-TileSet_YourHouse1 equ $1
-TileSet_PkmnCtr1 equ $2
-TileSet_VirForest equ $3
-TileSet_YourHouse2 equ $4
-TileSet_Gym1 equ $5
-TileSet_PkmnCtr2 equ $6
-TileSet_Gym2 equ $7
-TileSet_House equ $8
-TileSet_Museum1 equ $9
-TileSet_Museum2 equ $A
-TileSet_UndPath equ $B
-TileSet_Museum3 equ $C
-TileSet_SSAnne equ $D
-TileSet_VermPort equ $E
-TileSet_PokeCem equ $F
-TileSet_Silph equ $10
-TileSet_Cave equ $11
-TileSet_CeldMart equ $12
-TileSet_GmFrkHQ equ $13
-TileSet_Lab equ $14
-TileSet_BikeShp equ $15
-TileSet_Mansion equ $16
-TileSet_IndigoPlt equ $17 \ No newline at end of file