summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/data2.s12
-rw-r--r--graphics/pokedex/area_marker.pal19
-rw-r--r--graphics/pokedex/area_marker.pngbin0 -> 158 bytes
3 files changed, 28 insertions, 3 deletions
diff --git a/data/data2.s b/data/data2.s
index b3b54a36f..c0a13cd6c 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -20777,10 +20777,11 @@ gUnknown_083F857A:: @ 83F857A
.align 2
gUnknown_083F858C:: @ 83F858C
- obj_tiles 0x083f85dc, 128, 0x0002
+ obj_tiles AreaMarkerTiles, 0x80, 2
+ .align 2
gUnknown_083F8594:: @ 83F8594
- .incbin "baserom.gba", 0x003f8594, 0x8
+ obj_pal AreaMarkerPalette, 2
.align 2
gOamData_83F859C:: @ 83F859C
@@ -20793,7 +20794,12 @@ gSpriteTemplate_83F85A4:: @ 83F85A4
spr_template 2, 2, gOamData_83F859C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
- .incbin "baserom.gba", 0x3f85bc, 0xa0
+AreaMarkerPalette:
+ .incbin "graphics/pokedex/area_marker.gbapal"
+
+ .align 2
+AreaMarkerTiles:
+ .incbin "graphics/pokedex/area_marker.4bpp"
.align 2
gUnknown_083F865C:: @ 83F865C
diff --git a/graphics/pokedex/area_marker.pal b/graphics/pokedex/area_marker.pal
new file mode 100644
index 000000000..d625c8ce2
--- /dev/null
+++ b/graphics/pokedex/area_marker.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 180 0
+0 0 0
+255 0 0
+255 49 49
+255 98 98
+255 156 156
+255 205 205
+255 255 255
+255 255 49
+106 255 255
+172 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokedex/area_marker.png b/graphics/pokedex/area_marker.png
new file mode 100644
index 000000000..f74908f13
--- /dev/null
+++ b/graphics/pokedex/area_marker.png
Binary files differ