summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-10 22:08:22 -0700
committerYamaArashi <shadow962@live.com>2016-07-10 22:08:22 -0700
commitc4e48949f161a4b3d267cb7364217c4d2e59ad4d (patch)
tree4cbacada020dcc86586d58e42559a5e6edb708ef
parent87cfe18d33a76e9e71ce7f976b9f7500d670dd5d (diff)
pokedex area unknown sprite
-rw-r--r--asm/rom5.s2
-rw-r--r--data/data2.s5
-rw-r--r--data/graphics.s9
-rw-r--r--graphics/pokedex/area_unknown.pal19
-rw-r--r--graphics/pokedex/area_unknown.pngbin0 -> 393 bytes
5 files changed, 30 insertions, 5 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index 33bb4d2e8..e780700bc 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -310214,7 +310214,7 @@ sub_81117AC: @ 81117AC
bx r0
.align 2, 0
_081117D4: .4byte gUnknown_083F8664
-_081117D8: .4byte gUnknown_08E87BB4
+_081117D8: .4byte gAreaUnknownTiles
_081117DC: .4byte 0x02000fb4
_081117E0: .4byte gUnknown_083F865C
thumb_func_end sub_81117AC
diff --git a/data/data2.s b/data/data2.s
index c0a13cd6c..798317f99 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -20803,10 +20803,11 @@ AreaMarkerTiles:
.align 2
gUnknown_083F865C:: @ 83F865C
- obj_pal 0x08e87d90, 0x0003
+ obj_pal gAreaUnknownPalette, 3
+ .align 2
gUnknown_083F8664:: @ 83F8664
- .incbin "baserom.gba", 0x003f8664, 0x8
+ obj_tiles 0x02000FB4, 0x600, 3
.align 2
gOamData_83F866C:: @ 83F866C
diff --git a/data/graphics.s b/data/graphics.s
index 482cfc253..4ea76879f 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -2936,8 +2936,13 @@ gUnknown_08E87AF6:: @ 8E87AF6
gUnknown_08E87B56:: @ 8E87B56
.incbin "baserom.gba", 0x00e87b56, 0x5e
-gUnknown_08E87BB4:: @ 8E87BB4
- .incbin "baserom.gba", 0x00e87bb4, 0x1fc
+ .align 2
+gAreaUnknownTiles:: @ 8E87BB4
+ .incbin "graphics/pokedex/area_unknown.4bpp.lz"
+
+ .align 2
+gAreaUnknownPalette:: @ 8E87D90
+ .incbin "graphics/pokedex/area_unknown.gbapal"
gUnknown_08E87DB0:: @ 8E87DB0
.incbin "baserom.gba", 0x00e87db0, 0x52a
diff --git a/graphics/pokedex/area_unknown.pal b/graphics/pokedex/area_unknown.pal
new file mode 100644
index 000000000..86aeef732
--- /dev/null
+++ b/graphics/pokedex/area_unknown.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+246 148 0
+0 0 0
+222 213 222
+255 0 0
+255 255 115
+0 255 0
+0 255 255
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+222 213 222
+98 82 106
+139 148 197
+41 49 49
+82 65 123
diff --git a/graphics/pokedex/area_unknown.png b/graphics/pokedex/area_unknown.png
new file mode 100644
index 000000000..66d0382c3
--- /dev/null
+++ b/graphics/pokedex/area_unknown.png
Binary files differ