From 799d1efcbb20218cffba4dd50fcf9c80b5d91abd Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 4 Aug 2022 18:24:00 -0500 Subject: [PATCH] updating octopus game --- .../octopus_game_helpers.py | 54 +++++++++--------- .../{sprites => octopus_game_sprites}/bg.bmp | Bin 21546 -> 21546 bytes .../bg_with_shadow.bmp | Bin 21470 -> 21470 bytes .../diver_boat.bmp | Bin .../diver_boat_small.bmp | Bin .../diver_caught_small.bmp | Bin .../diver_extra_life.bmp | Bin .../diver_sprite_sheet_single_layer.bmp | Bin .../diver_sprite_sheet_v2.bmp | Bin .../tentacle_0_seg_0.bmp | Bin .../tentacle_0a_seg_1.bmp | Bin .../tentacle_0a_seg_2.bmp | Bin .../tentacle_0b_seg_1.bmp | Bin .../tentacle_0b_seg_2.bmp | Bin .../tentacle_0b_seg_3.bmp | Bin .../tentacle_1_seg_0.bmp | Bin .../tentacle_1_seg_1.bmp | Bin .../tentacle_1a_seg_2.bmp | Bin .../tentacle_1a_seg_3.bmp | Bin .../tentacle_1a_seg_4.bmp | Bin .../tentacle_1b_seg_2.bmp | Bin .../tentacle_2_seg_0.bmp | Bin .../tentacle_2_seg_1.bmp | Bin .../tentacle_2_seg_2.bmp | Bin .../tentacle_2_seg_3.bmp | Bin .../tentacle_3_seg_0.bmp | Bin .../tentacle_3_seg_1.bmp | Bin .../tentacle_3_seg_2.bmp | Bin 28 files changed, 27 insertions(+), 27 deletions(-) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/bg.bmp (94%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/bg_with_shadow.bmp (87%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/diver_boat.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/diver_boat_small.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/diver_caught_small.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/diver_extra_life.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/diver_sprite_sheet_single_layer.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/diver_sprite_sheet_v2.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_0_seg_0.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_0a_seg_1.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_0a_seg_2.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_0b_seg_1.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_0b_seg_2.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_0b_seg_3.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_1_seg_0.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_1_seg_1.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_1a_seg_2.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_1a_seg_3.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_1a_seg_4.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_1b_seg_2.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_2_seg_0.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_2_seg_1.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_2_seg_2.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_2_seg_3.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_3_seg_0.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_3_seg_1.bmp (100%) rename CircuitPython_GameAndWatch_Octopus/{sprites => octopus_game_sprites}/tentacle_3_seg_2.bmp (100%) diff --git a/CircuitPython_GameAndWatch_Octopus/octopus_game_helpers.py b/CircuitPython_GameAndWatch_Octopus/octopus_game_helpers.py index 005e2af8a..2f26fd94a 100644 --- a/CircuitPython_GameAndWatch_Octopus/octopus_game_helpers.py +++ b/CircuitPython_GameAndWatch_Octopus/octopus_game_helpers.py @@ -37,7 +37,7 @@ class OctopusGame(Group): # Vertical position of game mode labels (near bottom left) GAME_MODE_A_LBL_Y = 128 - 14 - GAME_MODE_B_LBL_Y = 128 - 4 + GAME_MODE_B_LBL_Y = 128 - 7 # speed adjustment values. Value in seconds will be subtracted from game speed. # larger values will equate to faster game speed. @@ -104,12 +104,12 @@ class OctopusGame(Group): # Set up Background self.bg_with_sadow = True - self.bg_bmp = OnDiskBitmap("bg_with_shadow.bmp") + self.bg_bmp = OnDiskBitmap("octopus_game_sprites/bg_with_shadow.bmp") self.bg_tilegrid = TileGrid(self.bg_bmp, pixel_shader=self.bg_bmp.pixel_shader) self.append(self.bg_tilegrid) # Set up Extra Life indicator images - self.extra_life_bmp = OnDiskBitmap("diver_extra_life.bmp") + self.extra_life_bmp = OnDiskBitmap("octopus_game_sprites/diver_extra_life.bmp") self.extra_life_bmp.pixel_shader.make_transparent(0) self.extra_life_tilegrid_1 = TileGrid(self.extra_life_bmp, pixel_shader=self.extra_life_bmp.pixel_shader) @@ -135,7 +135,7 @@ class OctopusGame(Group): # Set up caught flailing diver self.caught_diver_bmp, self.caught_diver_palette = adafruit_imageload.load( - "diver_caught_small.bmp") + "octopus_game_sprites/diver_caught_small.bmp") self.caught_diver_tilegrid = TileGrid(self.caught_diver_bmp, pixel_shader=self.caught_diver_palette, height=1, width=1, tile_width=31, tile_height=40) @@ -149,7 +149,7 @@ class OctopusGame(Group): # Set up treasure depositing boat diver sprite self.boat_diver_bmp, self.boat_diver_palette = adafruit_imageload.load( - "diver_boat_small.bmp" + "octopus_game_sprites/diver_boat_small.bmp" ) self.boat_diver_tilegrid = TileGrid(self.boat_diver_bmp, pixel_shader=self.boat_diver_palette, @@ -329,13 +329,13 @@ class OctopusGame(Group): # swap to the alternate background image if not self.bg_with_sadow: self.remove(self.bg_tilegrid) - self.bg_bmp = OnDiskBitmap("bg_with_shadow.bmp") + self.bg_bmp = OnDiskBitmap("octopus_game_sprites/bg_with_shadow.bmp") self.bg_tilegrid = TileGrid(self.bg_bmp, pixel_shader=self.bg_bmp.pixel_shader) self.insert(0, self.bg_tilegrid) else: self.remove(self.bg_tilegrid) - self.bg_bmp = OnDiskBitmap("bg.bmp") + self.bg_bmp = OnDiskBitmap("octopus_game_sprites/bg.bmp") self.bg_tilegrid = TileGrid(self.bg_bmp, pixel_shader=self.bg_bmp.pixel_shader) self.insert(0, self.bg_tilegrid) self.bg_with_sadow = not self.bg_with_sadow @@ -728,115 +728,115 @@ class Octopus(Group): self.current_tentacle_index = 0 # --- Set up tentacle segment images --- - self.t0s0_bmp, self.t0s0_palette = adafruit_imageload.load("tentacle_0_seg_0.bmp") + self.t0s0_bmp, self.t0s0_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_0_seg_0.bmp") self.t0s0_tilegrid = TileGrid(self.t0s0_bmp, pixel_shader=self.t0s0_palette) self.t0s0_palette.make_transparent(0) self.t0s0_tilegrid.x = 57 self.t0s0_tilegrid.y = 40 - self.t0as1_bmp, self.t0as1_palette = adafruit_imageload.load("tentacle_0a_seg_1.bmp") + self.t0as1_bmp, self.t0as1_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_0a_seg_1.bmp") self.t0as1_tilegrid = TileGrid(self.t0as1_bmp, pixel_shader=self.t0as1_palette) self.t0as1_palette.make_transparent(0) self.t0as1_tilegrid.x = 47 self.t0as1_tilegrid.y = 43 - self.t0as2_bmp, self.t0as2_palette = adafruit_imageload.load("tentacle_0a_seg_2.bmp") + self.t0as2_bmp, self.t0as2_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_0a_seg_2.bmp") self.t0as2_tilegrid = TileGrid(self.t0as2_bmp, pixel_shader=self.t0as2_palette) self.t0as2_palette.make_transparent(0) self.t0as2_tilegrid.x = 33 self.t0as2_tilegrid.y = 36 - self.t0bs1_bmp, self.t0bs1_palette = adafruit_imageload.load("tentacle_0b_seg_1.bmp") + self.t0bs1_bmp, self.t0bs1_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_0b_seg_1.bmp") self.t0bs1_tilegrid = TileGrid(self.t0bs1_bmp, pixel_shader=self.t0bs1_palette) self.t0bs1_palette.make_transparent(0) self.t0bs1_tilegrid.x = 53 self.t0bs1_tilegrid.y = 50 - self.t0bs2_bmp, self.t0bs2_palette = adafruit_imageload.load("tentacle_0b_seg_2.bmp") + self.t0bs2_bmp, self.t0bs2_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_0b_seg_2.bmp") self.t0bs2_tilegrid = TileGrid(self.t0bs2_bmp, pixel_shader=self.t0bs2_palette) self.t0bs2_palette.make_transparent(0) self.t0bs2_tilegrid.x = 49 self.t0bs2_tilegrid.y = 56 - self.t0bs3_bmp, self.t0bs3_palette = adafruit_imageload.load("tentacle_0b_seg_3.bmp") + self.t0bs3_bmp, self.t0bs3_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_0b_seg_3.bmp") self.t0bs3_tilegrid = TileGrid(self.t0bs3_bmp, pixel_shader=self.t0bs3_palette) self.t0bs3_palette.make_transparent(0) self.t0bs3_tilegrid.x = 36 self.t0bs3_tilegrid.y = 69 - self.t1s0_bmp, self.t1s0_palette = adafruit_imageload.load("tentacle_1_seg_0.bmp") + self.t1s0_bmp, self.t1s0_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_1_seg_0.bmp") self.t1s0_tilegrid = TileGrid(self.t1s0_bmp, pixel_shader=self.t1s0_palette) self.t1s0_palette.make_transparent(0) self.t1s0_tilegrid.x = 72 self.t1s0_tilegrid.y = 51 - self.t1s1_bmp, self.t1s1_palette = adafruit_imageload.load("tentacle_1_seg_1.bmp") + self.t1s1_bmp, self.t1s1_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_1_seg_1.bmp") self.t1s1_tilegrid = TileGrid(self.t1s1_bmp, pixel_shader=self.t1s1_palette) self.t1s1_palette.make_transparent(0) self.t1s1_tilegrid.x = 71 self.t1s1_tilegrid.y = 61 - self.t1as2_bmp, self.t1as2_palette = adafruit_imageload.load("tentacle_1a_seg_2.bmp") + self.t1as2_bmp, self.t1as2_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_1a_seg_2.bmp") self.t1as2_tilegrid = TileGrid(self.t1as2_bmp, pixel_shader=self.t1as2_palette) self.t1as2_palette.make_transparent(0) self.t1as2_tilegrid.x = 70 self.t1as2_tilegrid.y = 69 - self.t1as3_bmp, self.t1as3_palette = adafruit_imageload.load("tentacle_1a_seg_3.bmp") + self.t1as3_bmp, self.t1as3_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_1a_seg_3.bmp") self.t1as3_tilegrid = TileGrid(self.t1as3_bmp, pixel_shader=self.t1as3_palette) self.t1as3_palette.make_transparent(0) self.t1as3_tilegrid.x = 70 self.t1as3_tilegrid.y = 78 - self.t1as4_bmp, self.t1as4_palette = adafruit_imageload.load("tentacle_1a_seg_4.bmp") + self.t1as4_bmp, self.t1as4_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_1a_seg_4.bmp") self.t1as4_tilegrid = TileGrid(self.t1as4_bmp, pixel_shader=self.t1as4_palette) self.t1as4_palette.make_transparent(0) self.t1as4_tilegrid.x = 65 self.t1as4_tilegrid.y = 87 - self.t1bs2_bmp, self.t1bs2_palette = adafruit_imageload.load("tentacle_1b_seg_2.bmp") + self.t1bs2_bmp, self.t1bs2_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_1b_seg_2.bmp") self.t1bs2_tilegrid = TileGrid(self.t1bs2_bmp, pixel_shader=self.t1bs2_palette) self.t1bs2_palette.make_transparent(0) self.t1bs2_tilegrid.x = 79 self.t1bs2_tilegrid.y = 71 - self.t2s0_bmp, self.t2s0_palette = adafruit_imageload.load("tentacle_2_seg_0.bmp") + self.t2s0_bmp, self.t2s0_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_2_seg_0.bmp") self.t2s0_tilegrid = TileGrid(self.t2s0_bmp, pixel_shader=self.t2s0_palette) self.t2s0_palette.make_transparent(0) self.t2s0_tilegrid.x = 94 self.t2s0_tilegrid.y = 66 - self.t2s1_bmp, self.t2s1_palette = adafruit_imageload.load("tentacle_2_seg_1.bmp") + self.t2s1_bmp, self.t2s1_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_2_seg_1.bmp") self.t2s1_tilegrid = TileGrid(self.t2s1_bmp, pixel_shader=self.t2s1_palette) self.t2s1_palette.make_transparent(0) self.t2s1_tilegrid.x = 95 self.t2s1_tilegrid.y = 75 - self.t2s2_bmp, self.t2s2_palette = adafruit_imageload.load("tentacle_2_seg_2.bmp") + self.t2s2_bmp, self.t2s2_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_2_seg_2.bmp") self.t2s2_tilegrid = TileGrid(self.t2s2_bmp, pixel_shader=self.t2s2_palette) self.t2s2_palette.make_transparent(0) self.t2s2_tilegrid.x = 98 self.t2s2_tilegrid.y = 80 - self.t2s3_bmp, self.t2s3_palette = adafruit_imageload.load("tentacle_2_seg_3.bmp") + self.t2s3_bmp, self.t2s3_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_2_seg_3.bmp") self.t2s3_tilegrid = TileGrid(self.t2s3_bmp, pixel_shader=self.t2s3_palette) self.t2s3_palette.make_transparent(0) self.t2s3_tilegrid.x = 99 self.t2s3_tilegrid.y = 88 - self.t3s0_bmp, self.t3s0_palette = adafruit_imageload.load("tentacle_3_seg_0.bmp") + self.t3s0_bmp, self.t3s0_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_3_seg_0.bmp") self.t3s0_tilegrid = TileGrid(self.t3s0_bmp, pixel_shader=self.t3s0_palette) self.t3s0_palette.make_transparent(0) self.t3s0_tilegrid.x = 119 self.t3s0_tilegrid.y = 72 - self.t3s1_bmp, self.t3s1_palette = adafruit_imageload.load("tentacle_3_seg_1.bmp") + self.t3s1_bmp, self.t3s1_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_3_seg_1.bmp") self.t3s1_tilegrid = TileGrid(self.t3s1_bmp, pixel_shader=self.t3s1_palette) self.t3s1_palette.make_transparent(0) self.t3s1_tilegrid.x = 119 self.t3s1_tilegrid.y = 80 - self.t3s2_bmp, self.t3s2_palette = adafruit_imageload.load("tentacle_3_seg_2.bmp") + self.t3s2_bmp, self.t3s2_palette = adafruit_imageload.load("octopus_game_sprites/tentacle_3_seg_2.bmp") self.t3s2_tilegrid = TileGrid(self.t3s2_bmp, pixel_shader=self.t3s2_palette) self.t3s2_palette.make_transparent(0) self.t3s2_tilegrid.x = 120 @@ -1090,7 +1090,7 @@ class DiverPlayer(TileGrid): def __init__(self): # set up diver sprite sheet self._sprite_sheet_bmp, self._sprite_sheet_palette = adafruit_imageload.load( - "diver_sprite_sheet_v2.bmp") + "octopus_game_sprites/diver_sprite_sheet_v2.bmp") # initialize super instance of TileGrid super().__init__(self._sprite_sheet_bmp, pixel_shader=self._sprite_sheet_palette, diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/bg.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/bg.bmp similarity index 94% rename from CircuitPython_GameAndWatch_Octopus/sprites/bg.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/bg.bmp index 631b64b3ede11aa3550f818486f64daa2c96385a..64b8d959e65b0c2725c3e337c4027702e7a335b4 100644 GIT binary patch delta 212 zcmZ3rf^pRf#trT)lXaxIC;PKhOg_aTi-jFN`6a6zR6KNYJDUTP9WYsm-4)9AoV=Ue z2g;V7tjkdaWlK#y!%+=oi%rhptcS9NCbMug1KC`YCvr^#(wvhGxTk~Z3sAa%2gK)? t%+EUmOt0si!Sek1^Z3c$d~+a-*L<@l8)&jj?&6=r93LOQSyO<~1pt|XMCAYg delta 258 zcmZ3rf^pRf#trT)ll7%JCg0@Xot(gu1;i|qPqD}n5c8eyh{zlUcZ$!Tf%%8DLtU8$zFl()m0P nK0hynUJs_(C;Rcu1gdA7{1!-`1JXVGvzV2Yl{ae&FuDK$(F9SY diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/bg_with_shadow.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/bg_with_shadow.bmp similarity index 87% rename from CircuitPython_GameAndWatch_Octopus/sprites/bg_with_shadow.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/bg_with_shadow.bmp index f087a0fd6b46d37a97372f721ae607ceb1022c5a..ceb2efb3bfd8f6d330413e1aefe3c27e53804da5 100644 GIT binary patch delta 330 zcmcb&obldr#tpxjC;wn>o?OQwi$o_)p37cShR9a^8Z{~=}*VwctACZ;? zvI8gQvl~I#%99_mCqmUIO>W@GpL{`@AE-udvJ7WE&6c_x5#16lid=CEA3awT(eJTH{-AI6x^Hyb3i zY_c8y9Olf-%*}WCoopr-xcN=a^$7&h{*!rqA@l?hp2<6XUBO~+{X`}w`q@I+5czy< z_Q_NHy}@D=L^vi_iEvGJ2yg-Ny(do)VVfMF%rm)PoO3dlSNCLI9=^#1fk1ws!DNHr Kb#S~vRull&5`?M% delta 623 zcmaJ;OG^S_6vf6IXB;1-VEHJ+BE&!_f*`XHg&Ok(u3BZS3PRmhP(-^HNhhK}7eVA! zX;Z7(&9;TK%jgFP?S<%mqlHFwVYoAM&OPVc?`u>vjf$q);_$&8U{~wu>gy=?hv<6^ zbGiwKQfH;q6@}i|^HrPBXjk#9^Ya8U1O>m9#xlt9QydYIa@jSEHI6qvYiN(FLU`w< zaiGs3HY8|CkC8lZ3Hvne#+|Um$emJ%Jcy{cH{7vNy?#XT`Fwa456M-*sM}650*(wv z$T%%%aT3O)W9G#(FUEb4O2pA)!+1fRN1y2u4N<_g>0Eom2qANcqkj8h4hJQ5>(2hj zC&JiXNuwz9f|`=WLScCU&4dw-c*M#UW#`e=QImrx+9ce^qkrPfgbmrm{6Bd58>2%3@=7?d3lQZQQ*UHk kxomip1IVY7zeBmxNsF;(&CUz~13b$|0TCFUMKxXi1iUFvC;$Ke diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/diver_boat.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_boat.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/diver_boat.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_boat.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/diver_boat_small.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_boat_small.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/diver_boat_small.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_boat_small.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/diver_caught_small.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_caught_small.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/diver_caught_small.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_caught_small.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/diver_extra_life.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_extra_life.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/diver_extra_life.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_extra_life.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/diver_sprite_sheet_single_layer.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_sprite_sheet_single_layer.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/diver_sprite_sheet_single_layer.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_sprite_sheet_single_layer.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/diver_sprite_sheet_v2.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_sprite_sheet_v2.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/diver_sprite_sheet_v2.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/diver_sprite_sheet_v2.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0_seg_0.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0_seg_0.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0_seg_0.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0_seg_0.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0a_seg_1.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0a_seg_1.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0a_seg_1.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0a_seg_1.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0a_seg_2.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0a_seg_2.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0a_seg_2.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0a_seg_2.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0b_seg_1.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0b_seg_1.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0b_seg_1.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0b_seg_1.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0b_seg_2.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0b_seg_2.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0b_seg_2.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0b_seg_2.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0b_seg_3.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0b_seg_3.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_0b_seg_3.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_0b_seg_3.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1_seg_0.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1_seg_0.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1_seg_0.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1_seg_0.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1_seg_1.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1_seg_1.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1_seg_1.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1_seg_1.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1a_seg_2.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1a_seg_2.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1a_seg_2.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1a_seg_2.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1a_seg_3.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1a_seg_3.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1a_seg_3.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1a_seg_3.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1a_seg_4.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1a_seg_4.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1a_seg_4.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1a_seg_4.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1b_seg_2.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1b_seg_2.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_1b_seg_2.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_1b_seg_2.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_2_seg_0.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_2_seg_0.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_2_seg_0.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_2_seg_0.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_2_seg_1.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_2_seg_1.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_2_seg_1.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_2_seg_1.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_2_seg_2.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_2_seg_2.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_2_seg_2.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_2_seg_2.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_2_seg_3.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_2_seg_3.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_2_seg_3.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_2_seg_3.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_3_seg_0.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_3_seg_0.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_3_seg_0.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_3_seg_0.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_3_seg_1.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_3_seg_1.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_3_seg_1.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_3_seg_1.bmp diff --git a/CircuitPython_GameAndWatch_Octopus/sprites/tentacle_3_seg_2.bmp b/CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_3_seg_2.bmp similarity index 100% rename from CircuitPython_GameAndWatch_Octopus/sprites/tentacle_3_seg_2.bmp rename to CircuitPython_GameAndWatch_Octopus/octopus_game_sprites/tentacle_3_seg_2.bmp