Reformat and re-reidentify some gfx.

7 files changed, 14 insertions, 11 deletions

diff --git a/engine/link/mystery_gift_3.asm b/engine/link/mystery_gift_3.asm
index dce74c57..bc12d9c8 100644
--- a/engine/link/mystery_gift_3.asm
+++ b/engine/link/mystery_gift_3.asm
@@ -57,7 +57,7 @@ InitMysteryGiftLayout:
 	ld a, BANK(MysteryGiftGFX)
 	ld bc, $20 tiles
 	call FarCopyBytes
-	farcall LoadMysteryGiftBorderGFX
+	farcall LoadMysteryGiftBackgroundGFX
 	farcall LoadMysteryGiftGFX2
 	ld hl, vTiles2 tile $3d
 	ld a, $ff
diff --git a/engine/link/mystery_gift_gfx.asm b/engine/link/mystery_gift_gfx.asm
index 42641dd7..68701add 100644
--- a/engine/link/mystery_gift_gfx.asm
+++ b/engine/link/mystery_gift_gfx.asm
@@ -1,7 +1,7 @@
-LoadMysteryGiftBorderGFX:
-	ld hl, MysteryGiftBorderGFX
+LoadMysteryGiftBackgroundGFX:
+	ld hl, MysteryGiftBackgroundGFX
 	ld de, vTiles2 tile $20
-	ld a, BANK(MysteryGiftBorderGFX)
+	ld a, BANK(MysteryGiftBackgroundGFX)
 	ld bc, wBGMapBufferEnd - wBGMapBuffer
 	call FarCopyBytesDouble
 	ld hl, vTiles2 tile $20
@@ -23,8 +23,9 @@ LoadMysteryGiftGFX2:
 	ld bc, 14 tiles
 	jp FarCopyBytes
 
-MysteryGiftBorderGFX:
-INCBIN "gfx/mystery_gift/border.2bpp"
+MysteryGiftBackgroundGFX:
+INCBIN "gfx/mystery_gift/question_mark.1bpp"
+INCBIN "gfx/mystery_gift/border.1bpp"
 
 MysteryGiftGFX2:
 INCBIN "gfx/mystery_gift/mystery_gift_2.2bpp"
diff --git a/gfx/mystery_gift/border.1bpp b/gfx/mystery_gift/border.1bpp
new file mode 100644
index 00000000..1ce46789
--- /dev/null
+++ b/gfx/mystery_gift/border.1bpp
diff --git a/gfx/mystery_gift/border.png b/gfx/mystery_gift/border.png
index 1c3a43f3..9af68a94 100644
--- a/gfx/mystery_gift/border.png
+++ b/gfx/mystery_gift/border.png
diff --git a/gfx/mystery_gift/question_mark.1bpp b/gfx/mystery_gift/question_mark.1bpp
new file mode 100644
index 00000000..00e065b2
--- /dev/null
+++ b/gfx/mystery_gift/question_mark.1bpp
diff --git a/gfx/mystery_gift/question_mark.png b/gfx/mystery_gift/question_mark.png
new file mode 100644
index 00000000..3ad140ff
--- /dev/null
+++ b/gfx/mystery_gift/question_mark.png
diff --git a/tools/gfx.py b/tools/gfx.py
index 3e50d1ab..ba3e3d3d 100644
--- a/tools/gfx.py
+++ b/tools/gfx.py
@@ -93,12 +93,12 @@ def filepath_rules(filepath):
             # args['animate'] = True
         # startswith to handle back_gold / back_silver
         elif name.startswith('back'):
-            args['pal_file'] = os.path.join(filedir, 'shiny.pal')
+            args['pal_file'] = os.path.join(filedir, 'normal.pal')
             args['pic'] = True
 
     elif 'gfx/trainers' in filedir:
         trainer_name = filedir.split('/')[-1]
-        args['pal_file'] = os.path.join(filedir, trainer_name + '.pal')
+        args['pal_file'] = os.path.join(filedir, name + '.pal')
         args['pic'] = True
 
     elif 'gfx/battle' in filedir:
@@ -152,7 +152,6 @@ def filepath_rules(filepath):
     elif 'gfx/overworld' in filedir:
         if name == 'heal_machine':
             args['width'] = 8
-            args['pal_file'] = os.path.join(filedir, name + '.pal')
         elif name in overworld_px8:
             args['width'] = 8
         elif name in overworld_px16:
@@ -190,12 +189,15 @@ def filepath_rules(filepath):
         elif name == 'mystery_gift_2':
             args['width'] = 128
         # TODO: this is incomplete
+        elif name == 'question_mark':
+            args['width'] = 40
+            args['rows'] = [(1, 4), (0, 0), (0, 0), (2, 3), (2, 1)]
         elif name == 'border':
-            args['width'] = 16
+            args['width'] = 56
 
     elif 'gfx/sgb' in filedir:
         args['width'] = 128
-        args['pal_file'] = os.path.join(filedir, name + '.pal')
+        #args['pal_file'] = os.path.join(filedir, name + '.pal')
 
     elif 'gfx/slots' in filedir:
         if name == 'slots_1':