From eedb5c0ac2b922941703fe5f9ae55dbefbb9cea3 Mon Sep 17 00:00:00 2001 From: Bryan Elliott Date: Tue, 19 Oct 2021 15:31:00 -0400 Subject: [PATCH 1/6] Attempt at naming the remaining sprites --- libraries/picosystem.hpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libraries/picosystem.hpp b/libraries/picosystem.hpp index a4b2378..ba3cd00 100644 --- a/libraries/picosystem.hpp +++ b/libraries/picosystem.hpp @@ -228,11 +228,11 @@ namespace picosystem { GEM1, GEM2, GEM3, GEM4, GEM5, GEM6, AMULET, FOLDER, COIN1, SKULL, TICK, CROSS, IDOL1, IDOL2, IDOL3, IDOL4, SWEETCORN, BROCCOLI, BISCUIT, BERRIES, SCEPTRE, FIRE, LASERGUN1, LASERGUN2, - HELMET1, HELMET2, HELMET3, HELMET4, __1, __2, __3, __4, + HELMET1, HELMET2, HELMET3, HELMET4, BOOT1, BOOT2, BOOT3, BOOT4, HEART1, SLIME, COIN2, SWORD4, SWORD5, __5, DYNAMITE, MEDPACK, GOGGLES, HELMET5, BOMB, OILCAN, SHIRT1, SHIRT2, SPEECH, DREAM, HEART2, HEART3, HEART4, __6, TORCH, ICE, __7, __8, - __9, __10, UPARROW, RING1, RING2, RING3, RING4, __11, + HELMET5, HELMET6, UPARROW, RING1, RING2, RING3, RING4, POUCH, TOKEN, VIAL1, VIAL2, RING5, RING6, BLOCK1, BLOCK2, BLOCK3, BLOCK4, BLOCK5, BLOCK6, BLOCK7, BLOCK8, BLOCK9, SHIELD1, SACK, BUTTON, VIAL3, VIAL4, TOOTH, BONE, HALFBLOCK1, HALFBLOCK2, HALFBLOCK3, @@ -240,8 +240,20 @@ namespace picosystem { FLOWER1, FLOWER2, FLOWER3, FLOWER4, STAFF1, STAFF2, STAFF3, STICK1, SPIKEBALL, MACE2, AXE2, __12, SWORD6, SWORD7, SWORD8, CROWN1, GOLD, GEM7, GEM8, GEM9, AXE3, MUSHROOM, SALT2, STICK2, - VIAL5, VIAL6, DOT, HELMET6, SWORD9, SWORD10, SWORD11, CROWN2 - // etc... can we name all 256 built in sprites?! + VIAL5, VIAL6, DOT, HELMET6, SWORD9, SWORD10, SWORD11, CROWN2, + TOMATO, LEAF2, LEAF3, LEAF4, LEAF5, MUSHROOM2, STUMP, STAR, + BIRD, BAUBLE, KEY1, KEY2, KEY2, __13, NECKLACE1, NECKLACE2, NECKLACE3, + CATERPILLAR, LEAF2E, LEAF3E, LEAF4E, LEAF5E, FLOWER5, FLOWER6, FLOWERS, + DOLL, EYE, FISH, BURGER, LIGHT, NOTE, DROP, DIPPER, + AVOCADO, VIAL7, VIAL8, VIAL9, VIAL10, CANDYCANE, EGG, SCYTHE1, + SCYTHE2, SCYTHE3, CHEESE1, CHEESE2, CURSOR1, __14, FIREBALL1, FIREBALL2, + MEDIC, RING7, FLOWER7, FLOWER8, PAN, CONSOLE, HEADPHONES, BRICK1, + BRICK2, BRICK3, SHRIMP, __15, CURSOR2, BLUEDOT, __16, __17, + BOOK, __18, PHONE, ROSE, BLOCK10, BLOCK11, ICEBLOCK, ROCKET1, + ROCKET2, BIRD2, GOBLIN, __19, CARCAS, RETICLE, __20, __21, + CLOCK, ALERT, __22, QUESTION, BLOCK12, BLOCK13, HARP, CHECKER1, + CHECKER2, FLAG1, FLAG2, FLAG3, FLAG4, STOP, MISSILE, BEAMSPLASH + // can we better name the __## sprites? }; #endif From 85d800ff5daeebe1b7b5d64a7f86f1fcb3fa6de3 Mon Sep 17 00:00:00 2001 From: Bryan Elliott Date: Tue, 19 Oct 2021 16:30:09 -0400 Subject: [PATCH 2/6] Duplicates --- libraries/picosystem.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/picosystem.hpp b/libraries/picosystem.hpp index ba3cd00..a354eb1 100644 --- a/libraries/picosystem.hpp +++ b/libraries/picosystem.hpp @@ -232,7 +232,7 @@ namespace picosystem { HEART1, SLIME, COIN2, SWORD4, SWORD5, __5, DYNAMITE, MEDPACK, GOGGLES, HELMET5, BOMB, OILCAN, SHIRT1, SHIRT2, SPEECH, DREAM, HEART2, HEART3, HEART4, __6, TORCH, ICE, __7, __8, - HELMET5, HELMET6, UPARROW, RING1, RING2, RING3, RING4, POUCH, + HELMET6, HELMET7, UPARROW, RING1, RING2, RING3, RING4, POUCH, TOKEN, VIAL1, VIAL2, RING5, RING6, BLOCK1, BLOCK2, BLOCK3, BLOCK4, BLOCK5, BLOCK6, BLOCK7, BLOCK8, BLOCK9, SHIELD1, SACK, BUTTON, VIAL3, VIAL4, TOOTH, BONE, HALFBLOCK1, HALFBLOCK2, HALFBLOCK3, @@ -240,9 +240,9 @@ namespace picosystem { FLOWER1, FLOWER2, FLOWER3, FLOWER4, STAFF1, STAFF2, STAFF3, STICK1, SPIKEBALL, MACE2, AXE2, __12, SWORD6, SWORD7, SWORD8, CROWN1, GOLD, GEM7, GEM8, GEM9, AXE3, MUSHROOM, SALT2, STICK2, - VIAL5, VIAL6, DOT, HELMET6, SWORD9, SWORD10, SWORD11, CROWN2, + VIAL5, VIAL6, DOT, HELMET7, SWORD9, SWORD10, SWORD11, CROWN2, TOMATO, LEAF2, LEAF3, LEAF4, LEAF5, MUSHROOM2, STUMP, STAR, - BIRD, BAUBLE, KEY1, KEY2, KEY2, __13, NECKLACE1, NECKLACE2, NECKLACE3, + BIRD, BAUBLE, KEY1, KEY2, KEY3, __13, NECKLACE1, NECKLACE2, NECKLACE3, CATERPILLAR, LEAF2E, LEAF3E, LEAF4E, LEAF5E, FLOWER5, FLOWER6, FLOWERS, DOLL, EYE, FISH, BURGER, LIGHT, NOTE, DROP, DIPPER, AVOCADO, VIAL7, VIAL8, VIAL9, VIAL10, CANDYCANE, EGG, SCYTHE1, From eb6c99d668763820a101011d68a8de8057de6021 Mon Sep 17 00:00:00 2001 From: Bryan Elliott Date: Tue, 19 Oct 2021 16:39:01 -0400 Subject: [PATCH 3/6] more helmets, ignore mac system artifact --- .gitignore | 2 ++ libraries/picosystem.hpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e342c81..074b5d7 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ build*/ **/build .vscode + +.DS_Store diff --git a/libraries/picosystem.hpp b/libraries/picosystem.hpp index a354eb1..c0de60b 100644 --- a/libraries/picosystem.hpp +++ b/libraries/picosystem.hpp @@ -240,7 +240,7 @@ namespace picosystem { FLOWER1, FLOWER2, FLOWER3, FLOWER4, STAFF1, STAFF2, STAFF3, STICK1, SPIKEBALL, MACE2, AXE2, __12, SWORD6, SWORD7, SWORD8, CROWN1, GOLD, GEM7, GEM8, GEM9, AXE3, MUSHROOM, SALT2, STICK2, - VIAL5, VIAL6, DOT, HELMET7, SWORD9, SWORD10, SWORD11, CROWN2, + VIAL5, VIAL6, DOT, HELMET8, SWORD9, SWORD10, SWORD11, CROWN2, TOMATO, LEAF2, LEAF3, LEAF4, LEAF5, MUSHROOM2, STUMP, STAR, BIRD, BAUBLE, KEY1, KEY2, KEY3, __13, NECKLACE1, NECKLACE2, NECKLACE3, CATERPILLAR, LEAF2E, LEAF3E, LEAF4E, LEAF5E, FLOWER5, FLOWER6, FLOWERS, From abeec5f4d1a9594ef48df998ed27f0594c36139b Mon Sep 17 00:00:00 2001 From: Bryan Elliott Date: Tue, 19 Oct 2021 17:13:00 -0400 Subject: [PATCH 4/6] Added index markers, renamed unknowns to location --- libraries/picosystem.hpp | 52 ++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/libraries/picosystem.hpp b/libraries/picosystem.hpp index c0de60b..f4991f8 100644 --- a/libraries/picosystem.hpp +++ b/libraries/picosystem.hpp @@ -221,39 +221,71 @@ namespace picosystem { #ifndef NO_SPRITESHEET enum _sprites_ids { + // 00+ CHERRY, APPLE, BANANA, ORANGE, AUBERGINE, CARROT, POTATO, LEAF, + // 08+ PARSNIP, MEAT, BEAN, RADISH, STRAWBERRY, PUMPKIN, CUCUMBER, SALT1, + // 10+ SWORD1, SWORD2, SWORD3, AXE1, DAGGER, MACE1, BOW, ARROW1, + // 18+ ARROW2, ARROW3, TRIDENT1, SPEAR, TRIDENT2, MACHINEGUN, PISTOL, SHOTGUN, + // 20+ GEM1, GEM2, GEM3, GEM4, GEM5, GEM6, AMULET, FOLDER, + // 28+ COIN1, SKULL, TICK, CROSS, IDOL1, IDOL2, IDOL3, IDOL4, + // 30+ SWEETCORN, BROCCOLI, BISCUIT, BERRIES, SCEPTRE, FIRE, LASERGUN1, LASERGUN2, + // 38+ HELMET1, HELMET2, HELMET3, HELMET4, BOOT1, BOOT2, BOOT3, BOOT4, - HEART1, SLIME, COIN2, SWORD4, SWORD5, __5, DYNAMITE, MEDPACK, + // 40+ + HEART1, SLIME, COIN2, SWORD4, SWORD5, __SPR45, DYNAMITE, MEDPACK, + // 48+ GOGGLES, HELMET5, BOMB, OILCAN, SHIRT1, SHIRT2, SPEECH, DREAM, - HEART2, HEART3, HEART4, __6, TORCH, ICE, __7, __8, + // 50+ + HEART2, HEART3, HEART4, __SPR53, TORCH, ICE, CARD, DIE, + // 58+ HELMET6, HELMET7, UPARROW, RING1, RING2, RING3, RING4, POUCH, + // 60+ TOKEN, VIAL1, VIAL2, RING5, RING6, BLOCK1, BLOCK2, BLOCK3, + // 68+ BLOCK4, BLOCK5, BLOCK6, BLOCK7, BLOCK8, BLOCK9, SHIELD1, SACK, + // 70+ BUTTON, VIAL3, VIAL4, TOOTH, BONE, HALFBLOCK1, HALFBLOCK2, HALFBLOCK3, + // 78+ HALFBLOCK4, HALFBLOCK5, HALFBLOCK6, HALFBLOCK7, HALFBLOCK8, HALFBLOCK9, SHIELD2, SHIELD3, + // 80+ FLOWER1, FLOWER2, FLOWER3, FLOWER4, STAFF1, STAFF2, STAFF3, STICK1, - SPIKEBALL, MACE2, AXE2, __12, SWORD6, SWORD7, SWORD8, CROWN1, + // 88+ + SPIKEBALL, MACE2, AXE2, __SPR_8B, SWORD6, SWORD7, SWORD8, CROWN1, + // 90+ GOLD, GEM7, GEM8, GEM9, AXE3, MUSHROOM, SALT2, STICK2, + // 98+ VIAL5, VIAL6, DOT, HELMET8, SWORD9, SWORD10, SWORD11, CROWN2, + // A0+ TOMATO, LEAF2, LEAF3, LEAF4, LEAF5, MUSHROOM2, STUMP, STAR, - BIRD, BAUBLE, KEY1, KEY2, KEY3, __13, NECKLACE1, NECKLACE2, NECKLACE3, + // A8+ + BIRD, BAUBLE, KEY1, KEY2, KEY3, __SPR_AC, NECKLACE1, NECKLACE2, NECKLACE3, + // B0+ CATERPILLAR, LEAF2E, LEAF3E, LEAF4E, LEAF5E, FLOWER5, FLOWER6, FLOWERS, + // B8+ DOLL, EYE, FISH, BURGER, LIGHT, NOTE, DROP, DIPPER, + // C0+ AVOCADO, VIAL7, VIAL8, VIAL9, VIAL10, CANDYCANE, EGG, SCYTHE1, - SCYTHE2, SCYTHE3, CHEESE1, CHEESE2, CURSOR1, __14, FIREBALL1, FIREBALL2, + // C8+ + SCYTHE2, SCYTHE3, CHEESE1, CHEESE2, CURSOR1, __SPR_CD, FIREBALL1, FIREBALL2, + // D0+ MEDIC, RING7, FLOWER7, FLOWER8, PAN, CONSOLE, HEADPHONES, BRICK1, - BRICK2, BRICK3, SHRIMP, __15, CURSOR2, BLUEDOT, __16, __17, - BOOK, __18, PHONE, ROSE, BLOCK10, BLOCK11, ICEBLOCK, ROCKET1, - ROCKET2, BIRD2, GOBLIN, __19, CARCAS, RETICLE, __20, __21, - CLOCK, ALERT, __22, QUESTION, BLOCK12, BLOCK13, HARP, CHECKER1, + // D8+ + BRICK2, BRICK3, SHRIMP, __SPR_DA, CURSOR2, BLUEDOT, __SPR_DE, __SPR_DF, + // E0+ + BOOK, __SPR_E1, PHONE, ROSE, BLOCK10, BLOCK11, ICEBLOCK, ROCKET1, + // E8+ + ROCKET2, BIRD2, GOBLIN, __SPR_EB, CARCAS, RETICLE, __SPR_EE, __SPR_EF, + // F0+ + CLOCK, ALERT, __SPR_F2, QUESTION, BLOCK12, BLOCK13, HARP, CHECKER1, + // F8+ CHECKER2, FLAG1, FLAG2, FLAG3, FLAG4, STOP, MISSILE, BEAMSPLASH - // can we better name the __## sprites? + // can we better name the __SPR_XX sprites? }; #endif From afebd0185f0f25694ca8fcae8a54f56235a50ac7 Mon Sep 17 00:00:00 2001 From: Bryan Elliott Date: Tue, 19 Oct 2021 17:13:50 -0400 Subject: [PATCH 5/6] missing underscores --- libraries/picosystem.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/picosystem.hpp b/libraries/picosystem.hpp index f4991f8..92d8e75 100644 --- a/libraries/picosystem.hpp +++ b/libraries/picosystem.hpp @@ -238,11 +238,11 @@ namespace picosystem { // 38+ HELMET1, HELMET2, HELMET3, HELMET4, BOOT1, BOOT2, BOOT3, BOOT4, // 40+ - HEART1, SLIME, COIN2, SWORD4, SWORD5, __SPR45, DYNAMITE, MEDPACK, + HEART1, SLIME, COIN2, SWORD4, SWORD5, __SPR_45, DYNAMITE, MEDPACK, // 48+ GOGGLES, HELMET5, BOMB, OILCAN, SHIRT1, SHIRT2, SPEECH, DREAM, // 50+ - HEART2, HEART3, HEART4, __SPR53, TORCH, ICE, CARD, DIE, + HEART2, HEART3, HEART4, __SPR_53, TORCH, ICE, CARD, DIE, // 58+ HELMET6, HELMET7, UPARROW, RING1, RING2, RING3, RING4, POUCH, // 60+ From eaba905a7c0a33c9f24493e3255deed74397092d Mon Sep 17 00:00:00 2001 From: Bryan Elliott Date: Tue, 19 Oct 2021 17:16:34 -0400 Subject: [PATCH 6/6] misindex --- libraries/picosystem.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/picosystem.hpp b/libraries/picosystem.hpp index 92d8e75..ba3b8b3 100644 --- a/libraries/picosystem.hpp +++ b/libraries/picosystem.hpp @@ -276,7 +276,7 @@ namespace picosystem { // D0+ MEDIC, RING7, FLOWER7, FLOWER8, PAN, CONSOLE, HEADPHONES, BRICK1, // D8+ - BRICK2, BRICK3, SHRIMP, __SPR_DA, CURSOR2, BLUEDOT, __SPR_DE, __SPR_DF, + BRICK2, BRICK3, SHRIMP, __SPR_DB, CURSOR2, BLUEDOT, __SPR_DE, __SPR_DF, // E0+ BOOK, __SPR_E1, PHONE, ROSE, BLOCK10, BLOCK11, ICEBLOCK, ROCKET1, // E8+