From af8d571f27bebccf3132d424d275e190cc5df092 Mon Sep 17 00:00:00 2001 From: Spencer Vaughn Date: Thu, 25 Jan 2024 20:03:56 -0600 Subject: [PATCH] fixed odds and ends --- Makefile | 4 ++-- src/filehelper.c | 2 -- src/pksavhelper.c | 1 + src/raylibhelper.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 794f718..31d6c1e 100644 --- a/Makefile +++ b/Makefile @@ -30,9 +30,9 @@ PLATFORM ?= PLATFORM_DESKTOP # Define project variables PROJECT_NAME ?= pokeromtrader -PROJECT_VERSION := 1.0.0 +PROJECT_VERSION := 1.0.1 # prerelease or release -PROJECT_VERSION_TYPE ?= release +PROJECT_VERSION_TYPE ?= prerelease PROJECT_BUILD_PATH ?= . RAYLIB_PATH ?= deps/raylib diff --git a/src/filehelper.c b/src/filehelper.c index ca0f2f4..b17ae0b 100644 --- a/src/filehelper.c +++ b/src/filehelper.c @@ -516,8 +516,6 @@ void create_default_config(bool overwrite) strcpy(default_key, "SAVE_FILE_DIR="); strcat(default_key, saves_dir); fputs(default_key, fp); - fputs("\n", fp); - fputs("DISABLE_RANDOM_IVS_ON_TRADE=false", fp); fclose(fp); } diff --git a/src/pksavhelper.c b/src/pksavhelper.c index 62c3eab..aac0db9 100644 --- a/src/pksavhelper.c +++ b/src/pksavhelper.c @@ -612,6 +612,7 @@ pksavhelper_error swap_pkmn_at_index_between_saves_cross_gen(PokemonSave *player player_gen1->save.gen1_save.pokemon_storage.p_party->otnames[pkmn_party_index1][strlen(tmp_otname_gen2)] = 0x50; player_gen2->save.gen2_save.pokemon_storage.p_party->otnames[pkmn_party_index2][strlen(tmp_otname_gen1)] = 0x50; + // Fill pkmn hp to max player_gen1->save.gen1_save.pokemon_storage.p_party->party[pkmn_party_index1].pc_data.current_hp = player_gen1->save.gen1_save.pokemon_storage.p_party->party[pkmn_party_index1].party_data.max_hp; player_gen2->save.gen2_save.pokemon_storage.p_party->party[pkmn_party_index2].party_data.current_hp = player_gen2->save.gen2_save.pokemon_storage.p_party->party[pkmn_party_index2].party_data.max_hp; diff --git a/src/raylibhelper.c b/src/raylibhelper.c index 03c6e0d..043d37c 100644 --- a/src/raylibhelper.c +++ b/src/raylibhelper.c @@ -244,7 +244,7 @@ void draw_raylib_screen_loop( } } - for (int i = T_POKEBALL_0; i < T_POKEBALL_3 + 1; i++) + for (int i = T_POKEBALL_0; i < T_COUNT; i++) { if (textures[i].id == 0) {