fixed odds and ends

savaughn · Jan 26, 2024 · af8d571 · af8d571
1 parent 282912f
commit af8d571
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -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)
                 {
@@ Expand Down @@