From 8428ab0e0cd01e34a6c3a62393afe613a7cbf82e Mon Sep 17 00:00:00 2001 From: Kris Bahnsen Date: Thu, 14 Sep 2023 17:07:55 -0700 Subject: [PATCH] Revert "Update todo" This reverts commit 6f54ca25f6af91ad05a0b06ba70eb1f6111b1435. --- README.md | 19 +++++++++---------- pokemon_data.h | 12 ++++++------ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 6ebcff6b8d7..cf0cf25a9fb 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ ## Introduction -This is a Pokemon exchange application from Flipper Zero to Game Boy [(Generaction I)](https://bulbapedia.bulbagarden.net/wiki/Generation_I). Flipper Zero emulates a "Slave" Game Boy connected to a Game Link Cable to be able to exchange any Pokemon from the First Generation (Red, Blue, Yellow) to a real Game Boy. +This is a Pokemon exchange application from Flipper Zero to Game Boy [(GeneraciĆ³n I)](https://bulbapedia.bulbagarden.net/wiki/Generation_I). Flipper Zero emulates a "Slave" Game Boy connected to a Game Link Cable to be able to exchange any Pokemon from the First Generation (Red, Blue, Yellow) to a real Game Boy. -It currently trades a Pokemon based on your choice of Pokemon, Level, Stats and 4 Moves. +It currently trades a Pokemon based on your choice of Pokemon, Level, and 4 Moves. It assumes a perfect IV and sets the EV for each stat to 0 (captured Pokemon) and calculates the Pokemon's Stats. ## Installation Directions @@ -260,17 +260,16 @@ For each image, the color `#aaa` was transformed to `#fff` so that Flipper Zero - Game Boy Advance (GBA) ## Implemented by -EstebanFuentealba
+EstebanFuentealba R4g3D ## TODO -- [ ] Change the default traded Pokemon's naming to be no nickname (current nickname is the Pokemon's name) -- [x] Add view to allow the traded Pokemon's level to be chosen between 3 and 100 -- [x] Add view to allow the traded Pokemon's hidden stats to be chosen (IV and EV) from some options -- [x] Add view to allow the traded Pokemon's moveset to be chosen (all 4 moves) allowing no move as an option -- [ ] Add images for the level selection screen, stats selection screen, and move selection screens as per the original README -- [ ] Optimise the level selection screen to be a number slider input instead of the current slideshow still selector -- [ ] Add a view to allow for a custom Pokemon nickname +- [ ] Refactor the code +- [x] The OK button stops working when exiting the app, so it needs to be restarted šŸ¤” +- [x] Set each Pokemon's characteristics, attacks, and default levels +- [ ] Improve animations +- [ ] Add images for the level selction screen and the move selection screens as per the original README +- [ ] Add an option to enable EV to be set to the maximum as per level ((65535 / 100) * level), or to the utmost maximum (65535) ## Links diff --git a/pokemon_data.h b/pokemon_data.h index f53492de4e8..f1adf67df5a 100644 --- a/pokemon_data.h +++ b/pokemon_data.h @@ -292,12 +292,12 @@ struct trade_data_block DATA_BLOCK2 = {.str = {F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00}}, }, .nickname = { - {.str = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - {.str = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - {.str = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - {.str = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - {.str = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - {.str = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, + {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}}, + {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}}, + {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}}, + {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}}, + {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}}, + {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}}, }}; unsigned char INPUT_BLOCK[405];