More sprite cleanup, add 'house' sprite.

a_pleasant_stroll.p8

@@ -39,22 +39,22 @@ __gfx__
 00000077770000000000007777000000000000000000005000b0000b0b000b0008a800800008a8000e000000e00e7e00000700080007000000d5555555555550
 0000007777000000000000777700000005000050050500000000000b00000000008008a800008000e7e0000e7e00e000000000888000000000d5555555555000
 000000777700000000000077770000000000000000000000000000000000000000000080000000000e000000e00000000000000700000000000dddddddd00000
-ffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-fffffffffffffffffffffffffff88fffff8fffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-fffffffffff78fffffbbbbfffff88fffffff8fff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-ffffffffff8887ffffbccbfff88aa88fff8fff8f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-fffffffff878888fffbccbfff88aa88ff8ff8fff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-fffffffffff77fffffbbbbfffff88fffff8ff8ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-fffffffffff77ffffffffffffff88fffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-ffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000038333333333333e33833338333333333999999999998999999949994999999900000000000000000000000000000000000000000000000
-0000000000000000008a833383333e3e9e888338883333333399999999998a899994999499999999900000000000000000000000000000000000000000000000
-000000000000000000383338a833e9e3e33733337333333333999999999998b9b999499949999449900000000000000000000000000000000000000000000000
-00000000000000000033333383333e33333333333333378333999999999b9bb9b999994999994444900000000000000000000000000000000000000000000000
-00000000000000000033338333333333333333383333888733999999999b9bbbb999499994944444400000000000000000000000000000000000000000000000
-0000000000000000003338a8333e333e333333888338788883999999999bbbb99999994999944444400000000000000000000000000000000000000000000000
-00000000000000000033338333e9e3e9e3333337333337733399999999999bb99994999949994444900000000000000000000000000000000000000000000000
-000000000000000000333333333e333e33333333333337733399999999999bb99999999999999449900000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000780000b0bb0000000000000000000000005555550000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+008887000b0bb0b00000000000000000000055555555000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+087888800bbbb0b00000000000000000000555555555500000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00077000000bbbb00000000000000000005555555555550000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00077000000bb0000000000000000000004444444444440000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000bb0000000000000000000004666444466640000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000004666444466640000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00088000008000000000000000000000004666444466640000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00088000000080000000000000000000004666444466640000000000000000000000000000000000000000000000000000000000000000000000000000000000
+088aa880008000800000000000000000004444455544440000000000000000000000000000000000000000000000000000000000000000000000000000000000
+088aa880080080000000000000000000004444455544440000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00088000008008000000000000000000004444455544440000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00088000000000000000000000000000004444455544440000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000004444455544440000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

debug.lua

@@ -9,16 +9,15 @@ function init_debug()
    debug_mod_buffer = false
 end
 
-function debug_t(mode)
-   if mode == "res" then
-      debug_res = not debug_res
-   elseif mode == "map" then
-      debug_map = not debug_map
-   elseif mode == "sfx" then
-      debug_sfx = not debug_sfx
-   elseif mode == "mod" then
-      debug_mod_buffer = not debug_mod_buffer
-   end
+function debug_f(mode)
+   if (band(mode, 0x1)) debug_res = not debug_res
+   if (band(mode, 0x2)) debug_map = not debug_map
+   if (band(mode, 0x4)) debug_sfx = not debug_sfx
+   if (band(mode, 0x8)) debuf_mod_buffer = not debug_mod_buffer
+end
+
+function teleport(x, y)
+   player_x, player_y = x, y
 end
 
 function debug_print()

index_map.md

@@ -16,13 +16,14 @@
 42 - pink flowers
 44 - fairy ring
 46 - rock
+68 - house
 
 ### inventory icons
-64 - wood
-65 - mushroom
-66 - cactus meat
-67 - cactus flower
-68 - berries
+64 - mushroom
+65 - cactus meat
+66 - wood
+80 - cactus flower
+81 - berries
 
 ### HUD and player
 119 - interaction exclamation

world.lua

@@ -99,33 +99,31 @@ function init_world()
       [tile_bush] = {
          replacement = tile_empty_bush,
          sfx = 13,
-         drop = 68
+         drop = 81
       },
 
       [tile_tree] = {
          replacement = tile_tree_stump,
          sfx = 11,
-         drop = 64
+         drop = 66
       },
 
       [tile_big_mushroom] = {
          replacement = tile_mushroom_stump,
          sfx = 12,
-         drop = 65
+         drop = 64
       },
 
-      -- cactus w/ flower
       [tile_flowering_cactus] = {
          replacement = tile_cactus_stump,
          sfx = 12,
-         drop = 67
+         drop = 80
       },
 
-      -- cactus
       [tile_cactus] = {
          replacement = tile_cactus_stump,
          sfx = 12,
-         drop = 66
+         drop = 65
       }
    }