From 5e593a62fbfb631068772d1589d556c8a998142e Mon Sep 17 00:00:00 2001
From: Martin Griffin <martinrgriffin@gmail.com>
Date: Fri, 19 Aug 2022 04:07:25 +0100
Subject: [PATCH] Ignore num_tiles if it would truncate non-transparent tiles
 (#1729)

---
 graphics/battle_transitions/rayquaza.png | Bin 2308 -> 2074 bytes
 graphics/battle_transitions/regis.png    | Bin 231 -> 256 bytes
 graphics/picture_frame/lobby.png         | Bin 666 -> 719 bytes
 graphics_file_rules.mk                   | 222 +++++++++++------------
 tools/gbagfx/gfx.c                       |  32 +++-
 tools/gbagfx/gfx.h                       |   8 +-
 tools/gbagfx/main.c                      |   9 +-
 tools/gbagfx/options.h                   |   2 +
 8 files changed, 154 insertions(+), 119 deletions(-)

diff --git a/graphics/battle_transitions/rayquaza.png b/graphics/battle_transitions/rayquaza.png
index 5c3a914749b5f85021200c247847848369b313e9..00df7d741515db4ec8447efa05ff6ea1d47782ad 100644
GIT binary patch
delta 2072
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
CyPFCC

delta 2307
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
XK88E{zfJ4-Z}05h>E>|TjwkpR*N^R3

diff --git a/graphics/battle_transitions/regis.png b/graphics/battle_transitions/regis.png
index a0831073746388464d2a66d223c6d51f3a4d5d78..4926b165b75f73f915aeadab416d23942e95a6ee 100644
GIT binary patch
delta 239
zcmV<L01*G@0e}LK8Gi!+001ZqZ599k05DKYR7L;)|L*SY-QC^H%*?yHyQ-?HnVFf0
zh=_N0cV=d0RaI3)L_{+)Ga@1)5fKpp003`*yg>i}0E<aPK~zY`-IcKsz#t3*so8%3
zYO_Ji26(8DTtY~zFLD?4)=3ykDNSUvL}2Ed6)^AK+_$37$7q4BGUVD$f^hL2?3$0z
zB;<O}N0%hzDPTxY2<k%MiigL+@KBfo$;0;q_9iH33DO$YB}i+)3h*2J;2+>y;Ma)r
p04Ea8M4rmH7kD%AZshGOVh5LV7pxn662kxh002ovPDHLkV1mF9YF_{V

delta 214
zcmV;{04e`~0_Opc8Gir(0026<!uS9H0Io?yK~zYI&DF6H!!QU1Q0;^^Fy27a+J6Ao
zb`oP5-2JcIB~)s7hr|iWK4LT5@hIbDrmJ-xFx5qMg@p?+m3LHFaA0f82M|Ty!2$Dp
z5wwKj1zh=3!4e!81-wdNfEEDl3~=X5C4hJX^bUUlSOz)_v`++JZ8(9L54Pbu6->Xu
z@7p*HO#g-X-#9%F9uuh`aXNV>5<s5H1d#Uv1EkGF0dY5SK-kVC5PA#50b(P95RCVw
Qb^rhX07*qoM6N<$g7D~7+W-In

