summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-05-30 18:52:03 -0700
committerYamaArashi <shadow962@live.com>2016-05-30 18:52:03 -0700
commit2a9c15e60c46805ed90ed5d44c2610a81b9052dc (patch)
treeaf2f1d08257c60c1f251a5ce5c432fb89f83499a
parentb547477df9829c6461b4c730b564509b287b2a91 (diff)
outline cursor tiles
-rw-r--r--data/data2.s87
-rw-r--r--graphics/interface/outline_cursor_00.pngbin0 -> 75 bytes
-rw-r--r--graphics/interface/outline_cursor_01.pngbin0 -> 115 bytes
-rw-r--r--graphics/interface/outline_cursor_02.pngbin0 -> 115 bytes
-rw-r--r--graphics/interface/outline_cursor_03.pngbin0 -> 115 bytes
-rw-r--r--graphics/interface/outline_cursor_04.pngbin0 -> 115 bytes
-rw-r--r--graphics/interface/outline_cursor_05.pngbin0 -> 115 bytes
-rw-r--r--graphics/interface/outline_cursor_06.pngbin0 -> 115 bytes
-rw-r--r--graphics/interface/outline_cursor_07.pngbin0 -> 114 bytes
-rw-r--r--graphics/interface/outline_cursor_08.pngbin0 -> 114 bytes
-rw-r--r--graphics/interface/outline_cursor_09.pngbin0 -> 114 bytes
-rw-r--r--graphics/interface/outline_cursor_10.pngbin0 -> 114 bytes
-rw-r--r--graphics/interface/outline_cursor_11.pngbin0 -> 114 bytes
-rw-r--r--graphics/interface/outline_cursor_12.pngbin0 -> 114 bytes
-rw-r--r--graphics/interface/outline_cursor_13.pngbin0 -> 114 bytes
-rw-r--r--graphics/interface/outline_cursor_14.pngbin0 -> 114 bytes
-rw-r--r--graphics/interface/outline_cursor_15.pngbin0 -> 112 bytes
17 files changed, 83 insertions, 4 deletions
diff --git a/data/data2.s b/data/data2.s
index 79711885a..306730117 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -11606,13 +11606,92 @@ gUnknown_0842D4FC: @ 842D4FC
.global gUnknown_0842D4FF
gUnknown_0842D4FF: @ 842D4FF
-@ replacing .incbin "baserom.gba", 0x0042d4ff, 0x1c41
- .incbin "baserom.gba", 0x0042d4ff, 0x1c41
+ .string "Is this the correct time?$"
+
+ .align 2
+OutlineCursorTiles_00:
+ .incbin "graphics/interface/outline_cursor_00.4bpp"
+
+ .align 2
+OutlineCursorTiles_01:
+ .incbin "graphics/interface/outline_cursor_01.4bpp"
+
+ .align 2
+OutlineCursorTiles_02:
+ .incbin "graphics/interface/outline_cursor_02.4bpp"
+
+ .align 2
+OutlineCursorTiles_03:
+ .incbin "graphics/interface/outline_cursor_03.4bpp"
+
+ .align 2
+OutlineCursorTiles_04:
+ .incbin "graphics/interface/outline_cursor_04.4bpp"
+
+ .align 2
+OutlineCursorTiles_05:
+ .incbin "graphics/interface/outline_cursor_05.4bpp"
+
+ .align 2
+OutlineCursorTiles_06:
+ .incbin "graphics/interface/outline_cursor_06.4bpp"
+
+ .align 2
+OutlineCursorTiles_07:
+ .incbin "graphics/interface/outline_cursor_07.4bpp"
+
+ .align 2
+OutlineCursorTiles_08:
+ .incbin "graphics/interface/outline_cursor_08.4bpp"
+
+ .align 2
+OutlineCursorTiles_09:
+ .incbin "graphics/interface/outline_cursor_09.4bpp"
+
+ .align 2
+OutlineCursorTiles_10:
+ .incbin "graphics/interface/outline_cursor_10.4bpp"
+
+ .align 2
+OutlineCursorTiles_11:
+ .incbin "graphics/interface/outline_cursor_11.4bpp"
+
+ .align 2
+OutlineCursorTiles_12:
+ .incbin "graphics/interface/outline_cursor_12.4bpp"
+
+ .align 2
+OutlineCursorTiles_13:
+ .incbin "graphics/interface/outline_cursor_13.4bpp"
+
+ .align 2
+OutlineCursorTiles_14:
+ .incbin "graphics/interface/outline_cursor_14.4bpp"
+
+ .align 2
+OutlineCursorTiles_15:
+ .incbin "graphics/interface/outline_cursor_15.4bpp"
+
+ .incbin "baserom.gba", 0x42F11C, 0x24
.global gUnknown_0842F140
gUnknown_0842F140: @ 842F140
-@ replacing .incbin "baserom.gba", 0x0042f140, 0x80
- .incbin "baserom.gba", 0x0042f140, 0x80
+ obj_tiles OutlineCursorTiles_00, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_01, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_02, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_03, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_04, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_05, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_06, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_07, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_08, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_09, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_10, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_11, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_12, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_13, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_14, 0x1C0, 0xFFF0
+ obj_tiles OutlineCursorTiles_15, 0x1C0, 0xFFF0
.global gUnknown_0842F1C0
gUnknown_0842F1C0: @ 842F1C0
diff --git a/graphics/interface/outline_cursor_00.png b/graphics/interface/outline_cursor_00.png
new file mode 100644
index 000000000..8e0be365b
--- /dev/null
+++ b/graphics/interface/outline_cursor_00.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_01.png b/graphics/interface/outline_cursor_01.png
new file mode 100644
index 000000000..27bdb892d
--- /dev/null
+++ b/graphics/interface/outline_cursor_01.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_02.png b/graphics/interface/outline_cursor_02.png
new file mode 100644
index 000000000..93b5e9e6a
--- /dev/null
+++ b/graphics/interface/outline_cursor_02.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_03.png b/graphics/interface/outline_cursor_03.png
new file mode 100644
index 000000000..ef20425ec
--- /dev/null
+++ b/graphics/interface/outline_cursor_03.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_04.png b/graphics/interface/outline_cursor_04.png
new file mode 100644
index 000000000..4d06da317
--- /dev/null
+++ b/graphics/interface/outline_cursor_04.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_05.png b/graphics/interface/outline_cursor_05.png
new file mode 100644
index 000000000..ba9e28bea
--- /dev/null
+++ b/graphics/interface/outline_cursor_05.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_06.png b/graphics/interface/outline_cursor_06.png
new file mode 100644
index 000000000..e68d42763
--- /dev/null
+++ b/graphics/interface/outline_cursor_06.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_07.png b/graphics/interface/outline_cursor_07.png
new file mode 100644
index 000000000..6df7fd731
--- /dev/null
+++ b/graphics/interface/outline_cursor_07.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_08.png b/graphics/interface/outline_cursor_08.png
new file mode 100644
index 000000000..006a0dc50
--- /dev/null
+++ b/graphics/interface/outline_cursor_08.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_09.png b/graphics/interface/outline_cursor_09.png
new file mode 100644
index 000000000..f1db0963f
--- /dev/null
+++ b/graphics/interface/outline_cursor_09.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_10.png b/graphics/interface/outline_cursor_10.png
new file mode 100644
index 000000000..a5356f083
--- /dev/null
+++ b/graphics/interface/outline_cursor_10.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_11.png b/graphics/interface/outline_cursor_11.png
new file mode 100644
index 000000000..4415fa553
--- /dev/null
+++ b/graphics/interface/outline_cursor_11.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_12.png b/graphics/interface/outline_cursor_12.png
new file mode 100644
index 000000000..97c57da0b
--- /dev/null
+++ b/graphics/interface/outline_cursor_12.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_13.png b/graphics/interface/outline_cursor_13.png
new file mode 100644
index 000000000..301956091
--- /dev/null
+++ b/graphics/interface/outline_cursor_13.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_14.png b/graphics/interface/outline_cursor_14.png
new file mode 100644
index 000000000..336e4cdc6
--- /dev/null
+++ b/graphics/interface/outline_cursor_14.png
Binary files differ
diff --git a/graphics/interface/outline_cursor_15.png b/graphics/interface/outline_cursor_15.png
new file mode 100644
index 000000000..d9771c0be
--- /dev/null
+++ b/graphics/interface/outline_cursor_15.png
Binary files differ