Rename some previously unidentified code/gfx.

8 files changed, 19 insertions, 21 deletions

diff --git a/engine/link/mystery_gift_3.asm b/engine/link/mystery_gift_3.asm
index b7053679..dce74c57 100644
--- a/engine/link/mystery_gift_3.asm
+++ b/engine/link/mystery_gift_3.asm
@@ -57,8 +57,8 @@ InitMysteryGiftLayout:
 	ld a, BANK(MysteryGiftGFX)
 	ld bc, $20 tiles
 	call FarCopyBytes
-	farcall Function1704d
-	farcall Function1706b
+	farcall LoadMysteryGiftBorderGFX
+	farcall LoadMysteryGiftGFX2
 	ld hl, vTiles2 tile $3d
 	ld a, $ff
 	ld bc, 1 tiles
diff --git a/unknown/bank05_704d.asm b/engine/link/mystery_gift_gfx.asm
index 612db8ef..42641dd7 100644
--- a/unknown/bank05_704d.asm
+++ b/engine/link/mystery_gift_gfx.asm
@@ -1,7 +1,7 @@
-Function1704d:
-	ld hl, UnknownGFX17079
+LoadMysteryGiftBorderGFX:
+	ld hl, MysteryGiftBorderGFX
 	ld de, vTiles2 tile $20
-	ld a, BANK(UnknownGFX17079)
+	ld a, BANK(MysteryGiftBorderGFX)
 	ld bc, wBGMapBufferEnd - wBGMapBuffer
 	call FarCopyBytesDouble
 	ld hl, vTiles2 tile $20
@@ -16,15 +16,15 @@ Function1704d:
 	jr nz, .loop
 	ret
 
-Function1706b:
-	ld hl, UnknownGFX170f1
+LoadMysteryGiftGFX2:
+	ld hl, MysteryGiftGFX2
 	ld de, vTiles2 tile $2f
-	ld a, BANK(UnknownGFX170f1)
+	ld a, BANK(MysteryGiftGFX2)
 	ld bc, 14 tiles
 	jp FarCopyBytes
 
-UnknownGFX17079:
-INCBIN "gfx/unknown/gfx_17079.2bpp"
+MysteryGiftBorderGFX:
+INCBIN "gfx/mystery_gift/border.2bpp"
 
-UnknownGFX170f1:
-INCBIN "gfx/unknown/gfx_170f1.2bpp"
+MysteryGiftGFX2:
+INCBIN "gfx/mystery_gift/mystery_gift_2.2bpp"
diff --git a/gfx/unknown/gfx_17079.2bpp b/gfx/mystery_gift/border.2bpp
index f4a50690..f4a50690 100644
--- a/gfx/unknown/gfx_17079.2bpp
+++ b/gfx/mystery_gift/border.2bpp
diff --git a/gfx/unknown/gfx_17079.png b/gfx/mystery_gift/border.png
index 1c3a43f3..1c3a43f3 100644
--- a/gfx/unknown/gfx_17079.png
+++ b/gfx/mystery_gift/border.png
diff --git a/gfx/unknown/gfx_170f1.2bpp b/gfx/mystery_gift/mystery_gift_2.2bpp
index af5dda20..af5dda20 100644
--- a/gfx/unknown/gfx_170f1.2bpp
+++ b/gfx/mystery_gift/mystery_gift_2.2bpp
diff --git a/gfx/unknown/gfx_170f1.png b/gfx/mystery_gift/mystery_gift_2.png
index a887fcf2..a887fcf2 100644
--- a/gfx/unknown/gfx_170f1.png
+++ b/gfx/mystery_gift/mystery_gift_2.png
diff --git a/main.asm b/main.asm
index f92056f7..c9830c8d 100644
--- a/main.asm
+++ b/main.asm
@@ -96,7 +96,7 @@ INCLUDE "engine/events/mom.asm"
 INCLUDE "engine/events/daycare.asm"
 INCLUDE "engine/events/print_unown.asm"
 INCLUDE "engine/events/print_photo.asm"
-INCLUDE "unknown/bank05_704d.asm"
+INCLUDE "engine/link/mystery_gift_gfx.asm"
 INCLUDE "engine/pokemon/breeding.asm"
 
 
diff --git a/tools/gfx.py b/tools/gfx.py
index 5abbb029..3e50d1ab 100644
--- a/tools/gfx.py
+++ b/tools/gfx.py
@@ -187,6 +187,11 @@ def filepath_rules(filepath):
         if name == 'mystery_gift':
             args['width'] = 128
             args['rows'] = [(0, 15), (0, 15), (0, 2)]
+        elif name == 'mystery_gift_2':
+            args['width'] = 128
+        # TODO: this is incomplete
+        elif name == 'border':
+            args['width'] = 16
 
     elif 'gfx/sgb' in filedir:
         args['width'] = 128
@@ -210,9 +215,8 @@ def filepath_rules(filepath):
         else:
             args['width'] = 16
 
-
     elif 'gfx/tilesets' in filedir:
-        if filedir in ['gfx/tilesets/flower', 'gfx/tilesets/lava', 'gfx/tilesets/tower-pillar', 'gfx/tilesets/water', 'gfx/tilesets/whirlpool']:
+        if filedir != 'gfx/tilesets':
             args['width'] = 8
         else:
             args['width'] = 128
@@ -241,12 +245,6 @@ def filepath_rules(filepath):
         elif name == 'game_boy':
             args['width'] = 56
 
-    elif 'gfx/unknown' in filedir:
-        if name == 'gfx_170f1':
-            args['width'] = 128
-        elif name == 'gfx_17079':
-            args['width'] = 16
-
     elif os.path.join(filedir, name) in pics:
         args['pic'] = True