diff options
| -rw-r--r-- | data/data2.s | 10 | ||||
| -rw-r--r-- | data/graphics.s | 23 | ||||
| -rw-r--r-- | graphics/trade/menu.pal | 19 | ||||
| -rw-r--r-- | graphics/trade/menu.png | bin | 0 -> 539 bytes | |||
| -rw-r--r-- | graphics/trade/menu_map.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | graphics/trade/selected_mon.pal | 19 | ||||
| -rw-r--r-- | graphics/trade/selected_mon.png | bin | 0 -> 227 bytes | |||
| -rw-r--r-- | graphics/trade/stripes.pal | 19 | ||||
| -rw-r--r-- | graphics/trade/stripes_bg2_map.bin | 1 | ||||
| -rw-r--r-- | graphics/trade/stripes_bg3_map.bin | 1 | ||||
| -rwxr-xr-x | misc.mk | 3 |
11 files changed, 87 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 diff --git a/graphics/trade/menu.pal b/graphics/trade/menu.pal new file mode 100644 index 000000000..548ddcfc7 --- /dev/null +++ b/graphics/trade/menu.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +57 57 172 +98 98 180 +123 106 222 +82 90 213 +82 148 205 +131 115 230 +148 156 189 +205 106 0 +246 148 0 +49 49 90 +255 213 115 +205 74 90 +255 98 32 +205 205 222 +255 255 213 diff --git a/graphics/trade/menu.png b/graphics/trade/menu.png Binary files differnew file mode 100644 index 000000000..54b00eb1c --- /dev/null +++ b/graphics/trade/menu.png diff --git a/graphics/trade/menu_map.bin b/graphics/trade/menu_map.bin Binary files differnew file mode 100644 index 000000000..46218245f --- /dev/null +++ b/graphics/trade/menu_map.bin diff --git a/graphics/trade/selected_mon.pal b/graphics/trade/selected_mon.pal new file mode 100644 index 000000000..bb74b34a2 --- /dev/null +++ b/graphics/trade/selected_mon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +123 131 222 +98 98 180 +123 106 222 +106 172 238 +82 148 205 +180 189 230 +148 156 189 +205 106 0 +255 189 49 +246 148 0 +255 213 115 +205 74 90 +255 98 32 +205 205 222 +255 98 32 diff --git a/graphics/trade/selected_mon.png b/graphics/trade/selected_mon.png Binary files differnew file mode 100644 index 000000000..022b92429 --- /dev/null +++ b/graphics/trade/selected_mon.png diff --git a/graphics/trade/stripes.pal b/graphics/trade/stripes.pal new file mode 100644 index 000000000..0c53ace0f --- /dev/null +++ b/graphics/trade/stripes.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 8 16 +0 16 32 +0 24 49 +0 41 65 +0 49 82 +0 57 98 +0 65 115 +0 82 131 +0 90 148 +0 98 164 +0 106 180 +0 123 197 +0 131 213 +0 139 230 +0 156 255 diff --git a/graphics/trade/stripes_bg2_map.bin b/graphics/trade/stripes_bg2_map.bin new file mode 100644 index 000000000..22f8f3b71 --- /dev/null +++ b/graphics/trade/stripes_bg2_map.bin @@ -0,0 +1 @@ +@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@@ABCDEFGHIJKLMNOONMLKJIHHHFDCBA@
\ No newline at end of file diff --git a/graphics/trade/stripes_bg3_map.bin b/graphics/trade/stripes_bg3_map.bin new file mode 100644 index 000000000..e4168474a --- /dev/null +++ b/graphics/trade/stripes_bg3_map.bin @@ -0,0 +1 @@ +P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P P Q R S T U V W X Y Z [ \ ] ^ _ ^ ] \ [ Z Y X W V V U T S R Q P
\ No newline at end of file @@ -145,6 +145,9 @@ $(INTROGFXDIR)/intro3_misc.4bpp: $(INTROGFXDIR)/intro3_star.4bpp $(INTROGFXDIR)/ $(TRADEGFXDIR)/gba_affine.8bpp: $(TRADEGFXDIR)/gba_affine.png $(GFX) $< $@ -num_tiles 129 +$(TRADEGFXDIR)/menu.4bpp: $(TRADEGFXDIR)/menu.png + $(GFX) $< $@ -num_tiles 148 + $(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp $(BTLANMSPRGFXDIR)/001_1.4bpp @cat $(BTLANMSPRGFXDIR)/001_0.4bpp $(BTLANMSPRGFXDIR)/001_1.4bpp >$@ |
