From dc5afbdd899099fa20da61a8f7721e25d6bf2047 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 25 Nov 2019 16:08:05 -0500 Subject: Move newly-dumped graphics to link_games --- data/pokemon_jump.s | 34 +++++++++++++++++----------------- graphics/link_games/unk_846B794.pal | 19 +++++++++++++++++++ graphics/link_games/unk_846B7B4.pal | 19 +++++++++++++++++++ graphics/link_games/unk_846B7D4.png | Bin 0 -> 582 bytes graphics/link_games/unk_846BA00.bin | Bin 0 -> 1280 bytes graphics/link_games/unk_846BBB0.pal | 19 +++++++++++++++++++ graphics/link_games/unk_846BBD0.png | Bin 0 -> 2082 bytes graphics/link_games/unk_846C520.bin | Bin 0 -> 4096 bytes graphics/link_games/unk_846C8D8.pal | 19 +++++++++++++++++++ graphics/link_games/unk_846C8F8.png | Bin 0 -> 2401 bytes graphics/link_games/unk_846D3A8.bin | Bin 0 -> 8192 bytes graphics/link_games/unk_846D9E4.pal | 19 +++++++++++++++++++ graphics/link_games/unk_846DA04.pal | 19 +++++++++++++++++++ graphics/link_games/unk_846DA24.png | Bin 0 -> 284 bytes graphics/link_games/unk_846DB44.png | Bin 0 -> 322 bytes graphics/link_games/unk_846DD18.png | Bin 0 -> 338 bytes graphics/link_games/unk_846DE48.png | Bin 0 -> 256 bytes graphics/link_games/unk_846DF44.png | Bin 0 -> 335 bytes graphics/misc/unk_846B794.pal | 19 ------------------- graphics/misc/unk_846B7B4.pal | 19 ------------------- graphics/misc/unk_846B7D4.png | Bin 582 -> 0 bytes graphics/misc/unk_846BA00.bin | Bin 1280 -> 0 bytes graphics/misc/unk_846BBB0.pal | 19 ------------------- graphics/misc/unk_846BBD0.png | Bin 2082 -> 0 bytes graphics/misc/unk_846C520.bin | Bin 4096 -> 0 bytes graphics/misc/unk_846C8D8.pal | 19 ------------------- graphics/misc/unk_846C8F8.png | Bin 2401 -> 0 bytes graphics/misc/unk_846D3A8.bin | Bin 8192 -> 0 bytes graphics/misc/unk_846D9E4.pal | 19 ------------------- graphics/misc/unk_846DA04.pal | 19 ------------------- graphics/misc/unk_846DA24.png | Bin 284 -> 0 bytes graphics/misc/unk_846DB44.png | Bin 322 -> 0 bytes graphics/misc/unk_846DD18.png | Bin 338 -> 0 bytes graphics/misc/unk_846DE48.png | Bin 256 -> 0 bytes graphics/misc/unk_846DF44.png | Bin 335 -> 0 bytes 35 files changed, 131 insertions(+), 131 deletions(-) create mode 100644 graphics/link_games/unk_846B794.pal create mode 100644 graphics/link_games/unk_846B7B4.pal create mode 100644 graphics/link_games/unk_846B7D4.png create mode 100644 graphics/link_games/unk_846BA00.bin create mode 100644 graphics/link_games/unk_846BBB0.pal create mode 100644 graphics/link_games/unk_846BBD0.png create mode 100644 graphics/link_games/unk_846C520.bin create mode 100644 graphics/link_games/unk_846C8D8.pal create mode 100644 graphics/link_games/unk_846C8F8.png create mode 100644 graphics/link_games/unk_846D3A8.bin create mode 100644 graphics/link_games/unk_846D9E4.pal create mode 100644 graphics/link_games/unk_846DA04.pal create mode 100644 graphics/link_games/unk_846DA24.png create mode 100644 graphics/link_games/unk_846DB44.png create mode 100644 graphics/link_games/unk_846DD18.png create mode 100644 graphics/link_games/unk_846DE48.png create mode 100644 graphics/link_games/unk_846DF44.png delete mode 100644 graphics/misc/unk_846B794.pal delete mode 100644 graphics/misc/unk_846B7B4.pal delete mode 100644 graphics/misc/unk_846B7D4.png delete mode 100644 graphics/misc/unk_846BA00.bin delete mode 100644 graphics/misc/unk_846BBB0.pal delete mode 100644 graphics/misc/unk_846BBD0.png delete mode 100644 graphics/misc/unk_846C520.bin delete mode 100644 graphics/misc/unk_846C8D8.pal delete mode 100644 graphics/misc/unk_846C8F8.png delete mode 100644 graphics/misc/unk_846D3A8.bin delete mode 100644 graphics/misc/unk_846D9E4.pal delete mode 100644 graphics/misc/unk_846DA04.pal delete mode 100644 graphics/misc/unk_846DA24.png delete mode 100644 graphics/misc/unk_846DB44.png delete mode 100644 graphics/misc/unk_846DD18.png delete mode 100644 graphics/misc/unk_846DE48.png delete mode 100644 graphics/misc/unk_846DF44.png diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s index a5f30c674..3d01bf64f 100644 --- a/data/pokemon_jump.s +++ b/data/pokemon_jump.s @@ -126,34 +126,34 @@ gUnknown_846B76C:: @ 846B76C .4byte 20000, 5 gUnknown_846B794:: @ 846B794 gbapal - .incbin "graphics/misc/unk_846B794.gbapal" + .incbin "graphics/link_games/unk_846B794.gbapal" gUnknown_846B7B4:: @ 846B7B4 gbapal - .incbin "graphics/misc/unk_846B7B4.gbapal" + .incbin "graphics/link_games/unk_846B7B4.gbapal" gUnknown_846B7D4:: @ 846B7D4 4bpp.lz - .incbin "graphics/misc/unk_846B7D4.4bpp.lz" + .incbin "graphics/link_games/unk_846B7D4.4bpp.lz" gUnknown_846BA00:: @ 846BA00 bin.lz - .incbin "graphics/misc/unk_846BA00.bin.lz" + .incbin "graphics/link_games/unk_846BA00.bin.lz" gUnknown_846BBB0:: @ 846BBB0 gbapal - .incbin "graphics/misc/unk_846BBB0.gbapal" + .incbin "graphics/link_games/unk_846BBB0.gbapal" gUnknown_846BBD0:: @ 846BBD0 4bpp.lz - .incbin "graphics/misc/unk_846BBD0.4bpp.lz" + .incbin "graphics/link_games/unk_846BBD0.4bpp.lz" gUnknown_846C520:: @ 846C520 bin.lz - .incbin "graphics/misc/unk_846C520.bin.lz" + .incbin "graphics/link_games/unk_846C520.bin.lz" gUnknown_846C8D8:: @ 846C8D8 gbapal - .incbin "graphics/misc/unk_846C8D8.gbapal" + .incbin "graphics/link_games/unk_846C8D8.gbapal" gUnknown_846C8F8:: @ 846C8F8 4bpp.lz - .incbin "graphics/misc/unk_846C8F8.4bpp.lz" + .incbin "graphics/link_games/unk_846C8F8.4bpp.lz" gUnknown_846D3A8:: @ 846D3A8 bin.lz - .incbin "graphics/misc/unk_846D3A8.bin.lz" + .incbin "graphics/link_games/unk_846D3A8.bin.lz" gUnknown_846D8D4:: @ 846D8D4 .4byte 0x000001b0 @@ -269,25 +269,25 @@ gUnknown_846D9D4:: @ 846D9D4 .4byte gUnknown_846D9CA gUnknown_846D9E4:: @ gbapal - .incbin "graphics/misc/unk_846D9E4.gbapal" + .incbin "graphics/link_games/unk_846D9E4.gbapal" gUnknown_846DA04:: @ gbapal - .incbin "graphics/misc/unk_846DA04.gbapal" + .incbin "graphics/link_games/unk_846DA04.gbapal" gUnknown_846DA24:: @ 4bpp.lz - .incbin "graphics/misc/unk_846DA24.4bpp.lz" + .incbin "graphics/link_games/unk_846DA24.4bpp.lz" gUnknown_846DB44:: @ 4bpp.lz - .incbin "graphics/misc/unk_846DB44.4bpp.lz" + .incbin "graphics/link_games/unk_846DB44.4bpp.lz" gUnknown_846DD18:: @ 4bpp.lz - .incbin "graphics/misc/unk_846DD18.4bpp.lz" + .incbin "graphics/link_games/unk_846DD18.4bpp.lz" gUnknown_846DE48:: @ 4bpp.lz - .incbin "graphics/misc/unk_846DE48.4bpp.lz" + .incbin "graphics/link_games/unk_846DE48.4bpp.lz" gUnknown_846DF44:: @ 4bpp.lz - .incbin "graphics/misc/unk_846DF44.4bpp.lz" + .incbin "graphics/link_games/unk_846DF44.4bpp.lz" gUnknown_846E0B0:: @ 846E0B0 obj_tiles gUnknown_846DA24, 0x0600, 5 diff --git a/graphics/link_games/unk_846B794.pal b/graphics/link_games/unk_846B794.pal new file mode 100644 index 000000000..6b73be372 --- /dev/null +++ b/graphics/link_games/unk_846B794.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +0 0 0 +222 222 213 +255 156 24 +255 222 189 +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/link_games/unk_846B7B4.pal b/graphics/link_games/unk_846B7B4.pal new file mode 100644 index 000000000..aed4bcc8b --- /dev/null +++ b/graphics/link_games/unk_846B7B4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 156 197 +106 222 156 +106 230 230 +139 230 255 +156 238 255 +197 246 255 +189 213 131 +230 213 115 +238 230 131 +246 246 156 +222 222 172 +106 230 172 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/link_games/unk_846B7D4.png b/graphics/link_games/unk_846B7D4.png new file mode 100644 index 000000000..ceef49004 Binary files /dev/null and b/graphics/link_games/unk_846B7D4.png differ diff --git a/graphics/link_games/unk_846BA00.bin b/graphics/link_games/unk_846BA00.bin new file mode 100644 index 000000000..68303ba7e Binary files /dev/null and b/graphics/link_games/unk_846BA00.bin differ diff --git a/graphics/link_games/unk_846BBB0.pal b/graphics/link_games/unk_846BBB0.pal new file mode 100644 index 000000000..a3514b004 --- /dev/null +++ b/graphics/link_games/unk_846BBB0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +32 98 49 +98 156 115 +90 205 148 +139 238 189 +139 57 0 +189 106 49 +16 16 16 +230 74 65 +255 131 115 +156 246 139 +222 205 49 +255 238 82 +65 164 24 +106 205 65 +255 255 255 diff --git a/graphics/link_games/unk_846BBD0.png b/graphics/link_games/unk_846BBD0.png new file mode 100644 index 000000000..d555d324d Binary files /dev/null and b/graphics/link_games/unk_846BBD0.png differ diff --git a/graphics/link_games/unk_846C520.bin b/graphics/link_games/unk_846C520.bin new file mode 100644 index 000000000..093c0a5a5 Binary files /dev/null and b/graphics/link_games/unk_846C520.bin differ diff --git a/graphics/link_games/unk_846C8D8.pal b/graphics/link_games/unk_846C8D8.pal new file mode 100644 index 000000000..aca961de3 --- /dev/null +++ b/graphics/link_games/unk_846C8D8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 156 197 +148 197 115 +172 222 123 +213 180 57 +238 205 65 +230 164 131 +246 189 172 +98 98 82 +164 148 90 +205 189 82 +255 238 74 +156 164 230 +90 90 106 +172 148 106 +230 205 123 +180 189 246 diff --git a/graphics/link_games/unk_846C8F8.png b/graphics/link_games/unk_846C8F8.png new file mode 100644 index 000000000..b87d50659 Binary files /dev/null and b/graphics/link_games/unk_846C8F8.png differ diff --git a/graphics/link_games/unk_846D3A8.bin b/graphics/link_games/unk_846D3A8.bin new file mode 100644 index 000000000..b17c5052c Binary files /dev/null and b/graphics/link_games/unk_846D3A8.bin differ diff --git a/graphics/link_games/unk_846D9E4.pal b/graphics/link_games/unk_846D9E4.pal new file mode 100644 index 000000000..936a2b39f --- /dev/null +++ b/graphics/link_games/unk_846D9E4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 156 197 +65 148 74 +82 180 74 +106 205 74 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +98 98 82 +205 189 82 +255 246 82 +255 255 255 +238 172 131 +238 230 131 diff --git a/graphics/link_games/unk_846DA04.pal b/graphics/link_games/unk_846DA04.pal new file mode 100644 index 000000000..d7fc1394b --- /dev/null +++ b/graphics/link_games/unk_846DA04.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +49 123 57 +65 139 57 +82 164 57 +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 +0 0 0 diff --git a/graphics/link_games/unk_846DA24.png b/graphics/link_games/unk_846DA24.png new file mode 100644 index 000000000..03d2f2778 Binary files /dev/null and b/graphics/link_games/unk_846DA24.png differ diff --git a/graphics/link_games/unk_846DB44.png b/graphics/link_games/unk_846DB44.png new file mode 100644 index 000000000..6e397966e Binary files /dev/null and b/graphics/link_games/unk_846DB44.png differ diff --git a/graphics/link_games/unk_846DD18.png b/graphics/link_games/unk_846DD18.png new file mode 100644 index 000000000..907169a4c Binary files /dev/null and b/graphics/link_games/unk_846DD18.png differ diff --git a/graphics/link_games/unk_846DE48.png b/graphics/link_games/unk_846DE48.png new file mode 100644 index 000000000..b238382a0 Binary files /dev/null and b/graphics/link_games/unk_846DE48.png differ diff --git a/graphics/link_games/unk_846DF44.png b/graphics/link_games/unk_846DF44.png new file mode 100644 index 000000000..96abce388 Binary files /dev/null and b/graphics/link_games/unk_846DF44.png differ diff --git a/graphics/misc/unk_846B794.pal b/graphics/misc/unk_846B794.pal deleted file mode 100644 index 6b73be372..000000000 --- a/graphics/misc/unk_846B794.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 246 255 -0 0 0 -222 222 213 -255 156 24 -255 222 189 -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/misc/unk_846B7B4.pal b/graphics/misc/unk_846B7B4.pal deleted file mode 100644 index aed4bcc8b..000000000 --- a/graphics/misc/unk_846B7B4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 156 197 -106 222 156 -106 230 230 -139 230 255 -156 238 255 -197 246 255 -189 213 131 -230 213 115 -238 230 131 -246 246 156 -222 222 172 -106 230 172 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/graphics/misc/unk_846B7D4.png b/graphics/misc/unk_846B7D4.png deleted file mode 100644 index ceef49004..000000000 Binary files a/graphics/misc/unk_846B7D4.png and /dev/null differ diff --git a/graphics/misc/unk_846BA00.bin b/graphics/misc/unk_846BA00.bin deleted file mode 100644 index 68303ba7e..000000000 Binary files a/graphics/misc/unk_846BA00.bin and /dev/null differ diff --git a/graphics/misc/unk_846BBB0.pal b/graphics/misc/unk_846BBB0.pal deleted file mode 100644 index a3514b004..000000000 --- a/graphics/misc/unk_846BBB0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 213 213 -32 98 49 -98 156 115 -90 205 148 -139 238 189 -139 57 0 -189 106 49 -16 16 16 -230 74 65 -255 131 115 -156 246 139 -222 205 49 -255 238 82 -65 164 24 -106 205 65 -255 255 255 diff --git a/graphics/misc/unk_846BBD0.png b/graphics/misc/unk_846BBD0.png deleted file mode 100644 index d555d324d..000000000 Binary files a/graphics/misc/unk_846BBD0.png and /dev/null differ diff --git a/graphics/misc/unk_846C520.bin b/graphics/misc/unk_846C520.bin deleted file mode 100644 index 093c0a5a5..000000000 Binary files a/graphics/misc/unk_846C520.bin and /dev/null differ diff --git a/graphics/misc/unk_846C8D8.pal b/graphics/misc/unk_846C8D8.pal deleted file mode 100644 index aca961de3..000000000 --- a/graphics/misc/unk_846C8D8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 156 197 -148 197 115 -172 222 123 -213 180 57 -238 205 65 -230 164 131 -246 189 172 -98 98 82 -164 148 90 -205 189 82 -255 238 74 -156 164 230 -90 90 106 -172 148 106 -230 205 123 -180 189 246 diff --git a/graphics/misc/unk_846C8F8.png b/graphics/misc/unk_846C8F8.png deleted file mode 100644 index b87d50659..000000000 Binary files a/graphics/misc/unk_846C8F8.png and /dev/null differ diff --git a/graphics/misc/unk_846D3A8.bin b/graphics/misc/unk_846D3A8.bin deleted file mode 100644 index b17c5052c..000000000 Binary files a/graphics/misc/unk_846D3A8.bin and /dev/null differ diff --git a/graphics/misc/unk_846D9E4.pal b/graphics/misc/unk_846D9E4.pal deleted file mode 100644 index 936a2b39f..000000000 --- a/graphics/misc/unk_846D9E4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 156 197 -65 148 74 -82 180 74 -106 205 74 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -98 98 82 -205 189 82 -255 246 82 -255 255 255 -238 172 131 -238 230 131 diff --git a/graphics/misc/unk_846DA04.pal b/graphics/misc/unk_846DA04.pal deleted file mode 100644 index d7fc1394b..000000000 --- a/graphics/misc/unk_846DA04.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -49 123 57 -65 139 57 -82 164 57 -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 -0 0 0 diff --git a/graphics/misc/unk_846DA24.png b/graphics/misc/unk_846DA24.png deleted file mode 100644 index 03d2f2778..000000000 Binary files a/graphics/misc/unk_846DA24.png and /dev/null differ diff --git a/graphics/misc/unk_846DB44.png b/graphics/misc/unk_846DB44.png deleted file mode 100644 index 6e397966e..000000000 Binary files a/graphics/misc/unk_846DB44.png and /dev/null differ diff --git a/graphics/misc/unk_846DD18.png b/graphics/misc/unk_846DD18.png deleted file mode 100644 index 907169a4c..000000000 Binary files a/graphics/misc/unk_846DD18.png and /dev/null differ diff --git a/graphics/misc/unk_846DE48.png b/graphics/misc/unk_846DE48.png deleted file mode 100644 index b238382a0..000000000 Binary files a/graphics/misc/unk_846DE48.png and /dev/null differ diff --git a/graphics/misc/unk_846DF44.png b/graphics/misc/unk_846DF44.png deleted file mode 100644 index 96abce388..000000000 Binary files a/graphics/misc/unk_846DF44.png and /dev/null differ -- cgit v1.2.3