diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-01 00:16:05 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-01 00:16:05 -0700 |
| commit | b015def965ddb45794dd0acdbb165824d5c1608e (patch) | |
| tree | 4b7c7a7a03574082c3548f3db637545b433174ee | |
| parent | b46f187207a40c0341f816ad3a90475a1ab06bb9 (diff) | |
summary screen graphics
| -rw-r--r-- | asm/rom5.s | 6 | ||||
| -rw-r--r-- | data/data2.s | 28 | ||||
| -rw-r--r-- | graphics/summary_screen/buttons.png | bin | 0 -> 207 bytes | |||
| -rw-r--r-- | graphics/summary_screen/mon_markings.pal | 19 | ||||
| -rw-r--r-- | graphics/summary_screen/text.png | bin | 0 -> 223 bytes |
5 files changed, 39 insertions, 14 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 563b5ea60..e48c1a81e 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -71261,11 +71261,11 @@ _0809DBDC: add r1, r12 b _0809DDEE .align 2, 0 -_0809DC08: .4byte gUnknown_083C133C +_0809DC08: .4byte gSummaryScreenTextTiles _0809DC0C: .4byte 0x0600d000 _0809DC10: .4byte 0x040000d4 _0809DC14: .4byte 0x800000a0 -_0809DC18: .4byte gUnknown_083C147C +_0809DC18: .4byte gSummaryScreenButtonTiles _0809DC1C: .4byte 0x0600d140 _0809DC20: .4byte 0x80000080 _0809DC24: .4byte 0x02018000 @@ -79506,7 +79506,7 @@ _080A1DBA: bx r0 .align 2, 0 _080A1DC0: .4byte 0x00007533 -_080A1DC4: .4byte gUnknown_083C131C +_080A1DC4: .4byte gSummaryScreenMonMarkingsPalette _080A1DC8: .4byte 0x020384f4 thumb_func_end sub_80A1D84 diff --git a/data/data2.s b/data/data2.s index c908161e4..82deb82af 100644 --- a/data/data2.s +++ b/data/data2.s @@ -13563,21 +13563,27 @@ gUnknown_083C12FC:: @ 83C12FC gSpriteTemplate_83C1304:: @ 83C1304 spr_template 30001, 30001, gOamData_83C1298, gSpriteAnimTable_83C12D8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_083C131C:: @ 83C131C - .incbin "baserom.gba", 0x003c131c, 0x20 + .align 2 +gSummaryScreenMonMarkingsPalette:: @ 83C131C + .incbin "graphics/summary_screen/mon_markings.gbapal" -gUnknown_083C133C:: @ 83C133C - .incbin "baserom.gba", 0x003c133c, 0x140 + .align 2 +gSummaryScreenTextTiles:: @ 83C133C + .incbin "graphics/summary_screen/text.4bpp" -gUnknown_083C147C:: @ 83C147C - .incbin "baserom.gba", 0x003c147c, 0x100 + .align 2 +gSummaryScreenButtonTiles:: @ 83C147C + .incbin "graphics/summary_screen/buttons.4bpp" + .align 1 gUnknown_083C157C:: @ 83C157C - .incbin "baserom.gba", 0x003c157c, 0x2 + .2byte 0x5F5A @ palette color + .align 1 gUnknown_083C157E:: @ 83C157E - .incbin "baserom.gba", 0x003c157e, 0x2 + .2byte 0x6FDE @ palette color + .align 2 gUnknown_083C1580:: @ 83C1580 .4byte sub_809FC0C .4byte sub_809FEB8 @@ -13597,13 +13603,13 @@ gUnknown_083C1598:: @ 83C1598 .4byte sub_80A015C gUnknown_083C15A8:: @ 83C15A8 - .incbin "baserom.gba", 0x003c15a8, 0x6 + .byte 0, 2, 3, 1, 4, 5 gUnknown_083C15AE:: @ 83C15AE - .incbin "baserom.gba", 0x003c15ae, 0x6 + .string "{STR_VAR_1}{CLEAR_TO 64}$" gUnknown_083C15B4:: @ 83C15B4 - .incbin "baserom.gba", 0x003c15b4, 0x8 + .string "{STR_VAR_1}{CLEAR_TO 72}$" .align 2 gUnknown_083C15BC:: @ 83C15BC diff --git a/graphics/summary_screen/buttons.png b/graphics/summary_screen/buttons.png Binary files differnew file mode 100644 index 000000000..694f132bd --- /dev/null +++ b/graphics/summary_screen/buttons.png diff --git a/graphics/summary_screen/mon_markings.pal b/graphics/summary_screen/mon_markings.pal new file mode 100644 index 000000000..08124207d --- /dev/null +++ b/graphics/summary_screen/mon_markings.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +164 148 222 +172 156 238 +255 255 255 +205 205 205 +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/summary_screen/text.png b/graphics/summary_screen/text.png Binary files differnew file mode 100644 index 000000000..cd6b1e391 --- /dev/null +++ b/graphics/summary_screen/text.png |
