Break dependency on explicit ordering for species_data_files

pret · Jan 30, 2025 · d46e3ff · d46e3ff
1 parent 5957413
commit d46e3ff
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 29 deletions.
diff --git a/res/pokemon/deoxys/meson.build b/res/pokemon/deoxys/meson.build
@@ -1,7 +1,7 @@
 species_data_files += files('data.json')
-deoxys_attack_personal = files('forms/attack/data.json')
-deoxys_defense_personal = files('forms/defense/data.json')
-deoxys_speed_personal = files('forms/speed/data.json')
+species_data_files += files('forms/attack/data.json')
+species_data_files += files('forms/defense/data.json')
+species_data_files += files('forms/speed/data.json')
 
 poke_icon_files += files('icon.png')
 deoxys_attack_icon = files('forms/attack/icon.png')

diff --git a/res/pokemon/giratina/meson.build b/res/pokemon/giratina/meson.build
@@ -1,5 +1,5 @@
 species_data_files += files('data.json')
-giratina_origin_personal = files('forms/origin/data.json')
+species_data_files += files('forms/origin/data.json')
 
 poke_icon_files += files('icon.png')
 giratina_origin_icon = files('forms/origin/icon.png')

diff --git a/res/pokemon/meson.build b/res/pokemon/meson.build
@@ -106,23 +106,6 @@ species_env.append('SPECIES', species_dirnames, separator: ';')
 species_env.append('PYTHONPATH', meson.project_build_root()) # For python scripts
 
 
-# Order of extra personal files for mon forms
-# TODO: Move these into species directories after finishing the refactor
-species_data_files += [
-    deoxys_attack_personal,
-    deoxys_defense_personal,
-    deoxys_speed_personal,
-    wormadam_sandy_personal,
-    wormadam_trash_personal,
-    giratina_origin_personal,
-    shaymin_sky_personal,
-    rotom_heat_personal,
-    rotom_wash_personal,
-    rotom_frost_personal,
-    rotom_fan_personal,
-    rotom_mow_personal
-]
-
 # The last icon added to the list before this should have been
 # the basic egg icon.
 poke_icon_files += [

diff --git a/res/pokemon/rotom/meson.build b/res/pokemon/rotom/meson.build
@@ -1,9 +1,9 @@
 species_data_files += files('data.json')
-rotom_heat_personal = files('forms/heat/data.json')
-rotom_wash_personal = files('forms/wash/data.json')
-rotom_frost_personal = files('forms/frost/data.json')
-rotom_fan_personal = files('forms/fan/data.json')
-rotom_mow_personal = files('forms/mow/data.json')
+species_data_files += files('forms/heat/data.json')
+species_data_files += files('forms/wash/data.json')
+species_data_files += files('forms/frost/data.json')
+species_data_files += files('forms/fan/data.json')
+species_data_files += files('forms/mow/data.json')
 
 poke_icon_files += files('icon.png')
 rotom_heat_icon = files('forms/heat/icon.png')

diff --git a/res/pokemon/shaymin/meson.build b/res/pokemon/shaymin/meson.build
@@ -1,5 +1,5 @@
 species_data_files += files('data.json')
-shaymin_sky_personal = files('forms/sky/data.json')
+species_data_files += files('forms/sky/data.json')
 
 poke_icon_files += files('icon.png')
 shaymin_sky_icon = files('forms/sky/icon.png')

diff --git a/res/pokemon/wormadam/meson.build b/res/pokemon/wormadam/meson.build
@@ -1,6 +1,6 @@
 species_data_files += files('data.json')
-wormadam_sandy_personal = files('forms/sandy/data.json')
-wormadam_trash_personal = files('forms/trash/data.json')
+species_data_files += files('forms/sandy/data.json')
+species_data_files += files('forms/trash/data.json')
 
 poke_icon_files += files('icon.png')
 wormadam_sandy_icon = files('forms/sandy/icon.png')