diff --git a/app/controllers/api/v1/job_skills_controller.rb b/app/controllers/api/v1/job_skills_controller.rb
index f98ddf8..2bee31e 100644
--- a/app/controllers/api/v1/job_skills_controller.rb
+++ b/app/controllers/api/v1/job_skills_controller.rb
@@ -7,7 +7,19 @@ module Api
         render json: JobSkillBlueprint.render(JobSkill.includes(:job).all)
       end
 
+      # Returns skills that belong to a specific job
       def job
+        job = Job.find_by(granblue_id: params[:id])
+        return render_not_found_response('job') unless job
+
+        @skills = JobSkill.includes(:job)
+                          .where(job_id: job.id)
+                          .order(:order)
+        render json: JobSkillBlueprint.render(@skills)
+      end
+
+      # Returns EMP skills from other jobs (for party skill selection)
+      def emp
         @skills = JobSkill.includes(:job)
                           .where.not(job_id: params[:id])
                           .where(emp: true)
diff --git a/config/routes.rb b/config/routes.rb
index f6d6c09..0f3969c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -90,6 +90,7 @@ Rails.application.routes.draw do
     get 'jobs/:id', to: 'jobs#show'
     put 'jobs/:id', to: 'jobs#update'
     get 'jobs/:id/skills', to: 'job_skills#job'
+    get 'jobs/:id/emp_skills', to: 'job_skills#emp'
     get 'jobs/:id/accessories', to: 'job_accessories#job'
 
     get 'characters/:id/related', to: 'characters#related'