diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-18 21:54:39 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-18 21:54:39 -0700 |
| commit | 4fec693f0497e33c173733ff68bdc0563791a21f (patch) | |
| tree | 26855cbc7373140525c84f5723fed2c2cb141420 | |
| parent | e94dd6a9c5b498d494df006a4cbcee367cdcbaac (diff) | |
trade screen text palette
| -rw-r--r-- | asm/rom_8040EB4.s | 2 | ||||
| -rw-r--r-- | data/data2.s | 9 | ||||
| -rw-r--r-- | graphics/trade/text1.pal | 19 | ||||
| -rw-r--r-- | graphics/trade/text2.pal | 19 |
4 files changed, 44 insertions, 5 deletions
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index cc67845b8..fbc7d3d34 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -20001,7 +20001,7 @@ _0804AC60: ldr r1, [r0] b _0804ACC2 .align 2, 0 -_0804AC6C: .4byte gUnknown_0820C0E4 +_0804AC6C: .4byte gSpritePalette_TradeScreenText _0804AC70: .4byte 0x03004824 _0804AC74: ldr r0, _0804AC80 diff --git a/data/data2.s b/data/data2.s index 1f18691e9..c8393db4e 100644 --- a/data/data2.s +++ b/data/data2.s @@ -2710,8 +2710,9 @@ gSpriteAnimTable_820C024:: @ 820C024 .4byte gSpriteAnim_820C01C .align 2 -gUnknownPal_0820C03C:: - .incbin "baserom.gba", 0x0020c03c, 0x40 +TradeScreenTextPalette: @ 820C03C + .incbin "graphics/trade/text1.gbapal" + .incbin "graphics/trade/text2.gbapal" @ unused? .align 2 gUnknown_0820C07C:: @ 820C07C @@ -2730,8 +2731,8 @@ gUnknown_0820C07C:: @ 820C07C obj_tiles 0x0201dc00, 256, 0x00d4 .align 2 -gUnknown_0820C0E4:: @ 820C0E4 - obj_pal gUnknownPal_0820C03C, 0x133d +gSpritePalette_TradeScreenText:: @ 820C0E4 + obj_pal TradeScreenTextPalette, 4925 .align 2 gSpriteTemplate_820C0EC:: @ 820C0EC diff --git a/graphics/trade/text1.pal b/graphics/trade/text1.pal new file mode 100644 index 000000000..40426b71f --- /dev/null +++ b/graphics/trade/text1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 74 74 +255 0 0 +0 255 0 +0 0 255 +255 255 0 +0 255 255 +255 0 255 +213 213 205 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +115 115 115 +255 255 255 diff --git a/graphics/trade/text2.pal b/graphics/trade/text2.pal new file mode 100644 index 000000000..5cd4e5fb0 --- /dev/null +++ b/graphics/trade/text2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 74 74 +255 0 0 +0 255 0 +0 0 255 +255 255 0 +0 255 255 +255 0 255 +115 115 115 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +115 115 115 +255 255 255 |