Fix issue with shiny unown

This commit is contained in:
Lorenzo Carletti 2023-03-05 08:48:02 +01:00
parent a9432240a9
commit e60081897c
3 changed files with 3 additions and 3 deletions

View File

@ -25,7 +25,7 @@ ALWAYS_INLINE MAX_OPTIMIZE u8 get_unown_letter_gen2_fast(u16 ivs){
u8 def_ivs = ((ivs) & 0xF);
u8 spe_ivs = ((ivs>>12) & 0xF);
u8 spa_ivs = ((ivs>>8) & 0xF);
return SWI_Div(((((atk_ivs>>1)&3)<<6) | (((def_ivs>>1)&3)<<4) | (((spe_ivs>>1)&3)<<2) | (((spa_ivs>>1)&3)<<0)), 10);
return SWI_Div((((atk_ivs>>1)&3)<<6) | (((def_ivs>>1)&3)<<4) | (((spe_ivs>>1)&3)<<2) | (((spa_ivs>>1)&3)<<0), 10);
}
#endif

View File

@ -704,7 +704,7 @@ void set_origin_pid_iv(struct gen3_mon* dst, struct gen3_mon_data_unenc* data_ds
u8 encounter_type = get_encounter_type_gen3(species);
u8 is_shiny = is_shiny_gen2_unfiltered(wanted_ivs);
// To debug shiny Unown stuff
// To debug shiny Unown stuff more than normally possible
//is_shiny = 1;
u32 ivs = 0;
u8 ability = 0;

View File

@ -1078,7 +1078,7 @@ void generate_unown_shiny_info_letter_preloaded(u8 wanted_nature, u8 letter, u16
if(wanted_nature >= NUM_NATURES)
wanted_nature -= NUM_NATURES;
}
_generate_unown_shiny_info(wanted_nature, letter, tsv, dst_pid, dst_ivs, get_rng());
_generate_unown_shiny_info(wanted_nature, tsv, letter, dst_pid, dst_ivs, get_rng());
}
u8 get_roamer_ivs(u32 pid, u8 hp_ivs, u8 atk_ivs, u32* dst_ivs) {