diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-24 17:31:39 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-24 17:31:39 -0700 |
| commit | a1a9c88754b4dbb0cf24e7b16c81b12a0afc6762 (patch) | |
| tree | a79de52506315bccd748718d03bf5a84f40a24b3 | |
| parent | 4c12d260cc25c54000ea4308a3af84b882a92792 (diff) | |
badges graphics
| -rw-r--r-- | asm/rom5.s | 4 | ||||
| -rw-r--r-- | data/data2.s | 13 | ||||
| -rw-r--r-- | graphics/trainer_card/badges.pal | 19 | ||||
| -rw-r--r-- | graphics/trainer_card/badges.png | bin | 0 -> 513 bytes |
4 files changed, 30 insertions, 6 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 1589dfdb3..cec4f51e6 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -51247,7 +51247,7 @@ _08093E84: .4byte gUnknown_083B5F6C _08093E88: .4byte gUnknown_08E8B4E0 _08093E8C: .4byte 0x040000d4 _08093E90: .4byte 0x80000800 -_08093E94: .4byte gUnknown_083B5AB8 +_08093E94: .4byte gBadgesTiles _08093E98: .4byte 0x06001480 _08093E9C: .4byte 0x80000200 thumb_func_end sub_8093E28 @@ -51287,7 +51287,7 @@ _08093EDC: .align 2, 0 _08093EE4: .4byte gUnknown_083B5EF8 _08093EE8: .4byte 0x02000000 -_08093EEC: .4byte gUnknown_083B5F2C +_08093EEC: .4byte gBadgesPalette _08093EF0: .4byte gUnknown_083B5F4C _08093EF4: .4byte gUnknown_083B5F0C thumb_func_end sub_8093EA0 diff --git a/data/data2.s b/data/data2.s index df4f52e3c..0680b8f94 100644 --- a/data/data2.s +++ b/data/data2.s @@ -11032,8 +11032,12 @@ gUnknown_083B5AAC:: @ 83B5AAC gUnknown_083B5AB2:: @ 83B5AB2 .incbin "baserom.gba", 0x003b5ab2, 0x6 -gUnknown_083B5AB8:: @ 83B5AB8 - .incbin "baserom.gba", 0x003b5ab8, 0x404 + .align 2 +gBadgesTiles:: @ 83B5AB8 + .incbin "graphics/trainer_card/badges.4bpp" + + .align 2 + .4byte 0x02000000 @ XXX .align 2 gUnknown_083B5EBC:: @ 83B5EBC @@ -11072,8 +11076,9 @@ gUnknown_083B5EF8:: @ 83B5EF8 gUnknown_083B5F0C:: @ 83B5F0C .incbin "baserom.gba", 0x003b5f0c, 0x20 -gUnknown_083B5F2C:: @ 83B5F2C - .incbin "baserom.gba", 0x003b5f2c, 0x20 + .align 2 +gBadgesPalette:: @ 83B5F2C + .incbin "graphics/trainer_card/badges.gbapal" gUnknown_083B5F4C:: @ 83B5F4C .incbin "baserom.gba", 0x003b5f4c, 0x20 diff --git a/graphics/trainer_card/badges.pal b/graphics/trainer_card/badges.pal new file mode 100644 index 000000000..dd9246d9d --- /dev/null +++ b/graphics/trainer_card/badges.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 98 115 +255 255 255 +213 213 213 +180 180 180 +123 123 123 +255 139 57 +222 57 8 +106 189 255 +65 139 197 +255 213 98 +238 180 57 +197 123 197 +148 74 156 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/trainer_card/badges.png b/graphics/trainer_card/badges.png Binary files differnew file mode 100644 index 000000000..f7013646d --- /dev/null +++ b/graphics/trainer_card/badges.png |
