From 4b4c5a403b01ab57042a5ad61097a300d319ae4f Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sun, 14 Jan 2007 19:59:25 +0000 Subject: (svn r8129) -Codechange: Change data tables to use split off palette map. And include a file missed last time... --- src/table/unmovable_land.h | 60 +++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'src/table/unmovable_land.h') diff --git a/src/table/unmovable_land.h b/src/table/unmovable_land.h index 4c5908fb6..97b910938 100644 --- a/src/table/unmovable_land.h +++ b/src/table/unmovable_land.h @@ -10,7 +10,7 @@ typedef struct DrawTileUnmovableStruct { byte unused; } DrawTileUnmovableStruct; -#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, 0 } +#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, 0, 0 } static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = { {0xA29, 7, 7, 2, 2, 70, 0}, @@ -51,17 +51,17 @@ static const DrawTileSeqStruct _unmovable_display_datas_7[] = { }; static const DrawTileSeqStruct _unmovable_display_datas_8[] = { - { 0, 0, 0, 16, 16, 20, 0xA34 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 16, 20, 0xA34 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_9[] = { - { 0, 0, 0, 16, 16, 20, 0xA36 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 16, 20, 0xA36 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_10[] = { - { 0, 0, 0, 16, 16, 20, 0xA38 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 16, 20, 0xA38 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, TILE_SEQ_END() }; @@ -70,17 +70,17 @@ static const DrawTileSeqStruct _unmovable_display_datas_11[] = { }; static const DrawTileSeqStruct _unmovable_display_datas_12[] = { - { 0, 0, 0, 16, 16, 50, 0xA3B | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 16, 50, 0xA3B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_13[] = { - { 0, 0, 0, 16, 16, 50, 0xA3D | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 16, 50, 0xA3D | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_14[] = { - { 0, 0, 0, 16, 16, 50, 0xA3F | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 16, 50, 0xA3F | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, TILE_SEQ_END() }; @@ -89,17 +89,17 @@ static const DrawTileSeqStruct _unmovable_display_datas_15[] = { }; static const DrawTileSeqStruct _unmovable_display_datas_16[] = { - { 0, 0, 0, 16, 16, 60, 0xA42 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 16, 60, 0xA42 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_17[] = { - { 0, 0, 0, 16, 16, 60, 0xA44 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 16, 60, 0xA44 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_18[] = { - { 0, 0, 0, 16, 16, 60, 0xA46 | PALETTE_MODIFIER_COLOR }, + { 0, 0, 0, 16, 16, 60, 0xA46 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE }, TILE_SEQ_END() }; @@ -108,24 +108,24 @@ static const DrawTileSeqStruct _unmovable_display_datas_19[] = { }; static const DrawTileSprites _unmovable_display_datas[] = { - { 0xA2B | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_0 }, - { 0xA2C | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_1 }, - { 0xA2D | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_2 }, - { 0xA2E | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_3 }, - { 0xA2F | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_4 }, - { 0xA30 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_5 }, - { 0xA31 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_6 }, - { 0xA32 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_7 }, - { 0xA33 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_8 }, - { 0xA35 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_9 }, - { 0xA37 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_10 }, - { 0xA39 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_11 }, - { 0xA3A | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_12 }, - { 0xA3C | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_13 }, - { 0xA3E | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_14 }, - { 0xA40 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_15 }, - { 0xA41 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_16 }, - { 0xA43 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_17 }, - { 0xA45 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_18 }, - { 0xA47 | PALETTE_MODIFIER_COLOR, _unmovable_display_datas_19 }, + { 0xA2B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_0 }, + { 0xA2C | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_1 }, + { 0xA2D | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_2 }, + { 0xA2E | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_3 }, + { 0xA2F | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_4 }, + { 0xA30 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_5 }, + { 0xA31 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_6 }, + { 0xA32 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_7 }, + { 0xA33 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_8 }, + { 0xA35 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_9 }, + { 0xA37 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_10 }, + { 0xA39 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_11 }, + { 0xA3A | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_12 }, + { 0xA3C | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_13 }, + { 0xA3E | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_14 }, + { 0xA40 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_15 }, + { 0xA41 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_16 }, + { 0xA43 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_17 }, + { 0xA45 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_18 }, + { 0xA47 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, _unmovable_display_datas_19 }, }; -- cgit v1.2.3-54-g00ecf