Skip to content

Commit 4d65c48

Browse files
R4g3Dkbembedded
authored andcommitted
README: Roll back in updates
The following commits were cherry-picked back in to restore the README.md file (and associated images): 4b84b25 ("Update README") a113ee3 ("Update README") a712da6 ("Set pokemon name to act like no nickname") 6f54ca2 ("Update todo") 1d25614 ("Update for added usage") 01ddb3a ("Added pokemon name, type, level, exp, moves, stats")
1 parent 20f949f commit 4d65c48

15 files changed

+95
-14
lines changed

README.md

Lines changed: 95 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
## Introduction
1818

19-
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.
19+
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.
2020

21-
It is a Proof of Concept (POC) for using views, GPIO, and FURI (Flipper Universal Registry Implementation).
21+
It currently trades a Pokemon based on your choice of Pokemon, Level, Stats and 4 Moves.
2222

2323
## Installation Directions
2424

@@ -49,7 +49,7 @@ And use [**qFlipper**](https://flipperzero.one/update) to copy the generated **p
4949
These instructions assume that you are starting at the Flipper Zero desktop. Otherwise, press the Back button until you are at the desktop.
5050

5151
- Press the `OK` button on the Flipper to open the main menu.
52-
- Choose `Aplicaciones` from the menu.
52+
- Choose `Applications` from the menu.
5353
- Choose `Game Boy` from the submenu.
5454
- Choose `Pokemon Trading`
5555
- The Flipper Zero should show the selection of Pokemon that you want to trade, and by default, it appears as bulbasaur.
@@ -63,69 +63,145 @@ These instructions assume that you are starting at the Flipper Zero desktop. Oth
6363
- Press the `LEFT`/`RIGHT` buttons to paginate the selection of Pokemon by 1.
6464
- Press the `UP`/`DOWN` buttons to paginate the selection of Pokemon by 10.
6565
- Press the `OK` button to select the Pokemon to trade.
66+
6667
<p align='center'>
6768
<br />
6869
<img src="./docs/images/flipper-zero-flat-2.png" width="400" /><br />
6970
</p>
71+
72+
- The Flipper Zero should show the selection of the Pokemon's level that you want to trade, and by default, it appears as level 1.
73+
74+
<p align='center'>
75+
<br />
76+
<img src="./docs/images/flipper-zero-flat-3.png" width="400" />
77+
<br />
78+
</p>
79+
80+
- Press the `LEFT`/`RIGHT` buttons to paginate the selection of the Pokemon's level by 1.
81+
- Press the `UP`/`DOWN` buttons to paginate the selection of the Pokemon's level by 10.
82+
- Press the `OK` button to select the Pokemon's level to trade.
83+
84+
<p align='center'>
85+
<br />
86+
<img src="./docs/images/flipper-zero-flat-4.png" width="400" />
87+
<br />
88+
</p>
89+
90+
- The Flipper Zero should show the selection for the Pokemon's moves that you want to trade, this will happen 4 times with default bing no move.
91+
92+
<p align='center'>
93+
<br />
94+
<img src="./docs/images/flipper-zero-flat-5.png" width="400" />
95+
<br />
96+
</p>
97+
98+
- Press the `LEFT`/`RIGHT` buttons to paginate the selection of the Pokemon's current move selection by 1.
99+
- Press the `UP`/`DOWN` buttons to paginate the selection of the Pokemon's current move selection by 10.
100+
- Press the `OK` button to select the Pokemon's current move selection to trade.
101+
102+
<p align='center'>
103+
<br />
104+
<img src="./docs/images/flipper-zero-flat-6.png" width="400" />
105+
<br />
106+
</p>
107+
108+
- The Flipper Zero should show the selection for the Pokemon's stats that you want to trade, and by default, it appears as random IV and zero EV.
109+
110+
<p align='center'>
111+
<br />
112+
<img src="./docs/images/flipper-zero-flat-7.png" width="400" />
113+
<br />
114+
</p>
115+
116+
- Press the `RIGHT`/`UP` buttons to paginate the selection of the Pokemon's stats selection by 1 positively.
117+
- Press the `LEFT`/`DOWN` buttons to paginate the selection of the Pokemon's stats selection by 1 negatively.
118+
- Press the `OK` button to select the Pokemon's current move selection to trade.
119+
120+
<p align='center'>
121+
<br />
122+
<img src="./docs/images/flipper-zero-flat-8.png" width="400" />
123+
<br />
124+
</p>
125+
70126
- The Flipper Zero will display the view to connect the Game Boy.
127+
71128
<p align='center'>
72129
<br />
73-
<img src="./docs/images/flipper-zero-flat-3.png" width="400" /><br />
130+
<img src="./docs/images/flipper-zero-flat-9.png" width="400" /><br />
74131
</p>
132+
75133
- On your Game Boy, you should connect the **Game Link Cable** to the Game Boy and in the game, go to the nearest **Pokemon Center**.
134+
76135
<p align='center'>
77136
<br />
78137
<img src="./docs/images/game_boy_pokemon_center.png" width="400" /><br />
79138
</p>
139+
80140
- Talk to the girl at the counter on the right. The girl will tell us that we have to save the game before playing, we will answer **YES** by pressing the **A** button.
81141

82-
.
83142
<p align='center'>
84143
<br />
85144
<img src="./docs/images/game_boy_save.png" width="400" /><br />
86145
</p>
146+
87147
- The Flipper Zero will show that we are connected.
148+
88149
<p align='center'>
89150
<br />
90-
<img src="./docs/images/flipper-zero-flat-4.png" width="400" /><br />
151+
<img src="./docs/images/flipper-zero-flat-10.png" width="400" /><br />
91152
</p>
153+
92154
- On the Game Boy, we will be asked which option we want, and we select **TRADE CENTER**.
155+
93156
<p align='center'>
94157
<br />
95158
<img src="./docs/images/game_boy_save_trade.png" width="400" /><br />
96159
</p>
160+
97161
- You will enter the Trade Center where you must press the A button on the Game Boy on your side of the table.
162+
98163
<p align='center'>
99164
<br />
100165
<img src="./docs/images/game_boy_trade_room_2.png" width="400" /><br />
101166
</p>
167+
102168
- Flipper Zero will remain on a waiting screen with the Pokemon you selected.
169+
103170
<p align='center'>
104171
<br />
105-
<img src="./docs/images/flipper-zero-flat-5.png" width="400" /><br />
172+
<img src="./docs/images/flipper-zero-flat-10.png" width="400" /><br />
106173
</p>
174+
107175
- You will see your Pokemon and the Pokemon you selected on the Flipper Zero, in this case, `Mew`. You must select the Pokemon you want to trade and press **TRADE**.
176+
108177
<p align='center'>
109178
<br />
110179
<img src="./docs/images/game_boy_trade_list_select_trade.png" width="400" /><br />
111180
</p>
181+
112182
- You must confirm the selected trade by selecting **TRADE**.
183+
113184
<p align='center'>
114185
<br />
115186
<img src="./docs/images/game_boy_trade_list_select_trade_confirm.png" width="400" /><br />
116187
</p>
188+
117189
- Flipper Zero will remain on a waiting screen with the Pokemon you selected.
190+
118191
<p align='center'>
119192
<br />
120-
<img src="./docs/images/flipper-zero-flat-6.png" width="400" /><br />
193+
<img src="./docs/images/flipper-zero-flat-11.png" width="400" /><br />
121194
</p>
195+
122196
- Finally, the Pokemon exchange will start from **Flipper Zero** to the **Game Boy**.
197+
123198
<p align='center'>
124199
<br />
125-
<img src="./docs/images/flipper-zero-flat-7.png" width="400" /><br />
200+
<img src="./docs/images/flipper-zero-flat-12.png" width="400" /><br />
126201
</p>
127202

128203
If the Flipper Zero gets stuck at the end of the exchange, you must reboot it by pressing the <img src="./docs/images/left.png" /> LEFT + <img src="./docs/images/back.png" /> BACK key combination.
204+
129205
<p align='center'>
130206
<br />
131207
<img src="./docs/images/reboot.png" width="400" /><br />
@@ -226,13 +302,18 @@ For each image, the color `#aaa` was transformed to `#fff` so that Flipper Zero
226302
- Game Boy Advance (GBA)
227303

228304
## Implemented by
229-
<a href="https://github.com/EstebanFuentealba/Flipper-Zero-Game-Boy-Pokemon-Trading/issues?q=is%3Aissue+label%3AImplemented+is%3Aclosed+is%3Aopen+" target="_blank"><img src="./docs/images/implemented.svg" /></a>
305+
<a href="https://github.com/EstebanFuentealba/Flipper-Zero-Game-Boy-Pokemon-Trading/">EstebanFuentealba</a><br />
306+
<a href="https://github.com/R4g3D/Flipper-Zero-Game-Boy-Pokemon-Trading/">R4g3D</a>
230307

231308
## TODO
232-
- [ ] Refactor the code
233-
- [x] The OK button stops working when exiting the app, so it needs to be restarted 🤔
234-
- [ ] Set each Pokemon's characteristics, attacks, and default levels
235-
- [ ] Improve animations
309+
- [x] Change the default traded Pokemon's naming to be no nickname
310+
- [x] Add view to allow the traded Pokemon's level to be chosen between 3 and 100
311+
- [x] Add view to allow the traded Pokemon's hidden stats to be chosen (IV and EV) from some options
312+
- [x] Add view to allow the traded Pokemon's moveset to be chosen (all 4 moves) allowing no move as an option
313+
- [ ] Debug traded Pokemon level issue where after a battle the Pokemon's level drops (doesn't affect all traded Pokemon)
314+
- [x] Add images for the level selection screen, stats selection screen, and move selection screens as per the original README
315+
- [ ] Optimise the level selection screen to be a number slider input instead of the current slideshow style selector
316+
- [ ] Add a view to allow for a custom Pokemon nickname (11 chars, 10 chars max used, fill and terminate with TERM_)
236317

237318
## Links
238319

43.4 KB
Loading
53 KB
Loading
52.3 KB
Loading
52.1 KB
Loading
51.5 KB
Loading
41.1 KB
Loading
40.9 KB
Loading
41 KB
Loading
44.8 KB
Loading

0 commit comments

Comments
 (0)