Parcourir la source

pokemon_data: fix incorrect casting on Gen II trade struct update

See kids, this is what happens when you try to be efficient rather
than abstracting and creating a lot more code, but then also
copy/pasting existing code and forgetting to change the datatype
casts.

Signed-off-by: Kris Bahnsen <Kris@KBEmbedded.com>
Kris Bahnsen il y a 1 an
Parent
commit
6d8e2c5c63
1 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 3 3
      src/pokemon_data.c

+ 3 - 3
src/pokemon_data.c

@@ -896,12 +896,12 @@ void pokemon_stat_memcpy(PokemonData* dst, PokemonData* src, uint8_t which) {
             &(((TradeBlockGenI*)src->trade_block)->ot_name[which]),
             &(((TradeBlockGenI*)src->trade_block)->ot_name[which]),
             sizeof(struct name));
             sizeof(struct name));
     } else if(dst->gen == GEN_II) {
     } else if(dst->gen == GEN_II) {
-        ((TradeBlockGenI*)dst->trade_block)->party_members[0] =
-            ((TradeBlockGenI*)src->trade_block)->party_members[which];
+        ((TradeBlockGenII*)dst->trade_block)->party_members[0] =
+            ((TradeBlockGenII*)src->trade_block)->party_members[which];
         memcpy(
         memcpy(
             &(((TradeBlockGenII*)dst->trade_block)->party[0]),
             &(((TradeBlockGenII*)dst->trade_block)->party[0]),
             &(((TradeBlockGenII*)src->trade_block)->party[which]),
             &(((TradeBlockGenII*)src->trade_block)->party[which]),
-            sizeof(PokemonPartyGenI));
+            sizeof(PokemonPartyGenII));
         memcpy(
         memcpy(
             &(((TradeBlockGenII*)dst->trade_block)->nickname[0]),
             &(((TradeBlockGenII*)dst->trade_block)->nickname[0]),
             &(((TradeBlockGenII*)src->trade_block)->nickname[which]),
             &(((TradeBlockGenII*)src->trade_block)->nickname[which]),