diff --git a/graphics/picture_frame/lobby.png b/graphics/picture_frame/lobby.png
index 1b7da4a1a646bc90688d2f6a2899d1444993f91c..2f04105ff04345d802a975acd3ae6cb6d25a7418 100644
GIT binary patch
delta 706
zcmV;z0zLhj1<wVL8Gi!+001l6Z;b!|05DKYR7L;)|L*SY-QC^H%*?yHyQ-?HnVFf0
zh=_N0cV=d0RaI3)L_{+)Ga@1)5fKpp003`*yg>i}0$NE#K~zY`#n!!Un@|)7aPkJd
zws5B^ikD6q5JTm3=#m$p(p|h|Y3DBOE0}on0_|j3mC}P04}YBst^5Lh1|Fc26LobY
z=s6b-A$(k6Q>lN19TE8X+~aV9VPHflvvS<*4FXW9o@;QP%OY3vsK`x*xSqN?2tqn{
z^sdNN0hphPSaT@i;pM)n03hNDMs|@B@PUgOS@RpN|Jrjs0$eW$3CJsW%>{lh1H1wP
z{5+xOf?C7pV1KLD@KXagW0jW#e93<QBlKpV`Urpk_HnBL-VW&cv-cGs4>v^zoKXjc
zRUq#Igjp9FfjhX3380^Az|8j*08vE1i+C5;fZuX@rv>mu0r=7geDx)?1Fn|=xC9Nb
zYzLk;u^EtBz{>%u08WzzU@xaaTLI)1Y+HbIzZ`0sIDc~$5JAue+%JW#1^gU{T7cck
zUbOuoonzBzo7fi#ovQ<ebbnesfNVs(IvU8w$;YR+^8r9<pa7q62=F-PN+a!CGf*9A
z1PsPStZTnWGf*9>1hkFyCZIOfcd%M;O~3LBHn5IufP{h5KWa+}Fsi|MFyWdR2<0@s
zkkf7e-ha+3u7KNz$8Krw3M}nP@YtGm2Kb%kK^>3{fJ8vnf%7H+=Rxt!Gl1()0ryV8
zJwUonvv4yPbPR%yz{4iy?sEl`H~VDsut_=r|1RR0VVsB_fawTfI(-0XI`aPleV1^8
zms2B;2OKHQ9sqtm0#5xIuxo77q0Q#Ut%HF}Q#%SFolAaTJYos-xqX&k5imS{3F9%A
o;5^RvBLMsdJ?H_5O1fV67o5VyG1l973IG5A07*qoM6N<$f{wX8>;M1&

delta 653
zcmV;80&@M&1)2qr8Gir(0022}z+(Ua0%1u+K~zYI#n!!Un@|)7aFF7)N-XsOcm}_K
z)k3EZj>KuC%JS60;?cpc&@7qTC7YKkl^4j;p|Lt351G0+iaOQEzIlVV=Uh0~gfD>^
z`bS`yz|ZHNgcBQkjLc-7O_02R3o7|*>AgXRze49`X6sxeNPpm~yIt3zYd7C?ZZr^o
z(OJzv$H&_}RRMs_6>K7%3~<dwZC0}juK&^xd;$XBbqGi+_{jyn&jP#x0=zViAAnlJ
zXLq31@U{jB*DAjW_>}zoo#W3z^$`F8?Bk#Y_`ak2AHL>*G~ARr;DI`@%>!u{z)8AL
z3Y@{YMF71i0Dp7OQvldD0e`H%RRCU##aS(Y2L<4v6!_=~s0IQ*0dNU5z@!>@*~D@{
z)B=7APzCU4mH<7mkhK*+TEU<KFnW`1O%vyV0&H-rfYXVLY5^|=><XYij;2+ANcY$@
z+LqCsNf*}vTY5fM9e`v+{5l#)$H~>p$GHWN87ROPw0{8(b1pN|K9mFbkw(C7t+TrH
zbjpGJP$i&htd{|WvEGOAlxupE-Y|rb6#<wGJibz!LBKv2ng>g+nE^*EtUIx22H@j7
z<_frdc<!9`robf11<#FWXMkU69uxsl0tf^|5x6e{a31L2JOj9X18{EyoB|jlBMCQi
zO6S0B2!EUmE$%*7u>8?8hbKd`5s*L8HU~gH?f1{J0}zK&#$gvg#G&}VK-VQa<L%VQ
z<AG3!xC4Nnk3gu0h0!z&L~%%4#9y~s1Glk|QiQksg|RgtWBS}KOIQ)GJ$?!6HI@(_
n=KB!<{)66i0Awyr@BatHN${8^$Gr&v0000<MFvhpu0mjf>YFMy

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 42b1e6d74..3335179d1 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -64,31 +64,31 @@ $(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/shiny_normal_form.gbapal \
 ### Tilesets ###
 
 $(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 159
+	$(GFX) $< $@ -num_tiles 159 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 498
+	$(GFX) $< $@ -num_tiles 498 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/dewford/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 503
+	$(GFX) $< $@ -num_tiles 503 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/slateport/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 504
+	$(GFX) $< $@ -num_tiles 504 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/mauville/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 503
+	$(GFX) $< $@ -num_tiles 503 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 450
+	$(GFX) $< $@ -num_tiles 450 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/fortree/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 493
+	$(GFX) $< $@ -num_tiles 493 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 504
+	$(GFX) $< $@ -num_tiles 504 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 328
+	$(GFX) $< $@ -num_tiles 328 -Wnum_tiles
 
 SOOTOPOLISANIMDIR := $(TILESETGFXDIR)/secondary/sootopolis/anim
 
@@ -125,169 +125,169 @@ $(SOOTOPOLISANIMDIR)/stormy_water/7.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/7_ky
 	@cat $^ >$@
 
 $(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 508
+	$(GFX) $< $@ -num_tiles 508 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 508
+	$(GFX) $< $@ -num_tiles 508 -Wnum_tiles
 
 $(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 502
+	$(GFX) $< $@ -num_tiles 502 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/shop/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 502
+	$(GFX) $< $@ -num_tiles 502 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 478
+	$(GFX) $< $@ -num_tiles 478 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 425
+	$(GFX) $< $@ -num_tiles 425 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 278
+	$(GFX) $< $@ -num_tiles 278 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 319
+	$(GFX) $< $@ -num_tiles 319 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 17
+	$(GFX) $< $@ -num_tiles 17 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 460
+	$(GFX) $< $@ -num_tiles 460 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 319
+	$(GFX) $< $@ -num_tiles 319 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 120
+	$(GFX) $< $@ -num_tiles 120 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 312
+	$(GFX) $< $@ -num_tiles 312 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 345
+	$(GFX) $< $@ -num_tiles 345 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 355
+	$(GFX) $< $@ -num_tiles 355 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.png
-	$(GFX) $< $@ -num_tiles 82
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/tree/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/tree/tiles.png
-	$(GFX) $< $@ -num_tiles 82
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/shrub/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.png
-	$(GFX) $< $@ -num_tiles 82
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.png
-	$(GFX) $< $@ -num_tiles 82
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.png
-	$(GFX) $< $@ -num_tiles 82
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.png
-	$(GFX) $< $@ -num_tiles 82
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 83
+	$(GFX) $< $@ -num_tiles 83 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 83
+	$(GFX) $< $@ -num_tiles 83 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 83
+	$(GFX) $< $@ -num_tiles 83 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 83
+	$(GFX) $< $@ -num_tiles 83 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 83
+	$(GFX) $< $@ -num_tiles 83 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 83
+	$(GFX) $< $@ -num_tiles 83 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 62
+	$(GFX) $< $@ -num_tiles 62 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/contest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 430
+	$(GFX) $< $@ -num_tiles 430 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 431
+	$(GFX) $< $@ -num_tiles 431 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 500
+	$(GFX) $< $@ -num_tiles 500 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/underwater/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 500
+	$(GFX) $< $@ -num_tiles 500 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 509
+	$(GFX) $< $@ -num_tiles 509 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 469
+	$(GFX) $< $@ -num_tiles 469 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 150
+	$(GFX) $< $@ -num_tiles 150 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 60
+	$(GFX) $< $@ -num_tiles 60 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 61
+	$(GFX) $< $@ -num_tiles 61 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 54
+	$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 148
+	$(GFX) $< $@ -num_tiles 148 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 61
+	$(GFX) $< $@ -num_tiles 61 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 82
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 484
+	$(GFX) $< $@ -num_tiles 484 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 294
+	$(GFX) $< $@ -num_tiles 294 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 342
+	$(GFX) $< $@ -num_tiles 342 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 505
+	$(GFX) $< $@ -num_tiles 505 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 310
+	$(GFX) $< $@ -num_tiles 310 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 424
+	$(GFX) $< $@ -num_tiles 424 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 382
+	$(GFX) $< $@ -num_tiles 382 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 420
+	$(GFX) $< $@ -num_tiles 420 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 95
+	$(GFX) $< $@ -num_tiles 95 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 503
+	$(GFX) $< $@ -num_tiles 503 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 374
+	$(GFX) $< $@ -num_tiles 374 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 420
+	$(GFX) $< $@ -num_tiles 420 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 136
+	$(GFX) $< $@ -num_tiles 136 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 509
+	$(GFX) $< $@ -num_tiles 509 -Wnum_tiles
 
 
 
@@ -335,13 +335,13 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
 	$(GFX) $< $@ -num_colors 224
 
 graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 63
+	$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
 
 graphics/pokenav/region_map.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 233
+	$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
 
 $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 29
+	$(GFX) $< $@ -num_tiles 29 -Wnum_tiles
 
 $(BATINTGFXDIR)/textbox.gbapal: $(BATINTGFXDIR)/textbox_0.gbapal \
                                 $(BATINTGFXDIR)/textbox_1.gbapal
@@ -385,10 +385,10 @@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 353
+	$(GFX) $< $@ -num_tiles 353 -Wnum_tiles
 
 $(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 5
+	$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
 
 $(JPCONTESTGFXDIR)/composite_1.4bpp: $(JPCONTESTGFXDIR)/frame_1.4bpp \
                                      $(JPCONTESTGFXDIR)/floor.4bpp \
@@ -404,7 +404,7 @@ $(JPCONTESTGFXDIR)/composite_2.4bpp: $(JPCONTESTGFXDIR)/interface.4bpp \
 	@cat $^ >$@
 
 $(JPCONTESTGFXDIR)/voltage.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 36
+	$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
 
 $(BTLANMSPRGFXDIR)/ice_crystals.4bpp: $(BTLANMSPRGFXDIR)/ice_crystals_0.4bpp \
                                       $(BTLANMSPRGFXDIR)/ice_crystals_1.4bpp \
@@ -426,13 +426,13 @@ $(BTLANMSPRGFXDIR)/spark.4bpp: $(BTLANMSPRGFXDIR)/spark_0.4bpp \
 	@cat $^ >$@
 
 $(MASKSGFXDIR)/unused_level_up.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 14
+	$(GFX) $< $@ -num_tiles 14 -Wnum_tiles
 
 $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 16
+	$(GFX) $< $@ -num_tiles 16 -Wnum_tiles
 
 graphics/party_menu/bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 62
+	$(GFX) $< $@ -num_tiles 62 -Wnum_tiles
 
 $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp)
 	@cat $^ >$@
@@ -443,29 +443,29 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \
 	@cat $^ >$@
 
 graphics/bag/menu.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/scene_2/rayquaza.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 227
+	$(GFX) $< $@ -num_tiles 227 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/scene_2/bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 313
+	$(GFX) $< $@ -num_tiles 313 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/scene_3/rayquaza.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 124
+	$(GFX) $< $@ -num_tiles 124 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail.4bpp
 	cp $< $@
 	head -c 12 /dev/zero >> $@
 
 $(RAYQUAZAGFXDIR)/scene_4/streaks.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 19
+	$(GFX) $< $@ -num_tiles 19 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/scene_4/rayquaza.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 155
+	$(GFX) $< $@ -num_tiles 155 -Wnum_tiles
 
 graphics/picture_frame/lobby.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 86
+	$(GFX) $< $@ -num_tiles 86 -Wnum_tiles
 
 $(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \
                                       $(ROULETTEGFXDIR)/tailow.4bpp
@@ -478,10 +478,10 @@ $(ROULETTEGFXDIR)/wheel_icons.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \
 	@cat $^ >$@
 
 $(BATTRANSGFXDIR)/regis.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 938
+	$(GFX) $< $@ -num_tiles 938 -Wnum_tiles
 
 $(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
                                           $(BATTRANSGFXDIR)/frontier_squares_1.4bpp
@@ -504,20 +504,20 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.
 	@cat $^ >$@
 
 graphics/birch_speech/unused_beauty.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 822
+	$(GFX) $< $@ -num_tiles 822 -Wnum_tiles
 
 
 
 ### Pokémon Storage System ###
 
 $(WALLPAPERGFXDIR)/forest/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 55
+	$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/forest/tiles.4bpp: $(WALLPAPERGFXDIR)/forest/frame.4bpp $(WALLPAPERGFXDIR)/forest/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/city/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 52
+	$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/city/tiles.4bpp: $(WALLPAPERGFXDIR)/city/frame.4bpp $(WALLPAPERGFXDIR)/city/bg.4bpp
 	@cat $^ >$@
@@ -526,97 +526,97 @@ $(WALLPAPERGFXDIR)/desert/tiles.4bpp: $(WALLPAPERGFXDIR)/desert/frame.4bpp $(WAL
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/savanna/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 45
+	$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/savanna/bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 23
+	$(GFX) $< $@ -num_tiles 23 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/savanna/tiles.4bpp: $(WALLPAPERGFXDIR)/savanna/frame.4bpp $(WALLPAPERGFXDIR)/savanna/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/crag/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 49
+	$(GFX) $< $@ -num_tiles 49 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/crag/tiles.4bpp: $(WALLPAPERGFXDIR)/crag/frame.4bpp $(WALLPAPERGFXDIR)/crag/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/volcano/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 56
+	$(GFX) $< $@ -num_tiles 56 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/volcano/tiles.4bpp: $(WALLPAPERGFXDIR)/volcano/frame.4bpp $(WALLPAPERGFXDIR)/volcano/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/snow/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/snow/tiles.4bpp: $(WALLPAPERGFXDIR)/snow/frame.4bpp $(WALLPAPERGFXDIR)/snow/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/cave/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 55
+	$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/cave/tiles.4bpp: $(WALLPAPERGFXDIR)/cave/frame.4bpp $(WALLPAPERGFXDIR)/cave/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/beach/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 46
+	$(GFX) $< $@ -num_tiles 46 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/beach/bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 23
+	$(GFX) $< $@ -num_tiles 23 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/beach/tiles.4bpp: $(WALLPAPERGFXDIR)/beach/frame.4bpp $(WALLPAPERGFXDIR)/beach/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/seafloor/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 54
+	$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/seafloor/tiles.4bpp: $(WALLPAPERGFXDIR)/seafloor/frame.4bpp $(WALLPAPERGFXDIR)/seafloor/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/river/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 51
+	$(GFX) $< $@ -num_tiles 51 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/river/bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 11
+	$(GFX) $< $@ -num_tiles 11 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/river/tiles.4bpp: $(WALLPAPERGFXDIR)/river/frame.4bpp $(WALLPAPERGFXDIR)/river/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/sky/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 45
+	$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/sky/tiles.4bpp: $(WALLPAPERGFXDIR)/sky/frame.4bpp $(WALLPAPERGFXDIR)/sky/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/polkadot/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 54
+	$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/polkadot/tiles.4bpp: $(WALLPAPERGFXDIR)/polkadot/frame.4bpp $(WALLPAPERGFXDIR)/polkadot/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/pokecenter/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 35
+	$(GFX) $< $@ -num_tiles 35 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/pokecenter/tiles.4bpp: $(WALLPAPERGFXDIR)/pokecenter/frame.4bpp $(WALLPAPERGFXDIR)/pokecenter/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/machine/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 33
+	$(GFX) $< $@ -num_tiles 33 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/machine/tiles.4bpp: $(WALLPAPERGFXDIR)/machine/frame.4bpp $(WALLPAPERGFXDIR)/machine/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/plain/frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 18
+	$(GFX) $< $@ -num_tiles 18 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/plain/tiles.4bpp: $(WALLPAPERGFXDIR)/plain/frame.4bpp $(WALLPAPERGFXDIR)/plain/bg.4bpp
 	@cat $^ >$@
 
 $(WALLPAPERGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/zigzagoon/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/zigzagoon/bg.4bpp
 	@cat $^ >$@
@@ -667,13 +667,13 @@ $(WALLPAPERGFXDIR)/whiscash/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $
 	@cat $^ >$@
 
 $(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 11
+	$(GFX) $< $@ -num_tiles 11 -Wnum_tiles
 
 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 8
+	$(GFX) $< $@ -num_tiles 8 -Wnum_tiles
 	
 $(BATTRANSGFXDIR)/frontier_logo_center.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 43
+	$(GFX) $< $@ -num_tiles 43 -Wnum_tiles
 
 
 
@@ -695,19 +695,19 @@ $(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
 	@cat $^ >$@
 
 $(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(PKNAVGFXDIR)/device_outline.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 	
 $(PKNAVGFXDIR)/match_call/ui.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 13
+	$(GFX) $< $@ -num_tiles 13 -Wnum_tiles
 
 $(POKEDEXGFXDIR)/region_map.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 232
+	$(GFX) $< $@ -num_tiles 232 -Wnum_tiles
 
 $(POKEDEXGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 233
+	$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
 
 $(STARTERGFXDIR)/birch_help.4bpp: $(STARTERGFXDIR)/birch_bag.4bpp $(STARTERGFXDIR)/birch_grass.4bpp
 	@cat $^ >$@
diff --git a/tools/gbagfx/gfx.c b/tools/gbagfx/gfx.c
index 4e85953fd..832e9bb39 100644
--- a/tools/gbagfx/gfx.c
+++ b/tools/gbagfx/gfx.c
@@ -397,7 +397,7 @@ void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int
 	free(buffer);
 }
 
-void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors)
+void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors)
 {
 	int tileSize = bitDepth * 8;
 
@@ -424,7 +424,8 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m
 		FATAL_ERROR("The specified number of tiles (%d) is greater than the maximum possible value (%d).\n", numTiles, maxNumTiles);
 
 	int bufferSize = numTiles * tileSize;
-	unsigned char *buffer = malloc(bufferSize);
+	int maxBufferSize = maxNumTiles * tileSize;
+	unsigned char *buffer = malloc(maxBufferSize);
 
 	if (buffer == NULL)
 		FATAL_ERROR("Failed to allocate memory for pixels.\n");
@@ -433,17 +434,36 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m
 
 	switch (bitDepth) {
 	case 1:
-		ConvertToTiles1Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
+		ConvertToTiles1Bpp(image->pixels, buffer, maxNumTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
 		break;
 	case 4:
-		ConvertToTiles4Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
+		ConvertToTiles4Bpp(image->pixels, buffer, maxNumTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
 		break;
 	case 8:
-		ConvertToTiles8Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
+		ConvertToTiles8Bpp(image->pixels, buffer, maxNumTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
 		break;
 	}
 
-	WriteWholeFile(path, buffer, bufferSize);
+	bool zeroPadded = true;
+	for (int i = bufferSize; i < maxBufferSize && zeroPadded; i++) {
+		if (buffer[i] != 0)
+		{
+			switch (numTilesMode)
+			{
+			case NUM_TILES_IGNORE:
+				break;
+			case NUM_TILES_WARN:
+				fprintf(stderr, "Ignoring -num_tiles %d because tile %d contains non-transparent pixels.\n", numTiles, 1 + i / tileSize);
+				zeroPadded = false;
+				break;
+			case NUM_TILES_ERROR:
+				FATAL_ERROR("Tile %d contains non-transparent pixels.\n", 1 + i / tileSize);
+				break;
+			}
+		}
+	}
+
+	WriteWholeFile(path, buffer, zeroPadded ? bufferSize : maxBufferSize);
 
 	free(buffer);
 }
diff --git a/tools/gbagfx/gfx.h b/tools/gbagfx/gfx.h
index edb9e62c4..f1dbfcf4f 100644
--- a/tools/gbagfx/gfx.h
+++ b/tools/gbagfx/gfx.h
@@ -44,8 +44,14 @@ struct Image {
 	bool isAffine;
 };
 
+enum NumTilesMode {
+    NUM_TILES_IGNORE,
+    NUM_TILES_WARN,
+    NUM_TILES_ERROR,
+};
+
 void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
-void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
+void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
 void FreeImage(struct Image *image);
 void ReadGbaPalette(char *path, struct Palette *palette);
 void WriteGbaPalette(char *path, struct Palette *palette);
diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c
index cf3031696..5d4faacab 100644
--- a/tools/gbagfx/main.c
+++ b/tools/gbagfx/main.c
@@ -77,7 +77,7 @@ void ConvertPngToGba(char *inputPath, char *outputPath, struct PngToGbaOptions *
 
     ReadPng(inputPath, &image);
 
-    WriteImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette);
+    WriteImage(outputPath, options->numTilesMode, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette);
 
     FreeImage(&image);
 }
@@ -179,6 +179,7 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a
     char *outputFileExtension = GetFileExtensionAfterDot(outputPath);
     int bitDepth = outputFileExtension[0] - '0';
     struct PngToGbaOptions options;
+    options.numTilesMode = NUM_TILES_IGNORE;
     options.numTiles = 0;
     options.bitDepth = bitDepth;
     options.metatileWidth = 1;
@@ -203,6 +204,12 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a
             if (options.numTiles < 1)
                 FATAL_ERROR("Number of tiles must be positive.\n");
         }
+        else if (strcmp(option, "-Wnum_tiles") == 0) {
+            options.numTilesMode = NUM_TILES_WARN;
+        }
+        else if (strcmp(option, "-Werror=num_tiles") == 0) {
+            options.numTilesMode = NUM_TILES_ERROR;
+        }
         else if (strcmp(option, "-mwidth") == 0)
         {
             if (i + 1 >= argc)
diff --git a/tools/gbagfx/options.h b/tools/gbagfx/options.h
index 3b038f572..250b72345 100644
--- a/tools/gbagfx/options.h
+++ b/tools/gbagfx/options.h
@@ -4,6 +4,7 @@
 #define OPTIONS_H
 
 #include <stdbool.h>
+#include "gfx.h"
 
 struct GbaToPngOptions {
     char *paletteFilePath;
@@ -18,6 +19,7 @@ struct GbaToPngOptions {
 
 struct PngToGbaOptions {
     int numTiles;
+    enum NumTilesMode numTilesMode;
     int bitDepth;
     int metatileWidth;
     int metatileHeight;