ref: ec380e6df2d071dcd03f1d2d5bc06a3bb2865a67
parent: 41acb0667a321865277f50a45e662b1aae939a00
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Sun Dec 10 20:11:05 EST 2017
tilemap → tileset
--- a/constants.asm
+++ b/constants.asm
@@ -28,7 +28,7 @@
INCLUDE "constants/deco_constants.asm"
INCLUDE "constants/radio_constants.asm"
INCLUDE "constants/sprite_constants.asm"
-INCLUDE "constants/tilemap_constants.asm"
+INCLUDE "constants/tileset_constants.asm"
INCLUDE "constants/cgb_constants.asm"
INCLUDE "constants/battle_tower_constants.asm"
INCLUDE "constants/cry_constants.asm"
--- a/constants/tilemap_constants.asm
+++ /dev/null
@@ -1,55 +1,0 @@
-; collision values (see tilesets/collision.asm)
-LANDTILE EQU $0
-WATERTILE EQU $1
-WALLTILE EQU $f
-TALK EQU $10
-
-; Tilesets indexes (see tilesets/tileset_headers.asm)
-const_value SET 1
- const TILESET_JOHTO_1 ; 01
- const TILESET_JOHTO_2 ; 02
- const TILESET_KANTO ; 03
- const TILESET_BATTLE_TOWER_OUTSIDE ; 04
- const TILESET_HOUSE_1 ; 05
- const TILESET_PLAYERS_HOUSE ; 06
- const TILESET_POKECENTER ; 07
- const TILESET_GATE ; 08
- const TILESET_PORT ; 09
- const TILESET_LAB ; 0a
- const TILESET_POWER_PLANT ; 0b
- const TILESET_MART ; 0c
- const TILESET_CELADON_MANSION ; 0d
- const TILESET_GAME_CORNER ; 0e
- const TILESET_GYM_1 ; 0f
- const TILESET_KURTS_HOUSE ; 10
- const TILESET_TRAIN_STATION ; 11
- const TILESET_OLIVINE_GYM ; 12
- const TILESET_LIGHTHOUSE ; 13
- const TILESET_PLAYERS_HOUSE_2F ; 14
- const TILESET_POKECOM_CENTER ; 15
- const TILESET_BATTLE_TOWER ; 16
- const TILESET_SPROUT_TOWER ; 17
- const TILESET_CAVE ; 18
- const TILESET_PARK ; 19
- const TILESET_RUINS_OF_ALPH ; 1a
- const TILESET_RADIO_TOWER ; 1b
- const TILESET_UNDERGROUND ; 1c
- const TILESET_ICE_PATH ; 1d
- const TILESET_WHIRL_ISLANDS ; 1e
- const TILESET_ILEX_FOREST ; 1f
- const TILESET_BETA_WORD_ROOM ; 20
- const TILESET_HO_OH_WORD_ROOM ; 21
- const TILESET_KABUTO_WORD_ROOM ; 22
- const TILESET_OMANYTE_WORD_ROOM ; 23
- const TILESET_AERODACTYL_WORD_ROOM ; 24
-
-; bg palette values (see tilesets/*_palette_map.asm)
- const_def
- const PAL_BG_GRAY ; 0
- const PAL_BG_RED ; 1
- const PAL_BG_GREEN ; 2
- const PAL_BG_WATER ; 3
- const PAL_BG_YELLOW ; 4
- const PAL_BG_BROWN ; 5
- const PAL_BG_ROOF ; 6
- const PAL_BG_TEXT ; 7
--- /dev/null
+++ b/constants/tileset_constants.asm
@@ -1,0 +1,55 @@
+; collision values (see tilesets/collision.asm)
+LANDTILE EQU $0
+WATERTILE EQU $1
+WALLTILE EQU $f
+TALK EQU $10
+
+; Tilesets indexes (see tilesets/tileset_headers.asm)
+const_value SET 1
+ const TILESET_JOHTO_1 ; 01
+ const TILESET_JOHTO_2 ; 02
+ const TILESET_KANTO ; 03
+ const TILESET_BATTLE_TOWER_OUTSIDE ; 04
+ const TILESET_HOUSE_1 ; 05
+ const TILESET_PLAYERS_HOUSE ; 06
+ const TILESET_POKECENTER ; 07
+ const TILESET_GATE ; 08
+ const TILESET_PORT ; 09
+ const TILESET_LAB ; 0a
+ const TILESET_POWER_PLANT ; 0b
+ const TILESET_MART ; 0c
+ const TILESET_CELADON_MANSION ; 0d
+ const TILESET_GAME_CORNER ; 0e
+ const TILESET_GYM_1 ; 0f
+ const TILESET_KURTS_HOUSE ; 10
+ const TILESET_TRAIN_STATION ; 11
+ const TILESET_OLIVINE_GYM ; 12
+ const TILESET_LIGHTHOUSE ; 13
+ const TILESET_PLAYERS_HOUSE_2F ; 14
+ const TILESET_POKECOM_CENTER ; 15
+ const TILESET_BATTLE_TOWER ; 16
+ const TILESET_SPROUT_TOWER ; 17
+ const TILESET_CAVE ; 18
+ const TILESET_PARK ; 19
+ const TILESET_RUINS_OF_ALPH ; 1a
+ const TILESET_RADIO_TOWER ; 1b
+ const TILESET_UNDERGROUND ; 1c
+ const TILESET_ICE_PATH ; 1d
+ const TILESET_WHIRL_ISLANDS ; 1e
+ const TILESET_ILEX_FOREST ; 1f
+ const TILESET_BETA_WORD_ROOM ; 20
+ const TILESET_HO_OH_WORD_ROOM ; 21
+ const TILESET_KABUTO_WORD_ROOM ; 22
+ const TILESET_OMANYTE_WORD_ROOM ; 23
+ const TILESET_AERODACTYL_WORD_ROOM ; 24
+
+; bg palette values (see tilesets/*_palette_map.asm)
+ const_def
+ const PAL_BG_GRAY ; 0
+ const PAL_BG_RED ; 1
+ const PAL_BG_GREEN ; 2
+ const PAL_BG_WATER ; 3
+ const PAL_BG_YELLOW ; 4
+ const PAL_BG_BROWN ; 5
+ const PAL_BG_ROOF ; 6
+ const PAL_BG_TEXT ; 7