diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-30 10:24:26 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-30 10:24:26 -0700 |
| commit | 2575f8ff7fec402b65bae182c90c66e6861ec41d (patch) | |
| tree | 706a91221f7804d79b6ca4bc01178fe851d7c360 /data | |
| parent | 4420c7181ac6438362d5c5386a03ac2d89dc7b33 (diff) | |
bag graphics
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 6 | ||||
| -rw-r--r-- | data/graphics.s | 15 |
2 files changed, 17 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 |