diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-24 08:24:01 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-24 08:24:01 -0700 |
| commit | 57d14eadd4551c8296e4e81540aa940a79dd82d4 (patch) | |
| tree | 6df19b5e0457868fee89bca46e075279f684bbac | |
| parent | 156270e18d943d8675aac0fc7928e1e13c161ca2 (diff) | |
cry meter needle graphics
| -rw-r--r-- | asm/rom5.s | 4 | ||||
| -rw-r--r-- | data/data2.s | 24 | ||||
| -rw-r--r-- | graphics/pokedex/cry_meter_needle.pal | 19 | ||||
| -rw-r--r-- | graphics/pokedex/cry_meter_needle.png | bin | 0 -> 156 bytes |
4 files changed, 40 insertions, 7 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index c6a91d0a7..8355d701d 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -327541,8 +327541,8 @@ _0811A4D6: pop {r1} bx r1 .align 2, 0 -_0811A4E8: .4byte gUnknown_083FB78C -_0811A4EC: .4byte gUnknown_083FB79C +_0811A4E8: .4byte gCryMeterNeedleSpriteSheets +_0811A4EC: .4byte gCryMeterNeedleSpritePalettes _0811A4F0: .4byte gSpriteTemplate_83FB774 _0811A4F4: .4byte 0x0201c800 thumb_func_end sub_811A3CC diff --git a/data/data2.s b/data/data2.s index f77ecbb2e..e6c78a721 100644 --- a/data/data2.s +++ b/data/data2.s @@ -22832,7 +22832,15 @@ gUnknown_083FA64A:: @ 83FA64A .incbin "baserom.gba", 0x003fa64a, 0x2 gUnknown_083FA64C:: @ 83FA64C - .incbin "baserom.gba", 0x003fa64c, 0x830 + .incbin "baserom.gba", 0x003fa64c, 0x10 + + .align 2 +CryMeterNeedlePalette: @ 83FA65C + .incbin "graphics/pokedex/cry_meter_needle.gbapal" + + .align 2 +CryMeterNeedleTiles: @ 83FA67C + .incbin "graphics/pokedex/cry_meter_needle.4bpp" gUnknown_083FAE7C:: @ 83FAE7C .incbin "baserom.gba", 0x003fae7c, 0xa0 @@ -22877,11 +22885,17 @@ gOamData_83FB76C:: @ 83FB76C gSpriteTemplate_83FB774:: @ 83FB774 spr_template 8192, 8192, gOamData_83FB76C, gSpriteAnimTable_83FB768, NULL, gDummySpriteAffineAnimTable, sub_811A534 -gUnknown_083FB78C:: @ 83FB78C - .incbin "baserom.gba", 0x003fb78c, 0x10 + .align 2 +gCryMeterNeedleSpriteSheets:: @ 83FB78C + obj_tiles CryMeterNeedleTiles, 0x800, 8192 + null_obj_tiles + + .align 2 +gCryMeterNeedleSpritePalettes:: @ 83FB79C + obj_pal CryMeterNeedlePalette, 8192 + null_obj_pal -gUnknown_083FB79C:: @ 83FB79C - .incbin "baserom.gba", 0x003fb79c, 0x27c + .incbin "baserom.gba", 0x003fb7ac, 0x26c gUnknown_083FBA18:: @ 83FBA18 .incbin "baserom.gba", 0x003fba18, 0x170 diff --git a/graphics/pokedex/cry_meter_needle.pal b/graphics/pokedex/cry_meter_needle.pal new file mode 100644 index 000000000..7336488ff --- /dev/null +++ b/graphics/pokedex/cry_meter_needle.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 90 123 +246 139 164 +246 197 205 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokedex/cry_meter_needle.png b/graphics/pokedex/cry_meter_needle.png Binary files differnew file mode 100644 index 000000000..34e5ab410 --- /dev/null +++ b/graphics/pokedex/cry_meter_needle.png |
