ref: 0f57aefdf2b97df9ed017ec5f4c6afd5df65149b
parent: 89073da581022316228818272892cb12c851cb68
parent: 07b9c4b03044a6e24bfeb784df62da71ff58ae94
author: yenatch <yenatch@gmail.com>
date: Fri Jun 26 07:00:39 EDT 2015
Merge branch 'tilesets' into master Conflicts: tilesets/tileset_headers.asm
--- a/Makefile
+++ b/Makefile
@@ -76,8 +76,8 @@
pngs:
find . -iname "*.lz" -exec $(gfx) unlz {} + find . -iname "*.[12]bpp" -exec $(gfx) png {} +- find . -iname "*.lz" -exec touch {} + find . -iname "*.[12]bpp" -exec touch {} ++ find . -iname "*.lz" -exec touch {} +%.2bpp: %.png ; @$(gfx) 2bpp $<
%.1bpp: %.png ; @$(gfx) 1bpp $<
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1942,6 +1942,7 @@
Functionb1de: ; b1de
callba Function494ac
jr c, .asm_b230
+
ld a, [wd19a]
and 7
ld e, a
@@ -1977,7 +1978,7 @@
add hl, hl
add hl, hl
add hl, hl
- ld de, MornPal
+ ld de, TilesetBGPalette
add hl, de
ld e, l
ld d, h
@@ -2000,18 +2001,18 @@
ld a, [TimeOfDayPal]
and 3
ld bc, $40
- ld hl, Palettes_b469
+ ld hl, MapObjectPals
call AddNTimes
ld de, Unkn2Pals
- ld bc, $0040
- ld a, $5
+ ld bc, $40
+ ld a, $5 ; BANK(Unkn2Pals)
call FarCopyWRAM
+
ld a, [wd19a]
cp 1
jr z, .asm_b253
cp 2
ret nz
-
.asm_b253
ld a, [MapGroup]
ld l, a
@@ -2019,20 +2020,19 @@
add hl, hl
add hl, hl
add hl, hl
- ld de, Palettes_b569
+ ld de, RoofPals
add hl, de
ld a, [TimeOfDayPal]
and 3
- cp 2
+ cp NITE
jr c, .asm_b26d
inc hl
inc hl
inc hl
inc hl
-
.asm_b26d
ld de, Unkn1Pals + 8 * 6 + 2
- ld bc, $0004
+ ld bc, 4
ld a, $5
call FarCopyWRAM
ret
@@ -2039,31 +2039,39 @@
; b279
Unknown_b279: ; b279
- dw Unknown_b289
- dw Unknown_b289
- dw Unknown_b289
- dw Unknown_b2a9
- dw Unknown_b2c9
- dw Unknown_b2e9
- dw Unknown_b2a9
- dw Unknown_b2c9
+ dw TilesetColors1
+ dw TilesetColors1
+ dw TilesetColors1
+ dw TilesetColors2
+ dw TilesetColors3
+ dw TilesetColors4
+ dw TilesetColors2
+ dw TilesetColors3
; b289
-Unknown_b289: ; b289
- db $00, $01, $02, $28, $04, $05, $06, $07, $08, $09, $0a, $28, $0c, $0d, $0e, $0f
- db $10, $11, $12, $29, $14, $15, $16, $17, $18, $19, $1a, $1b, $1c, $1d, $1e, $1f
+TilesetColors1: ; b289
+ db $00, $01, $02, $28, $04, $05, $06, $07
+ db $08, $09, $0a, $28, $0c, $0d, $0e, $0f
+ db $10, $11, $12, $29, $14, $15, $16, $17
+ db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f
-Unknown_b2a9: ; b289
- db $20, $21, $22, $23, $24, $25, $26, $07, $20, $21, $22, $23, $24, $25, $26, $07
- db $10, $11, $12, $13, $14, $15, $16, $07, $18, $19, $1a, $1b, $1c, $1d, $1e, $07
+TilesetColors2: ; b289
+ db $20, $21, $22, $23, $24, $25, $26, $07
+ db $20, $21, $22, $23, $24, $25, $26, $07
+ db $10, $11, $12, $13, $14, $15, $16, $07
+ db $18, $19, $1a, $1b, $1c, $1d, $1e, $07
-Unknown_b2c9: ; b289
- db $00, $01, $02, $03, $04, $05, $06, $07, $08, $09, $0a, $0b, $0c, $0d, $0e, $0f
- db $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $1a, $1b, $1c, $1d, $1e, $1f
+TilesetColors3: ; b289
+ db $00, $01, $02, $03, $04, $05, $06, $07
+ db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f
+ db $10, $11, $12, $13, $14, $15, $16, $17
+ db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f
-Unknown_b2e9: ; b289
- db $00, $01, $02, $03, $04, $05, $06, $07, $08, $09, $0a, $0b, $0c, $0d, $0e, $0f
- db $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $1a, $1b, $1c, $1d, $1e, $1f
+TilesetColors4: ; b289
+ db $00, $01, $02, $03, $04, $05, $06, $07
+ db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f
+ db $10, $11, $12, $13, $14, $15, $16, $17
+ db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f
; b309
Palette_b309: ; b309
@@ -2080,376 +2088,15 @@
RGB 00, 00, 00
; b319
-MornPal: ; 0xb319
-INCLUDE "tilesets/morn.pal"
-; 0xb359
+TilesetBGPalette: ; b319
+INCLUDE "tilesets/bg.pal"
-DayPal: ; 0xb359
-INCLUDE "tilesets/day.pal"
-; 0xb399
+MapObjectPals:: ; b469
+INCLUDE "tilesets/ob.pal"
-NitePal: ; 0xb399
-INCLUDE "tilesets/nite.pal"
-; 0xb3d9
+RoofPals: ; b569
+INCLUDE "tilesets/roof.pal"
-DarkPal: ; 0xb3d9
-INCLUDE "tilesets/dark.pal"
-; 0xb419
-
-; There are actually a lot more of these.
-
-; b419
-
- RGB 30, 28, 26
- RGB 19, 19, 19
- RGB 13, 13, 13
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 31, 19, 24
- RGB 30, 10, 06
- RGB 07, 07, 07
-
- RGB 18, 24, 09
- RGB 15, 20, 01
- RGB 09, 13, 00
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 15, 16, 31
- RGB 09, 09, 31
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 31, 31, 07
- RGB 31, 16, 01
- RGB 07, 07, 07
-
- RGB 26, 24, 17
- RGB 21, 17, 07
- RGB 16, 13, 03
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 17, 19, 31
- RGB 14, 16, 31
- RGB 07, 07, 07
-
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
-
- RGB 23, 23, 31
- RGB 18, 19, 31
- RGB 13, 12, 31
- RGB 07, 07, 07
-
- RGB 15, 13, 27
- RGB 10, 09, 20
- RGB 04, 03, 18
- RGB 00, 00, 00
-; b469
-
-Palettes_b469: ; b469
- RGB 28, 31, 16
- RGB 31, 19, 10
- RGB 31, 07, 01
- RGB 00, 00, 00
-
-Palette_b471::
- RGB 28, 31, 16
- RGB 31, 19, 10
- RGB 10, 09, 31
- RGB 00, 00, 00
-
- RGB 28, 31, 16
- RGB 31, 19, 10
- RGB 07, 23, 03
- RGB 00, 00, 00
-
- RGB 28, 31, 16
- RGB 31, 19, 10
- RGB 15, 10, 03
- RGB 00, 00, 00
-
- RGB 28, 31, 16
- RGB 31, 19, 10
- RGB 30, 10, 06
- RGB 00, 00, 00
-
- RGB 31, 31, 31
- RGB 31, 31, 31
- RGB 13, 13, 13
- RGB 00, 00, 00
-
- RGB 22, 31, 10
- RGB 12, 25, 01
- RGB 05, 14, 00
- RGB 07, 07, 07
-
- RGB 28, 31, 16
- RGB 24, 18, 07
- RGB 20, 15, 03
- RGB 07, 07, 07
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 31, 07, 01
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 10, 09, 31
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 07, 23, 03
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 15, 10, 03
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 30, 10, 06
- RGB 00, 00, 00
-
- RGB 31, 31, 31
- RGB 31, 31, 31
- RGB 13, 13, 13
- RGB 00, 00, 00
-
- RGB 22, 31, 10
- RGB 12, 25, 01
- RGB 05, 14, 00
- RGB 07, 07, 07
-
- RGB 27, 31, 27
- RGB 24, 18, 07
- RGB 20, 15, 03
- RGB 07, 07, 07
-
- RGB 15, 14, 24
- RGB 31, 19, 10
- RGB 31, 07, 01
- RGB 00, 00, 00
-
- RGB 15, 14, 24
- RGB 31, 19, 10
- RGB 10, 09, 31
- RGB 00, 00, 00
-
- RGB 15, 14, 24
- RGB 31, 19, 10
- RGB 07, 23, 03
- RGB 00, 00, 00
-
- RGB 15, 14, 24
- RGB 31, 19, 10
- RGB 15, 10, 03
- RGB 00, 00, 00
-
- RGB 15, 14, 24
- RGB 31, 19, 10
- RGB 30, 10, 06
- RGB 00, 00, 00
-
- RGB 31, 31, 31
- RGB 31, 31, 31
- RGB 13, 13, 13
- RGB 00, 00, 00
-
- RGB 15, 14, 24
- RGB 08, 13, 19
- RGB 00, 11, 13
- RGB 00, 00, 00
-
- RGB 15, 14, 24
- RGB 12, 09, 15
- RGB 08, 04, 05
- RGB 00, 00, 00
-
- RGB 01, 01, 02
- RGB 31, 19, 10
- RGB 31, 07, 01
- RGB 00, 00, 00
-
- RGB 01, 01, 02
- RGB 31, 19, 10
- RGB 10, 09, 31
- RGB 00, 00, 00
-
- RGB 01, 01, 02
- RGB 31, 19, 10
- RGB 07, 23, 03
- RGB 00, 00, 00
-
- RGB 01, 01, 02
- RGB 31, 19, 10
- RGB 15, 10, 03
- RGB 00, 00, 00
-
- RGB 01, 01, 02
- RGB 31, 19, 10
- RGB 30, 10, 06
- RGB 00, 00, 00
-
- RGB 31, 31, 31
- RGB 31, 31, 31
- RGB 13, 13, 13
- RGB 00, 00, 00
-
- RGB 01, 01, 02
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 00, 00, 00
-
- RGB 01, 01, 02
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 00, 00, 00
-; b569
-
-Palettes_b569: ; b569
- RGB 21, 21, 21
- RGB 11, 11, 11
- RGB 21, 21, 21
- RGB 11, 11, 11
-
- RGB 14, 17, 31
- RGB 07, 11, 15
- RGB 09, 09, 17
- RGB 05, 07, 13
-
- RGB 12, 19, 00
- RGB 06, 10, 00
- RGB 06, 09, 07
- RGB 04, 05, 06
-
- RGB 21, 21, 21
- RGB 11, 11, 11
- RGB 21, 21, 21
- RGB 17, 08, 07
-
- RGB 31, 19, 00
- RGB 27, 10, 05
- RGB 15, 07, 02
- RGB 11, 04, 02
-
- RGB 11, 10, 16
- RGB 05, 06, 07
- RGB 03, 04, 08
- RGB 00, 00, 00
-
- RGB 31, 10, 00
- RGB 18, 06, 00
- RGB 18, 05, 09
- RGB 17, 08, 07
-
- RGB 17, 27, 31
- RGB 05, 15, 31
- RGB 07, 08, 22
- RGB 07, 07, 16
-
- RGB 22, 20, 10
- RGB 17, 14, 03
- RGB 11, 11, 05
- RGB 10, 09, 07
-
- RGB 31, 08, 04
- RGB 09, 09, 08
- RGB 18, 05, 09
- RGB 09, 09, 08
-
- RGB 24, 14, 31
- RGB 13, 07, 21
- RGB 12, 03, 18
- RGB 09, 03, 15
-
- RGB 25, 25, 00
- RGB 20, 17, 08
- RGB 12, 12, 00
- RGB 10, 09, 05
-
- RGB 27, 23, 01
- RGB 23, 11, 00
- RGB 15, 11, 01
- RGB 11, 10, 01
-
- RGB 27, 28, 31
- RGB 17, 19, 22
- RGB 14, 14, 18
- RGB 10, 09, 13
-
- RGB 19, 19, 16
- RGB 10, 12, 15
- RGB 09, 09, 11
- RGB 04, 05, 07
-
- RGB 14, 17, 31
- RGB 07, 11, 15
- RGB 09, 13, 19
- RGB 07, 07, 16
-
- RGB 21, 21, 21
- RGB 13, 13, 13
- RGB 11, 11, 19
- RGB 07, 07, 12
-
- RGB 31, 18, 29
- RGB 17, 13, 20
- RGB 14, 06, 12
- RGB 11, 03, 10
-
- RGB 23, 15, 31
- RGB 16, 05, 31
- RGB 12, 07, 17
- RGB 08, 06, 10
-
- RGB 21, 21, 25
- RGB 16, 16, 16
- RGB 13, 13, 13
- RGB 07, 07, 07
-
- RGB 21, 21, 21
- RGB 11, 11, 11
- RGB 21, 21, 21
- RGB 11, 11, 11
-
- RGB 19, 31, 15
- RGB 31, 22, 02
- RGB 12, 13, 09
- RGB 09, 12, 03
-
- RGB 15, 10, 31
- RGB 07, 05, 15
- RGB 06, 05, 17
- RGB 02, 02, 08
-
- RGB 21, 31, 07
- RGB 13, 25, 04
- RGB 09, 14, 08
- RGB 06, 10, 04
-
- RGB 20, 31, 14
- RGB 11, 23, 05
- RGB 09, 13, 08
- RGB 06, 09, 04
-
- RGB 31, 26, 00
- RGB 31, 15, 00
- RGB 13, 13, 01
- RGB 08, 08, 01
-
- RGB 31, 14, 28
- RGB 31, 05, 21
- RGB 14, 07, 17
- RGB 13, 00, 08
-
Palettes_b641: ; b641
RGB 27, 31, 27
RGB 21, 21, 21
@@ -2475,7 +2122,6 @@
RGB 31, 31, 07
RGB 31, 16, 01
RGB 00, 00, 00
-; b669
RGB 27, 31, 27
RGB 22, 16, 08
--- a/main.asm
+++ b/main.asm
@@ -41100,7 +41100,7 @@
; 49420
Function49420:: ; 49420 (12:5420)
- ld hl, Palette_496bd
+ ld hl, MansionPalette4
ld de, Unkn1Pals + $30
ld bc, $8
ld a, $5 ; BANK(Unkn1Pals)
@@ -41177,314 +41177,124 @@
Function494ac: ; 494ac
ld a, [wd199]
cp $15
- jr z, .asm_494c9
+ jr z, .pokecom_2f
cp $16
- jr z, .asm_494ce
+ jr z, .battle_tower
cp $1d
- jr z, .asm_494d3
+ jr z, .ice_path
cp $5
- jr z, .asm_494e1
+ jr z, .house
cp $1b
- jr z, .asm_494e6
+ jr z, .radio_tower
cp $d
- jr z, .asm_494eb
- jr .asm_494f0
+ jr z, .mansion_mobile
+ jr .do_nothing
-.asm_494c9
- call Function494f2
+.pokecom_2f
+ call LoadPokeComPalette
scf
ret
-.asm_494ce
- call Function49541
+.battle_tower
+ call LoadBattleTowerPalette
scf
ret
-.asm_494d3
- ld a, [wd19a]
- and $7
- cp $3
- jr z, .asm_494f0
- call Function49590
+.ice_path
+ ld a, [wd19a] ; permission
+ and 7
+ cp 3 ; Hall of Fame
+ jr z, .do_nothing
+ call LoadIcePathPalette
scf
ret
-.asm_494e1
- call Function495df
+.house
+ call LoadHousePalette
scf
ret
-.asm_494e6
- call Function4962e
+.radio_tower
+ call LoadRadioTowerPalette
scf
ret
-.asm_494eb
- call Function496c5
+.mansion_mobile
+ call LoadMansionPalette
scf
ret
-.asm_494f0
+.do_nothing
and a
ret
; 494f2
-Function494f2: ; 494f2
+LoadPokeComPalette: ; 494f2
ld a, $5
ld de, Unkn1Pals
- ld hl, Palette_49501
+ ld hl, PokeComPalette
ld bc, $0040
call FarCopyWRAM
ret
; 49501
-Palette_49501: ; 49501
- RGB 30, 28, 26
- RGB 19, 19, 19
- RGB 13, 13, 13
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 31, 19, 24
- RGB 30, 10, 06
- RGB 07, 07, 07
-
- RGB 18, 24, 09
- RGB 15, 20, 01
- RGB 09, 13, 00
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 17, 19, 31
- RGB 14, 16, 31
- RGB 07, 07, 07
-
- RGB 31, 26, 21
- RGB 31, 20, 01
- RGB 14, 16, 31
- RGB 07, 07, 07
-
- RGB 21, 17, 07
- RGB 17, 19, 31
- RGB 16, 13, 03
- RGB 07, 07, 07
-
- RGB 05, 05, 16
- RGB 08, 19, 28
- RGB 00, 00, 00
- RGB 31, 31, 31
-
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
+PokeComPalette: ; 49501
+INCLUDE "tilesets/pokecom.pal"
; 49541
-Function49541: ; 49541
+LoadBattleTowerPalette: ; 49541
ld a, $5
ld de, Unkn1Pals
- ld hl, Palette_49550
+ ld hl, BattleTowerPalette
ld bc, $0040
call FarCopyWRAM
ret
; 49550
-Palette_49550: ; 49550
- RGB 30, 28, 26
- RGB 19, 19, 19
- RGB 13, 13, 13
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 31, 19, 24
- RGB 30, 10, 06
- RGB 07, 07, 07
-
- RGB 18, 24, 09
- RGB 15, 20, 01
- RGB 09, 13, 00
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 15, 16, 31
- RGB 09, 09, 31
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 31, 31, 07
- RGB 31, 16, 01
- RGB 07, 07, 07
-
- RGB 26, 24, 17
- RGB 21, 17, 07
- RGB 16, 13, 03
- RGB 07, 07, 07
-
- RGB 05, 05, 16
- RGB 08, 19, 28
- RGB 00, 00, 00
- RGB 31, 31, 31
-
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
+BattleTowerPalette: ; 49550
+INCLUDE "tilesets/battle_tower.pal"
; 49590
-Function49590: ; 49590
+LoadIcePathPalette: ; 49590
ld a, $5
ld de, Unkn1Pals
- ld hl, Palette_4959f
+ ld hl, IcePathPalette
ld bc, $0040
call FarCopyWRAM
ret
; 4959f
-Palette_4959f: ; 4959f
- RGB 15, 14, 24
- RGB 11, 11, 19
- RGB 07, 07, 12
- RGB 00, 00, 00
-
- RGB 15, 14, 24
- RGB 14, 07, 17
- RGB 13, 00, 08
- RGB 00, 00, 00
-
- RGB 22, 29, 31
- RGB 10, 27, 31
- RGB 31, 31, 31
- RGB 05, 00, 09
-
- RGB 15, 14, 24
- RGB 05, 05, 17
- RGB 03, 03, 10
- RGB 00, 00, 00
-
- RGB 30, 30, 11
- RGB 16, 14, 18
- RGB 16, 14, 10
- RGB 00, 00, 00
-
- RGB 15, 14, 24
- RGB 12, 09, 15
- RGB 08, 04, 05
- RGB 00, 00, 00
-
- RGB 25, 31, 31
- RGB 09, 28, 31
- RGB 16, 11, 31
- RGB 05, 00, 09
-
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
+IcePathPalette: ; 4959f
+INCLUDE "tilesets/ice_path.pal"
; 495df
-Function495df: ; 495df
+LoadHousePalette: ; 495df
ld a, $5
ld de, Unkn1Pals
- ld hl, Palette_495ee
+ ld hl, HousePalette
ld bc, $0040
call FarCopyWRAM
ret
; 495ee
-Palette_495ee: ; 495ee
- RGB 30, 28, 26
- RGB 19, 19, 19
- RGB 13, 13, 13
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 31, 19, 24
- RGB 30, 10, 06
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 15, 20, 01
- RGB 09, 13, 00
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 15, 16, 31
- RGB 09, 09, 31
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 31, 31, 07
- RGB 31, 16, 01
- RGB 07, 07, 07
-
- RGB 26, 24, 17
- RGB 21, 17, 07
- RGB 16, 13, 03
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 31, 19, 24
- RGB 16, 13, 03
- RGB 07, 07, 07
-
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
+HousePalette: ; 495ee
+INCLUDE "tilesets/house.pal"
; 4962e
-Function4962e: ; 4962e
+LoadRadioTowerPalette: ; 4962e
ld a, $5
ld de, Unkn1Pals
- ld hl, Palette_4963d
+ ld hl, RadioTowerPalette
ld bc, $0040
call FarCopyWRAM
ret
; 4963d
-Palette_4963d: ; 4963d
- RGB 27, 31, 27
- RGB 21, 21, 21
- RGB 13, 13, 13
- RGB 07, 07, 07
-
- RGB 27, 31, 27
- RGB 31, 19, 24
- RGB 30, 10, 06
- RGB 07, 07, 07
-
- RGB 08, 12, 31
- RGB 12, 25, 01
- RGB 05, 14, 00
- RGB 07, 07, 07
-
- RGB 31, 31, 31
- RGB 08, 12, 31
- RGB 01, 04, 31
- RGB 07, 07, 07
-
- RGB 27, 31, 27
- RGB 12, 25, 01
- RGB 05, 14, 00
- RGB 07, 07, 07
-
- RGB 27, 31, 27
- RGB 24, 18, 07
- RGB 20, 15, 03
- RGB 07, 07, 07
-
- RGB 27, 31, 27
- RGB 15, 31, 31
- RGB 05, 17, 31
- RGB 07, 07, 07
-
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
+RadioTowerPalette: ; 4963d
+INCLUDE "tilesets/radio_tower.pal"
; 4967d
-Palette_4967d: ; 4967d
+MansionPalette1: ; 4967d
RGB 30, 28, 26
RGB 19, 19, 19
RGB 13, 13, 13
@@ -41515,7 +41325,7 @@
RGB 16, 13, 03
RGB 07, 07, 07
-Palette_496ad: ; 496ad
+MansionPalette3: ; 496ad
RGB 30, 28, 26
RGB 17, 19, 31
RGB 14, 16, 31
@@ -41527,7 +41337,7 @@
RGB 00, 00, 00
; 496bd
-Palette_496bd: ; 496bd
+MansionPalette4: ; 496bd
RGB 05, 05, 16
RGB 08, 19, 28
RGB 00, 00, 00
@@ -41534,31 +41344,31 @@
RGB 31, 31, 31
; 496c5
-Function496c5: ; 496c5
+LoadMansionPalette: ; 496c5
ld a, $5
ld de, Unkn1Pals
- ld hl, Palette_4967d
+ ld hl, MansionPalette1
ld bc, $0040
call FarCopyWRAM
ld a, $5
- ld de, wd020
- ld hl, Palette_496fe
+ ld de, Unkn1Pals + $20
+ ld hl, MansionPalette2
ld bc, $0008
call FarCopyWRAM
ld a, $5
- ld de, wd018
- ld hl, Palette_496ad
+ ld de, Unkn1Pals + $18
+ ld hl, MansionPalette3
ld bc, $0008
call FarCopyWRAM
ld a, $5
- ld de, wd030
- ld hl, Palette_496bd
+ ld de, Unkn1Pals + $30
+ ld hl, MansionPalette4
ld bc, $0008
call FarCopyWRAM
ret
; 496fe
-Palette_496fe: ; 496fe
+MansionPalette2: ; 496fe
RGB 25, 24, 23
RGB 20, 19, 19
RGB 14, 16, 31
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -752,10 +752,10 @@
ld de, $d048
ld bc, $10
call CopyBytes
- ld hl, Palette_b471
+ ld hl, MapObjectPals + 8
ld de, $d058
ld bc, $8
- ld a, BANK(Palette_b471)
+ ld a, BANK(MapObjectPals)
call FarCopyBytes
pop af
ld [rSVBK], a ; $ff00+$70
--- a/misc/unused_title.asm
+++ b/misc/unused_title.asm
@@ -66,22 +66,22 @@
ld a, $5
ld [rSVBK], a
- ld hl, UnsuedTitleBG_Palettes
+ ld hl, UnusedTitleBG_Palettes
ld de, Unkn1Pals
ld bc, $40
call CopyBytes
- ld hl, UnsuedTitleFG_Palettes
+ ld hl, UnusedTitleFG_Palettes
ld de, Unkn2Pals
ld bc, $40
call CopyBytes
- ld hl, UnsuedTitleBG_Palettes
+ ld hl, UnusedTitleBG_Palettes
ld de, BGPals
ld bc, $40
call CopyBytes
- ld hl, UnsuedTitleFG_Palettes
+ ld hl, UnusedTitleFG_Palettes
ld de, OBPals
ld bc, $40
call CopyBytes
@@ -138,7 +138,7 @@
db $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00
; 10d8b1
-UnsuedTitleBG_Palettes: ; 10d8b1
+UnusedTitleBG_Palettes: ; 10d8b1
RGB 00, 00, 00
RGB 25, 15, 28
RGB 22, 11, 28
@@ -202,7 +202,7 @@
INCBIN "gfx/title/old_fg.2bpp"
; 10eab1
-UnsuedTitleFG_Palettes: ; 10eab1
+UnusedTitleFG_Palettes: ; 10eab1
RGB 00, 00, 00
RGB 31, 31, 31
RGB 16, 16, 24
--- /dev/null
+++ b/tilesets/battle_tower.pal
@@ -1,0 +1,39 @@
+ RGB 30, 28, 26
+ RGB 19, 19, 19
+ RGB 13, 13, 13
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 31, 19, 24
+ RGB 30, 10, 06
+ RGB 07, 07, 07
+
+ RGB 18, 24, 09
+ RGB 15, 20, 01
+ RGB 09, 13, 00
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 15, 16, 31
+ RGB 09, 09, 31
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 31, 31, 07
+ RGB 31, 16, 01
+ RGB 07, 07, 07
+
+ RGB 26, 24, 17
+ RGB 21, 17, 07
+ RGB 16, 13, 03
+ RGB 07, 07, 07
+
+ RGB 05, 05, 16
+ RGB 08, 19, 28
+ RGB 00, 00, 00
+ RGB 31, 31, 31
+
+ RGB 31, 31, 16
+ RGB 31, 31, 16
+ RGB 14, 09, 00
+ RGB 00, 00, 00
--- /dev/null
+++ b/tilesets/bg.pal
@@ -1,0 +1,209 @@
+ RGB 28, 31, 16
+ RGB 21, 21, 21
+ RGB 13, 13, 13
+ RGB 07, 07, 07
+
+ RGB 28, 31, 16
+ RGB 31, 19, 24
+ RGB 30, 10, 06
+ RGB 07, 07, 07
+
+ RGB 22, 31, 10
+ RGB 12, 25, 01
+ RGB 05, 14, 00
+ RGB 07, 07, 07
+
+ RGB 31, 31, 31
+ RGB 08, 12, 31
+ RGB 01, 04, 31
+ RGB 07, 07, 07
+
+ RGB 28, 31, 16
+ RGB 31, 31, 07
+ RGB 31, 16, 01
+ RGB 07, 07, 07
+
+ RGB 28, 31, 16
+ RGB 24, 18, 07
+ RGB 20, 15, 03
+ RGB 07, 07, 07
+
+ RGB 28, 31, 16
+ RGB 15, 31, 31
+ RGB 05, 17, 31
+ RGB 07, 07, 07
+
+ RGB 31, 31, 16
+ RGB 31, 31, 16
+ RGB 14, 09, 00
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 21, 21, 21
+ RGB 13, 13, 13
+ RGB 07, 07, 07
+
+ RGB 27, 31, 27
+ RGB 31, 19, 24
+ RGB 30, 10, 06
+ RGB 07, 07, 07
+
+ RGB 22, 31, 10
+ RGB 12, 25, 01
+ RGB 05, 14, 00
+ RGB 07, 07, 07
+
+ RGB 31, 31, 31
+ RGB 08, 12, 31
+ RGB 01, 04, 31
+ RGB 07, 07, 07
+
+ RGB 27, 31, 27
+ RGB 31, 31, 07
+ RGB 31, 16, 01
+ RGB 07, 07, 07
+
+ RGB 27, 31, 27
+ RGB 24, 18, 07
+ RGB 20, 15, 03
+ RGB 07, 07, 07
+
+ RGB 27, 31, 27
+ RGB 15, 31, 31
+ RGB 05, 17, 31
+ RGB 07, 07, 07
+
+ RGB 31, 31, 16
+ RGB 31, 31, 16
+ RGB 14, 09, 00
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 11, 11, 19
+ RGB 07, 07, 12
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 14, 07, 17
+ RGB 13, 00, 08
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 08, 13, 19
+ RGB 00, 11, 13
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 05, 05, 17
+ RGB 03, 03, 10
+ RGB 00, 00, 00
+
+ RGB 30, 30, 11
+ RGB 16, 14, 18
+ RGB 16, 14, 10
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 12, 09, 15
+ RGB 08, 04, 05
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 13, 12, 23
+ RGB 11, 09, 20
+ RGB 00, 00, 00
+
+ RGB 31, 31, 16
+ RGB 31, 31, 16
+ RGB 14, 09, 00
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+
+ RGB 30, 30, 11
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+
+ RGB 31, 31, 16
+ RGB 31, 31, 16
+ RGB 14, 09, 00
+ RGB 00, 00, 00
+
+ RGB 30, 28, 26
+ RGB 19, 19, 19
+ RGB 13, 13, 13
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 31, 19, 24
+ RGB 30, 10, 06
+ RGB 07, 07, 07
+
+ RGB 18, 24, 09
+ RGB 15, 20, 01
+ RGB 09, 13, 00
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 15, 16, 31
+ RGB 09, 09, 31
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 31, 31, 07
+ RGB 31, 16, 01
+ RGB 07, 07, 07
+
+ RGB 26, 24, 17
+ RGB 21, 17, 07
+ RGB 16, 13, 03
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 17, 19, 31
+ RGB 14, 16, 31
+ RGB 07, 07, 07
+
+ RGB 31, 31, 16
+ RGB 31, 31, 16
+ RGB 14, 09, 00
+ RGB 00, 00, 00
+
+ RGB 23, 23, 31
+ RGB 18, 19, 31
+ RGB 13, 12, 31
+ RGB 07, 07, 07
+
+ RGB 15, 13, 27
+ RGB 10, 09, 20
+ RGB 04, 03, 18
+ RGB 00, 00, 00
--- a/tilesets/dark.pal
+++ /dev/null
@@ -1,32 +1,0 @@
- RGB 01, 01, 02
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 01, 01, 02
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 01, 01, 02
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 01, 01, 02
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 30, 30, 11
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 01, 01, 02
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 01, 01, 02
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 00, 00, 00
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
--- a/tilesets/day.pal
+++ /dev/null
@@ -1,32 +1,0 @@
- RGB 27, 31, 27
- RGB 21, 21, 21
- RGB 13, 13, 13
- RGB 07, 07, 07
- RGB 27, 31, 27
- RGB 31, 19, 24
- RGB 30, 10, 06
- RGB 07, 07, 07
- RGB 22, 31, 10
- RGB 12, 25, 01
- RGB 05, 14, 00
- RGB 07, 07, 07
- RGB 31, 31, 31
- RGB 08, 12, 31
- RGB 01, 04, 31
- RGB 07, 07, 07
- RGB 27, 31, 27
- RGB 31, 31, 07
- RGB 31, 16, 01
- RGB 07, 07, 07
- RGB 27, 31, 27
- RGB 24, 18, 07
- RGB 20, 15, 03
- RGB 07, 07, 07
- RGB 27, 31, 27
- RGB 15, 31, 31
- RGB 05, 17, 31
- RGB 07, 07, 07
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
--- /dev/null
+++ b/tilesets/house.pal
@@ -1,0 +1,39 @@
+ RGB 30, 28, 26
+ RGB 19, 19, 19
+ RGB 13, 13, 13
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 31, 19, 24
+ RGB 30, 10, 06
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 15, 20, 01
+ RGB 09, 13, 00
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 15, 16, 31
+ RGB 09, 09, 31
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 31, 31, 07
+ RGB 31, 16, 01
+ RGB 07, 07, 07
+
+ RGB 26, 24, 17
+ RGB 21, 17, 07
+ RGB 16, 13, 03
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 31, 19, 24
+ RGB 16, 13, 03
+ RGB 07, 07, 07
+
+ RGB 31, 31, 16
+ RGB 31, 31, 16
+ RGB 14, 09, 00
+ RGB 00, 00, 00
--- /dev/null
+++ b/tilesets/ice_path.pal
@@ -1,0 +1,39 @@
+ RGB 15, 14, 24
+ RGB 11, 11, 19
+ RGB 07, 07, 12
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 14, 07, 17
+ RGB 13, 00, 08
+ RGB 00, 00, 00
+
+ RGB 22, 29, 31
+ RGB 10, 27, 31
+ RGB 31, 31, 31
+ RGB 05, 00, 09
+
+ RGB 15, 14, 24
+ RGB 05, 05, 17
+ RGB 03, 03, 10
+ RGB 00, 00, 00
+
+ RGB 30, 30, 11
+ RGB 16, 14, 18
+ RGB 16, 14, 10
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 12, 09, 15
+ RGB 08, 04, 05
+ RGB 00, 00, 00
+
+ RGB 25, 31, 31
+ RGB 09, 28, 31
+ RGB 16, 11, 31
+ RGB 05, 00, 09
+
+ RGB 31, 31, 16
+ RGB 31, 31, 16
+ RGB 14, 09, 00
+ RGB 00, 00, 00
--- a/tilesets/morn.pal
+++ /dev/null
@@ -1,32 +1,0 @@
- RGB 28, 31, 16
- RGB 21, 21, 21
- RGB 13, 13, 13
- RGB 07, 07, 07
- RGB 28, 31, 16
- RGB 31, 19, 24
- RGB 30, 10, 06
- RGB 07, 07, 07
- RGB 22, 31, 10
- RGB 12, 25, 01
- RGB 05, 14, 00
- RGB 07, 07, 07
- RGB 31, 31, 31
- RGB 08, 12, 31
- RGB 01, 04, 31
- RGB 07, 07, 07
- RGB 28, 31, 16
- RGB 31, 31, 07
- RGB 31, 16, 01
- RGB 07, 07, 07
- RGB 28, 31, 16
- RGB 24, 18, 07
- RGB 20, 15, 03
- RGB 07, 07, 07
- RGB 28, 31, 16
- RGB 15, 31, 31
- RGB 05, 17, 31
- RGB 07, 07, 07
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
--- a/tilesets/nite.pal
+++ /dev/null
@@ -1,32 +1,0 @@
- RGB 15, 14, 24
- RGB 11, 11, 19
- RGB 07, 07, 12
- RGB 00, 00, 00
- RGB 15, 14, 24
- RGB 14, 07, 17
- RGB 13, 00, 08
- RGB 00, 00, 00
- RGB 15, 14, 24
- RGB 08, 13, 19
- RGB 00, 11, 13
- RGB 00, 00, 00
- RGB 15, 14, 24
- RGB 05, 05, 17
- RGB 03, 03, 10
- RGB 00, 00, 00
- RGB 30, 30, 11
- RGB 16, 14, 18
- RGB 16, 14, 10
- RGB 00, 00, 00
- RGB 15, 14, 24
- RGB 12, 09, 15
- RGB 08, 04, 05
- RGB 00, 00, 00
- RGB 15, 14, 24
- RGB 13, 12, 23
- RGB 11, 09, 20
- RGB 00, 00, 00
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
--- /dev/null
+++ b/tilesets/ob.pal
@@ -1,0 +1,159 @@
+ RGB 28, 31, 16
+ RGB 31, 19, 10
+ RGB 31, 07, 01
+ RGB 00, 00, 00
+
+ RGB 28, 31, 16
+ RGB 31, 19, 10
+ RGB 10, 09, 31
+ RGB 00, 00, 00
+
+ RGB 28, 31, 16
+ RGB 31, 19, 10
+ RGB 07, 23, 03
+ RGB 00, 00, 00
+
+ RGB 28, 31, 16
+ RGB 31, 19, 10
+ RGB 15, 10, 03
+ RGB 00, 00, 00
+
+ RGB 28, 31, 16
+ RGB 31, 19, 10
+ RGB 30, 10, 06
+ RGB 00, 00, 00
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 13, 13, 13
+ RGB 00, 00, 00
+
+ RGB 22, 31, 10
+ RGB 12, 25, 01
+ RGB 05, 14, 00
+ RGB 07, 07, 07
+
+ RGB 28, 31, 16
+ RGB 24, 18, 07
+ RGB 20, 15, 03
+ RGB 07, 07, 07
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 31, 07, 01
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 10, 09, 31
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 07, 23, 03
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 15, 10, 03
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 30, 10, 06
+ RGB 00, 00, 00
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 13, 13, 13
+ RGB 00, 00, 00
+
+ RGB 22, 31, 10
+ RGB 12, 25, 01
+ RGB 05, 14, 00
+ RGB 07, 07, 07
+
+ RGB 27, 31, 27
+ RGB 24, 18, 07
+ RGB 20, 15, 03
+ RGB 07, 07, 07
+
+ RGB 15, 14, 24
+ RGB 31, 19, 10
+ RGB 31, 07, 01
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 31, 19, 10
+ RGB 10, 09, 31
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 31, 19, 10
+ RGB 07, 23, 03
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 31, 19, 10
+ RGB 15, 10, 03
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 31, 19, 10
+ RGB 30, 10, 06
+ RGB 00, 00, 00
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 13, 13, 13
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 08, 13, 19
+ RGB 00, 11, 13
+ RGB 00, 00, 00
+
+ RGB 15, 14, 24
+ RGB 12, 09, 15
+ RGB 08, 04, 05
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 31, 19, 10
+ RGB 31, 07, 01
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 31, 19, 10
+ RGB 10, 09, 31
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 31, 19, 10
+ RGB 07, 23, 03
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 31, 19, 10
+ RGB 15, 10, 03
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 31, 19, 10
+ RGB 30, 10, 06
+ RGB 00, 00, 00
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 13, 13, 13
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+
+ RGB 01, 01, 02
+ RGB 00, 00, 00
+ RGB 00, 00, 00
+ RGB 00, 00, 00
--- /dev/null
+++ b/tilesets/pokecom.pal
@@ -1,0 +1,39 @@
+ RGB 30, 28, 26
+ RGB 19, 19, 19
+ RGB 13, 13, 13
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 31, 19, 24
+ RGB 30, 10, 06
+ RGB 07, 07, 07
+
+ RGB 18, 24, 09
+ RGB 15, 20, 01
+ RGB 09, 13, 00
+ RGB 07, 07, 07
+
+ RGB 30, 28, 26
+ RGB 17, 19, 31
+ RGB 14, 16, 31
+ RGB 07, 07, 07
+
+ RGB 31, 26, 21
+ RGB 31, 20, 01
+ RGB 14, 16, 31
+ RGB 07, 07, 07
+
+ RGB 21, 17, 07
+ RGB 17, 19, 31
+ RGB 16, 13, 03
+ RGB 07, 07, 07
+
+ RGB 05, 05, 16
+ RGB 08, 19, 28
+ RGB 00, 00, 00
+ RGB 31, 31, 31
+
+ RGB 31, 31, 16
+ RGB 31, 31, 16
+ RGB 14, 09, 00
+ RGB 00, 00, 00
--- /dev/null
+++ b/tilesets/radio_tower.pal
@@ -1,0 +1,39 @@
+ RGB 27, 31, 27
+ RGB 21, 21, 21
+ RGB 13, 13, 13
+ RGB 07, 07, 07
+
+ RGB 27, 31, 27
+ RGB 31, 19, 24
+ RGB 30, 10, 06
+ RGB 07, 07, 07
+
+ RGB 08, 12, 31
+ RGB 12, 25, 01
+ RGB 05, 14, 00
+ RGB 07, 07, 07
+
+ RGB 31, 31, 31
+ RGB 08, 12, 31
+ RGB 01, 04, 31
+ RGB 07, 07, 07
+
+ RGB 27, 31, 27
+ RGB 12, 25, 01
+ RGB 05, 14, 00
+ RGB 07, 07, 07
+
+ RGB 27, 31, 27
+ RGB 24, 18, 07
+ RGB 20, 15, 03
+ RGB 07, 07, 07
+
+ RGB 27, 31, 27
+ RGB 15, 31, 31
+ RGB 05, 17, 31
+ RGB 07, 07, 07
+
+ RGB 31, 31, 16
+ RGB 31, 31, 16
+ RGB 14, 09, 00
+ RGB 00, 00, 00
--- /dev/null
+++ b/tilesets/roof.pal
@@ -1,0 +1,134 @@
+ RGB 21, 21, 21
+ RGB 11, 11, 11
+ RGB 21, 21, 21
+ RGB 11, 11, 11
+
+ RGB 14, 17, 31
+ RGB 07, 11, 15
+ RGB 09, 09, 17
+ RGB 05, 07, 13
+
+ RGB 12, 19, 00
+ RGB 06, 10, 00
+ RGB 06, 09, 07
+ RGB 04, 05, 06
+
+ RGB 21, 21, 21
+ RGB 11, 11, 11
+ RGB 21, 21, 21
+ RGB 17, 08, 07
+
+ RGB 31, 19, 00
+ RGB 27, 10, 05
+ RGB 15, 07, 02
+ RGB 11, 04, 02
+
+ RGB 11, 10, 16
+ RGB 05, 06, 07
+ RGB 03, 04, 08
+ RGB 00, 00, 00
+
+ RGB 31, 10, 00
+ RGB 18, 06, 00
+ RGB 18, 05, 09
+ RGB 17, 08, 07
+
+ RGB 17, 27, 31
+ RGB 05, 15, 31
+ RGB 07, 08, 22
+ RGB 07, 07, 16
+
+ RGB 22, 20, 10
+ RGB 17, 14, 03
+ RGB 11, 11, 05
+ RGB 10, 09, 07
+
+ RGB 31, 08, 04
+ RGB 09, 09, 08
+ RGB 18, 05, 09
+ RGB 09, 09, 08
+
+ RGB 24, 14, 31
+ RGB 13, 07, 21
+ RGB 12, 03, 18
+ RGB 09, 03, 15
+
+ RGB 25, 25, 00
+ RGB 20, 17, 08
+ RGB 12, 12, 00
+ RGB 10, 09, 05
+
+ RGB 27, 23, 01
+ RGB 23, 11, 00
+ RGB 15, 11, 01
+ RGB 11, 10, 01
+
+ RGB 27, 28, 31
+ RGB 17, 19, 22
+ RGB 14, 14, 18
+ RGB 10, 09, 13
+
+ RGB 19, 19, 16
+ RGB 10, 12, 15
+ RGB 09, 09, 11
+ RGB 04, 05, 07
+
+ RGB 14, 17, 31
+ RGB 07, 11, 15
+ RGB 09, 13, 19
+ RGB 07, 07, 16
+
+ RGB 21, 21, 21
+ RGB 13, 13, 13
+ RGB 11, 11, 19
+ RGB 07, 07, 12
+
+ RGB 31, 18, 29
+ RGB 17, 13, 20
+ RGB 14, 06, 12
+ RGB 11, 03, 10
+
+ RGB 23, 15, 31
+ RGB 16, 05, 31
+ RGB 12, 07, 17
+ RGB 08, 06, 10
+
+ RGB 21, 21, 25
+ RGB 16, 16, 16
+ RGB 13, 13, 13
+ RGB 07, 07, 07
+
+ RGB 21, 21, 21
+ RGB 11, 11, 11
+ RGB 21, 21, 21
+ RGB 11, 11, 11
+
+ RGB 19, 31, 15
+ RGB 31, 22, 02
+ RGB 12, 13, 09
+ RGB 09, 12, 03
+
+ RGB 15, 10, 31
+ RGB 07, 05, 15
+ RGB 06, 05, 17
+ RGB 02, 02, 08
+
+ RGB 21, 31, 07
+ RGB 13, 25, 04
+ RGB 09, 14, 08
+ RGB 06, 10, 04
+
+ RGB 20, 31, 14
+ RGB 11, 23, 05
+ RGB 09, 13, 08
+ RGB 06, 09, 04
+
+ RGB 31, 26, 00
+ RGB 31, 15, 00
+ RGB 13, 13, 01
+ RGB 08, 08, 01
+
+ RGB 31, 14, 28
+ RGB 31, 05, 21
+ RGB 14, 07, 17
+ RGB 13, 00, 08
--- a/tilesets/tileset_headers.asm
+++ b/tilesets/tileset_headers.asm
@@ -1,297 +1,48 @@
-Tileset00:: ; 0x4d596
- dbw BANK(Tileset00GFX), Tileset00GFX
- dbw BANK(Tileset00Meta), Tileset00Meta
- dbw BANK(Tileset00Coll), Tileset00Coll
- dw Tileset00Anim
- dw $0000
- dw Tileset00PalMap
+tileset: macro
+ dbw BANK(\1GFX), \1GFX
+ dbw BANK(\1Meta), \1Meta
+ dbw BANK(\1Coll), \1Coll
+ dw \1Anim
+ dw NULL
+ dw \1PalMap
+endm
-Tileset01:: ; 0x4d5a5
- dbw BANK(Tileset01GFX), Tileset01GFX
- dbw BANK(Tileset01Meta), Tileset01Meta
- dbw BANK(Tileset01Coll), Tileset01Coll
- dw Tileset01Anim
- dw $0000
- dw Tileset01PalMap
-
-Tileset02: ; 0x4d5b4
- dbw BANK(Tileset02GFX), Tileset02GFX
- dbw BANK(Tileset02Meta), Tileset02Meta
- dbw BANK(Tileset02Coll), Tileset02Coll
- dw Tileset02Anim
- dw $0000
- dw Tileset02PalMap
-
-Tileset03: ; 0x4d5c3
- dbw BANK(Tileset03GFX), Tileset03GFX
- dbw BANK(Tileset03Meta), Tileset03Meta
- dbw BANK(Tileset03Coll), Tileset03Coll
- dw Tileset03Anim
- dw $0000
- dw Tileset03PalMap
-
-Tileset04: ; 0x4d5d2
- dbw BANK(Tileset04GFX), Tileset04GFX
- dbw BANK(Tileset04Meta), Tileset04Meta
- dbw BANK(Tileset04Coll), Tileset04Coll
- dw Tileset04Anim
- dw $0000
- dw Tileset04PalMap
-
-Tileset05: ; 0x4d5e1
- dbw BANK(Tileset05GFX), Tileset05GFX
- dbw BANK(Tileset05Meta), Tileset05Meta
- dbw BANK(Tileset05Coll), Tileset05Coll
- dw Tileset05Anim
- dw $0000
- dw Tileset05PalMap
-
-Tileset06: ; 0x4d5f0
- dbw BANK(Tileset06GFX), Tileset06GFX
- dbw BANK(Tileset06Meta), Tileset06Meta
- dbw BANK(Tileset06Coll), Tileset06Coll
- dw Tileset06Anim
- dw $0000
- dw Tileset06PalMap
-
-Tileset07: ; 0x4d5ff
- dbw BANK(Tileset07GFX), Tileset07GFX
- dbw BANK(Tileset07Meta), Tileset07Meta
- dbw BANK(Tileset07Coll), Tileset07Coll
- dw Tileset07Anim
- dw $0000
- dw Tileset07PalMap
-
-Tileset08: ; 0x4d60e
- dbw BANK(Tileset08GFX), Tileset08GFX
- dbw BANK(Tileset08Meta), Tileset08Meta
- dbw BANK(Tileset08Coll), Tileset08Coll
- dw Tileset08Anim
- dw $0000
- dw Tileset08PalMap
-
-Tileset09: ; 0x4d61d
- dbw BANK(Tileset09GFX), Tileset09GFX
- dbw BANK(Tileset09Meta), Tileset09Meta
- dbw BANK(Tileset09Coll), Tileset09Coll
- dw Tileset09Anim
- dw $0000
- dw Tileset09PalMap
-
-Tileset10: ; 0x4d62c
- dbw BANK(Tileset10GFX), Tileset10GFX
- dbw BANK(Tileset10Meta), Tileset10Meta
- dbw BANK(Tileset10Coll), Tileset10Coll
- dw Tileset10Anim
- dw $0000
- dw Tileset10PalMap
-
-Tileset11: ; 0x4d63b
- dbw BANK(Tileset11GFX), Tileset11GFX
- dbw BANK(Tileset11Meta), Tileset11Meta
- dbw BANK(Tileset11Coll), Tileset11Coll
- dw Tileset11Anim
- dw $0000
- dw Tileset11PalMap
-
-Tileset12: ; 0x4d64a
- dbw BANK(Tileset12GFX), Tileset12GFX
- dbw BANK(Tileset12Meta), Tileset12Meta
- dbw BANK(Tileset12Coll), Tileset12Coll
- dw Tileset12Anim
- dw $0000
- dw Tileset12PalMap
-
-Tileset13: ; 0x4d659
- dbw BANK(Tileset13GFX), Tileset13GFX
- dbw BANK(Tileset13Meta), Tileset13Meta
- dbw BANK(Tileset13Coll), Tileset13Coll
- dw Tileset13Anim
- dw $0000
- dw Tileset13PalMap
-
-Tileset14: ; 0x4d668
- dbw BANK(Tileset14GFX), Tileset14GFX
- dbw BANK(Tileset14Meta), Tileset14Meta
- dbw BANK(Tileset14Coll), Tileset14Coll
- dw Tileset14Anim
- dw $0000
- dw Tileset14PalMap
-
-Tileset15: ; 0x4d677
- dbw BANK(Tileset15GFX), Tileset15GFX
- dbw BANK(Tileset15Meta), Tileset15Meta
- dbw BANK(Tileset15Coll), Tileset15Coll
- dw Tileset15Anim
- dw $0000
- dw Tileset15PalMap
-
-Tileset16: ; 0x4d686
- dbw BANK(Tileset16GFX), Tileset16GFX
- dbw BANK(Tileset16Meta), Tileset16Meta
- dbw BANK(Tileset16Coll), Tileset16Coll
- dw Tileset16Anim
- dw $0000
- dw Tileset16PalMap
-
-Tileset17: ; 0x4d695
- dbw BANK(Tileset17GFX), Tileset17GFX
- dbw BANK(Tileset17Meta), Tileset17Meta
- dbw BANK(Tileset17Coll), Tileset17Coll
- dw Tileset17Anim
- dw $0000
- dw Tileset17PalMap
-
-Tileset18: ; 0x4d6a4
- dbw BANK(Tileset18GFX), Tileset18GFX
- dbw BANK(Tileset18Meta), Tileset18Meta
- dbw BANK(Tileset18Coll), Tileset18Coll
- dw Tileset18Anim
- dw $0000
- dw Tileset18PalMap
-
-Tileset19: ; 0x4d6b3
- dbw BANK(Tileset19GFX), Tileset19GFX
- dbw BANK(Tileset19Meta), Tileset19Meta
- dbw BANK(Tileset19Coll), Tileset19Coll
- dw Tileset19Anim
- dw $0000
- dw Tileset19PalMap
-
-Tileset20: ; 0x4d6c2
- dbw BANK(Tileset20GFX), Tileset20GFX
- dbw BANK(Tileset20Meta), Tileset20Meta
- dbw BANK(Tileset20Coll), Tileset20Coll
- dw Tileset20Anim
- dw $0000
- dw Tileset20PalMap
-
-Tileset21: ; 0x4d6d1
- dbw BANK(Tileset21GFX), Tileset21GFX
- dbw BANK(Tileset21Meta), Tileset21Meta
- dbw BANK(Tileset21Coll), Tileset21Coll
- dw Tileset21Anim
- dw $0000
- dw Tileset21PalMap
-
-Tileset22: ; 0x4d6e0
- dbw BANK(Tileset22GFX), Tileset22GFX
- dbw BANK(Tileset22Meta), Tileset22Meta
- dbw BANK(Tileset22Coll), Tileset22Coll
- dw Tileset22Anim
- dw $0000
- dw Tileset22PalMap
-
-Tileset23: ; 0x4d6ef
- dbw BANK(Tileset23GFX), Tileset23GFX
- dbw BANK(Tileset23Meta), Tileset23Meta
- dbw BANK(Tileset23Coll), Tileset23Coll
- dw Tileset23Anim
- dw $0000
- dw Tileset23PalMap
-
-Tileset24: ; 0x4d6fe
- dbw BANK(Tileset24GFX), Tileset24GFX
- dbw BANK(Tileset24Meta), Tileset24Meta
- dbw BANK(Tileset24Coll), Tileset24Coll
- dw Tileset24Anim
- dw $0000
- dw Tileset24PalMap
-
-Tileset25: ; 0x4d70d
- dbw BANK(Tileset25GFX), Tileset25GFX
- dbw BANK(Tileset25Meta), Tileset25Meta
- dbw BANK(Tileset25Coll), Tileset25Coll
- dw Tileset25Anim
- dw $0000
- dw Tileset25PalMap
-
-Tileset26: ; 0x4d71c
- dbw BANK(Tileset26GFX), Tileset26GFX
- dbw BANK(Tileset26Meta), Tileset26Meta
- dbw BANK(Tileset26Coll), Tileset26Coll
- dw Tileset26Anim
- dw $0000
- dw Tileset26PalMap
-
-Tileset27: ; 0x4d72b
- dbw BANK(Tileset27GFX), Tileset27GFX
- dbw BANK(Tileset27Meta), Tileset27Meta
- dbw BANK(Tileset27Coll), Tileset27Coll
- dw Tileset27Anim
- dw $0000
- dw Tileset27PalMap
-
-Tileset28: ; 0x4d73a
- dbw BANK(Tileset28GFX), Tileset28GFX
- dbw BANK(Tileset28Meta), Tileset28Meta
- dbw BANK(Tileset28Coll), Tileset28Coll
- dw Tileset28Anim
- dw $0000
- dw Tileset28PalMap
-
-Tileset29: ; 0x4d749
- dbw BANK(Tileset29GFX), Tileset29GFX
- dbw BANK(Tileset29Meta), Tileset29Meta
- dbw BANK(Tileset29Coll), Tileset29Coll
- dw Tileset29Anim
- dw $0000
- dw Tileset29PalMap
-
-Tileset30: ; 0x4d758
- dbw BANK(Tileset30GFX), Tileset30GFX
- dbw BANK(Tileset30Meta), Tileset30Meta
- dbw BANK(Tileset30Coll), Tileset30Coll
- dw Tileset30Anim
- dw $0000
- dw Tileset30PalMap
-
-Tileset31: ; 0x4d767
- dbw BANK(Tileset31GFX), Tileset31GFX
- dbw BANK(Tileset31Meta), Tileset31Meta
- dbw BANK(Tileset31Coll), Tileset31Coll
- dw Tileset31Anim
- dw $0000
- dw Tileset31PalMap
-
-Tileset32: ; 0x4d776
- dbw BANK(Tileset32GFX), Tileset32GFX
- dbw BANK(Tileset32Meta), Tileset32Meta
- dbw BANK(Tileset32Coll), Tileset32Coll
- dw Tileset32Anim
- dw $0000
- dw Tileset32PalMap
-
-Tileset33: ; 0x4d785
- dbw BANK(Tileset33GFX), Tileset33GFX
- dbw BANK(Tileset33Meta), Tileset33Meta
- dbw BANK(Tileset33Coll), Tileset33Coll
- dw Tileset33Anim
- dw $0000
- dw Tileset33PalMap
-
-Tileset34: ; 0x4d794
- dbw BANK(Tileset34GFX), Tileset34GFX
- dbw BANK(Tileset34Meta), Tileset34Meta
- dbw BANK(Tileset34Coll), Tileset34Coll
- dw Tileset34Anim
- dw $0000
- dw Tileset34PalMap
-
-Tileset35: ; 0x4d7a3
- dbw BANK(Tileset35GFX), Tileset35GFX
- dbw BANK(Tileset35Meta), Tileset35Meta
- dbw BANK(Tileset35Coll), Tileset35Coll
- dw Tileset35Anim
- dw $0000
- dw Tileset35PalMap
-
-Tileset36: ; 0x4d7b2
- dbw BANK(Tileset36GFX), Tileset36GFX
- dbw BANK(Tileset36Meta), Tileset36Meta
- dbw BANK(Tileset36Coll), Tileset36Coll
- dw Tileset36Anim
- dw $0000
- dw Tileset36PalMap
-
-; 0x4d7c1
+Tileset00::
+ tileset Tileset00
+Tileset01::
+ tileset Tileset01
+ tileset Tileset02
+ tileset Tileset03
+ tileset Tileset04
+ tileset Tileset05
+ tileset Tileset06
+ tileset Tileset07
+ tileset Tileset08
+ tileset Tileset09
+ tileset Tileset10
+ tileset Tileset11
+ tileset Tileset12
+ tileset Tileset13
+ tileset Tileset14
+ tileset Tileset15
+ tileset Tileset16
+ tileset Tileset17
+ tileset Tileset18
+ tileset Tileset19
+ tileset Tileset20
+ tileset Tileset21
+ tileset Tileset22
+ tileset Tileset23
+ tileset Tileset24
+ tileset Tileset25
+ tileset Tileset26
+ tileset Tileset27
+ tileset Tileset28
+ tileset Tileset29
+ tileset Tileset30
+ tileset Tileset31
+ tileset Tileset32
+ tileset Tileset33
+ tileset Tileset34
+ tileset Tileset35
+ tileset Tileset36