diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 10 | ||||
| -rw-r--r-- | data/graphics.s | 23 |
2 files changed, 25 insertions, 8 deletions
diff --git a/data/data2.s b/data/data2.s index 8c3a7fae4..980ba0f5a 100644 --- a/data/data2.s +++ b/data/data2.s @@ -2134,11 +2134,13 @@ gUnknown_0820ABF0:: @ 820ABF0 gUnknown_0820ADEE:: @ 820ADEE .incbin "baserom.gba", 0x0020adee, 0x1fe + .align 2 gUnknown_0820AFEC:: @ 820AFEC - .incbin "baserom.gba", 0x0020afec, 0x800 + .incbin "graphics/trade/stripes_bg2_map.bin" + .align 2 gUnknown_0820B7EC:: @ 820B7EC - .incbin "baserom.gba", 0x0020b7ec, 0x800 + .incbin "graphics/trade/stripes_bg3_map.bin" .align 2 gOamData_820BFEC:: @ 820BFEC @@ -2235,11 +2237,11 @@ gSpriteAnimTable_820C11C:: @ 820C11C .align 2 gUnknown_0820C124:: @ 820C124 - obj_tiles 0x08ea1dec, 2048, 0x012c + obj_tiles gUnknown_08EA1DEC, 0x800, 300 .align 2 gUnknown_0820C12C:: @ 820C12C - obj_pal 0x08ea0328, 0x0929 + obj_pal gUnknown_08EA0328, 2345 .align 2 gSpriteTemplate_820C134:: @ 820C134 diff --git a/data/graphics.s b/data/graphics.s index c506bc844..00c5d8768 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3742,17 +3742,32 @@ gUnknown_08EA0028:: @ 8EA0028 gUnknown_08EA0108:: @ 8EA0108 .incbin "baserom.gba", 0x00ea0108, 0x1c0 + .align 2 gUnknown_08EA02C8:: @ 8EA02C8 - .incbin "baserom.gba", 0x00ea02c8, 0x80 + .incbin "graphics/trade/menu.gbapal" + .incbin "graphics/trade/stripes.gbapal" + .incbin "graphics/trade/stripes.gbapal" + + .align 2 +gUnknown_08EA0328:: @ 8EA0328 + .incbin "graphics/trade/selected_mon.gbapal" + .align 2 gUnknown_08EA0348:: @ 8EA0348 - .incbin "baserom.gba", 0x00ea0348, 0x1280 + .incbin "graphics/trade/menu.4bpp" + .align 2 gUnknown_08EA15C8:: @ 8EA15C8 - .incbin "baserom.gba", 0x00ea15c8, 0x800 + .incbin "graphics/trade/menu_map.bin" gUnknown_08EA1DC8:: @ 8EA1DC8 - .incbin "baserom.gba", 0x00ea1dc8, 0x844 + .incbin "baserom.gba", 0x00ea1dc8, 0x24 + + .align 2 +gUnknown_08EA1DEC:: @ 8EA1DEC + .incbin "graphics/trade/selected_mon.4bpp" + + .incbin "baserom.gba", 0x00ea25ec, 0x20 gUnknown_08EA260C:: @ 8EA260C .incbin "baserom.gba", 0x00ea260c, 0x438 |