diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-25 19:01:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-25 19:01:36 -0500 |
| commit | 73db02d3cdaf81a214ec6faa5462195618a80a48 (patch) | |
| tree | b4d1a5187fda9da6186c52c03e836a5ff8f4dd90 /data/maps | |
| parent | ec8c9688ce970b9c3b63a5b287a99542f0bc9984 (diff) | |
| parent | 29b41068cb0644956494dd2b7b75331a336b8d26 (diff) | |
Merge pull request #433 from roukaour/master
More code cleanup
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/environment_colors.asm | 35 | ||||
| -rw-r--r-- | data/maps/mapgroup_roofs.asm | 11 |
2 files changed, 44 insertions, 2 deletions
diff --git a/data/maps/environment_colors.asm b/data/maps/environment_colors.asm new file mode 100644 index 000000000..92d788fe1 --- /dev/null +++ b/data/maps/environment_colors.asm @@ -0,0 +1,35 @@ +EnvironmentColorsPointers: +; entries correspond to environment constants (see constants/map_constants.asm) + dw .OutdoorColors ; unused + dw .OutdoorColors ; TOWN + dw .OutdoorColors ; ROUTE + dw .IndoorColors ; INDOOR + dw .DungeonColors ; CAVE + dw .Env5Colors ; ENVIRONMENT_5 + dw .IndoorColors ; GATE + dw .DungeonColors ; DUNGEON + +; Valid indices: $00 - $29 +.OutdoorColors: + db $00, $01, $02, $28, $04, $05, $06, $07 ; morn + db $08, $09, $0a, $28, $0c, $0d, $0e, $0f ; day + db $10, $11, $12, $29, $14, $15, $16, $17 ; nite + db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark + +.IndoorColors: + db $20, $21, $22, $23, $24, $25, $26, $07 ; morn + db $20, $21, $22, $23, $24, $25, $26, $07 ; day + db $10, $11, $12, $13, $14, $15, $16, $07 ; nite + db $18, $19, $1a, $1b, $1c, $1d, $1e, $07 ; dark + +.DungeonColors: + db $00, $01, $02, $03, $04, $05, $06, $07 ; morn + db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day + db $10, $11, $12, $13, $14, $15, $16, $17 ; nite + db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark + +.Env5Colors: + db $00, $01, $02, $03, $04, $05, $06, $07 ; morn + db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day + db $10, $11, $12, $13, $14, $15, $16, $17 ; nite + db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark diff --git a/data/maps/mapgroup_roofs.asm b/data/maps/mapgroup_roofs.asm index 0cad8a0e3..8c79e6f82 100644 --- a/data/maps/mapgroup_roofs.asm +++ b/data/maps/mapgroup_roofs.asm @@ -1,6 +1,5 @@ -; valid roofs: 0, 1, 2, 3, 4, or -1 for none - MapGroupRoofs: ; 1c021i +; entries correspond to Roofs (see below) db -1 ; group 0 (unused) db 3 ; group 1 (Olivine) db 2 ; group 2 (Mahogany) @@ -29,3 +28,11 @@ MapGroupRoofs: ; 1c021i db -1 ; group 25 db 0 ; group 26 (Cherrygrove) ; 1c03c + +Roofs: ; 1c03c +INCBIN "gfx/tilesets/roofs/0.2bpp" +INCBIN "gfx/tilesets/roofs/1.2bpp" +INCBIN "gfx/tilesets/roofs/2.2bpp" +INCBIN "gfx/tilesets/roofs/3.2bpp" +INCBIN "gfx/tilesets/roofs/4.2bpp" +; 1c30c |