added evolve ui

savaughn · Nov 18, 2023 · dcb9bfe · dcb9bfe
1 parent 56e460a
commit dcb9bfe
Show file tree

Hide file tree

Showing 9 changed files with 204 additions and 42 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/include/pksavhelper.h b/include/pksavhelper.h
@@ -91,6 +91,7 @@ enum eligible_evolution_status check_trade_evolution_gen2(PokemonSave *pkmn_save
 void evolve_party_pokemon_at_index(PokemonSave *pkmn_save, uint8_t pkmn_party_index);
 void generate_random_number_step(void);
 void update_pkmn_DVs(PokemonSave *pkmn_save, uint8_t pkmn_party_index);
+void update_pkmn_stats(PokemonSave *pkmn_save, uint8_t pkmn_party_index);
 bool get_is_random_DVs_disabled(void);
 void set_is_random_DVs_disabled(bool is_disabled);
 bool get_is_item_required(void);

diff --git a/include/raylibhelper.h b/include/raylibhelper.h
@@ -37,7 +37,7 @@ void draw_file_select(struct save_file_data *save_file_data, char *player1_save_
 void draw_trade(PokemonSave *save_player1, PokemonSave *save_player2, char *player1_save_path, char *player2_save_path, struct TrainerSelection trainer_selection[2], struct trainer_info *trainer1, struct trainer_info *trainer2, bool *is_same_generation, GameScreen *current_screen, Texture2D *trade_texture);
 void draw_file_select_single(struct save_file_data *save_file_data, PokemonSave *save_player1, char *player1_save_path, struct trainer_info *trainer1, struct TrainerSelection *trainer_selection, enum single_player_menu_types menu_type, GameScreen *current_screen);
 void draw_bills_pc(PokemonSave *pkmn_save, char *save_path, struct trainer_info *trainer, struct TrainerSelection *trainerSelection, GameScreen *current_screen);
-void draw_evolve(PokemonSave *pkmn_save, char *save_path, struct trainer_info *trainer, GameScreen *current_screen);
+void draw_evolve(PokemonSave *pkmn_save, char *save_path, struct trainer_info *trainer, GameScreen *current_screen, Texture2D *evolve_texture);
 void handle_list_scroll(int *y_offset, const int num_saves, const int corrupted_count, int *mouses_down_index, bool *is_moving_scroll, int *banner_position_offset);
 void update_selected_indexes_with_selection(int *selected_saves_index, int *mouses_down_index, bool *is_moving_scroll);
 void draw_no_save_files(char *save_path);

diff --git a/saves/Pokemon - Blue Evolve.sav b/saves/Pokemon - Blue Evolve.sav
diff --git a/saves/Pokemon - Crystal Evolve.sav b/saves/Pokemon - Crystal Evolve.sav
diff --git a/src/pksavhelper.c b/src/pksavhelper.c
@@ -52,11 +52,8 @@ pksavhelper_error update_seen_owned_pkmn(PokemonSave *pkmn_save, uint8_t pokemon
             error_handler(pksav_error, "Error setting owned pokedex bit");
         }
     }
-    if (pksav_error != PKSAV_ERROR_NONE)
-    {
-        return error_update_pokedex;
-    }
-    return error_none;
+
+    return pksav_error == PKSAV_ERROR_NONE ? error_none : error_update_pokedex;
 }
 
 void swap_party_pkmn_at_indices(struct pksav_gen2_save *save, uint8_t pkmn_party_index1, uint8_t pkmn_party_index2)
@@ -362,6 +359,7 @@ void update_pkmn_stats(PokemonSave *pkmn_save, uint8_t pkmn_party_index)
         pkmn_save->save.gen1_save.pokemon_storage.p_party->party[pkmn_party_index].party_data.spd = pksav_bigendian16(pkmn_stats[PKSAV_GEN1_STAT_SPEED]);
         pkmn_save->save.gen1_save.pokemon_storage.p_party->party[pkmn_party_index].party_data.spcl = pksav_bigendian16(pkmn_stats[PKSAV_GEN1_STAT_SPECIAL]);
         pkmn_save->save.gen1_save.pokemon_storage.p_party->party[pkmn_party_index].party_data.max_hp = pksav_bigendian16(pkmn_stats[PKSAV_GEN1_STAT_HP]);
+        pkmn_save->save.gen1_save.pokemon_storage.p_party->party[pkmn_party_index].pc_data.current_hp = pkmn_save->save.gen1_save.pokemon_storage.p_party->party[pkmn_party_index].party_data.max_hp;
     }
     else
     {

diff --git a/src/raylibhelper.c b/src/raylibhelper.c
@@ -308,7 +308,7 @@ void draw_raylib_screen_loop(
             draw_file_select_single(save_file_data, pkmn_save_player1, player1_save_path, trainer1, &trainerSelection[0], SINGLE_PLAYER_MENU_TYPE_EVOLVE, &current_screen);
             break;
         case SCREEN_EVOLVE:
-            draw_evolve(pkmn_save_player1, player1_save_path, trainer1, &current_screen);
+            draw_evolve(pkmn_save_player1, player1_save_path, trainer1, &current_screen, &textures[T_EVOLVE]);
             break;
         case SCREEN_ABOUT:
             draw_about(&current_screen, is_build_prerelease);

diff --git a/src/screens/EvolveScreen.c b/src/screens/EvolveScreen.c
diff --git a/src/screens/TradeScreen.c b/src/screens/TradeScreen.c
@@ -21,8 +21,8 @@ void draw_trade(PokemonSave *save_player1, PokemonSave *save_player2, char *play
     DrawTextureEx(*trade_texture, (Vector2){50, 10}, 0, 0.4, WHITE);
 
     bool is_valid_trade[2] = {true, true};
-    draw_trainer_info(trainer1, 25, (SCREEN_HEIGHT - 100)/2 - 75, trainerSelection, *is_same_generation, is_valid_trade);
-    draw_trainer_info(trainer2, SCREEN_WIDTH - 178, (SCREEN_HEIGHT - 100)/2-75, trainerSelection, *is_same_generation, is_valid_trade);
+    draw_trainer_info(trainer1, 25, (SCREEN_HEIGHT - 100) / 2 - 75, trainerSelection, *is_same_generation, is_valid_trade);
+    draw_trainer_info(trainer2, SCREEN_WIDTH - 178, (SCREEN_HEIGHT - 100) / 2 - 75, trainerSelection, *is_same_generation, is_valid_trade);
     bool can_submit_trade = trainerSelection[0].pkmn_party_index != -1 && trainerSelection[1].pkmn_party_index != -1 && is_valid_trade[0] == true && is_valid_trade[1] == true;
 
     // Bottom bar
@@ -51,7 +51,7 @@ void draw_trade(PokemonSave *save_player1, PokemonSave *save_player2, char *play
             ui_selection = BUTTON_NONE;
         }
     }
-    
+
     static pksavhelper_error pksavhelper_error = error_none;
     if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT) && ui_selection != BUTTON_NONE)
     {
@@ -151,7 +151,7 @@ void draw_trade(PokemonSave *save_player1, PokemonSave *save_player2, char *play
         default:
             break;
         }
-        
+
         show_trade_toast = !draw_toast_message(toast_message, TOAST_SHORT, TOAST_INFO);
     }
     else