diff --git a/assets.yaml b/assets.yaml index aa57e4a4..40f89cc9 100644 --- a/assets.yaml +++ b/assets.yaml @@ -54773,6 +54773,18 @@ - path: assets/data_08132B30/gUnk_081FF1B4.bin start: 0x1ff1b4 size: 0x19300 +- path: graphics/npc/postman.4bpp + start: 0x2184b4 + size: 0x5800 + type: graphic + options: + width: 2 +- path: graphics/npc/malon.4bpp + start: 0x21dcb4 + size: 0xc40 + type: graphic + options: + width: 2 - path: assets/data_08132B30/gUnk_081FF1B4_1.bin start: 0x21e8f4 size: 0x2d07 @@ -54796,6 +54808,10 @@ - path: assets/data_08132B30/gUnk_082474D4.bin start: 0x2474d4 size: 0x8d3c0 +- path: graphics/pot_portal.4bpp + start: 0x2d4894 + size: 0x1200 + type: graphic - path: assets/data_08132B30/gUnk_082D4894.bin start: 0x2d5a94 size: 0x10e60 @@ -55031,9 +55047,21 @@ - path: assets/data_08132B30/gUnk_08324AE4.bin start: 0x324ae4 size: 0x3d0 -- path: assets/data_08132B30/gUnk_08324AE4_1.bin +- path: tilesets/gTileset_MinishWoods_0_0.4bpp.lz + start: 0x324eb4 + size: 0x2c54 + type: tileset +- path: tilesets/gTileset_MinishWoods_0_1.4bpp.lz start: 0x327b08 - size: 0x1db6f + size: 0x25f0 + type: tileset +- path: tilesets/gTileset_MinishWoods_0_2.4bpp.lz + start: 0x32a0f8 + size: 0x20f0 + type: tileset +- path: assets/data_08132B30/gUnk_08324AE4_1.bin + start: 0x32c1e8 + size: 0x1948f - path: assets/data_08132B30/gUnk_08324AE4_2_EU.bin variants: - EU @@ -55503,6 +55531,14 @@ - path: assets/data_08132B30/gUnk_085BD520.bin start: 0x5bd520 size: 0x100 +- path: graphics/intro/capcom.gbapal + start: 0x5bd620 + size: 0x20 + type: palette +- path: graphics/intro/nintendo.gbapal + start: 0x5bd640 + size: 0x20 + type: palette - path: assets/data_08132B30/gUnk_085BD520_1.bin start: 0x5bd660 size: 0x6fc0 @@ -56014,6 +56050,10 @@ - path: assets/data_08132B30/gUnk_088C00E0.bin start: 0x8c00e0 size: 0x21a0 +- path: graphics/intro/nintendo_capcom.4bpp + start: 0x8c2280 + size: 0xf60 + type: graphic - path: assets/data_08132B30/gUnk_088C00E0_1.bin start: 0x8c31e0 size: 0x3d440 diff --git a/data/data_08132B30.s b/data/data_08132B30.s index e3c7ff63..c194a1f7 100644 --- a/data/data_08132B30.s +++ b/data/data_08132B30.s @@ -2745,11 +2745,7 @@ gUnk_081DF834:: @ 081DF834 gUnk_081FF1B4:: @ 081FF1B4 .incbin "assets/data_08132B30/gUnk_081FF1B4.bin" - -@ 0x2184B4 - 0x21DCB3 .incbin "graphics/npc/postman.4bpp" - -@ 0x21DCB4 - 0x21E913 .incbin "graphics/npc/malon.4bpp" .incbin "assets/data_08132B30/gUnk_081FF1B4_1.bin" .ifdef EU @@ -2871,7 +2867,9 @@ gUnk_082F3D74:: @ 082F3D74 gUnk_08324AE4:: @ 08324AE4 .incbin "assets/data_08132B30/gUnk_08324AE4.bin" - .incbin "data/tilesets/minish_woods/tiles_bottom.4bpp.lz" + .incbin "tilesets/gTileset_MinishWoods_0_0.4bpp.lz" + .incbin "tilesets/gTileset_MinishWoods_0_1.4bpp.lz" + .incbin "tilesets/gTileset_MinishWoods_0_2.4bpp.lz" .incbin "assets/data_08132B30/gUnk_08324AE4_1.bin" @ TODO EU differs from here diff --git a/data/tilesets/minish_woods/tiles_bottom.png b/data/tilesets/minish_woods/tiles_bottom.png deleted file mode 100644 index d7d8b39b..00000000 Binary files a/data/tilesets/minish_woods/tiles_bottom.png and /dev/null differ diff --git a/graphics/font.png b/graphics/font.png deleted file mode 100644 index fe121323..00000000 Binary files a/graphics/font.png and /dev/null differ diff --git a/graphics/intro/capcom.pal b/graphics/intro/capcom.pal deleted file mode 100644 index 97dc7b18..00000000 --- a/graphics/intro/capcom.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -41 0 238 -74 115 180 -98 131 123 -139 156 106 -205 164 24 -238 197 49 -255 230 0 -106 139 189 -164 172 197 -213 213 222 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/intro/nintendo.pal b/graphics/intro/nintendo.pal deleted file mode 100644 index 32b3f094..00000000 --- a/graphics/intro/nintendo.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -255 57 0 -255 98 8 -255 131 41 -255 156 74 -255 180 115 -255 205 156 -255 238 213 -255 255 255 -255 156 74 -255 180 115 -255 205 156 -255 238 213 -0 0 0 -0 0 0 -255 222 0 diff --git a/graphics/intro/nintendo_capcom.png b/graphics/intro/nintendo_capcom.png deleted file mode 100644 index a9b6fad1..00000000 Binary files a/graphics/intro/nintendo_capcom.png and /dev/null differ diff --git a/graphics/npc/malon.png b/graphics/npc/malon.png deleted file mode 100644 index 9eeef700..00000000 Binary files a/graphics/npc/malon.png and /dev/null differ diff --git a/graphics/npc/postman.png b/graphics/npc/postman.png deleted file mode 100644 index 13c22549..00000000 Binary files a/graphics/npc/postman.png and /dev/null differ diff --git a/graphics/pot_portal.png b/graphics/pot_portal.png deleted file mode 100644 index ff5dd252..00000000 Binary files a/graphics/pot_portal.png and /dev/null differ