summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-30 10:24:26 -0700
committerYamaArashi <shadow962@live.com>2016-07-30 10:24:26 -0700
commit2575f8ff7fec402b65bae182c90c66e6861ec41d (patch)
tree706a91221f7804d79b6ca4bc01178fe851d7c360
parent4420c7181ac6438362d5c5386a03ac2d89dc7b33 (diff)
bag graphics
-rw-r--r--data/data2.s6
-rw-r--r--data/graphics.s15
-rw-r--r--graphics/misc/bag.pal19
-rw-r--r--graphics/misc/bag_female.pngbin0 -> 1460 bytes
-rw-r--r--graphics/misc/bag_male.pngbin0 -> 1637 bytes
5 files changed, 36 insertions, 4 deletions
diff --git a/data/data2.s b/data/data2.s
index ca910008c..e5db4067b 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -12408,15 +12408,15 @@ gSpriteAffineAnimTable_83C1CC4:: @ 83C1CC4
.align 2
gUnknown_083C1CC8:: @ 83C1CC8
- obj_tiles 0x08e75024, 0x3000, 30000
+ obj_tiles gBagMaleTiles, 0x3000, 30000
.align 2
gUnknown_083C1CD0:: @ 83C1CD0
- obj_tiles 0x08e75ba0, 0x3000, 30000
+ obj_tiles gBagFemaleTiles, 0x3000, 30000
.align 2
gUnknown_083C1CD8:: @ 83C1CD8
- obj_pal 0x08e76700, 30000
+ obj_pal gBagPalette, 30000
.align 2
gSpriteTemplate_83C1CE0:: @ 83C1CE0
diff --git a/data/graphics.s b/data/graphics.s
index 6ae62fc69..98ec999ce 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -2834,8 +2834,21 @@ gUnknown_08E74688:: @ 8E74688
.incbin "baserom.gba", 0x00e74688, 0x800
gUnknown_08E74E88:: @ 8E74E88
- .incbin "baserom.gba", 0x00e74e88, 0x18a0
+ .incbin "baserom.gba", 0x00e74e88, 0x19c
+ .align 2
+gBagMaleTiles:: @ 8E75024
+ .incbin "graphics/misc/bag_male.4bpp.lz"
+
+ .align 2
+gBagFemaleTiles:: @ 8E75BA0
+ .incbin "graphics/misc/bag_female.4bpp.lz"
+
+ .align 2
+gBagPalette:: @ 8E76700
+ .incbin "graphics/misc/bag.gbapal.lz"
+
+ .align 2
gUnknown_08E76728:: @ 8E76728
.incbin "baserom.gba", 0x00e76728, 0x86c
diff --git a/graphics/misc/bag.pal b/graphics/misc/bag.pal
new file mode 100644
index 000000000..dc8be3c90
--- /dev/null
+++ b/graphics/misc/bag.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 213 148
+255 197 90
+222 172 90
+189 156 90
+148 115 82
+131 82 74
+98 65 65
+74 49 57
+0 0 0
+255 230 180
+213 213 222
+189 189 197
+98 98 115
+255 255 255
+0 0 0
diff --git a/graphics/misc/bag_female.png b/graphics/misc/bag_female.png
new file mode 100644
index 000000000..dbb4ec85e
--- /dev/null
+++ b/graphics/misc/bag_female.png
Binary files differ
diff --git a/graphics/misc/bag_male.png b/graphics/misc/bag_male.png
new file mode 100644
index 000000000..9b6fa419b
--- /dev/null
+++ b/graphics/misc/bag_male.png
Binary files differ