summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-04-04 14:42:31 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-04-04 15:15:02 -0400
commit0ee9d7a48baed7e9388e7e377b5eab5b4f795688 (patch)
tree749cbc7e9407feb2253573f5264f7006c03e7d52 /gfx
parenta325db0f14ca3c48bd9057627f7306b207544700 (diff)
Upgrade to rgbds 0.4.0
- fail for rgbds < 0.4.0 - `rst <Label>` - `ds <count>, <byte>` - `shift <N>` - ASCII "\r" - Sorted .sym file
Diffstat (limited to 'gfx')
-rw-r--r--gfx/pokegear/town_map_palette_map.asm3
-rw-r--r--gfx/tileset_palette_maps.asm8
2 files changed, 3 insertions, 8 deletions
diff --git a/gfx/pokegear/town_map_palette_map.asm b/gfx/pokegear/town_map_palette_map.asm
index 67ca7fbdd..3224ec35b 100644
--- a/gfx/pokegear/town_map_palette_map.asm
+++ b/gfx/pokegear/town_map_palette_map.asm
@@ -9,8 +9,7 @@
townmappals: MACRO
rept _NARG / 2
dn PAL_TOWNMAP_\2, PAL_TOWNMAP_\1
- shift
- shift
+ shift 2
endr
ENDM
diff --git a/gfx/tileset_palette_maps.asm b/gfx/tileset_palette_maps.asm
index df751c311..7f94ecc1f 100644
--- a/gfx/tileset_palette_maps.asm
+++ b/gfx/tileset_palette_maps.asm
@@ -4,8 +4,7 @@ tilepal: MACRO
x = \1 << OAM_TILE_BANK
rept (_NARG - 1) / 2
dn (x | PAL_BG_\3), (x | PAL_BG_\2)
- shift
- shift
+ shift 2
endr
ENDM
@@ -109,7 +108,4 @@ INCLUDE "gfx/tilesets/battle_tower_inside_palette_map.asm"
TilesetBattleTowerOutsidePalMap:
INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
-; unused
-rept 26
- db $06
-endr
+ ds 26, $06 ; unused