From 238e47cd42c009f2ab1359428788a65a26fafebb Mon Sep 17 00:00:00 2001 From: celestar Date: Sun, 24 Jul 2005 15:56:31 +0000 Subject: (svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers by enums. There remains work in gfx.c to move the "transparency" and "recolor" bits around to make space for more sprites. However, 2800 additional sprites can now be loaded. There also remains cleanup and Doxygen work on many of the header files. --- table/unmovable_land.h | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'table/unmovable_land.h') diff --git a/table/unmovable_land.h b/table/unmovable_land.h index 58353651a..15c226333 100644 --- a/table/unmovable_land.h +++ b/table/unmovable_land.h @@ -41,17 +41,17 @@ static const DrawTileSeqStruct _unmovable_display_datas_7[] = { }; static const DrawTileSeqStruct _unmovable_display_datas_8[] = { - { 0, 0, 0, 16, 16, 20, 0x8A34 }, + { 0, 0, 0, 16, 16, 20, 0xA34 | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_9[] = { - { 0, 0, 0, 16, 16, 20, 0x8A36 }, + { 0, 0, 0, 16, 16, 20, 0xA36 | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_10[] = { - { 0, 0, 0, 16, 16, 20, 0x8A38 }, + { 0, 0, 0, 16, 16, 20, 0xA38 | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; @@ -60,17 +60,17 @@ static const DrawTileSeqStruct _unmovable_display_datas_11[] = { }; static const DrawTileSeqStruct _unmovable_display_datas_12[] = { - { 0, 0, 0, 16, 16, 50, 0x8A3B }, + { 0, 0, 0, 16, 16, 50, 0xA3B | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_13[] = { - { 0, 0, 0, 16, 16, 50, 0x8A3D }, + { 0, 0, 0, 16, 16, 50, 0xA3D | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_14[] = { - { 0, 0, 0, 16, 16, 50, 0x8A3F }, + { 0, 0, 0, 16, 16, 50, 0xA3F | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; @@ -79,17 +79,17 @@ static const DrawTileSeqStruct _unmovable_display_datas_15[] = { }; static const DrawTileSeqStruct _unmovable_display_datas_16[] = { - { 0, 0, 0, 16, 16, 60, 0x8A42 }, + { 0, 0, 0, 16, 16, 60, 0xA42 | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_17[] = { - { 0, 0, 0, 16, 16, 60, 0x8A44 }, + { 0, 0, 0, 16, 16, 60, 0xA44 | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; static const DrawTileSeqStruct _unmovable_display_datas_18[] = { - { 0, 0, 0, 16, 16, 60, 0x8A46 }, + { 0, 0, 0, 16, 16, 60, 0xA46 | PALETTE_MODIFIER_COLOR }, TILE_SEQ_END() }; @@ -98,24 +98,24 @@ static const DrawTileSeqStruct _unmovable_display_datas_19[] = { }; static const DrawTileSprites _unmovable_display_datas[] = { - { 0x8A2B, _unmovable_display_datas_0 }, - { 0x8A2C, _unmovable_display_datas_1 }, - { 0x8A2D, _unmovable_display_datas_2 }, - { 0x8A2E, _unmovable_display_datas_3 }, - { 0x8A2F, _unmovable_display_datas_4 }, - { 0x8A30, _unmovable_display_datas_5 }, - { 0x8A31, _unmovable_display_datas_6 }, - { 0x8A32, _unmovable_display_datas_7 }, - { 0x8A33, _unmovable_display_datas_8 }, - { 0x8A35, _unmovable_display_datas_9 }, - { 0x8A37, _unmovable_display_datas_10 }, - { 0x8A39, _unmovable_display_datas_11 }, - { 0x8A3A, _unmovable_display_datas_12 }, - { 0x8A3C, _unmovable_display_datas_13 }, - { 0x8A3E, _unmovable_display_datas_14 }, - { 0x8A40, _unmovable_display_datas_15 }, - { 0x8A41, _unmovable_display_datas_16 }, - { 0x8A43, _unmovable_display_datas_17 }, - { 0x8A45, _unmovable_display_datas_18 }, - { 0x8A47, _unmovable_display_datas_19 }, + { 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 }, }; -- cgit v1.2.3-70-g09d2