diff --git a/asm/rom5.s b/asm/rom5.s index e780700bc..0dfe90798 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -258305,7 +258305,7 @@ _080F8B54: bl LoadPalette b _080F8D30 .align 2, 0 -_080F8B70: .4byte gUnknown_083E5634 +_080F8B70: .4byte gMailGraphicsTable _080F8B74: .4byte 0x02000000 _080F8B78: ldr r2, _080F8B94 @@ -258322,7 +258322,7 @@ _080F8B78: bl LZ77UnCompVram b _080F8D30 .align 2, 0 -_080F8B94: .4byte gUnknown_083E5634 +_080F8B94: .4byte gMailGraphicsTable _080F8B98: .4byte 0x02000000 _080F8B9C: .4byte 0x06004000 _080F8BA0: @@ -258374,7 +258374,7 @@ _080F8BA0: strh r0, [r3, 0x16] b _080F8D30 .align 2, 0 -_080F8C00: .4byte gUnknown_083E5634 +_080F8C00: .4byte gMailGraphicsTable _080F8C04: .4byte 0x02000000 _080F8C08: .4byte 0x0202eac8 _080F8C0C: .4byte gUnknown_083E562C diff --git a/data/data2.s b/data/data2.s index aa6760f4b..7d5b6e373 100644 --- a/data/data2.s +++ b/data/data2.s @@ -18901,8 +18901,105 @@ gUnknown_083E5620:: @ 83E5620 gUnknown_083E562C:: @ 83E562C .incbin "baserom.gba", 0x003e562c, 0x8 -gUnknown_083E5634:: @ 83E5634 - .incbin "baserom.gba", 0x003e5634, 0xfc + .align 2 +gMailGraphicsTable:: @ 83E5634 + .4byte gMailPalette_Orange + .4byte gMailTiles_Orange + .4byte gMailTilemap_Orange + .2byte 0x2C0 + .2byte 0 + .2byte 0x294A + .2byte 0x6739 + + .4byte gMailPalette_Harbor + .4byte gMailTiles_Harbor + .4byte gMailTilemap_Harbor + .2byte 0x2E0 + .2byte 0 + .2byte 0x7FFF + .2byte 0x4631 + + .4byte gMailPalette_Glitter + .4byte gMailTiles_Glitter + .4byte gMailTilemap_Glitter + .2byte 0x400 + .2byte 0 + .2byte 0x294A + .2byte 0x6739 + + .4byte gMailPalette_Mech + .4byte gMailTiles_Mech + .4byte gMailTilemap_Mech + .2byte 0x1E0 + .2byte 0 + .2byte 0x7FFF + .2byte 0x4631 + + .4byte gMailPalette_Wood + .4byte gMailTiles_Wood + .4byte gMailTilemap_Wood + .2byte 0x2E0 + .2byte 0 + .2byte 0x7FFF + .2byte 0x4631 + + .4byte gMailPalette_Wave + .4byte gMailTiles_Wave + .4byte gMailTilemap_Wave + .2byte 0x300 + .2byte 0 + .2byte 0x294A + .2byte 0x6739 + + .4byte gMailPalette_Bead + .4byte gMailTiles_Bead + .4byte gMailTilemap_Bead + .2byte 0x140 + .2byte 0 + .2byte 0x7FFF + .2byte 0x4631 + + .4byte gMailPalette_Shadow + .4byte gMailTiles_Shadow + .4byte gMailTilemap_Shadow + .2byte 0x300 + .2byte 0 + .2byte 0x7FFF + .2byte 0x4631 + + .4byte gMailPalette_Tropic + .4byte gMailTiles_Tropic + .4byte gMailTilemap_Tropic + .2byte 0x220 + .2byte 0 + .2byte 0x294A + .2byte 0x6739 + + .4byte gMailPalette_Dream + .4byte gMailTiles_Dream + .4byte gMailTilemap_Dream + .2byte 0x340 + .2byte 0 + .2byte 0x294A + .2byte 0x6739 + + .4byte gMailPalette_Fab + .4byte gMailTiles_Fab + .4byte gMailTilemap_Fab + .2byte 0x2A0 + .2byte 0 + .2byte 0x294A + .2byte 0x6739 + + .4byte gMailPalette_Retro + .4byte gMailTiles_Retro + .4byte gMailTilemap_Retro + .2byte 0x520 + .2byte 0 + .2byte 0x294A + .2byte 0x6739 + + .incbin "baserom.gba", 0x003e5724, 0xC gUnknown_083E5730:: @ 83E5730 .incbin "baserom.gba", 0x003e5730, 0x74 diff --git a/data/graphics.s b/data/graphics.s index 2e6c5599b..2a1b03042 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2934,7 +2934,151 @@ gRouletteNumbersTiles:: @ 8E82C30 gRouletteMultiplierTiles:: @ 8E82D14 .incbin "graphics/roulette/multiplier.4bpp.lz" - .incbin "baserom.gba", 0x00e82e9c, 0x2afc + .align 2 +gMailPalette_Orange:: @ 8E82E9C + .incbin "graphics/mail/orange/palette.gbapal" + + .align 2 +gMailPalette_Harbor:: @ 8E82EBC + .incbin "graphics/mail/harbor/palette.gbapal" + + .align 2 +gMailPalette_Glitter:: @ 8E82EDC + .incbin "graphics/mail/glitter/palette.gbapal" + + .align 2 +gMailPalette_Mech:: @ 8E82EFC + .incbin "graphics/mail/mech/palette.gbapal" + + .align 2 +gMailPalette_Wood:: @ 8E82F1C + .incbin "graphics/mail/wood/palette.gbapal" + + .align 2 +gMailPalette_Wave:: @ 8E82F3C + .incbin "graphics/mail/wave/palette.gbapal" + + .align 2 +gMailPalette_Bead:: @ 8E82F5C + .incbin "graphics/mail/bead/palette.gbapal" + + .align 2 +gMailPalette_Shadow:: @ 8E82F7C + .incbin "graphics/mail/shadow/palette.gbapal" + + .align 2 +gMailPalette_Tropic:: @ 8E82F9C + .incbin "graphics/mail/tropic/palette.gbapal" + + .align 2 +gMailPalette_Dream:: @ 8E82FBC + .incbin "graphics/mail/dream/palette.gbapal" + + .align 2 +gMailPalette_Fab:: @ 8E82FDC + .incbin "graphics/mail/fab/palette.gbapal" + + .align 2 +gMailPalette_Retro:: @ 8E82FFC + .incbin "graphics/mail/retro/palette.gbapal" + + .align 2 +gMailTiles_Orange:: @ 8E8301C + .incbin "graphics/mail/orange/tiles.4bpp.lz" + + .align 2 +gMailTiles_Harbor:: @ 8E831BC + .incbin "graphics/mail/harbor/tiles.4bpp.lz" + + .align 2 +gMailTiles_Glitter:: @ 8E832F8 + .incbin "graphics/mail/glitter/tiles.4bpp.lz" + + .align 2 +gMailTiles_Mech:: @ 8E83508 + .incbin "graphics/mail/mech/tiles.4bpp.lz" + + .align 2 +gMailTiles_Wood:: @ 8E835E0 + .incbin "graphics/mail/wood/tiles.4bpp.lz" + + .align 2 +gMailTiles_Wave:: @ 8E837D8 + .incbin "graphics/mail/wave/tiles.4bpp.lz" + + .align 2 +gMailTiles_Bead:: @ 8E83958 + .incbin "graphics/mail/bead/tiles.4bpp.lz" + + .align 2 +gMailTiles_Shadow:: @ 8E83A00 + .incbin "graphics/mail/shadow/tiles.4bpp.lz" + + .align 2 +gMailTiles_Tropic:: @ 8E83B90 + .incbin "graphics/mail/tropic/tiles.4bpp.lz" + + .align 2 +gMailTiles_Dream:: @ 8E83CD0 + .incbin "graphics/mail/dream/tiles.4bpp.lz" + + .align 2 +gMailTiles_Fab:: @ 8E83E38 + .incbin "graphics/mail/fab/tiles.4bpp.lz" + + .align 2 +gMailTiles_Retro:: @ 8E83F88 + .incbin "graphics/mail/retro/tiles.4bpp.lz" + + .align 2 +gMailTilemap_Orange:: @ 8E84228 + .incbin "graphics/mail/orange/map.bin.lz" + + .align 2 +gMailTilemap_Harbor:: @ 8E84300 + .incbin "graphics/mail/harbor/map.bin.lz" + + .align 2 +gMailTilemap_Glitter:: @ 8E843E0 + .incbin "graphics/mail/glitter/map.bin.lz" + + .align 2 +gMailTilemap_Mech:: @ 8E844EC + .incbin "graphics/mail/mech/map.bin.lz" + + .align 2 +gMailTilemap_Wood:: @ 8E845C8 + .incbin "graphics/mail/wood/map.bin.lz" + + .align 2 +gMailTilemap_Wave:: @ 8E846B8 + .incbin "graphics/mail/wave/map.bin.lz" + + .align 2 +gMailTilemap_Bead:: @ 8E84798 + .incbin "graphics/mail/bead/map.bin.lz" + + .align 2 +gMailTilemap_Shadow:: @ 8E84878 + .incbin "graphics/mail/shadow/map.bin.lz" + + .align 2 +gMailTilemap_Tropic:: @ 8E84984 + .incbin "graphics/mail/tropic/map.bin.lz" + + .align 2 +gMailTilemap_Dream:: @ 8E84A74 + .incbin "graphics/mail/dream/map.bin.lz" + + .align 2 +gMailTilemap_Fab:: @ 8E84B6C + .incbin "graphics/mail/fab/map.bin.lz" + + .align 2 +gMailTilemap_Retro:: @ 8E84C84 + .incbin "graphics/mail/retro/map.bin.lz" + + .incbin "baserom.gba", 0x00e84d98, 0xc00 gUnknown_08E85998:: @ 8E85998 .incbin "baserom.gba", 0x00e85998, 0x800 diff --git a/graphics/mail/bead/map.bin b/graphics/mail/bead/map.bin new file mode 100644 index 000000000..6ebb4932c Binary files /dev/null and b/graphics/mail/bead/map.bin differ diff --git a/graphics/mail/bead/palette.pal b/graphics/mail/bead/palette.pal new file mode 100644 index 000000000..e2e6ca291 --- /dev/null +++ b/graphics/mail/bead/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +65 90 123 +98 123 156 +213 230 238 +238 255 255 +139 189 164 +255 148 131 +213 106 90 +164 156 189 +255 197 82 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/bead/tiles.png b/graphics/mail/bead/tiles.png new file mode 100644 index 000000000..d006fb987 Binary files /dev/null and b/graphics/mail/bead/tiles.png differ diff --git a/graphics/mail/dream/map.bin b/graphics/mail/dream/map.bin new file mode 100644 index 000000000..bc28d8864 Binary files /dev/null and b/graphics/mail/dream/map.bin differ diff --git a/graphics/mail/dream/palette.pal b/graphics/mail/dream/palette.pal new file mode 100644 index 000000000..47172825c --- /dev/null +++ b/graphics/mail/dream/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +255 189 205 +222 164 197 +197 148 189 +172 131 189 +255 213 230 +0 0 0 +205 255 213 +230 255 230 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/dream/tiles.png b/graphics/mail/dream/tiles.png new file mode 100644 index 000000000..cb4411757 Binary files /dev/null and b/graphics/mail/dream/tiles.png differ diff --git a/graphics/mail/fab/map.bin b/graphics/mail/fab/map.bin new file mode 100644 index 000000000..b11121bdf Binary files /dev/null and b/graphics/mail/fab/map.bin differ diff --git a/graphics/mail/fab/palette.pal b/graphics/mail/fab/palette.pal new file mode 100644 index 000000000..17e1afcc3 --- /dev/null +++ b/graphics/mail/fab/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +238 205 222 +255 230 238 +213 230 238 +238 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/fab/tiles.png b/graphics/mail/fab/tiles.png new file mode 100644 index 000000000..99e9cac71 Binary files /dev/null and b/graphics/mail/fab/tiles.png differ diff --git a/graphics/mail/glitter/map.bin b/graphics/mail/glitter/map.bin new file mode 100644 index 000000000..fad949aa9 Binary files /dev/null and b/graphics/mail/glitter/map.bin differ diff --git a/graphics/mail/glitter/palette.pal b/graphics/mail/glitter/palette.pal new file mode 100644 index 000000000..544a0a11b --- /dev/null +++ b/graphics/mail/glitter/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +255 255 172 +255 238 123 +255 238 0 +255 41 41 +255 238 230 +255 189 41 +238 180 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/glitter/tiles.png b/graphics/mail/glitter/tiles.png new file mode 100644 index 000000000..12bd11801 Binary files /dev/null and b/graphics/mail/glitter/tiles.png differ diff --git a/graphics/mail/harbor/map.bin b/graphics/mail/harbor/map.bin new file mode 100644 index 000000000..ce07a7539 Binary files /dev/null and b/graphics/mail/harbor/map.bin differ diff --git a/graphics/mail/harbor/palette.pal b/graphics/mail/harbor/palette.pal new file mode 100644 index 000000000..1a8795c33 --- /dev/null +++ b/graphics/mail/harbor/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +24 172 255 +255 255 148 +115 205 255 +74 172 255 +16 57 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/harbor/tiles.png b/graphics/mail/harbor/tiles.png new file mode 100644 index 000000000..b0a09ef69 Binary files /dev/null and b/graphics/mail/harbor/tiles.png differ diff --git a/graphics/mail/mech/map.bin b/graphics/mail/mech/map.bin new file mode 100644 index 000000000..d74974008 Binary files /dev/null and b/graphics/mail/mech/map.bin differ diff --git a/graphics/mail/mech/palette.pal b/graphics/mail/mech/palette.pal new file mode 100644 index 000000000..bb55d7c04 --- /dev/null +++ b/graphics/mail/mech/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +230 230 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 230 189 +197 189 139 +172 164 115 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/mech/tiles.png b/graphics/mail/mech/tiles.png new file mode 100644 index 000000000..4d47dd73b Binary files /dev/null and b/graphics/mail/mech/tiles.png differ diff --git a/graphics/mail/orange/map.bin b/graphics/mail/orange/map.bin new file mode 100644 index 000000000..be4dbf9c5 Binary files /dev/null and b/graphics/mail/orange/map.bin differ diff --git a/graphics/mail/orange/palette.pal b/graphics/mail/orange/palette.pal new file mode 100644 index 000000000..20efef172 --- /dev/null +++ b/graphics/mail/orange/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +246 213 148 +238 180 74 +205 139 65 +189 246 222 +148 222 197 +131 189 164 +255 255 148 +189 180 123 +139 123 65 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/orange/tiles.png b/graphics/mail/orange/tiles.png new file mode 100644 index 000000000..1676bd258 Binary files /dev/null and b/graphics/mail/orange/tiles.png differ diff --git a/graphics/mail/retro/map.bin b/graphics/mail/retro/map.bin new file mode 100644 index 000000000..30ee05ba2 Binary files /dev/null and b/graphics/mail/retro/map.bin differ diff --git a/graphics/mail/retro/palette.pal b/graphics/mail/retro/palette.pal new file mode 100644 index 000000000..707bdff93 --- /dev/null +++ b/graphics/mail/retro/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +246 106 41 +255 246 156 +255 205 65 +148 238 82 +172 106 49 +189 164 57 +123 213 246 +0 0 0 +255 230 90 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/retro/tiles.png b/graphics/mail/retro/tiles.png new file mode 100644 index 000000000..da96ad486 Binary files /dev/null and b/graphics/mail/retro/tiles.png differ diff --git a/graphics/mail/shadow/map.bin b/graphics/mail/shadow/map.bin new file mode 100644 index 000000000..01fcfe4ce Binary files /dev/null and b/graphics/mail/shadow/map.bin differ diff --git a/graphics/mail/shadow/palette.pal b/graphics/mail/shadow/palette.pal new file mode 100644 index 000000000..f08b838c5 --- /dev/null +++ b/graphics/mail/shadow/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +139 139 164 +123 123 139 +106 106 123 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +213 65 16 +148 49 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/shadow/tiles.png b/graphics/mail/shadow/tiles.png new file mode 100644 index 000000000..cdc63cde1 Binary files /dev/null and b/graphics/mail/shadow/tiles.png differ diff --git a/graphics/mail/tropic/map.bin b/graphics/mail/tropic/map.bin new file mode 100644 index 000000000..8ef408f37 Binary files /dev/null and b/graphics/mail/tropic/map.bin differ diff --git a/graphics/mail/tropic/palette.pal b/graphics/mail/tropic/palette.pal new file mode 100644 index 000000000..99b2bb636 --- /dev/null +++ b/graphics/mail/tropic/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +230 255 98 +197 246 131 +189 246 65 +123 213 41 +255 180 98 +255 255 148 +123 180 24 +197 238 65 +205 156 90 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/tropic/tiles.png b/graphics/mail/tropic/tiles.png new file mode 100644 index 000000000..6cee88775 Binary files /dev/null and b/graphics/mail/tropic/tiles.png differ diff --git a/graphics/mail/wave/map.bin b/graphics/mail/wave/map.bin new file mode 100644 index 000000000..0af44f798 Binary files /dev/null and b/graphics/mail/wave/map.bin differ diff --git a/graphics/mail/wave/palette.pal b/graphics/mail/wave/palette.pal new file mode 100644 index 000000000..dd9bbfae4 --- /dev/null +++ b/graphics/mail/wave/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +0 172 246 +65 90 156 +106 131 197 +197 222 255 +82 156 197 +230 246 255 +0 0 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/wave/tiles.png b/graphics/mail/wave/tiles.png new file mode 100644 index 000000000..6b5af8a01 Binary files /dev/null and b/graphics/mail/wave/tiles.png differ diff --git a/graphics/mail/wood/map.bin b/graphics/mail/wood/map.bin new file mode 100644 index 000000000..4338a31c8 Binary files /dev/null and b/graphics/mail/wood/map.bin differ diff --git a/graphics/mail/wood/palette.pal b/graphics/mail/wood/palette.pal new file mode 100644 index 000000000..9ed936918 --- /dev/null +++ b/graphics/mail/wood/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +139 131 74 +164 180 82 +189 180 106 +222 205 106 +180 156 65 +246 213 156 +189 164 90 +222 164 123 +255 205 180 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/wood/tiles.png b/graphics/mail/wood/tiles.png new file mode 100644 index 000000000..a55029fac Binary files /dev/null and b/graphics/mail/wood/tiles.png differ