diff --git a/data/rom_1.s b/data/rom_1.s index 7d61c72..d3d3d00 100644 --- a/data/rom_1.s +++ b/data/rom_1.s @@ -1405,38 +1405,38 @@ gUnknown_08158284:: @ 0x08158284 gUnknown_0815A6A4:: @ 0x0815A6A4 .incbin "baserom.gba", 0x15A6A4, 0x200 -gUnknown_0815A8A4:: @ 0x0815A8A4 - .incbin "baserom.gba", 0x15A8A4, 0x1C20 +gEvoExAppear_Gfx:: @ 0x0815A8A4 + .incbin "graphics/board_pickups/evo_item_ex.4bpp"; gUnknown_0815C4C4:: @ 0x0815C4C4 .incbin "baserom.gba", 0x15C4C4, 0x200 -gUnknown_0815C6C4:: @ 0x0815C6C4 - .incbin "baserom.gba", 0x15C6C4, 0x1C20 +gEvoLeafAppear_Gfx:: @ 0x0815C6C4 + .incbin "graphics/board_pickups/evo_item_leaf.4bpp"; -gUnknown_0815E2E4:: @ 0x0815E2E4 - .incbin "baserom.gba", 0x15E2E4, 0x1C20 +gEvoFireAppear_Gfx:: @ 0x0815E2E4 + .incbin "graphics/board_pickups/evo_item_fire.4bpp"; -gUnknown_0815FF04:: @ 0x0815FF04 - .incbin "baserom.gba", 0x15FF04, 0x1C20 +gEvoHeartAppear_Gfx:: @ 0x0815FF04 + .incbin "graphics/board_pickups/evo_item_heart.4bpp"; -gUnknown_08161B24:: @ 0x08161B24 - .incbin "baserom.gba", 0x161B24, 0x1C20 +gEvoLinkAppear_Gfx:: @ 0x08161B24 + .incbin "graphics/board_pickups/evo_item_link.4bpp"; -gUnknown_08163744:: @ 0x08163744 - .incbin "baserom.gba", 0x163744, 0x1C20 +gEvoMoonAppear_Gfx:: @ 0x08163744 + .incbin "graphics/board_pickups/evo_item_moon.4bpp"; -gUnknown_08165364:: @ 0x08165364 - .incbin "baserom.gba", 0x165364, 0x1C20 +gEvoWaterAppear_Gfx:: @ 0x08165364 + .incbin "graphics/board_pickups/evo_item_water.4bpp"; -gUnknown_08166F84:: @ 0x08166F84 - .incbin "baserom.gba", 0x166F84, 0x1C20 +gEvoBoxAppear_Gfx:: @ 0x08166F84 + .incbin "graphics/board_pickups/evo_item_box.4bpp"; -gUnknown_08168BA4:: @ 0x08168BA4 - .incbin "baserom.gba", 0x168BA4, 0x1C20 +gEvoSunAppear_Gfx:: @ 0x08168BA4 + .incbin "graphics/board_pickups/evo_item_sun.4bpp"; -gUnknown_0816A7C4:: @ 0x0816A7C4 - .incbin "baserom.gba", 0x16A7C4, 0x1C20 +gEvoBoltAppear_Gfx:: @ 0x0816A7C4 + .incbin "graphics/board_pickups/evo_item_bolt.4bpp"; gUnknown_0816C3E4:: @ 0x0816C3E4 .incbin "baserom.gba", 0x16C3E4, 0x42800 diff --git a/data/rom_2.s b/data/rom_2.s index e41752e..89f2d8d 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -630,17 +630,17 @@ gUnknown_086AD456:: @ 0x086AD456 .2byte 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006; .align 2, 0 -gUnknown_086AD474:: @ 0x086AD474 - .4byte gUnknown_0815A8A4 - .4byte gUnknown_0815C6C4 - .4byte gUnknown_0815E2E4 - .4byte gUnknown_08161B24 - .4byte gUnknown_08163744 - .4byte gUnknown_08165364 - .4byte gUnknown_0816A7C4 - .4byte gUnknown_08168BA4 - .4byte gUnknown_0815FF04 - .4byte gUnknown_08166F84 +gEvoItemAppear_GfxList:: @ 0x086AD474 + .4byte gEvoExAppear_Gfx + .4byte gEvoLeafAppear_Gfx + .4byte gEvoFireAppear_Gfx + .4byte gEvoLinkAppear_Gfx + .4byte gEvoMoonAppear_Gfx + .4byte gEvoWaterAppear_Gfx + .4byte gEvoBoltAppear_Gfx + .4byte gEvoSunAppear_Gfx + .4byte gEvoHeartAppear_Gfx + .4byte gEvoBoxAppear_Gfx gUnknown_086AD49C:: @ 0x086AD49C .4byte gPickupIcon1_Gfx diff --git a/graphics/board_pickups/evo_item_appear_1.png b/graphics/board_pickups/evo_item_appear_1.png new file mode 100644 index 0000000..72dc380 Binary files /dev/null and b/graphics/board_pickups/evo_item_appear_1.png differ diff --git a/graphics/board_pickups/evo_item_appear_2.png b/graphics/board_pickups/evo_item_appear_2.png new file mode 100644 index 0000000..c1ee79c Binary files /dev/null and b/graphics/board_pickups/evo_item_appear_2.png differ diff --git a/graphics/board_pickups/evo_item_appear_3.png b/graphics/board_pickups/evo_item_appear_3.png new file mode 100644 index 0000000..31c2651 Binary files /dev/null and b/graphics/board_pickups/evo_item_appear_3.png differ diff --git a/graphics/board_pickups/evo_item_appear_4.png b/graphics/board_pickups/evo_item_appear_4.png new file mode 100644 index 0000000..e8e46ff Binary files /dev/null and b/graphics/board_pickups/evo_item_appear_4.png differ diff --git a/graphics/board_pickups/evo_item_appear_5.png b/graphics/board_pickups/evo_item_appear_5.png new file mode 100644 index 0000000..b301558 Binary files /dev/null and b/graphics/board_pickups/evo_item_appear_5.png differ diff --git a/graphics/board_pickups/evo_item_appear_6.png b/graphics/board_pickups/evo_item_appear_6.png new file mode 100644 index 0000000..6ff08ff Binary files /dev/null and b/graphics/board_pickups/evo_item_appear_6.png differ diff --git a/graphics/board_pickups/evo_item_appear_7.png b/graphics/board_pickups/evo_item_appear_7.png new file mode 100644 index 0000000..4f0f1b1 Binary files /dev/null and b/graphics/board_pickups/evo_item_appear_7.png differ diff --git a/graphics/board_pickups/evo_item_appear_8.png b/graphics/board_pickups/evo_item_appear_8.png new file mode 100644 index 0000000..e8669d6 Binary files /dev/null and b/graphics/board_pickups/evo_item_appear_8.png differ diff --git a/graphics/board_pickups/evo_item_bolt_collected_fade.png b/graphics/board_pickups/evo_item_bolt_collected_fade.png new file mode 100644 index 0000000..9ee7ffd Binary files /dev/null and b/graphics/board_pickups/evo_item_bolt_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_bolt_turn_1.png b/graphics/board_pickups/evo_item_bolt_turn_1.png new file mode 100644 index 0000000..e91a601 Binary files /dev/null and b/graphics/board_pickups/evo_item_bolt_turn_1.png differ diff --git a/graphics/board_pickups/evo_item_bolt_turn_2.png b/graphics/board_pickups/evo_item_bolt_turn_2.png new file mode 100644 index 0000000..ccab2b1 Binary files /dev/null and b/graphics/board_pickups/evo_item_bolt_turn_2.png differ diff --git a/graphics/board_pickups/evo_item_bolt_turn_3.png b/graphics/board_pickups/evo_item_bolt_turn_3.png new file mode 100644 index 0000000..1bd421d Binary files /dev/null and b/graphics/board_pickups/evo_item_bolt_turn_3.png differ diff --git a/graphics/board_pickups/evo_item_bolt_turn_4.png b/graphics/board_pickups/evo_item_bolt_turn_4.png new file mode 100644 index 0000000..aaa31b8 Binary files /dev/null and b/graphics/board_pickups/evo_item_bolt_turn_4.png differ diff --git a/graphics/board_pickups/evo_item_bolt_turn_5.png b/graphics/board_pickups/evo_item_bolt_turn_5.png new file mode 100644 index 0000000..3372829 Binary files /dev/null and b/graphics/board_pickups/evo_item_bolt_turn_5.png differ diff --git a/graphics/board_pickups/evo_item_box_collected_fade.png b/graphics/board_pickups/evo_item_box_collected_fade.png new file mode 100644 index 0000000..3459106 Binary files /dev/null and b/graphics/board_pickups/evo_item_box_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_box_turn_1.png b/graphics/board_pickups/evo_item_box_turn_1.png new file mode 100644 index 0000000..6a6e3d1 Binary files /dev/null and b/graphics/board_pickups/evo_item_box_turn_1.png differ diff --git a/graphics/board_pickups/evo_item_box_turn_2.png b/graphics/board_pickups/evo_item_box_turn_2.png new file mode 100644 index 0000000..4bd0a02 Binary files /dev/null and b/graphics/board_pickups/evo_item_box_turn_2.png differ diff --git a/graphics/board_pickups/evo_item_box_turn_3.png b/graphics/board_pickups/evo_item_box_turn_3.png new file mode 100644 index 0000000..83c8449 Binary files /dev/null and b/graphics/board_pickups/evo_item_box_turn_3.png differ diff --git a/graphics/board_pickups/evo_item_box_turn_4.png b/graphics/board_pickups/evo_item_box_turn_4.png new file mode 100644 index 0000000..5370394 Binary files /dev/null and b/graphics/board_pickups/evo_item_box_turn_4.png differ diff --git a/graphics/board_pickups/evo_item_box_turn_5.png b/graphics/board_pickups/evo_item_box_turn_5.png new file mode 100644 index 0000000..9af69b0 Binary files /dev/null and b/graphics/board_pickups/evo_item_box_turn_5.png differ diff --git a/graphics/board_pickups/evo_item_ex_collected_fade.png b/graphics/board_pickups/evo_item_ex_collected_fade.png new file mode 100644 index 0000000..b917b6c Binary files /dev/null and b/graphics/board_pickups/evo_item_ex_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_ex_turn_1.png b/graphics/board_pickups/evo_item_ex_turn_1.png new file mode 100644 index 0000000..2f2eef2 Binary files /dev/null and b/graphics/board_pickups/evo_item_ex_turn_1.png differ diff --git a/graphics/board_pickups/evo_item_ex_turn_2.png b/graphics/board_pickups/evo_item_ex_turn_2.png new file mode 100644 index 0000000..ede9d8f Binary files /dev/null and b/graphics/board_pickups/evo_item_ex_turn_2.png differ diff --git a/graphics/board_pickups/evo_item_ex_turn_3.png b/graphics/board_pickups/evo_item_ex_turn_3.png new file mode 100644 index 0000000..3e84696 Binary files /dev/null and b/graphics/board_pickups/evo_item_ex_turn_3.png differ diff --git a/graphics/board_pickups/evo_item_ex_turn_4.png b/graphics/board_pickups/evo_item_ex_turn_4.png new file mode 100644 index 0000000..1609aca Binary files /dev/null and b/graphics/board_pickups/evo_item_ex_turn_4.png differ diff --git a/graphics/board_pickups/evo_item_ex_turn_5.png b/graphics/board_pickups/evo_item_ex_turn_5.png new file mode 100644 index 0000000..7e5d200 Binary files /dev/null and b/graphics/board_pickups/evo_item_ex_turn_5.png differ diff --git a/graphics/board_pickups/evo_item_fire_collected_fade.png b/graphics/board_pickups/evo_item_fire_collected_fade.png new file mode 100644 index 0000000..036c453 Binary files /dev/null and b/graphics/board_pickups/evo_item_fire_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_fire_turn_1.png b/graphics/board_pickups/evo_item_fire_turn_1.png new file mode 100644 index 0000000..8a43e88 Binary files /dev/null and b/graphics/board_pickups/evo_item_fire_turn_1.png differ diff --git a/graphics/board_pickups/evo_item_fire_turn_2.png b/graphics/board_pickups/evo_item_fire_turn_2.png new file mode 100644 index 0000000..c02e568 Binary files /dev/null and b/graphics/board_pickups/evo_item_fire_turn_2.png differ diff --git a/graphics/board_pickups/evo_item_fire_turn_3.png b/graphics/board_pickups/evo_item_fire_turn_3.png new file mode 100644 index 0000000..db541c5 Binary files /dev/null and b/graphics/board_pickups/evo_item_fire_turn_3.png differ diff --git a/graphics/board_pickups/evo_item_fire_turn_4.png b/graphics/board_pickups/evo_item_fire_turn_4.png new file mode 100644 index 0000000..3e0628f Binary files /dev/null and b/graphics/board_pickups/evo_item_fire_turn_4.png differ diff --git a/graphics/board_pickups/evo_item_fire_turn_5.png b/graphics/board_pickups/evo_item_fire_turn_5.png new file mode 100644 index 0000000..26dc776 Binary files /dev/null and b/graphics/board_pickups/evo_item_fire_turn_5.png differ diff --git a/graphics/board_pickups/evo_item_heart_collected_fade.png b/graphics/board_pickups/evo_item_heart_collected_fade.png new file mode 100644 index 0000000..8bc2d1e Binary files /dev/null and b/graphics/board_pickups/evo_item_heart_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_heart_turn_1.png b/graphics/board_pickups/evo_item_heart_turn_1.png new file mode 100644 index 0000000..7a59c55 Binary files /dev/null and b/graphics/board_pickups/evo_item_heart_turn_1.png differ diff --git a/graphics/board_pickups/evo_item_heart_turn_2.png b/graphics/board_pickups/evo_item_heart_turn_2.png new file mode 100644 index 0000000..caf669d Binary files /dev/null and b/graphics/board_pickups/evo_item_heart_turn_2.png differ diff --git a/graphics/board_pickups/evo_item_heart_turn_3.png b/graphics/board_pickups/evo_item_heart_turn_3.png new file mode 100644 index 0000000..3319a22 Binary files /dev/null and b/graphics/board_pickups/evo_item_heart_turn_3.png differ diff --git a/graphics/board_pickups/evo_item_heart_turn_4.png b/graphics/board_pickups/evo_item_heart_turn_4.png new file mode 100644 index 0000000..6fcf8f6 Binary files /dev/null and b/graphics/board_pickups/evo_item_heart_turn_4.png differ diff --git a/graphics/board_pickups/evo_item_heart_turn_5.png b/graphics/board_pickups/evo_item_heart_turn_5.png new file mode 100644 index 0000000..256e1cb Binary files /dev/null and b/graphics/board_pickups/evo_item_heart_turn_5.png differ diff --git a/graphics/board_pickups/evo_item_leaf_collected_fade.png b/graphics/board_pickups/evo_item_leaf_collected_fade.png new file mode 100644 index 0000000..cd67274 Binary files /dev/null and b/graphics/board_pickups/evo_item_leaf_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_leaf_turn_1.png b/graphics/board_pickups/evo_item_leaf_turn_1.png new file mode 100644 index 0000000..605ffb5 Binary files /dev/null and b/graphics/board_pickups/evo_item_leaf_turn_1.png differ diff --git a/graphics/board_pickups/evo_item_leaf_turn_2.png b/graphics/board_pickups/evo_item_leaf_turn_2.png new file mode 100644 index 0000000..5db53d7 Binary files /dev/null and b/graphics/board_pickups/evo_item_leaf_turn_2.png differ diff --git a/graphics/board_pickups/evo_item_leaf_turn_3.png b/graphics/board_pickups/evo_item_leaf_turn_3.png new file mode 100644 index 0000000..45a5e05 Binary files /dev/null and b/graphics/board_pickups/evo_item_leaf_turn_3.png differ diff --git a/graphics/board_pickups/evo_item_leaf_turn_4.png b/graphics/board_pickups/evo_item_leaf_turn_4.png new file mode 100644 index 0000000..8e9058c Binary files /dev/null and b/graphics/board_pickups/evo_item_leaf_turn_4.png differ diff --git a/graphics/board_pickups/evo_item_leaf_turn_5.png b/graphics/board_pickups/evo_item_leaf_turn_5.png new file mode 100644 index 0000000..85085be Binary files /dev/null and b/graphics/board_pickups/evo_item_leaf_turn_5.png differ diff --git a/graphics/board_pickups/evo_item_link_collected_fade.png b/graphics/board_pickups/evo_item_link_collected_fade.png new file mode 100644 index 0000000..756da05 Binary files /dev/null and b/graphics/board_pickups/evo_item_link_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_link_turn_1.png b/graphics/board_pickups/evo_item_link_turn_1.png new file mode 100644 index 0000000..1a46e49 Binary files /dev/null and b/graphics/board_pickups/evo_item_link_turn_1.png differ diff --git a/graphics/board_pickups/evo_item_link_turn_2.png b/graphics/board_pickups/evo_item_link_turn_2.png new file mode 100644 index 0000000..d22cef8 Binary files /dev/null and b/graphics/board_pickups/evo_item_link_turn_2.png differ diff --git a/graphics/board_pickups/evo_item_link_turn_3.png b/graphics/board_pickups/evo_item_link_turn_3.png new file mode 100644 index 0000000..e7d5056 Binary files /dev/null and b/graphics/board_pickups/evo_item_link_turn_3.png differ diff --git a/graphics/board_pickups/evo_item_link_turn_4.png b/graphics/board_pickups/evo_item_link_turn_4.png new file mode 100644 index 0000000..a4f31f5 Binary files /dev/null and b/graphics/board_pickups/evo_item_link_turn_4.png differ diff --git a/graphics/board_pickups/evo_item_link_turn_5.png b/graphics/board_pickups/evo_item_link_turn_5.png new file mode 100644 index 0000000..b514eee Binary files /dev/null and b/graphics/board_pickups/evo_item_link_turn_5.png differ diff --git a/graphics/board_pickups/evo_item_moon_collected_fade.png b/graphics/board_pickups/evo_item_moon_collected_fade.png new file mode 100644 index 0000000..46b37e5 Binary files /dev/null and b/graphics/board_pickups/evo_item_moon_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_moon_turn_1.png b/graphics/board_pickups/evo_item_moon_turn_1.png new file mode 100644 index 0000000..b99702d Binary files /dev/null and b/graphics/board_pickups/evo_item_moon_turn_1.png differ diff --git a/graphics/board_pickups/evo_item_moon_turn_2.png b/graphics/board_pickups/evo_item_moon_turn_2.png new file mode 100644 index 0000000..93e9a2e Binary files /dev/null and b/graphics/board_pickups/evo_item_moon_turn_2.png differ diff --git a/graphics/board_pickups/evo_item_moon_turn_3.png b/graphics/board_pickups/evo_item_moon_turn_3.png new file mode 100644 index 0000000..7e568c3 Binary files /dev/null and b/graphics/board_pickups/evo_item_moon_turn_3.png differ diff --git a/graphics/board_pickups/evo_item_moon_turn_4.png b/graphics/board_pickups/evo_item_moon_turn_4.png new file mode 100644 index 0000000..79ef134 Binary files /dev/null and b/graphics/board_pickups/evo_item_moon_turn_4.png differ diff --git a/graphics/board_pickups/evo_item_moon_turn_5.png b/graphics/board_pickups/evo_item_moon_turn_5.png new file mode 100644 index 0000000..6088618 Binary files /dev/null and b/graphics/board_pickups/evo_item_moon_turn_5.png differ diff --git a/graphics/board_pickups/evo_item_sparkle_1.png b/graphics/board_pickups/evo_item_sparkle_1.png new file mode 100644 index 0000000..4c779de Binary files /dev/null and b/graphics/board_pickups/evo_item_sparkle_1.png differ diff --git a/graphics/board_pickups/evo_item_sparkle_2.png b/graphics/board_pickups/evo_item_sparkle_2.png new file mode 100644 index 0000000..3a4cdbb Binary files /dev/null and b/graphics/board_pickups/evo_item_sparkle_2.png differ diff --git a/graphics/board_pickups/evo_item_sparkle_3.png b/graphics/board_pickups/evo_item_sparkle_3.png new file mode 100644 index 0000000..0c661f5 Binary files /dev/null and b/graphics/board_pickups/evo_item_sparkle_3.png differ diff --git a/graphics/board_pickups/evo_item_sun_appear_1.png b/graphics/board_pickups/evo_item_sun_appear_1.png new file mode 100644 index 0000000..e7900d6 Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_appear_1.png differ diff --git a/graphics/board_pickups/evo_item_sun_appear_2.png b/graphics/board_pickups/evo_item_sun_appear_2.png new file mode 100644 index 0000000..edc8174 Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_appear_2.png differ diff --git a/graphics/board_pickups/evo_item_sun_appear_3.png b/graphics/board_pickups/evo_item_sun_appear_3.png new file mode 100644 index 0000000..005d0e6 Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_appear_3.png differ diff --git a/graphics/board_pickups/evo_item_sun_appear_4.png b/graphics/board_pickups/evo_item_sun_appear_4.png new file mode 100644 index 0000000..388579b Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_appear_4.png differ diff --git a/graphics/board_pickups/evo_item_sun_appear_5.png b/graphics/board_pickups/evo_item_sun_appear_5.png new file mode 100644 index 0000000..b301558 Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_appear_5.png differ diff --git a/graphics/board_pickups/evo_item_sun_appear_6.png b/graphics/board_pickups/evo_item_sun_appear_6.png new file mode 100644 index 0000000..6ff08ff Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_appear_6.png differ diff --git a/graphics/board_pickups/evo_item_sun_appear_7.png b/graphics/board_pickups/evo_item_sun_appear_7.png new file mode 100644 index 0000000..4f0f1b1 Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_appear_7.png differ diff --git a/graphics/board_pickups/evo_item_sun_appear_8.png b/graphics/board_pickups/evo_item_sun_appear_8.png new file mode 100644 index 0000000..e8669d6 Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_appear_8.png differ diff --git a/graphics/board_pickups/evo_item_sun_collected_fade.png b/graphics/board_pickups/evo_item_sun_collected_fade.png new file mode 100644 index 0000000..e7c4502 Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_sun_sparkle_1.png b/graphics/board_pickups/evo_item_sun_sparkle_1.png new file mode 100644 index 0000000..4c779de Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_sparkle_1.png differ diff --git a/graphics/board_pickups/evo_item_sun_sparkle_2.png b/graphics/board_pickups/evo_item_sun_sparkle_2.png new file mode 100644 index 0000000..3a4cdbb Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_sparkle_2.png differ diff --git a/graphics/board_pickups/evo_item_sun_sparkle_3.png b/graphics/board_pickups/evo_item_sun_sparkle_3.png new file mode 100644 index 0000000..0c661f5 Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_sparkle_3.png differ diff --git a/graphics/board_pickups/evo_item_sun_turn_1.png b/graphics/board_pickups/evo_item_sun_turn_1.png new file mode 100644 index 0000000..e38e7b2 Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_turn_1.png differ diff --git a/graphics/board_pickups/evo_item_sun_turn_2.png b/graphics/board_pickups/evo_item_sun_turn_2.png new file mode 100644 index 0000000..9c567ed Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_turn_2.png differ diff --git a/graphics/board_pickups/evo_item_sun_turn_3.png b/graphics/board_pickups/evo_item_sun_turn_3.png new file mode 100644 index 0000000..6164fbe Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_turn_3.png differ diff --git a/graphics/board_pickups/evo_item_sun_turn_4.png b/graphics/board_pickups/evo_item_sun_turn_4.png new file mode 100644 index 0000000..31ebd8e Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_turn_4.png differ diff --git a/graphics/board_pickups/evo_item_sun_turn_5.png b/graphics/board_pickups/evo_item_sun_turn_5.png new file mode 100644 index 0000000..1607ffb Binary files /dev/null and b/graphics/board_pickups/evo_item_sun_turn_5.png differ diff --git a/graphics/board_pickups/evo_item_water_collected_fade.png b/graphics/board_pickups/evo_item_water_collected_fade.png new file mode 100644 index 0000000..b4ea99a Binary files /dev/null and b/graphics/board_pickups/evo_item_water_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_water_turn_1.png b/graphics/board_pickups/evo_item_water_turn_1.png new file mode 100644 index 0000000..70a9435 Binary files /dev/null and b/graphics/board_pickups/evo_item_water_turn_1.png differ diff --git a/graphics/board_pickups/evo_item_water_turn_2.png b/graphics/board_pickups/evo_item_water_turn_2.png new file mode 100644 index 0000000..035d59b Binary files /dev/null and b/graphics/board_pickups/evo_item_water_turn_2.png differ diff --git a/graphics/board_pickups/evo_item_water_turn_3.png b/graphics/board_pickups/evo_item_water_turn_3.png new file mode 100644 index 0000000..b010928 Binary files /dev/null and b/graphics/board_pickups/evo_item_water_turn_3.png differ diff --git a/graphics/board_pickups/evo_item_water_turn_4.png b/graphics/board_pickups/evo_item_water_turn_4.png new file mode 100644 index 0000000..25bf0d1 Binary files /dev/null and b/graphics/board_pickups/evo_item_water_turn_4.png differ diff --git a/graphics/board_pickups/evo_item_water_turn_5.png b/graphics/board_pickups/evo_item_water_turn_5.png new file mode 100644 index 0000000..3e5014e Binary files /dev/null and b/graphics/board_pickups/evo_item_water_turn_5.png differ diff --git a/graphics/board_pickups/gfx_segments.json b/graphics/board_pickups/gfx_segments.json new file mode 100644 index 0000000..64ad98e --- /dev/null +++ b/graphics/board_pickups/gfx_segments.json @@ -0,0 +1,813 @@ +{ + "kind": "gfx-config", + "version": 1, + "defaults": { + "mwidth": 0, + "mheight": 0, + "oam": false, + "width": 16, + "palette": "" + }, + "files": [ + { + "gfx_filename": "evo_item_ex", + "align":1, + "segments": [ + { + "segfile": "evo_item_appear_1", + "width": 4 + }, + { + "segfile": "evo_item_appear_2", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_3", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_4", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_5", + "width": 4 + }, + { + "segfile": "evo_item_appear_6", + "width": 4 + }, + { + "segfile": "evo_item_ex_turn_1", + "width": 2 + }, + { + "segfile": "evo_item_appear_7", + "width": 4 + }, + { + "segfile": "evo_item_ex_turn_2", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_1", + "width": 2 + }, + { + "segfile": "evo_item_ex_turn_3", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_2", + "width": 2 + }, + { + "segfile": "evo_item_ex_turn_4", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_3", + "width": 2 + }, + { + "segfile": "evo_item_appear_8", + "width": 4 + }, + { + "segfile": "evo_item_ex_turn_5", + "width": 2 + }, + { + "segfile": "evo_item_ex_collected_fade", + "width": 2 + } + ] + }, + { + "gfx_filename": "evo_item_leaf", + "align":1, + "segments": [ + { + "segfile": "evo_item_appear_1", + "width": 4 + }, + { + "segfile": "evo_item_appear_2", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_3", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_4", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_5", + "width": 4 + }, + { + "segfile": "evo_item_appear_6", + "width": 4 + }, + { + "segfile": "evo_item_leaf_turn_1", + "width": 2 + }, + { + "segfile": "evo_item_appear_7", + "width": 4 + }, + { + "segfile": "evo_item_leaf_turn_2", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_1", + "width": 2 + }, + { + "segfile": "evo_item_leaf_turn_3", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_2", + "width": 2 + }, + { + "segfile": "evo_item_leaf_turn_4", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_3", + "width": 2 + }, + { + "segfile": "evo_item_appear_8", + "width": 4 + }, + { + "segfile": "evo_item_leaf_turn_5", + "width": 2 + }, + { + "segfile": "evo_item_leaf_collected_fade", + "width": 2 + } + ] + }, + { + "gfx_filename": "evo_item_fire", + "align":1, + "segments": [ + { + "segfile": "evo_item_appear_1", + "width": 4 + }, + { + "segfile": "evo_item_appear_2", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_3", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_4", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_5", + "width": 4 + }, + { + "segfile": "evo_item_appear_6", + "width": 4 + }, + { + "segfile": "evo_item_fire_turn_1", + "width": 2 + }, + { + "segfile": "evo_item_appear_7", + "width": 4 + }, + { + "segfile": "evo_item_fire_turn_2", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_1", + "width": 2 + }, + { + "segfile": "evo_item_fire_turn_3", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_2", + "width": 2 + }, + { + "segfile": "evo_item_fire_turn_4", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_3", + "width": 2 + }, + { + "segfile": "evo_item_appear_8", + "width": 4 + }, + { + "segfile": "evo_item_fire_turn_5", + "width": 2 + }, + { + "segfile": "evo_item_fire_collected_fade", + "width": 2 + } + ] + }, + { + "gfx_filename": "evo_item_heart", + "align":1, + "segments": [ + { + "segfile": "evo_item_appear_1", + "width": 4 + }, + { + "segfile": "evo_item_appear_2", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_3", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_4", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_5", + "width": 4 + }, + { + "segfile": "evo_item_appear_6", + "width": 4 + }, + { + "segfile": "evo_item_heart_turn_1", + "width": 2 + }, + { + "segfile": "evo_item_appear_7", + "width": 4 + }, + { + "segfile": "evo_item_heart_turn_2", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_1", + "width": 2 + }, + { + "segfile": "evo_item_heart_turn_3", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_2", + "width": 2 + }, + { + "segfile": "evo_item_heart_turn_4", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_3", + "width": 2 + }, + { + "segfile": "evo_item_appear_8", + "width": 4 + }, + { + "segfile": "evo_item_heart_turn_5", + "width": 2 + }, + { + "segfile": "evo_item_heart_collected_fade", + "width": 2 + } + ] + }, + { + "gfx_filename": "evo_item_link", + "align":1, + "segments": [ + { + "segfile": "evo_item_appear_1", + "width": 4 + }, + { + "segfile": "evo_item_appear_2", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_3", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_4", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_5", + "width": 4 + }, + { + "segfile": "evo_item_appear_6", + "width": 4 + }, + { + "segfile": "evo_item_link_turn_1", + "width": 2 + }, + { + "segfile": "evo_item_appear_7", + "width": 4 + }, + { + "segfile": "evo_item_link_turn_2", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_1", + "width": 2 + }, + { + "segfile": "evo_item_link_turn_3", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_2", + "width": 2 + }, + { + "segfile": "evo_item_link_turn_4", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_3", + "width": 2 + }, + { + "segfile": "evo_item_appear_8", + "width": 4 + }, + { + "segfile": "evo_item_link_turn_5", + "width": 2 + }, + { + "segfile": "evo_item_link_collected_fade", + "width": 2 + } + ] + }, + { + "gfx_filename": "evo_item_moon", + "align":1, + "segments": [ + { + "segfile": "evo_item_appear_1", + "width": 4 + }, + { + "segfile": "evo_item_appear_2", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_3", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_4", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_5", + "width": 4 + }, + { + "segfile": "evo_item_appear_6", + "width": 4 + }, + { + "segfile": "evo_item_moon_turn_1", + "width": 2 + }, + { + "segfile": "evo_item_appear_7", + "width": 4 + }, + { + "segfile": "evo_item_moon_turn_2", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_1", + "width": 2 + }, + { + "segfile": "evo_item_moon_turn_3", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_2", + "width": 2 + }, + { + "segfile": "evo_item_moon_turn_4", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_3", + "width": 2 + }, + { + "segfile": "evo_item_appear_8", + "width": 4 + }, + { + "segfile": "evo_item_moon_turn_5", + "width": 2 + }, + { + "segfile": "evo_item_moon_collected_fade", + "width": 2 + } + ] + }, + { + "gfx_filename": "evo_item_water", + "align":1, + "segments": [ + { + "segfile": "evo_item_appear_1", + "width": 4 + }, + { + "segfile": "evo_item_appear_2", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_3", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_4", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_5", + "width": 4 + }, + { + "segfile": "evo_item_appear_6", + "width": 4 + }, + { + "segfile": "evo_item_water_turn_1", + "width": 2 + }, + { + "segfile": "evo_item_appear_7", + "width": 4 + }, + { + "segfile": "evo_item_water_turn_2", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_1", + "width": 2 + }, + { + "segfile": "evo_item_water_turn_3", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_2", + "width": 2 + }, + { + "segfile": "evo_item_water_turn_4", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_3", + "width": 2 + }, + { + "segfile": "evo_item_appear_8", + "width": 4 + }, + { + "segfile": "evo_item_water_turn_5", + "width": 2 + }, + { + "segfile": "evo_item_water_collected_fade", + "width": 2 + } + ] + }, + { + "gfx_filename": "evo_item_box", + "align":1, + "segments": [ + { + "segfile": "evo_item_appear_1", + "width": 4 + }, + { + "segfile": "evo_item_appear_2", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_3", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_4", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_5", + "width": 4 + }, + { + "segfile": "evo_item_appear_6", + "width": 4 + }, + { + "segfile": "evo_item_box_turn_1", + "width": 2 + }, + { + "segfile": "evo_item_appear_7", + "width": 4 + }, + { + "segfile": "evo_item_box_turn_2", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_1", + "width": 2 + }, + { + "segfile": "evo_item_box_turn_3", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_2", + "width": 2 + }, + { + "segfile": "evo_item_box_turn_4", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_3", + "width": 2 + }, + { + "segfile": "evo_item_appear_8", + "width": 4 + }, + { + "segfile": "evo_item_box_turn_5", + "width": 2 + }, + { + "segfile": "evo_item_box_collected_fade", + "width": 2 + } + ] + }, + { + "gfx_filename": "evo_item_sun", + "align":1, + "segments": [ + { + "segfile": "evo_item_sun_appear_1", + "width": 4 + }, + { + "segfile": "evo_item_sun_appear_2", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_sun_appear_3", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_sun_appear_4", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_sun_appear_5", + "width": 4 + }, + { + "segfile": "evo_item_sun_appear_6", + "width": 4 + }, + { + "segfile": "evo_item_sun_turn_1", + "width": 2 + }, + { + "segfile": "evo_item_sun_appear_7", + "width": 4 + }, + { + "segfile": "evo_item_sun_turn_2", + "width": 2 + }, + { + "segfile": "evo_item_sun_sparkle_1", + "width": 2 + }, + { + "segfile": "evo_item_sun_turn_3", + "width": 2 + }, + { + "segfile": "evo_item_sun_sparkle_2", + "width": 2 + }, + { + "segfile": "evo_item_sun_turn_4", + "width": 2 + }, + { + "segfile": "evo_item_sun_sparkle_3", + "width": 2 + }, + { + "segfile": "evo_item_sun_appear_8", + "width": 4 + }, + { + "segfile": "evo_item_sun_turn_5", + "width": 2 + }, + { + "segfile": "evo_item_sun_collected_fade", + "width": 2 + } + ] + }, + { + "gfx_filename": "evo_item_bolt", + "align":1, + "segments": [ + { + "segfile": "evo_item_appear_1", + "width": 4 + }, + { + "segfile": "evo_item_appear_2", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_3", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_4", + "oam": true, + "mwidth": 6, + "mheight": 6 + }, + { + "segfile": "evo_item_appear_5", + "width": 4 + }, + { + "segfile": "evo_item_appear_6", + "width": 4 + }, + { + "segfile": "evo_item_bolt_turn_1", + "width": 2 + }, + { + "segfile": "evo_item_appear_7", + "width": 4 + }, + { + "segfile": "evo_item_bolt_turn_2", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_1", + "width": 2 + }, + { + "segfile": "evo_item_bolt_turn_3", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_2", + "width": 2 + }, + { + "segfile": "evo_item_bolt_turn_4", + "width": 2 + }, + { + "segfile": "evo_item_sparkle_3", + "width": 2 + }, + { + "segfile": "evo_item_appear_8", + "width": 4 + }, + { + "segfile": "evo_item_bolt_turn_5", + "width": 2 + }, + { + "segfile": "evo_item_bolt_collected_fade", + "width": 2 + } + ] + } + ] +} diff --git a/src/pinball_game_main.c b/src/pinball_game_main.c index 2a435c9..90fd040 100644 --- a/src/pinball_game_main.c +++ b/src/pinball_game_main.c @@ -47,7 +47,7 @@ extern const u8 gMainBoardEndOfBall_Gfx[]; extern const u8 gSapphireBoardZigzagoonFx_Gfx[]; extern const s16 gUnknown_086ACFE0[]; extern const u16 gUnknown_086AD2DE[]; -extern const u8 *gUnknown_086AD474[]; +extern const u8 *gEvoItemAppear_GfxList[]; extern const s16 gUnknown_086AD456[][7]; extern const u8 gRubyBoardHatchCave_Gfx[][0x480]; extern const u8 gUnknown_083C3C2C[][0x300]; @@ -1311,7 +1311,7 @@ void sub_4BC34(void) } break; case 14: - DmaCopy16(3, gUnknown_086AD474[gCurrentPinballGame->unk25F], (void *)0x6015800, 0x1C00); + DmaCopy16(3, gEvoItemAppear_GfxList[gCurrentPinballGame->unk25F], (void *)0x6015800, 0x1C00); break; case 15: DmaCopy16(3, gUnknown_08158284, (void *)0x6015800, 0x2400); diff --git a/src/rom_27E08.c b/src/rom_27E08.c index 41d4c17..83951b5 100644 --- a/src/rom_27E08.c +++ b/src/rom_27E08.c @@ -6,7 +6,7 @@ #define BONUS_CATCH_TIME 7200 //2 minutes, 60FPS extern const u8 gUnknown_081C0064[]; -extern const u8 *gUnknown_086AD474[]; +extern const u8 *gEvoItemAppear_GfxList[]; extern const u8 gUnknown_0815C4C4[][0x20]; extern const s16 gUnknown_086AE0E6[]; extern const u16 gUnknown_086B4202[58][15]; @@ -3380,7 +3380,7 @@ void sub_278F4(void) if (gCurrentPinballGame->unk26E == 80) { gCurrentPinballGame->unkE4 = 15; - DmaCopy16(3, gUnknown_086AD474[gCurrentPinballGame->unk25F], (void *)0x06015800, 0x1C00); + DmaCopy16(3, gEvoItemAppear_GfxList[gCurrentPinballGame->unk25F], (void *)0x06015800, 0x1C00); DmaCopy16(3, &gUnknown_0815C4C4[gCurrentPinballGame->unk25F], (void *)0x050003E0, 0x20); gCurrentPinballGame->unk626 = 0; gCurrentPinballGame->unk628 = 0;