diff --git a/Tupfile.lua b/Tupfile.lua
index b64ce2ab..2521d90a 100644
--- a/Tupfile.lua
+++ b/Tupfile.lua
@@ -13,7 +13,7 @@ for canon in iter{"canonical", "cap"} do
             rep{"src/{canon}/minisprites/gen6/{dir}/*", canon=canon, dir=dir},
             makecmd{
                 display="pad g6 minisprite %f",
-                pad(40, 30, "%f", "%o")
+                pad{w=40, h=30}
             },
             rep{"build/gen6-minisprites-padded/{canon}/{dir}/%b",canon=canon,dir=dir}
         )
@@ -70,7 +70,7 @@ tup.foreach_rule(
     {"src/canonical/trainers/*"},
     makecmd{
         display="pad trainer %f",
-        pad(80, 80, "%f", "%o"),
+        pad{w=80, h=80},
         compresspng{config="TRAINERS"}
     },
     {"build/padded-trainers/canonical/%b"}
@@ -83,7 +83,7 @@ for dir in iter{"front", "front-cosmetic", "front-shiny", "front-shiny-cosmetic"
         rep{"src/canonical/dex/{dir}/*", dir=dir},
         makecmd{
             display="pad dex %f",
-            pad(120, 120, "%f", "%o"),
+            pad{w=120, h=120},
             compresspng{config="DEX"}
         },
         rep{"build/padded-dex/canonical/{dir}/%b", dir=dir}
diff --git a/Tuprules.lua b/Tuprules.lua
index c3a99a89..4f3fcb22 100644
--- a/Tuprules.lua
+++ b/Tuprules.lua
@@ -5,13 +5,13 @@ tup.include("util/tup-ext.lua")
 
 ROOTDIR = tup.getcwd()
 
-function pad(w, h, input, output)
+function pad(opts)
     return rep{
         "convert {input} -background transparent -gravity center -extent {w}x{h} {output}",
-        input = input,
-        output = output,
-        w = w,
-        h = h
+        input = opts.input or "%f",
+        output = opts.output or "%o",
+        w = opts.w,
+        h = opts.h
     }
 end