tfv: add desert

This commit is contained in:
Vince Weaver 2017-08-11 00:23:18 -04:00
parent 8eee92d73d
commit 2c276a6d4e
4 changed files with 21 additions and 4 deletions

View File

@ -772,11 +772,11 @@ static int do_battle(void) {
1 BEACH LANDING GRASS FOREST 1 BEACH LANDING GRASS FOREST
PINETREE MOUNTAIN PINETREE MOUNTAIN
2 BEACH GRASS COLLEGE FOREST 2 BEACH GRASS GRASS FOREST
PALMTREE PALMTREE MOUNTAIN
3 BEACH BEACH BEACH BEACH 3 BEACH DESERT COLLEGE BEACH
MOUNTAIN CACTUS PARK
*/ */
/* Walk through bushes, beach water */ /* Walk through bushes, beach water */
@ -796,6 +796,7 @@ static int load_map_bg(void) {
grsim_unrle(landing_rle,0x800); grsim_unrle(landing_rle,0x800);
return 0; return 0;
} }
if (map_x==14) { if (map_x==14) {
grsim_unrle(collegep_rle,0x800); grsim_unrle(collegep_rle,0x800);
return 0; return 0;
@ -809,6 +810,7 @@ static int load_map_bg(void) {
} }
if (map_x<4) ground_color=COLOR_WHITE; if (map_x<4) ground_color=COLOR_WHITE;
else if (map_x==13) ground_color=COLOR_ORANGE;
else ground_color=COLOR_LIGHTGREEN; else ground_color=COLOR_LIGHTGREEN;
/* grassland/sloped left beach */ /* grassland/sloped left beach */
@ -1002,6 +1004,8 @@ static int world_map(void) {
if (map_x==4) if (tfv_y>=15) grsim_put_sprite(0,pine_tree,25,15); if (map_x==4) if (tfv_y>=15) grsim_put_sprite(0,pine_tree,25,15);
if (map_x==8) if (tfv_y>=22) grsim_put_sprite(0,palm_tree,10,20); if (map_x==8) if (tfv_y>=22) grsim_put_sprite(0,palm_tree,10,20);
if (map_x==12) if (tfv_y>=22) grsim_put_sprite(0,palm_tree,20,20); if (map_x==12) if (tfv_y>=22) grsim_put_sprite(0,palm_tree,20,20);
if (map_x==13) if (tfv_y>=15) grsim_put_sprite(0,cactus,25,15);
if ((map_x==7) || (map_x==11)) { if ((map_x==7) || (map_x==11)) {
for(i=10;i<tfv_y+8;i+=2) { for(i=10;i<tfv_y+8;i+=2) {
@ -1024,6 +1028,7 @@ static int world_map(void) {
if (map_x==4) if (tfv_y<15) grsim_put_sprite(0,pine_tree,25,15); if (map_x==4) if (tfv_y<15) grsim_put_sprite(0,pine_tree,25,15);
if (map_x==8) if (tfv_y<22) grsim_put_sprite(0,palm_tree,10,20); if (map_x==8) if (tfv_y<22) grsim_put_sprite(0,palm_tree,10,20);
if (map_x==12) if (tfv_y<22) grsim_put_sprite(0,palm_tree,20,20); if (map_x==12) if (tfv_y<22) grsim_put_sprite(0,palm_tree,20,20);
if (map_x==13) if (tfv_y<15) grsim_put_sprite(0,cactus,25,15);
if ((map_x==7) || (map_x==11)) { if ((map_x==7) || (map_x==11)) {
for(i=tfv_y+8;i<36;i+=2) { for(i=tfv_y+8;i<36;i+=2) {

View File

@ -140,6 +140,18 @@ static unsigned char snowy_tree[]={
0x00,0x00,0x00,0x88,0x00,0x00,0x00, 0x00,0x00,0x00,0x88,0x00,0x00,0x00,
}; };
/* Cactus */
static unsigned char cactus[]={
0x05,0x06,
0x00,0x00,0x44,0x00,0x00,
0x44,0x00,0x44,0x00,0x40,
0x44,0x00,0x44,0x00,0x44,
0x04,0x04,0x44,0x04,0x04,
0x00,0x00,0x44,0x00,0x00,
0x00,0x00,0x44,0x00,0x00,
};
/* Mountain */ /* Mountain */
static unsigned char mountain[]={ static unsigned char mountain[]={
0x0d,0x07, 0x0d,0x07,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 521 B

After

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 919 B