diff --git a/data/rom_1.s b/data/rom_1.s index 2110bebf..5c81c0c9 100644 --- a/data/rom_1.s +++ b/data/rom_1.s @@ -753,7 +753,11 @@ gPinballGameStateFuncs:: @ 0x08137E04 .4byte PinballGame_State3_4B20C @ called once after game over? gBallPalettes:: @ 0x08137E14 - .incbin "baserom.gba", 0x137E14, 0x100 + .incbin "graphics/stage/main/pokeball_regular.gbapal" + .incbin "graphics/stage/main/pokeball_great.gbapal" + .incbin "graphics/stage/main/pokeball_ultra.gbapal" + .incbin "graphics/stage/main/pokeball_master.gbapal" + .incbin "baserom.gba", 0x137E94, 0x80 gBallFlashPalette:: @ 0x08137F14 .incbin "baserom.gba", 0x137F14, 0x100 @@ -821,7 +825,18 @@ gEvoExAppear_Gfx:: @ 0x0815A8A4 .incbin "graphics/board_pickups/evo_item_ex.4bpp"; gEvoItemPalettes:: @ 0x0815C4C4 - .incbin "baserom.gba", 0x15C4C4, 0x200 + .incbin "graphics/board_pickups/icon1_xp.gbapal"; + .incbin "graphics/board_pickups/icon2_leaf.gbapal"; + .incbin "graphics/board_pickups/icon3_fire.gbapal"; + .incbin "graphics/board_pickups/icon4_link.gbapal"; + .incbin "graphics/board_pickups/icon5_moon.gbapal"; + .incbin "graphics/board_pickups/icon6_water.gbapal"; + .incbin "graphics/board_pickups/icon7_bolt.gbapal"; + .incbin "graphics/board_pickups/icon8_sun.gbapal"; + .incbin "graphics/board_pickups/icon9_heart.gbapal"; + .incbin "graphics/board_pickups/icon10_pokeblock.gbapal"; + .incbin "baserom.gba", 0x15C604, 0xC0 + @.incbin "baserom.gba", 0x15C4C4, 0x200 gEvoLeafAppear_Gfx:: @ 0x0815C6C4 .incbin "graphics/board_pickups/evo_item_leaf.4bpp"; @@ -1286,25 +1301,25 @@ gRubyFlashingTiles_Secondary:: @ 0x083C806C .include "data/graphics/mon_hatch_sprites.inc" gPickupIcon1_Gfx:: @ 0x083EB84C - .incbin "graphics/board_pickups/icon1.4bpp" + .incbin "graphics/board_pickups/icon1_xp.4bpp" gPickupIcon2_Gfx:: @ 0x083ED64C - .incbin "graphics/board_pickups/icon2.4bpp" + .incbin "graphics/board_pickups/icon2_leaf.4bpp" gPickupIcon3_Gfx:: @ 0x083EF44C - .incbin "graphics/board_pickups/icon3.4bpp" + .incbin "graphics/board_pickups/icon3_fire.4bpp" gPickupIcon9_Gfx:: @ 0x083F124C - .incbin "graphics/board_pickups/icon9.4bpp" + .incbin "graphics/board_pickups/icon9_heart.4bpp" gPickupIcon4_Gfx:: @ 0x083F304C - .incbin "graphics/board_pickups/icon4.4bpp" + .incbin "graphics/board_pickups/icon4_link.4bpp" gPickupIcon5_Gfx:: @ 0x083F4E4C - .incbin "graphics/board_pickups/icon5.4bpp" + .incbin "graphics/board_pickups/icon5_moon.4bpp" gPickupIcon6_Gfx:: @ 0x083F6C4C - .incbin "graphics/board_pickups/icon6.4bpp" + .incbin "graphics/board_pickups/icon6_water.4bpp" gPickupIcon10_Gfx:: @ 0x083F8A4C - .incbin "graphics/board_pickups/icon10.4bpp" + .incbin "graphics/board_pickups/icon10_pokeblock.4bpp" gPickupIcon8_Gfx:: @ 0x083FA84C - .incbin "graphics/board_pickups/icon8.4bpp" + .incbin "graphics/board_pickups/icon8_sun.4bpp" gPickupIcon7_Gfx:: @ 0x083FC64C - .incbin "graphics/board_pickups/icon7.4bpp" + .incbin "graphics/board_pickups/icon7_bolt.4bpp" gFlipperTileGraphics:: @ 0x083FE44C .incbin "baserom.gba", 0x3FE44C, 0xC00 diff --git a/graphics/board_pickups/evo_item_bolt_collected_fade.png b/graphics/board_pickups/evo_item_bolt_collected_fade.png index 9ee7ffd4..26fea0fb 100644 Binary files a/graphics/board_pickups/evo_item_bolt_collected_fade.png 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 index e91a601e..1d333f59 100644 Binary files a/graphics/board_pickups/evo_item_bolt_turn_1.png 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 index ccab2b10..c3e702db 100644 Binary files a/graphics/board_pickups/evo_item_bolt_turn_2.png 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 index 1bd421d1..63cf3802 100644 Binary files a/graphics/board_pickups/evo_item_bolt_turn_3.png 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 index aaa31b80..5702d612 100644 Binary files a/graphics/board_pickups/evo_item_bolt_turn_4.png 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 index 33728290..23f24fff 100644 Binary files a/graphics/board_pickups/evo_item_bolt_turn_5.png 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 index 34591062..a033d424 100644 Binary files a/graphics/board_pickups/evo_item_box_collected_fade.png 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 index 6a6e3d18..678f7f6f 100644 Binary files a/graphics/board_pickups/evo_item_box_turn_1.png 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 index 4bd0a02e..14332adc 100644 Binary files a/graphics/board_pickups/evo_item_box_turn_2.png 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 index 83c8449c..f2197ce7 100644 Binary files a/graphics/board_pickups/evo_item_box_turn_3.png 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 index 53703940..9a7b8546 100644 Binary files a/graphics/board_pickups/evo_item_box_turn_4.png 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 index 9af69b0e..10e19172 100644 Binary files a/graphics/board_pickups/evo_item_box_turn_5.png 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 index b917b6ca..c1101b20 100644 Binary files a/graphics/board_pickups/evo_item_ex_collected_fade.png 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 index 2f2eef2f..eb591135 100644 Binary files a/graphics/board_pickups/evo_item_ex_turn_1.png 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 index ede9d8fe..f47eeb22 100644 Binary files a/graphics/board_pickups/evo_item_ex_turn_2.png 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 index 3e84696d..aa91313b 100644 Binary files a/graphics/board_pickups/evo_item_ex_turn_3.png 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 index 1609acad..88c4ec9a 100644 Binary files a/graphics/board_pickups/evo_item_ex_turn_4.png 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 index 7e5d2005..eb7d4bec 100644 Binary files a/graphics/board_pickups/evo_item_ex_turn_5.png 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 index 036c453f..fe7a9e50 100644 Binary files a/graphics/board_pickups/evo_item_fire_collected_fade.png 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 index 8a43e888..32aaaa14 100644 Binary files a/graphics/board_pickups/evo_item_fire_turn_1.png 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 index c02e5688..5efdb1ee 100644 Binary files a/graphics/board_pickups/evo_item_fire_turn_2.png 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 index db541c52..3c448b28 100644 Binary files a/graphics/board_pickups/evo_item_fire_turn_3.png 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 index 3e0628f4..e31497f0 100644 Binary files a/graphics/board_pickups/evo_item_fire_turn_4.png 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 index 26dc776c..efb2a27c 100644 Binary files a/graphics/board_pickups/evo_item_fire_turn_5.png 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 index 8bc2d1e2..5a1bd896 100644 Binary files a/graphics/board_pickups/evo_item_heart_collected_fade.png 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 index 7a59c55c..25adf383 100644 Binary files a/graphics/board_pickups/evo_item_heart_turn_1.png 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 index caf669d9..fbf24625 100644 Binary files a/graphics/board_pickups/evo_item_heart_turn_2.png 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 index 3319a224..4c291056 100644 Binary files a/graphics/board_pickups/evo_item_heart_turn_3.png 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 index 6fcf8f64..7744a8ba 100644 Binary files a/graphics/board_pickups/evo_item_heart_turn_4.png 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 index 256e1cbe..d89a8e43 100644 Binary files a/graphics/board_pickups/evo_item_heart_turn_5.png 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 index cd672745..ab1e5b9c 100644 Binary files a/graphics/board_pickups/evo_item_leaf_collected_fade.png 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 index 605ffb53..1b0dcc69 100644 Binary files a/graphics/board_pickups/evo_item_leaf_turn_1.png 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 index 5db53d70..b1b44a88 100644 Binary files a/graphics/board_pickups/evo_item_leaf_turn_2.png 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 index 45a5e05e..62d57e66 100644 Binary files a/graphics/board_pickups/evo_item_leaf_turn_3.png 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 index 8e9058c9..a2843b04 100644 Binary files a/graphics/board_pickups/evo_item_leaf_turn_4.png 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 index 85085be9..84291084 100644 Binary files a/graphics/board_pickups/evo_item_leaf_turn_5.png 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 index 756da059..eb52f815 100644 Binary files a/graphics/board_pickups/evo_item_link_collected_fade.png 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 index 1a46e492..9f9b967c 100644 Binary files a/graphics/board_pickups/evo_item_link_turn_1.png 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 index d22cef8c..0c057199 100644 Binary files a/graphics/board_pickups/evo_item_link_turn_2.png 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 index e7d5056f..4afc3080 100644 Binary files a/graphics/board_pickups/evo_item_link_turn_3.png 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 index a4f31f50..85fda03f 100644 Binary files a/graphics/board_pickups/evo_item_link_turn_4.png 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 index b514eee3..fe39fc1d 100644 Binary files a/graphics/board_pickups/evo_item_link_turn_5.png 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 index 46b37e55..e503f636 100644 Binary files a/graphics/board_pickups/evo_item_moon_collected_fade.png 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 index b99702d3..7a8f1e02 100644 Binary files a/graphics/board_pickups/evo_item_moon_turn_1.png 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 index 93e9a2e6..39608989 100644 Binary files a/graphics/board_pickups/evo_item_moon_turn_2.png 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 index 7e568c3b..1025851e 100644 Binary files a/graphics/board_pickups/evo_item_moon_turn_3.png 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 index 79ef134b..41bfd789 100644 Binary files a/graphics/board_pickups/evo_item_moon_turn_4.png 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 index 60886181..6f38a01e 100644 Binary files a/graphics/board_pickups/evo_item_moon_turn_5.png and b/graphics/board_pickups/evo_item_moon_turn_5.png differ diff --git a/graphics/board_pickups/evo_item_sun_collected_fade.png b/graphics/board_pickups/evo_item_sun_collected_fade.png index e7c45022..1f5ecff9 100644 Binary files a/graphics/board_pickups/evo_item_sun_collected_fade.png and b/graphics/board_pickups/evo_item_sun_collected_fade.png differ diff --git a/graphics/board_pickups/evo_item_sun_turn_1.png b/graphics/board_pickups/evo_item_sun_turn_1.png index e38e7b2b..943f889e 100644 Binary files a/graphics/board_pickups/evo_item_sun_turn_1.png 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 index 9c567ed4..0e23125b 100644 Binary files a/graphics/board_pickups/evo_item_sun_turn_2.png 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 index 6164fbe7..b21b7581 100644 Binary files a/graphics/board_pickups/evo_item_sun_turn_3.png 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 index 31ebd8e9..9989fff1 100644 Binary files a/graphics/board_pickups/evo_item_sun_turn_4.png 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 index 1607ffb3..bd85eba6 100644 Binary files a/graphics/board_pickups/evo_item_sun_turn_5.png 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 index b4ea99a1..bc47c0d4 100644 Binary files a/graphics/board_pickups/evo_item_water_collected_fade.png 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 index 70a94350..3a6c271a 100644 Binary files a/graphics/board_pickups/evo_item_water_turn_1.png 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 index 035d59b8..476b590b 100644 Binary files a/graphics/board_pickups/evo_item_water_turn_2.png 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 index b0109287..0b25169d 100644 Binary files a/graphics/board_pickups/evo_item_water_turn_3.png 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 index 25bf0d1b..f916b3ee 100644 Binary files a/graphics/board_pickups/evo_item_water_turn_4.png 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 index 3e5014ea..3a493c80 100644 Binary files a/graphics/board_pickups/evo_item_water_turn_5.png and b/graphics/board_pickups/evo_item_water_turn_5.png differ diff --git a/graphics/board_pickups/icon1.png b/graphics/board_pickups/icon1.png deleted file mode 100644 index b0635296..00000000 Binary files a/graphics/board_pickups/icon1.png and /dev/null differ diff --git a/graphics/board_pickups/icon10.png b/graphics/board_pickups/icon10.png deleted file mode 100644 index a43751d2..00000000 Binary files a/graphics/board_pickups/icon10.png and /dev/null differ diff --git a/graphics/board_pickups/icon10_pokeblock.png b/graphics/board_pickups/icon10_pokeblock.png new file mode 100644 index 00000000..63b2cb53 Binary files /dev/null and b/graphics/board_pickups/icon10_pokeblock.png differ diff --git a/graphics/board_pickups/icon1_xp.png b/graphics/board_pickups/icon1_xp.png new file mode 100644 index 00000000..9e8c8de6 Binary files /dev/null and b/graphics/board_pickups/icon1_xp.png differ diff --git a/graphics/board_pickups/icon2.png b/graphics/board_pickups/icon2.png deleted file mode 100644 index 7d7d5cb6..00000000 Binary files a/graphics/board_pickups/icon2.png and /dev/null differ diff --git a/graphics/board_pickups/icon2_leaf.png b/graphics/board_pickups/icon2_leaf.png new file mode 100644 index 00000000..f9d6365e Binary files /dev/null and b/graphics/board_pickups/icon2_leaf.png differ diff --git a/graphics/board_pickups/icon3.png b/graphics/board_pickups/icon3.png deleted file mode 100644 index 43851cee..00000000 Binary files a/graphics/board_pickups/icon3.png and /dev/null differ diff --git a/graphics/board_pickups/icon3_fire.png b/graphics/board_pickups/icon3_fire.png new file mode 100644 index 00000000..3faec347 Binary files /dev/null and b/graphics/board_pickups/icon3_fire.png differ diff --git a/graphics/board_pickups/icon4.png b/graphics/board_pickups/icon4.png deleted file mode 100644 index 3f10ed36..00000000 Binary files a/graphics/board_pickups/icon4.png and /dev/null differ diff --git a/graphics/board_pickups/icon4_link.png b/graphics/board_pickups/icon4_link.png new file mode 100644 index 00000000..f1614c20 Binary files /dev/null and b/graphics/board_pickups/icon4_link.png differ diff --git a/graphics/board_pickups/icon5.png b/graphics/board_pickups/icon5.png deleted file mode 100644 index 13515020..00000000 Binary files a/graphics/board_pickups/icon5.png and /dev/null differ diff --git a/graphics/board_pickups/icon5_moon.png b/graphics/board_pickups/icon5_moon.png new file mode 100644 index 00000000..b82bc2ae Binary files /dev/null and b/graphics/board_pickups/icon5_moon.png differ diff --git a/graphics/board_pickups/icon6.png b/graphics/board_pickups/icon6.png deleted file mode 100644 index a6ac8110..00000000 Binary files a/graphics/board_pickups/icon6.png and /dev/null differ diff --git a/graphics/board_pickups/icon6_water.png b/graphics/board_pickups/icon6_water.png new file mode 100644 index 00000000..24a06971 Binary files /dev/null and b/graphics/board_pickups/icon6_water.png differ diff --git a/graphics/board_pickups/icon7.png b/graphics/board_pickups/icon7.png deleted file mode 100644 index 546d31e6..00000000 Binary files a/graphics/board_pickups/icon7.png and /dev/null differ diff --git a/graphics/board_pickups/icon7_bolt.png b/graphics/board_pickups/icon7_bolt.png new file mode 100644 index 00000000..09a37214 Binary files /dev/null and b/graphics/board_pickups/icon7_bolt.png differ diff --git a/graphics/board_pickups/icon8.png b/graphics/board_pickups/icon8.png deleted file mode 100644 index cf174ccc..00000000 Binary files a/graphics/board_pickups/icon8.png and /dev/null differ diff --git a/graphics/board_pickups/icon8_sun.png b/graphics/board_pickups/icon8_sun.png new file mode 100644 index 00000000..59d063d2 Binary files /dev/null and b/graphics/board_pickups/icon8_sun.png differ diff --git a/graphics/board_pickups/icon9.png b/graphics/board_pickups/icon9.png deleted file mode 100644 index 336e4ecd..00000000 Binary files a/graphics/board_pickups/icon9.png and /dev/null differ diff --git a/graphics/board_pickups/icon9_heart.png b/graphics/board_pickups/icon9_heart.png new file mode 100644 index 00000000..6aad3d27 Binary files /dev/null and b/graphics/board_pickups/icon9_heart.png differ diff --git a/graphics/stage/main/ball_open_to_catch.json b/graphics/stage/main/ball_open_to_catch.json index ee0f479d..8ad8867b 100644 --- a/graphics/stage/main/ball_open_to_catch.json +++ b/graphics/stage/main/ball_open_to_catch.json @@ -1,7 +1,7 @@ { "kind": "oam-shape", "version":1, - "pngsize": "3x6", + "pngsize": "6x3", "pieces": [ { "pos":"0,0", @@ -21,20 +21,20 @@ "spacer":true }, { - "pos":"0,3", + "pos":"3,0", "size": "2x2" }, { - "pos":"2,3", + "pos":"5,0", "size": "1x2" }, { - "pos":"0,5", + "pos":"3,2", "size": "1x1" "spacer":true }, { - "pos":"1,5", + "pos":"4,2", "size": "2x1" } ] diff --git a/graphics/stage/main/ball_open_to_catch.png b/graphics/stage/main/ball_open_to_catch.png deleted file mode 100644 index e6b08153..00000000 Binary files a/graphics/stage/main/ball_open_to_catch.png and /dev/null differ diff --git a/graphics/stage/main/ball_open_to_catch_greatball.png b/graphics/stage/main/ball_open_to_catch_greatball.png new file mode 100644 index 00000000..b304beb3 Binary files /dev/null and b/graphics/stage/main/ball_open_to_catch_greatball.png differ diff --git a/graphics/stage/main/ball_open_to_catch_masterball.png b/graphics/stage/main/ball_open_to_catch_masterball.png new file mode 100644 index 00000000..e34b2344 Binary files /dev/null and b/graphics/stage/main/ball_open_to_catch_masterball.png differ diff --git a/graphics/stage/main/ball_open_to_catch_pokeball.png b/graphics/stage/main/ball_open_to_catch_pokeball.png new file mode 100644 index 00000000..05fe2260 Binary files /dev/null and b/graphics/stage/main/ball_open_to_catch_pokeball.png differ diff --git a/graphics/stage/main/ball_open_to_catch_ultraball.png b/graphics/stage/main/ball_open_to_catch_ultraball.png new file mode 100644 index 00000000..29dbabf9 Binary files /dev/null and b/graphics/stage/main/ball_open_to_catch_ultraball.png differ diff --git a/graphics/stage/main/capture_ball_variants.png b/graphics/stage/main/capture_ball_variants.png deleted file mode 100644 index 9a4b7d11..00000000 Binary files a/graphics/stage/main/capture_ball_variants.png and /dev/null differ diff --git a/graphics/stage/main/main_stage_gfx.json b/graphics/stage/main/main_stage_gfx.json index a24928aa..aa5dc629 100644 --- a/graphics/stage/main/main_stage_gfx.json +++ b/graphics/stage/main/main_stage_gfx.json @@ -161,9 +161,26 @@ }, { "gfx_filename": "ball_open_to_catch", - "oamshape": "ball_open_to_catch.json" - }, - { + "segments": [ + { + "segfile": "ball_open_to_catch_pokeball", + "oamshape": "ball_open_to_catch.json" + }, + { + "segfile": "ball_open_to_catch_greatball", + "oamshape": "ball_open_to_catch.json" + }, + { + "segfile": "ball_open_to_catch_ultraball", + "oamshape": "ball_open_to_catch.json" + }, + { + "segfile": "ball_open_to_catch_masterball", + "oamshape": "ball_open_to_catch.json" + } + ] + }, + { "gfx_filename": "catch_mode_banner", "oam": true, "mheight": 9, diff --git a/graphics/stage/main/pokeball_great.png b/graphics/stage/main/pokeball_great.png index 0e50e36f..2b76dedf 100644 Binary files a/graphics/stage/main/pokeball_great.png and b/graphics/stage/main/pokeball_great.png differ diff --git a/graphics/stage/main/pokeball_master.png b/graphics/stage/main/pokeball_master.png index acffb829..b09e01eb 100644 Binary files a/graphics/stage/main/pokeball_master.png and b/graphics/stage/main/pokeball_master.png differ diff --git a/graphics/stage/main/pokeball_regular.png b/graphics/stage/main/pokeball_regular.png index e84e5227..731299aa 100644 Binary files a/graphics/stage/main/pokeball_regular.png and b/graphics/stage/main/pokeball_regular.png differ diff --git a/graphics/stage/main/pokeball_ultra.png b/graphics/stage/main/pokeball_ultra.png index 9e85be86..d9096469 100644 Binary files a/graphics/stage/main/pokeball_ultra.png and b/graphics/stage/main/pokeball_ultra.png differ