From: Lynn "Zhorken" Vaughan Date: Sun, 8 Apr 2012 23:56:50 +0000 (-0400) Subject: Pokémon + Nobunaga → Pokémon Conquest X-Git-Tag: veekun-promotions/2012062401~1 X-Git-Url: http://git.veekun.com/pokedex-media.git/commitdiff_plain/3841b29fe5afe231f58cd33dc08e92db9759fe2a?hp=bedc2a9a66ffd5de5b719c899cc0a6e7bf69e948 Pokémon + Nobunaga → Pokémon Conquest --- diff --git a/pokemon/nobunaga/111.png b/pokemon/conquest/111.png similarity index 100% rename from pokemon/nobunaga/111.png rename to pokemon/conquest/111.png diff --git a/pokemon/nobunaga/112.png b/pokemon/conquest/112.png similarity index 100% rename from pokemon/nobunaga/112.png rename to pokemon/conquest/112.png diff --git a/pokemon/nobunaga/123.png b/pokemon/conquest/123.png similarity index 100% rename from pokemon/nobunaga/123.png rename to pokemon/conquest/123.png diff --git a/pokemon/nobunaga/129.png b/pokemon/conquest/129.png similarity index 100% rename from pokemon/nobunaga/129.png rename to pokemon/conquest/129.png diff --git a/pokemon/nobunaga/130.png b/pokemon/conquest/130.png similarity index 100% rename from pokemon/nobunaga/130.png rename to pokemon/conquest/130.png diff --git a/pokemon/nobunaga/131.png b/pokemon/conquest/131.png similarity index 100% rename from pokemon/nobunaga/131.png rename to pokemon/conquest/131.png diff --git a/pokemon/nobunaga/133.png b/pokemon/conquest/133.png similarity index 100% rename from pokemon/nobunaga/133.png rename to pokemon/conquest/133.png diff --git a/pokemon/nobunaga/134.png b/pokemon/conquest/134.png similarity index 100% rename from pokemon/nobunaga/134.png rename to pokemon/conquest/134.png diff --git a/pokemon/nobunaga/135.png b/pokemon/conquest/135.png similarity index 100% rename from pokemon/nobunaga/135.png rename to pokemon/conquest/135.png diff --git a/pokemon/nobunaga/136.png b/pokemon/conquest/136.png similarity index 100% rename from pokemon/nobunaga/136.png rename to pokemon/conquest/136.png diff --git a/pokemon/nobunaga/143.png b/pokemon/conquest/143.png similarity index 100% rename from pokemon/nobunaga/143.png rename to pokemon/conquest/143.png diff --git a/pokemon/nobunaga/144.png b/pokemon/conquest/144.png similarity index 100% rename from pokemon/nobunaga/144.png rename to pokemon/conquest/144.png diff --git a/pokemon/nobunaga/147.png b/pokemon/conquest/147.png similarity index 100% rename from pokemon/nobunaga/147.png rename to pokemon/conquest/147.png diff --git a/pokemon/nobunaga/148.png b/pokemon/conquest/148.png similarity index 100% rename from pokemon/nobunaga/148.png rename to pokemon/conquest/148.png diff --git a/pokemon/nobunaga/149.png b/pokemon/conquest/149.png similarity index 100% rename from pokemon/nobunaga/149.png rename to pokemon/conquest/149.png diff --git a/pokemon/nobunaga/15.png b/pokemon/conquest/15.png similarity index 100% rename from pokemon/nobunaga/15.png rename to pokemon/conquest/15.png diff --git a/pokemon/nobunaga/150.png b/pokemon/conquest/150.png similarity index 100% rename from pokemon/nobunaga/150.png rename to pokemon/conquest/150.png diff --git a/pokemon/nobunaga/169.png b/pokemon/conquest/169.png similarity index 100% rename from pokemon/nobunaga/169.png rename to pokemon/conquest/169.png diff --git a/pokemon/nobunaga/172.png b/pokemon/conquest/172.png similarity index 100% rename from pokemon/nobunaga/172.png rename to pokemon/conquest/172.png diff --git a/pokemon/nobunaga/174.png b/pokemon/conquest/174.png similarity index 100% rename from pokemon/nobunaga/174.png rename to pokemon/conquest/174.png diff --git a/pokemon/nobunaga/179.png b/pokemon/conquest/179.png similarity index 100% rename from pokemon/nobunaga/179.png rename to pokemon/conquest/179.png diff --git a/pokemon/nobunaga/180.png b/pokemon/conquest/180.png similarity index 100% rename from pokemon/nobunaga/180.png rename to pokemon/conquest/180.png diff --git a/pokemon/nobunaga/181.png b/pokemon/conquest/181.png similarity index 100% rename from pokemon/nobunaga/181.png rename to pokemon/conquest/181.png diff --git a/pokemon/nobunaga/194.png b/pokemon/conquest/194.png similarity index 100% rename from pokemon/nobunaga/194.png rename to pokemon/conquest/194.png diff --git a/pokemon/nobunaga/195.png b/pokemon/conquest/195.png similarity index 100% rename from pokemon/nobunaga/195.png rename to pokemon/conquest/195.png diff --git a/pokemon/nobunaga/196.png b/pokemon/conquest/196.png similarity index 100% rename from pokemon/nobunaga/196.png rename to pokemon/conquest/196.png diff --git a/pokemon/nobunaga/197.png b/pokemon/conquest/197.png similarity index 100% rename from pokemon/nobunaga/197.png rename to pokemon/conquest/197.png diff --git a/pokemon/nobunaga/200.png b/pokemon/conquest/200.png similarity index 100% rename from pokemon/nobunaga/200.png rename to pokemon/conquest/200.png diff --git a/pokemon/nobunaga/204.png b/pokemon/conquest/204.png similarity index 100% rename from pokemon/nobunaga/204.png rename to pokemon/conquest/204.png diff --git a/pokemon/nobunaga/205.png b/pokemon/conquest/205.png similarity index 100% rename from pokemon/nobunaga/205.png rename to pokemon/conquest/205.png diff --git a/pokemon/nobunaga/208.png b/pokemon/conquest/208.png similarity index 100% rename from pokemon/nobunaga/208.png rename to pokemon/conquest/208.png diff --git a/pokemon/nobunaga/212.png b/pokemon/conquest/212.png similarity index 100% rename from pokemon/nobunaga/212.png rename to pokemon/conquest/212.png diff --git a/pokemon/nobunaga/215.png b/pokemon/conquest/215.png similarity index 100% rename from pokemon/nobunaga/215.png rename to pokemon/conquest/215.png diff --git a/pokemon/nobunaga/23.png b/pokemon/conquest/23.png similarity index 100% rename from pokemon/nobunaga/23.png rename to pokemon/conquest/23.png diff --git a/pokemon/nobunaga/24.png b/pokemon/conquest/24.png similarity index 100% rename from pokemon/nobunaga/24.png rename to pokemon/conquest/24.png diff --git a/pokemon/nobunaga/246.png b/pokemon/conquest/246.png similarity index 100% rename from pokemon/nobunaga/246.png rename to pokemon/conquest/246.png diff --git a/pokemon/nobunaga/247.png b/pokemon/conquest/247.png similarity index 100% rename from pokemon/nobunaga/247.png rename to pokemon/conquest/247.png diff --git a/pokemon/nobunaga/248.png b/pokemon/conquest/248.png similarity index 100% rename from pokemon/nobunaga/248.png rename to pokemon/conquest/248.png diff --git a/pokemon/nobunaga/25.png b/pokemon/conquest/25.png similarity index 100% rename from pokemon/nobunaga/25.png rename to pokemon/conquest/25.png diff --git a/pokemon/nobunaga/252.png b/pokemon/conquest/252.png similarity index 100% rename from pokemon/nobunaga/252.png rename to pokemon/conquest/252.png diff --git a/pokemon/nobunaga/253.png b/pokemon/conquest/253.png similarity index 100% rename from pokemon/nobunaga/253.png rename to pokemon/conquest/253.png diff --git a/pokemon/nobunaga/254.png b/pokemon/conquest/254.png similarity index 100% rename from pokemon/nobunaga/254.png rename to pokemon/conquest/254.png diff --git a/pokemon/nobunaga/26.png b/pokemon/conquest/26.png similarity index 100% rename from pokemon/nobunaga/26.png rename to pokemon/conquest/26.png diff --git a/pokemon/nobunaga/280.png b/pokemon/conquest/280.png similarity index 100% rename from pokemon/nobunaga/280.png rename to pokemon/conquest/280.png diff --git a/pokemon/nobunaga/281.png b/pokemon/conquest/281.png similarity index 100% rename from pokemon/nobunaga/281.png rename to pokemon/conquest/281.png diff --git a/pokemon/nobunaga/282.png b/pokemon/conquest/282.png similarity index 100% rename from pokemon/nobunaga/282.png rename to pokemon/conquest/282.png diff --git a/pokemon/nobunaga/304.png b/pokemon/conquest/304.png similarity index 100% rename from pokemon/nobunaga/304.png rename to pokemon/conquest/304.png diff --git a/pokemon/nobunaga/305.png b/pokemon/conquest/305.png similarity index 100% rename from pokemon/nobunaga/305.png rename to pokemon/conquest/305.png diff --git a/pokemon/nobunaga/306.png b/pokemon/conquest/306.png similarity index 100% rename from pokemon/nobunaga/306.png rename to pokemon/conquest/306.png diff --git a/pokemon/nobunaga/347.png b/pokemon/conquest/347.png similarity index 100% rename from pokemon/nobunaga/347.png rename to pokemon/conquest/347.png diff --git a/pokemon/nobunaga/348.png b/pokemon/conquest/348.png similarity index 100% rename from pokemon/nobunaga/348.png rename to pokemon/conquest/348.png diff --git a/pokemon/nobunaga/355.png b/pokemon/conquest/355.png similarity index 100% rename from pokemon/nobunaga/355.png rename to pokemon/conquest/355.png diff --git a/pokemon/nobunaga/356.png b/pokemon/conquest/356.png similarity index 100% rename from pokemon/nobunaga/356.png rename to pokemon/conquest/356.png diff --git a/pokemon/nobunaga/358.png b/pokemon/conquest/358.png similarity index 100% rename from pokemon/nobunaga/358.png rename to pokemon/conquest/358.png diff --git a/pokemon/nobunaga/361.png b/pokemon/conquest/361.png similarity index 100% rename from pokemon/nobunaga/361.png rename to pokemon/conquest/361.png diff --git a/pokemon/nobunaga/362.png b/pokemon/conquest/362.png similarity index 100% rename from pokemon/nobunaga/362.png rename to pokemon/conquest/362.png diff --git a/pokemon/nobunaga/363.png b/pokemon/conquest/363.png similarity index 100% rename from pokemon/nobunaga/363.png rename to pokemon/conquest/363.png diff --git a/pokemon/nobunaga/364.png b/pokemon/conquest/364.png similarity index 100% rename from pokemon/nobunaga/364.png rename to pokemon/conquest/364.png diff --git a/pokemon/nobunaga/365.png b/pokemon/conquest/365.png similarity index 100% rename from pokemon/nobunaga/365.png rename to pokemon/conquest/365.png diff --git a/pokemon/nobunaga/374.png b/pokemon/conquest/374.png similarity index 100% rename from pokemon/nobunaga/374.png rename to pokemon/conquest/374.png diff --git a/pokemon/nobunaga/375.png b/pokemon/conquest/375.png similarity index 100% rename from pokemon/nobunaga/375.png rename to pokemon/conquest/375.png diff --git a/pokemon/nobunaga/376.png b/pokemon/conquest/376.png similarity index 100% rename from pokemon/nobunaga/376.png rename to pokemon/conquest/376.png diff --git a/pokemon/nobunaga/379.png b/pokemon/conquest/379.png similarity index 100% rename from pokemon/nobunaga/379.png rename to pokemon/conquest/379.png diff --git a/pokemon/nobunaga/383.png b/pokemon/conquest/383.png similarity index 100% rename from pokemon/nobunaga/383.png rename to pokemon/conquest/383.png diff --git a/pokemon/nobunaga/384.png b/pokemon/conquest/384.png similarity index 100% rename from pokemon/nobunaga/384.png rename to pokemon/conquest/384.png diff --git a/pokemon/nobunaga/39.png b/pokemon/conquest/39.png similarity index 100% rename from pokemon/nobunaga/39.png rename to pokemon/conquest/39.png diff --git a/pokemon/nobunaga/390.png b/pokemon/conquest/390.png similarity index 100% rename from pokemon/nobunaga/390.png rename to pokemon/conquest/390.png diff --git a/pokemon/nobunaga/391.png b/pokemon/conquest/391.png similarity index 100% rename from pokemon/nobunaga/391.png rename to pokemon/conquest/391.png diff --git a/pokemon/nobunaga/392.png b/pokemon/conquest/392.png similarity index 100% rename from pokemon/nobunaga/392.png rename to pokemon/conquest/392.png diff --git a/pokemon/nobunaga/393.png b/pokemon/conquest/393.png similarity index 100% rename from pokemon/nobunaga/393.png rename to pokemon/conquest/393.png diff --git a/pokemon/nobunaga/394.png b/pokemon/conquest/394.png similarity index 100% rename from pokemon/nobunaga/394.png rename to pokemon/conquest/394.png diff --git a/pokemon/nobunaga/395.png b/pokemon/conquest/395.png similarity index 100% rename from pokemon/nobunaga/395.png rename to pokemon/conquest/395.png diff --git a/pokemon/nobunaga/396.png b/pokemon/conquest/396.png similarity index 100% rename from pokemon/nobunaga/396.png rename to pokemon/conquest/396.png diff --git a/pokemon/nobunaga/397.png b/pokemon/conquest/397.png similarity index 100% rename from pokemon/nobunaga/397.png rename to pokemon/conquest/397.png diff --git a/pokemon/nobunaga/398.png b/pokemon/conquest/398.png similarity index 100% rename from pokemon/nobunaga/398.png rename to pokemon/conquest/398.png diff --git a/pokemon/nobunaga/399.png b/pokemon/conquest/399.png similarity index 100% rename from pokemon/nobunaga/399.png rename to pokemon/conquest/399.png diff --git a/pokemon/nobunaga/4.png b/pokemon/conquest/4.png similarity index 100% rename from pokemon/nobunaga/4.png rename to pokemon/conquest/4.png diff --git a/pokemon/nobunaga/40.png b/pokemon/conquest/40.png similarity index 100% rename from pokemon/nobunaga/40.png rename to pokemon/conquest/40.png diff --git a/pokemon/nobunaga/400.png b/pokemon/conquest/400.png similarity index 100% rename from pokemon/nobunaga/400.png rename to pokemon/conquest/400.png diff --git a/pokemon/nobunaga/403.png b/pokemon/conquest/403.png similarity index 100% rename from pokemon/nobunaga/403.png rename to pokemon/conquest/403.png diff --git a/pokemon/nobunaga/404.png b/pokemon/conquest/404.png similarity index 100% rename from pokemon/nobunaga/404.png rename to pokemon/conquest/404.png diff --git a/pokemon/nobunaga/405.png b/pokemon/conquest/405.png similarity index 100% rename from pokemon/nobunaga/405.png rename to pokemon/conquest/405.png diff --git a/pokemon/nobunaga/41.png b/pokemon/conquest/41.png similarity index 100% rename from pokemon/nobunaga/41.png rename to pokemon/conquest/41.png diff --git a/pokemon/nobunaga/410.png b/pokemon/conquest/410.png similarity index 100% rename from pokemon/nobunaga/410.png rename to pokemon/conquest/410.png diff --git a/pokemon/nobunaga/411.png b/pokemon/conquest/411.png similarity index 100% rename from pokemon/nobunaga/411.png rename to pokemon/conquest/411.png diff --git a/pokemon/nobunaga/42.png b/pokemon/conquest/42.png similarity index 100% rename from pokemon/nobunaga/42.png rename to pokemon/conquest/42.png diff --git a/pokemon/nobunaga/425.png b/pokemon/conquest/425.png similarity index 100% rename from pokemon/nobunaga/425.png rename to pokemon/conquest/425.png diff --git a/pokemon/nobunaga/426.png b/pokemon/conquest/426.png similarity index 100% rename from pokemon/nobunaga/426.png rename to pokemon/conquest/426.png diff --git a/pokemon/nobunaga/429.png b/pokemon/conquest/429.png similarity index 100% rename from pokemon/nobunaga/429.png rename to pokemon/conquest/429.png diff --git a/pokemon/nobunaga/433.png b/pokemon/conquest/433.png similarity index 100% rename from pokemon/nobunaga/433.png rename to pokemon/conquest/433.png diff --git a/pokemon/nobunaga/442.png b/pokemon/conquest/442.png similarity index 100% rename from pokemon/nobunaga/442.png rename to pokemon/conquest/442.png diff --git a/pokemon/nobunaga/443.png b/pokemon/conquest/443.png similarity index 100% rename from pokemon/nobunaga/443.png rename to pokemon/conquest/443.png diff --git a/pokemon/nobunaga/444.png b/pokemon/conquest/444.png similarity index 100% rename from pokemon/nobunaga/444.png rename to pokemon/conquest/444.png diff --git a/pokemon/nobunaga/445.png b/pokemon/conquest/445.png similarity index 100% rename from pokemon/nobunaga/445.png rename to pokemon/conquest/445.png diff --git a/pokemon/nobunaga/446.png b/pokemon/conquest/446.png similarity index 100% rename from pokemon/nobunaga/446.png rename to pokemon/conquest/446.png diff --git a/pokemon/nobunaga/447.png b/pokemon/conquest/447.png similarity index 100% rename from pokemon/nobunaga/447.png rename to pokemon/conquest/447.png diff --git a/pokemon/nobunaga/448.png b/pokemon/conquest/448.png similarity index 100% rename from pokemon/nobunaga/448.png rename to pokemon/conquest/448.png diff --git a/pokemon/nobunaga/451.png b/pokemon/conquest/451.png similarity index 100% rename from pokemon/nobunaga/451.png rename to pokemon/conquest/451.png diff --git a/pokemon/nobunaga/452.png b/pokemon/conquest/452.png similarity index 100% rename from pokemon/nobunaga/452.png rename to pokemon/conquest/452.png diff --git a/pokemon/nobunaga/453.png b/pokemon/conquest/453.png similarity index 100% rename from pokemon/nobunaga/453.png rename to pokemon/conquest/453.png diff --git a/pokemon/nobunaga/454.png b/pokemon/conquest/454.png similarity index 100% rename from pokemon/nobunaga/454.png rename to pokemon/conquest/454.png diff --git a/pokemon/nobunaga/455.png b/pokemon/conquest/455.png similarity index 100% rename from pokemon/nobunaga/455.png rename to pokemon/conquest/455.png diff --git a/pokemon/nobunaga/461.png b/pokemon/conquest/461.png similarity index 100% rename from pokemon/nobunaga/461.png rename to pokemon/conquest/461.png diff --git a/pokemon/nobunaga/464.png b/pokemon/conquest/464.png similarity index 100% rename from pokemon/nobunaga/464.png rename to pokemon/conquest/464.png diff --git a/pokemon/nobunaga/470.png b/pokemon/conquest/470.png similarity index 100% rename from pokemon/nobunaga/470.png rename to pokemon/conquest/470.png diff --git a/pokemon/nobunaga/471.png b/pokemon/conquest/471.png similarity index 100% rename from pokemon/nobunaga/471.png rename to pokemon/conquest/471.png diff --git a/pokemon/nobunaga/475.png b/pokemon/conquest/475.png similarity index 100% rename from pokemon/nobunaga/475.png rename to pokemon/conquest/475.png diff --git a/pokemon/nobunaga/477.png b/pokemon/conquest/477.png similarity index 100% rename from pokemon/nobunaga/477.png rename to pokemon/conquest/477.png diff --git a/pokemon/nobunaga/478.png b/pokemon/conquest/478.png similarity index 100% rename from pokemon/nobunaga/478.png rename to pokemon/conquest/478.png diff --git a/pokemon/nobunaga/483.png b/pokemon/conquest/483.png similarity index 100% rename from pokemon/nobunaga/483.png rename to pokemon/conquest/483.png diff --git a/pokemon/nobunaga/493.png b/pokemon/conquest/493.png similarity index 100% rename from pokemon/nobunaga/493.png rename to pokemon/conquest/493.png diff --git a/pokemon/nobunaga/495.png b/pokemon/conquest/495.png similarity index 100% rename from pokemon/nobunaga/495.png rename to pokemon/conquest/495.png diff --git a/pokemon/nobunaga/496.png b/pokemon/conquest/496.png similarity index 100% rename from pokemon/nobunaga/496.png rename to pokemon/conquest/496.png diff --git a/pokemon/nobunaga/497.png b/pokemon/conquest/497.png similarity index 100% rename from pokemon/nobunaga/497.png rename to pokemon/conquest/497.png diff --git a/pokemon/nobunaga/498.png b/pokemon/conquest/498.png similarity index 100% rename from pokemon/nobunaga/498.png rename to pokemon/conquest/498.png diff --git a/pokemon/nobunaga/499.png b/pokemon/conquest/499.png similarity index 100% rename from pokemon/nobunaga/499.png rename to pokemon/conquest/499.png diff --git a/pokemon/nobunaga/5.png b/pokemon/conquest/5.png similarity index 100% rename from pokemon/nobunaga/5.png rename to pokemon/conquest/5.png diff --git a/pokemon/nobunaga/500.png b/pokemon/conquest/500.png similarity index 100% rename from pokemon/nobunaga/500.png rename to pokemon/conquest/500.png diff --git a/pokemon/nobunaga/501.png b/pokemon/conquest/501.png similarity index 100% rename from pokemon/nobunaga/501.png rename to pokemon/conquest/501.png diff --git a/pokemon/nobunaga/502.png b/pokemon/conquest/502.png similarity index 100% rename from pokemon/nobunaga/502.png rename to pokemon/conquest/502.png diff --git a/pokemon/nobunaga/503.png b/pokemon/conquest/503.png similarity index 100% rename from pokemon/nobunaga/503.png rename to pokemon/conquest/503.png diff --git a/pokemon/nobunaga/511.png b/pokemon/conquest/511.png similarity index 100% rename from pokemon/nobunaga/511.png rename to pokemon/conquest/511.png diff --git a/pokemon/nobunaga/512.png b/pokemon/conquest/512.png similarity index 100% rename from pokemon/nobunaga/512.png rename to pokemon/conquest/512.png diff --git a/pokemon/nobunaga/513.png b/pokemon/conquest/513.png similarity index 100% rename from pokemon/nobunaga/513.png rename to pokemon/conquest/513.png diff --git a/pokemon/nobunaga/514.png b/pokemon/conquest/514.png similarity index 100% rename from pokemon/nobunaga/514.png rename to pokemon/conquest/514.png diff --git a/pokemon/nobunaga/515.png b/pokemon/conquest/515.png similarity index 100% rename from pokemon/nobunaga/515.png rename to pokemon/conquest/515.png diff --git a/pokemon/nobunaga/516.png b/pokemon/conquest/516.png similarity index 100% rename from pokemon/nobunaga/516.png rename to pokemon/conquest/516.png diff --git a/pokemon/nobunaga/517.png b/pokemon/conquest/517.png similarity index 100% rename from pokemon/nobunaga/517.png rename to pokemon/conquest/517.png diff --git a/pokemon/nobunaga/518.png b/pokemon/conquest/518.png similarity index 100% rename from pokemon/nobunaga/518.png rename to pokemon/conquest/518.png diff --git a/pokemon/nobunaga/52.png b/pokemon/conquest/52.png similarity index 100% rename from pokemon/nobunaga/52.png rename to pokemon/conquest/52.png diff --git a/pokemon/nobunaga/522.png b/pokemon/conquest/522.png similarity index 100% rename from pokemon/nobunaga/522.png rename to pokemon/conquest/522.png diff --git a/pokemon/nobunaga/523.png b/pokemon/conquest/523.png similarity index 100% rename from pokemon/nobunaga/523.png rename to pokemon/conquest/523.png diff --git a/pokemon/nobunaga/524.png b/pokemon/conquest/524.png similarity index 100% rename from pokemon/nobunaga/524.png rename to pokemon/conquest/524.png diff --git a/pokemon/nobunaga/525.png b/pokemon/conquest/525.png similarity index 100% rename from pokemon/nobunaga/525.png rename to pokemon/conquest/525.png diff --git a/pokemon/nobunaga/526.png b/pokemon/conquest/526.png similarity index 100% rename from pokemon/nobunaga/526.png rename to pokemon/conquest/526.png diff --git a/pokemon/nobunaga/529.png b/pokemon/conquest/529.png similarity index 100% rename from pokemon/nobunaga/529.png rename to pokemon/conquest/529.png diff --git a/pokemon/nobunaga/53.png b/pokemon/conquest/53.png similarity index 100% rename from pokemon/nobunaga/53.png rename to pokemon/conquest/53.png diff --git a/pokemon/nobunaga/530.png b/pokemon/conquest/530.png similarity index 100% rename from pokemon/nobunaga/530.png rename to pokemon/conquest/530.png diff --git a/pokemon/nobunaga/531.png b/pokemon/conquest/531.png similarity index 100% rename from pokemon/nobunaga/531.png rename to pokemon/conquest/531.png diff --git a/pokemon/nobunaga/532.png b/pokemon/conquest/532.png similarity index 100% rename from pokemon/nobunaga/532.png rename to pokemon/conquest/532.png diff --git a/pokemon/nobunaga/533.png b/pokemon/conquest/533.png similarity index 100% rename from pokemon/nobunaga/533.png rename to pokemon/conquest/533.png diff --git a/pokemon/nobunaga/534.png b/pokemon/conquest/534.png similarity index 100% rename from pokemon/nobunaga/534.png rename to pokemon/conquest/534.png diff --git a/pokemon/nobunaga/540.png b/pokemon/conquest/540.png similarity index 100% rename from pokemon/nobunaga/540.png rename to pokemon/conquest/540.png diff --git a/pokemon/nobunaga/541.png b/pokemon/conquest/541.png similarity index 100% rename from pokemon/nobunaga/541.png rename to pokemon/conquest/541.png diff --git a/pokemon/nobunaga/542.png b/pokemon/conquest/542.png similarity index 100% rename from pokemon/nobunaga/542.png rename to pokemon/conquest/542.png diff --git a/pokemon/nobunaga/543.png b/pokemon/conquest/543.png similarity index 100% rename from pokemon/nobunaga/543.png rename to pokemon/conquest/543.png diff --git a/pokemon/nobunaga/544.png b/pokemon/conquest/544.png similarity index 100% rename from pokemon/nobunaga/544.png rename to pokemon/conquest/544.png diff --git a/pokemon/nobunaga/545.png b/pokemon/conquest/545.png similarity index 100% rename from pokemon/nobunaga/545.png rename to pokemon/conquest/545.png diff --git a/pokemon/nobunaga/546.png b/pokemon/conquest/546.png similarity index 100% rename from pokemon/nobunaga/546.png rename to pokemon/conquest/546.png diff --git a/pokemon/nobunaga/547.png b/pokemon/conquest/547.png similarity index 100% rename from pokemon/nobunaga/547.png rename to pokemon/conquest/547.png diff --git a/pokemon/nobunaga/548.png b/pokemon/conquest/548.png similarity index 100% rename from pokemon/nobunaga/548.png rename to pokemon/conquest/548.png diff --git a/pokemon/nobunaga/549.png b/pokemon/conquest/549.png similarity index 100% rename from pokemon/nobunaga/549.png rename to pokemon/conquest/549.png diff --git a/pokemon/nobunaga/551.png b/pokemon/conquest/551.png similarity index 100% rename from pokemon/nobunaga/551.png rename to pokemon/conquest/551.png diff --git a/pokemon/nobunaga/552.png b/pokemon/conquest/552.png similarity index 100% rename from pokemon/nobunaga/552.png rename to pokemon/conquest/552.png diff --git a/pokemon/nobunaga/553.png b/pokemon/conquest/553.png similarity index 100% rename from pokemon/nobunaga/553.png rename to pokemon/conquest/553.png diff --git a/pokemon/nobunaga/554.png b/pokemon/conquest/554.png similarity index 100% rename from pokemon/nobunaga/554.png rename to pokemon/conquest/554.png diff --git a/pokemon/nobunaga/555-standard.png b/pokemon/conquest/555-standard.png similarity index 100% rename from pokemon/nobunaga/555-standard.png rename to pokemon/conquest/555-standard.png diff --git a/pokemon/nobunaga/555.png b/pokemon/conquest/555.png similarity index 100% rename from pokemon/nobunaga/555.png rename to pokemon/conquest/555.png diff --git a/pokemon/nobunaga/559.png b/pokemon/conquest/559.png similarity index 100% rename from pokemon/nobunaga/559.png rename to pokemon/conquest/559.png diff --git a/pokemon/nobunaga/560.png b/pokemon/conquest/560.png similarity index 100% rename from pokemon/nobunaga/560.png rename to pokemon/conquest/560.png diff --git a/pokemon/nobunaga/570.png b/pokemon/conquest/570.png similarity index 100% rename from pokemon/nobunaga/570.png rename to pokemon/conquest/570.png diff --git a/pokemon/nobunaga/571.png b/pokemon/conquest/571.png similarity index 100% rename from pokemon/nobunaga/571.png rename to pokemon/conquest/571.png diff --git a/pokemon/nobunaga/572.png b/pokemon/conquest/572.png similarity index 100% rename from pokemon/nobunaga/572.png rename to pokemon/conquest/572.png diff --git a/pokemon/nobunaga/573.png b/pokemon/conquest/573.png similarity index 100% rename from pokemon/nobunaga/573.png rename to pokemon/conquest/573.png diff --git a/pokemon/nobunaga/574.png b/pokemon/conquest/574.png similarity index 100% rename from pokemon/nobunaga/574.png rename to pokemon/conquest/574.png diff --git a/pokemon/nobunaga/575.png b/pokemon/conquest/575.png similarity index 100% rename from pokemon/nobunaga/575.png rename to pokemon/conquest/575.png diff --git a/pokemon/nobunaga/576.png b/pokemon/conquest/576.png similarity index 100% rename from pokemon/nobunaga/576.png rename to pokemon/conquest/576.png diff --git a/pokemon/nobunaga/587.png b/pokemon/conquest/587.png similarity index 100% rename from pokemon/nobunaga/587.png rename to pokemon/conquest/587.png diff --git a/pokemon/nobunaga/595.png b/pokemon/conquest/595.png similarity index 100% rename from pokemon/nobunaga/595.png rename to pokemon/conquest/595.png diff --git a/pokemon/nobunaga/596.png b/pokemon/conquest/596.png similarity index 100% rename from pokemon/nobunaga/596.png rename to pokemon/conquest/596.png diff --git a/pokemon/nobunaga/6.png b/pokemon/conquest/6.png similarity index 100% rename from pokemon/nobunaga/6.png rename to pokemon/conquest/6.png diff --git a/pokemon/nobunaga/607.png b/pokemon/conquest/607.png similarity index 100% rename from pokemon/nobunaga/607.png rename to pokemon/conquest/607.png diff --git a/pokemon/nobunaga/608.png b/pokemon/conquest/608.png similarity index 100% rename from pokemon/nobunaga/608.png rename to pokemon/conquest/608.png diff --git a/pokemon/nobunaga/609.png b/pokemon/conquest/609.png similarity index 100% rename from pokemon/nobunaga/609.png rename to pokemon/conquest/609.png diff --git a/pokemon/nobunaga/610.png b/pokemon/conquest/610.png similarity index 100% rename from pokemon/nobunaga/610.png rename to pokemon/conquest/610.png diff --git a/pokemon/nobunaga/611.png b/pokemon/conquest/611.png similarity index 100% rename from pokemon/nobunaga/611.png rename to pokemon/conquest/611.png diff --git a/pokemon/nobunaga/612.png b/pokemon/conquest/612.png similarity index 100% rename from pokemon/nobunaga/612.png rename to pokemon/conquest/612.png diff --git a/pokemon/nobunaga/613.png b/pokemon/conquest/613.png similarity index 100% rename from pokemon/nobunaga/613.png rename to pokemon/conquest/613.png diff --git a/pokemon/nobunaga/614.png b/pokemon/conquest/614.png similarity index 100% rename from pokemon/nobunaga/614.png rename to pokemon/conquest/614.png diff --git a/pokemon/nobunaga/624.png b/pokemon/conquest/624.png similarity index 100% rename from pokemon/nobunaga/624.png rename to pokemon/conquest/624.png diff --git a/pokemon/nobunaga/625.png b/pokemon/conquest/625.png similarity index 100% rename from pokemon/nobunaga/625.png rename to pokemon/conquest/625.png diff --git a/pokemon/nobunaga/627.png b/pokemon/conquest/627.png similarity index 100% rename from pokemon/nobunaga/627.png rename to pokemon/conquest/627.png diff --git a/pokemon/nobunaga/628.png b/pokemon/conquest/628.png similarity index 100% rename from pokemon/nobunaga/628.png rename to pokemon/conquest/628.png diff --git a/pokemon/nobunaga/63.png b/pokemon/conquest/63.png similarity index 100% rename from pokemon/nobunaga/63.png rename to pokemon/conquest/63.png diff --git a/pokemon/nobunaga/633.png b/pokemon/conquest/633.png similarity index 100% rename from pokemon/nobunaga/633.png rename to pokemon/conquest/633.png diff --git a/pokemon/nobunaga/634.png b/pokemon/conquest/634.png similarity index 100% rename from pokemon/nobunaga/634.png rename to pokemon/conquest/634.png diff --git a/pokemon/nobunaga/635.png b/pokemon/conquest/635.png similarity index 100% rename from pokemon/nobunaga/635.png rename to pokemon/conquest/635.png diff --git a/pokemon/nobunaga/636.png b/pokemon/conquest/636.png similarity index 100% rename from pokemon/nobunaga/636.png rename to pokemon/conquest/636.png diff --git a/pokemon/nobunaga/637.png b/pokemon/conquest/637.png similarity index 100% rename from pokemon/nobunaga/637.png rename to pokemon/conquest/637.png diff --git a/pokemon/nobunaga/639.png b/pokemon/conquest/639.png similarity index 100% rename from pokemon/nobunaga/639.png rename to pokemon/conquest/639.png diff --git a/pokemon/nobunaga/64.png b/pokemon/conquest/64.png similarity index 100% rename from pokemon/nobunaga/64.png rename to pokemon/conquest/64.png diff --git a/pokemon/nobunaga/643.png b/pokemon/conquest/643.png similarity index 100% rename from pokemon/nobunaga/643.png rename to pokemon/conquest/643.png diff --git a/pokemon/nobunaga/644.png b/pokemon/conquest/644.png similarity index 100% rename from pokemon/nobunaga/644.png rename to pokemon/conquest/644.png diff --git a/pokemon/nobunaga/65.png b/pokemon/conquest/65.png similarity index 100% rename from pokemon/nobunaga/65.png rename to pokemon/conquest/65.png diff --git a/pokemon/nobunaga/66.png b/pokemon/conquest/66.png similarity index 100% rename from pokemon/nobunaga/66.png rename to pokemon/conquest/66.png diff --git a/pokemon/nobunaga/67.png b/pokemon/conquest/67.png similarity index 100% rename from pokemon/nobunaga/67.png rename to pokemon/conquest/67.png diff --git a/pokemon/nobunaga/68.png b/pokemon/conquest/68.png similarity index 100% rename from pokemon/nobunaga/68.png rename to pokemon/conquest/68.png diff --git a/pokemon/nobunaga/92.png b/pokemon/conquest/92.png similarity index 100% rename from pokemon/nobunaga/92.png rename to pokemon/conquest/92.png diff --git a/pokemon/nobunaga/93.png b/pokemon/conquest/93.png similarity index 100% rename from pokemon/nobunaga/93.png rename to pokemon/conquest/93.png diff --git a/pokemon/nobunaga/94.png b/pokemon/conquest/94.png similarity index 100% rename from pokemon/nobunaga/94.png rename to pokemon/conquest/94.png diff --git a/pokemon/nobunaga/95.png b/pokemon/conquest/95.png similarity index 100% rename from pokemon/nobunaga/95.png rename to pokemon/conquest/95.png