diff --git a/graphics/event_objects/pics/pokemon/azumarill.png b/graphics/event_objects/pics/pokemon/azumarill.png new file mode 100644 index 0000000000..0a03fd3d4d Binary files /dev/null and b/graphics/event_objects/pics/pokemon/azumarill.png differ diff --git a/graphics/event_objects/pics/pokemon/azumarill/0.png b/graphics/event_objects/pics/pokemon/azumarill/0.png deleted file mode 100644 index 9b219e5521..0000000000 Binary files a/graphics/event_objects/pics/pokemon/azumarill/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/azumarill/1.png b/graphics/event_objects/pics/pokemon/azumarill/1.png deleted file mode 100644 index 16e493f8bf..0000000000 Binary files a/graphics/event_objects/pics/pokemon/azumarill/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/azumarill/2.png b/graphics/event_objects/pics/pokemon/azumarill/2.png deleted file mode 100644 index b10e6a2832..0000000000 Binary files a/graphics/event_objects/pics/pokemon/azumarill/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/azurill.png b/graphics/event_objects/pics/pokemon/azurill.png new file mode 100644 index 0000000000..d6050257b7 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/azurill.png differ diff --git a/graphics/event_objects/pics/pokemon/azurill/0.png b/graphics/event_objects/pics/pokemon/azurill/0.png deleted file mode 100644 index efbcea03fa..0000000000 Binary files a/graphics/event_objects/pics/pokemon/azurill/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/azurill/1.png b/graphics/event_objects/pics/pokemon/azurill/1.png deleted file mode 100644 index 4e00acdc62..0000000000 Binary files a/graphics/event_objects/pics/pokemon/azurill/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/azurill/2.png b/graphics/event_objects/pics/pokemon/azurill/2.png deleted file mode 100644 index 08bf43c5bf..0000000000 Binary files a/graphics/event_objects/pics/pokemon/azurill/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/deoxys.png b/graphics/event_objects/pics/pokemon/deoxys.png new file mode 100644 index 0000000000..2e892f0da0 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/deoxys.png differ diff --git a/graphics/event_objects/pics/pokemon/deoxys/0.png b/graphics/event_objects/pics/pokemon/deoxys/0.png deleted file mode 100644 index 37b90dbfe2..0000000000 Binary files a/graphics/event_objects/pics/pokemon/deoxys/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/deoxys/1.png b/graphics/event_objects/pics/pokemon/deoxys/1.png deleted file mode 100644 index 4d38cb9468..0000000000 Binary files a/graphics/event_objects/pics/pokemon/deoxys/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/dusclops.png b/graphics/event_objects/pics/pokemon/dusclops.png new file mode 100644 index 0000000000..faf183ff43 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/0.png b/graphics/event_objects/pics/pokemon/dusclops/0.png deleted file mode 100644 index b738a9ef1d..0000000000 Binary files a/graphics/event_objects/pics/pokemon/dusclops/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/1.png b/graphics/event_objects/pics/pokemon/dusclops/1.png deleted file mode 100644 index 70ec671c87..0000000000 Binary files a/graphics/event_objects/pics/pokemon/dusclops/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/2.png b/graphics/event_objects/pics/pokemon/dusclops/2.png deleted file mode 100644 index 0cbb7c6209..0000000000 Binary files a/graphics/event_objects/pics/pokemon/dusclops/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/3.png b/graphics/event_objects/pics/pokemon/dusclops/3.png deleted file mode 100644 index 3d5858ff61..0000000000 Binary files a/graphics/event_objects/pics/pokemon/dusclops/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/4.png b/graphics/event_objects/pics/pokemon/dusclops/4.png deleted file mode 100644 index f99269afaf..0000000000 Binary files a/graphics/event_objects/pics/pokemon/dusclops/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/5.png b/graphics/event_objects/pics/pokemon/dusclops/5.png deleted file mode 100644 index 6b496be3cb..0000000000 Binary files a/graphics/event_objects/pics/pokemon/dusclops/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/6.png b/graphics/event_objects/pics/pokemon/dusclops/6.png deleted file mode 100644 index 3ff10d7abd..0000000000 Binary files a/graphics/event_objects/pics/pokemon/dusclops/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/7.png b/graphics/event_objects/pics/pokemon/dusclops/7.png deleted file mode 100644 index 925080a4fd..0000000000 Binary files a/graphics/event_objects/pics/pokemon/dusclops/7.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/dusclops/8.png b/graphics/event_objects/pics/pokemon/dusclops/8.png deleted file mode 100644 index 57dcef5967..0000000000 Binary files a/graphics/event_objects/pics/pokemon/dusclops/8.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png new file mode 100644 index 0000000000..5c75f647f5 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png deleted file mode 100644 index 9fa5da9c11..0000000000 Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png deleted file mode 100644 index b328fc8449..0000000000 Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png deleted file mode 100644 index e4935a1cd6..0000000000 Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png deleted file mode 100644 index 3ea74a6ea3..0000000000 Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png deleted file mode 100644 index ab2dbf891c..0000000000 Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png deleted file mode 100644 index a16efcb6ea..0000000000 Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png deleted file mode 100644 index 38fec7b469..0000000000 Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png deleted file mode 100644 index a5a8c034de..0000000000 Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png deleted file mode 100644 index 727908cf9e..0000000000 Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/groudon.png b/graphics/event_objects/pics/pokemon/groudon.png new file mode 100644 index 0000000000..de569261c5 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/groudon.png differ diff --git a/graphics/event_objects/pics/pokemon/groudon_front/0.png b/graphics/event_objects/pics/pokemon/groudon_front/0.png deleted file mode 100644 index 05cb164339..0000000000 Binary files a/graphics/event_objects/pics/pokemon/groudon_front/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/groudon_front/1.png b/graphics/event_objects/pics/pokemon/groudon_front/1.png deleted file mode 100644 index fcafab2a02..0000000000 Binary files a/graphics/event_objects/pics/pokemon/groudon_front/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/groudon_side/0.png b/graphics/event_objects/pics/pokemon/groudon_side/0.png deleted file mode 100644 index 76bd8a11c6..0000000000 Binary files a/graphics/event_objects/pics/pokemon/groudon_side/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/groudon_side/1.png b/graphics/event_objects/pics/pokemon/groudon_side/1.png deleted file mode 100644 index 2ecf098223..0000000000 Binary files a/graphics/event_objects/pics/pokemon/groudon_side/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/ho_oh.png b/graphics/event_objects/pics/pokemon/ho_oh.png new file mode 100644 index 0000000000..883bf65773 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/ho_oh.png differ diff --git a/graphics/event_objects/pics/pokemon/ho_oh/0.png b/graphics/event_objects/pics/pokemon/ho_oh/0.png deleted file mode 100644 index 0d8ef71e15..0000000000 Binary files a/graphics/event_objects/pics/pokemon/ho_oh/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/ho_oh/1.png b/graphics/event_objects/pics/pokemon/ho_oh/1.png deleted file mode 100644 index 03d3b0874d..0000000000 Binary files a/graphics/event_objects/pics/pokemon/ho_oh/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kecleon.png b/graphics/event_objects/pics/pokemon/kecleon.png new file mode 100644 index 0000000000..460d3acc47 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kecleon.png differ diff --git a/graphics/event_objects/pics/pokemon/kecleon/0.png b/graphics/event_objects/pics/pokemon/kecleon/0.png deleted file mode 100644 index 691797af01..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kecleon/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kecleon/1.png b/graphics/event_objects/pics/pokemon/kecleon/1.png deleted file mode 100644 index 0d82cc66d9..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kecleon/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kecleon/2.png b/graphics/event_objects/pics/pokemon/kecleon/2.png deleted file mode 100644 index 2713ce0571..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kecleon/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kirlia.png b/graphics/event_objects/pics/pokemon/kirlia.png new file mode 100644 index 0000000000..b71b575ebf Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/0.png b/graphics/event_objects/pics/pokemon/kirlia/0.png deleted file mode 100644 index e069df4899..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kirlia/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/1.png b/graphics/event_objects/pics/pokemon/kirlia/1.png deleted file mode 100644 index d158bd3351..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kirlia/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/2.png b/graphics/event_objects/pics/pokemon/kirlia/2.png deleted file mode 100644 index 388077d93e..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kirlia/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/3.png b/graphics/event_objects/pics/pokemon/kirlia/3.png deleted file mode 100644 index 4887b16534..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kirlia/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/4.png b/graphics/event_objects/pics/pokemon/kirlia/4.png deleted file mode 100644 index e734a8f60e..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kirlia/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/5.png b/graphics/event_objects/pics/pokemon/kirlia/5.png deleted file mode 100644 index e2e36561bb..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kirlia/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/6.png b/graphics/event_objects/pics/pokemon/kirlia/6.png deleted file mode 100644 index 0731cb711b..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kirlia/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/7.png b/graphics/event_objects/pics/pokemon/kirlia/7.png deleted file mode 100644 index c4f33879cd..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kirlia/7.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kirlia/8.png b/graphics/event_objects/pics/pokemon/kirlia/8.png deleted file mode 100644 index 87fe530c5d..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kirlia/8.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kyogre.png b/graphics/event_objects/pics/pokemon/kyogre.png new file mode 100644 index 0000000000..b67f3b15fc Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kyogre.png differ diff --git a/graphics/event_objects/pics/pokemon/kyogre_front/0.png b/graphics/event_objects/pics/pokemon/kyogre_front/0.png deleted file mode 100644 index 2cfea8e010..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kyogre_front/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kyogre_front/1.png b/graphics/event_objects/pics/pokemon/kyogre_front/1.png deleted file mode 100644 index 8f2dcd7afa..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kyogre_front/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kyogre_side/0.png b/graphics/event_objects/pics/pokemon/kyogre_side/0.png deleted file mode 100644 index f60199f77b..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kyogre_side/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/kyogre_side/1.png b/graphics/event_objects/pics/pokemon/kyogre_side/1.png deleted file mode 100644 index 00d53d563c..0000000000 Binary files a/graphics/event_objects/pics/pokemon/kyogre_side/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/latias_latios.png b/graphics/event_objects/pics/pokemon/latias_latios.png new file mode 100644 index 0000000000..e9355d4a60 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/latias_latios.png differ diff --git a/graphics/event_objects/pics/pokemon/latias_latios/0.png b/graphics/event_objects/pics/pokemon/latias_latios/0.png deleted file mode 100644 index 5338fc55ac..0000000000 Binary files a/graphics/event_objects/pics/pokemon/latias_latios/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/latias_latios/1.png b/graphics/event_objects/pics/pokemon/latias_latios/1.png deleted file mode 100644 index 57cde71a98..0000000000 Binary files a/graphics/event_objects/pics/pokemon/latias_latios/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/latias_latios/2.png b/graphics/event_objects/pics/pokemon/latias_latios/2.png deleted file mode 100644 index c8812bec0f..0000000000 Binary files a/graphics/event_objects/pics/pokemon/latias_latios/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/lugia.png b/graphics/event_objects/pics/pokemon/lugia.png new file mode 100644 index 0000000000..d38e374b38 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/lugia.png differ diff --git a/graphics/event_objects/pics/pokemon/lugia/0.png b/graphics/event_objects/pics/pokemon/lugia/0.png deleted file mode 100644 index 4e50209fe1..0000000000 Binary files a/graphics/event_objects/pics/pokemon/lugia/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/lugia/1.png b/graphics/event_objects/pics/pokemon/lugia/1.png deleted file mode 100644 index 6f36abc919..0000000000 Binary files a/graphics/event_objects/pics/pokemon/lugia/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/mew.png b/graphics/event_objects/pics/pokemon/mew.png new file mode 100644 index 0000000000..152bdabce2 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew.png differ diff --git a/graphics/event_objects/pics/pokemon/mew/0.png b/graphics/event_objects/pics/pokemon/mew/0.png deleted file mode 100644 index 55955453cb..0000000000 Binary files a/graphics/event_objects/pics/pokemon/mew/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/mew/1.png b/graphics/event_objects/pics/pokemon/mew/1.png deleted file mode 100644 index 3c6062bd75..0000000000 Binary files a/graphics/event_objects/pics/pokemon/mew/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/mew/2.png b/graphics/event_objects/pics/pokemon/mew/2.png deleted file mode 100644 index 1c3c6e52d8..0000000000 Binary files a/graphics/event_objects/pics/pokemon/mew/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/mew/3.png b/graphics/event_objects/pics/pokemon/mew/3.png deleted file mode 100644 index be04a769bd..0000000000 Binary files a/graphics/event_objects/pics/pokemon/mew/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/mew/4.png b/graphics/event_objects/pics/pokemon/mew/4.png deleted file mode 100644 index 3ddbfa03a1..0000000000 Binary files a/graphics/event_objects/pics/pokemon/mew/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/mew/5.png b/graphics/event_objects/pics/pokemon/mew/5.png deleted file mode 100644 index 44b7bd56bc..0000000000 Binary files a/graphics/event_objects/pics/pokemon/mew/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/mew/6.png b/graphics/event_objects/pics/pokemon/mew/6.png deleted file mode 100644 index c6abc021af..0000000000 Binary files a/graphics/event_objects/pics/pokemon/mew/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/mew/7.png b/graphics/event_objects/pics/pokemon/mew/7.png deleted file mode 100644 index f22f4072ab..0000000000 Binary files a/graphics/event_objects/pics/pokemon/mew/7.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/mew/8.png b/graphics/event_objects/pics/pokemon/mew/8.png deleted file mode 100644 index c603d7ced2..0000000000 Binary files a/graphics/event_objects/pics/pokemon/mew/8.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/pikachu.png b/graphics/event_objects/pics/pokemon/pikachu.png new file mode 100644 index 0000000000..bd70269555 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/pikachu.png differ diff --git a/graphics/event_objects/pics/pokemon/pikachu/0.png b/graphics/event_objects/pics/pokemon/pikachu/0.png deleted file mode 100644 index 1a08b623c3..0000000000 Binary files a/graphics/event_objects/pics/pokemon/pikachu/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/pikachu/1.png b/graphics/event_objects/pics/pokemon/pikachu/1.png deleted file mode 100644 index f1640a1e54..0000000000 Binary files a/graphics/event_objects/pics/pokemon/pikachu/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/pikachu/2.png b/graphics/event_objects/pics/pokemon/pikachu/2.png deleted file mode 100644 index 68836768bc..0000000000 Binary files a/graphics/event_objects/pics/pokemon/pikachu/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/poochyena.png b/graphics/event_objects/pics/pokemon/poochyena.png new file mode 100644 index 0000000000..86fd9b3acb Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/0.png b/graphics/event_objects/pics/pokemon/poochyena/0.png deleted file mode 100644 index 1ee0425729..0000000000 Binary files a/graphics/event_objects/pics/pokemon/poochyena/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/1.png b/graphics/event_objects/pics/pokemon/poochyena/1.png deleted file mode 100644 index 3dbdb383cd..0000000000 Binary files a/graphics/event_objects/pics/pokemon/poochyena/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/2.png b/graphics/event_objects/pics/pokemon/poochyena/2.png deleted file mode 100644 index bda367b940..0000000000 Binary files a/graphics/event_objects/pics/pokemon/poochyena/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/3.png b/graphics/event_objects/pics/pokemon/poochyena/3.png deleted file mode 100644 index 8b7d8f8033..0000000000 Binary files a/graphics/event_objects/pics/pokemon/poochyena/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/4.png b/graphics/event_objects/pics/pokemon/poochyena/4.png deleted file mode 100644 index 47012ad543..0000000000 Binary files a/graphics/event_objects/pics/pokemon/poochyena/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/5.png b/graphics/event_objects/pics/pokemon/poochyena/5.png deleted file mode 100644 index e256e8a07c..0000000000 Binary files a/graphics/event_objects/pics/pokemon/poochyena/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/6.png b/graphics/event_objects/pics/pokemon/poochyena/6.png deleted file mode 100644 index 173b9fe5ef..0000000000 Binary files a/graphics/event_objects/pics/pokemon/poochyena/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/7.png b/graphics/event_objects/pics/pokemon/poochyena/7.png deleted file mode 100644 index 8fdc28209c..0000000000 Binary files a/graphics/event_objects/pics/pokemon/poochyena/7.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/poochyena/8.png b/graphics/event_objects/pics/pokemon/poochyena/8.png deleted file mode 100644 index 911619f6a1..0000000000 Binary files a/graphics/event_objects/pics/pokemon/poochyena/8.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza.png b/graphics/event_objects/pics/pokemon/rayquaza.png new file mode 100644 index 0000000000..aec6616d9a Binary files /dev/null and b/graphics/event_objects/pics/pokemon/rayquaza.png differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza/0.png b/graphics/event_objects/pics/pokemon/rayquaza/0.png deleted file mode 100644 index 9f5db910f5..0000000000 Binary files a/graphics/event_objects/pics/pokemon/rayquaza/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza/1.png b/graphics/event_objects/pics/pokemon/rayquaza/1.png deleted file mode 100644 index e770b65497..0000000000 Binary files a/graphics/event_objects/pics/pokemon/rayquaza/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza/2.png b/graphics/event_objects/pics/pokemon/rayquaza/2.png deleted file mode 100644 index e72c17b079..0000000000 Binary files a/graphics/event_objects/pics/pokemon/rayquaza/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza/3.png b/graphics/event_objects/pics/pokemon/rayquaza/3.png deleted file mode 100644 index edcfe94ba8..0000000000 Binary files a/graphics/event_objects/pics/pokemon/rayquaza/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza/4.png b/graphics/event_objects/pics/pokemon/rayquaza/4.png deleted file mode 100644 index d34cb5d58a..0000000000 Binary files a/graphics/event_objects/pics/pokemon/rayquaza/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/skitty.png b/graphics/event_objects/pics/pokemon/skitty.png new file mode 100644 index 0000000000..2b40113207 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/skitty.png differ diff --git a/graphics/event_objects/pics/pokemon/skitty/0.png b/graphics/event_objects/pics/pokemon/skitty/0.png deleted file mode 100644 index 105611a10a..0000000000 Binary files a/graphics/event_objects/pics/pokemon/skitty/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/skitty/1.png b/graphics/event_objects/pics/pokemon/skitty/1.png deleted file mode 100644 index 66a9640e0c..0000000000 Binary files a/graphics/event_objects/pics/pokemon/skitty/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/skitty/2.png b/graphics/event_objects/pics/pokemon/skitty/2.png deleted file mode 100644 index 2ab6cabfab..0000000000 Binary files a/graphics/event_objects/pics/pokemon/skitty/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/sudowoodo.png b/graphics/event_objects/pics/pokemon/sudowoodo.png new file mode 100644 index 0000000000..ff2cc385b6 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/sudowoodo.png differ diff --git a/graphics/event_objects/pics/pokemon/sudowoodo/0.png b/graphics/event_objects/pics/pokemon/sudowoodo/0.png deleted file mode 100644 index 20584b1a69..0000000000 Binary files a/graphics/event_objects/pics/pokemon/sudowoodo/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/sudowoodo/1.png b/graphics/event_objects/pics/pokemon/sudowoodo/1.png deleted file mode 100644 index 1d865c43a0..0000000000 Binary files a/graphics/event_objects/pics/pokemon/sudowoodo/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/sudowoodo/2.png b/graphics/event_objects/pics/pokemon/sudowoodo/2.png deleted file mode 100644 index 319220edfb..0000000000 Binary files a/graphics/event_objects/pics/pokemon/sudowoodo/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth.png b/graphics/event_objects/pics/pokemon/vigoroth.png new file mode 100644 index 0000000000..b90c5fddde Binary files /dev/null and b/graphics/event_objects/pics/pokemon/vigoroth.png differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png deleted file mode 100644 index 088986e807..0000000000 Binary files a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png deleted file mode 100644 index 79d269e55e..0000000000 Binary files a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png deleted file mode 100644 index 2918caf224..0000000000 Binary files a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png deleted file mode 100644 index 30f989ca50..0000000000 Binary files a/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png deleted file mode 100644 index f0edeb876b..0000000000 Binary files a/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/wingull.png b/graphics/event_objects/pics/pokemon/wingull.png new file mode 100644 index 0000000000..4ebb0039e7 Binary files /dev/null and b/graphics/event_objects/pics/pokemon/wingull.png differ diff --git a/graphics/event_objects/pics/pokemon/wingull/0.png b/graphics/event_objects/pics/pokemon/wingull/0.png deleted file mode 100644 index 2e83a4b4ee..0000000000 Binary files a/graphics/event_objects/pics/pokemon/wingull/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/wingull/1.png b/graphics/event_objects/pics/pokemon/wingull/1.png deleted file mode 100644 index 22dadf0aeb..0000000000 Binary files a/graphics/event_objects/pics/pokemon/wingull/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/wingull/2.png b/graphics/event_objects/pics/pokemon/wingull/2.png deleted file mode 100644 index 9758aff0a0..0000000000 Binary files a/graphics/event_objects/pics/pokemon/wingull/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/wingull/3.png b/graphics/event_objects/pics/pokemon/wingull/3.png deleted file mode 100644 index c3404d20d6..0000000000 Binary files a/graphics/event_objects/pics/pokemon/wingull/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/wingull/4.png b/graphics/event_objects/pics/pokemon/wingull/4.png deleted file mode 100644 index 11052fe994..0000000000 Binary files a/graphics/event_objects/pics/pokemon/wingull/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/wingull/5.png b/graphics/event_objects/pics/pokemon/wingull/5.png deleted file mode 100644 index af5505e31c..0000000000 Binary files a/graphics/event_objects/pics/pokemon/wingull/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/zigzagoon.png b/graphics/event_objects/pics/pokemon/zigzagoon.png new file mode 100644 index 0000000000..2312d4f97a Binary files /dev/null and b/graphics/event_objects/pics/pokemon/zigzagoon.png differ diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/0.png b/graphics/event_objects/pics/pokemon/zigzagoon/0.png deleted file mode 100644 index 0601efadeb..0000000000 Binary files a/graphics/event_objects/pics/pokemon/zigzagoon/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/1.png b/graphics/event_objects/pics/pokemon/zigzagoon/1.png deleted file mode 100644 index c7e067a6de..0000000000 Binary files a/graphics/event_objects/pics/pokemon/zigzagoon/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/2.png b/graphics/event_objects/pics/pokemon/zigzagoon/2.png deleted file mode 100644 index d44a71b8d8..0000000000 Binary files a/graphics/event_objects/pics/pokemon/zigzagoon/2.png and /dev/null differ diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index d2307a932a..546b26f174 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -161,53 +161,24 @@ const u32 gEventObjectPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/peo const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); const u32 gEventObjectPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp"); const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); -const u32 gEventObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/0.4bpp"); -const u32 gEventObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/1.4bpp"); -const u32 gEventObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/2.4bpp"); +const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); const u32 gEventObjectPic_Boy5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5.4bpp"); const u32 gEventObjectPic_ContestOldMan[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man.4bpp"); const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp"); const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp"); -const u32 gEventObjectPic_KyogreFront_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_front/0.4bpp"); -const u32 gEventObjectPic_KyogreFront_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_front/1.4bpp"); -const u32 gEventObjectPic_KyogreSide_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_side/0.4bpp"); -const u32 gEventObjectPic_KyogreSide_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_side/1.4bpp"); -const u32 gEventObjectPic_GroudonFront_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_front/0.4bpp"); -const u32 gEventObjectPic_GroudonFront_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_front/1.4bpp"); -const u32 gEventObjectPic_GroudonSide_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_side/0.4bpp"); -const u32 gEventObjectPic_GroudonSide_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_side/1.4bpp"); +const u32 gEventObjectPic_KyogreFront[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); +const u32 gEventObjectPic_GroudonFront[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); -const u32 gEventObjectPic_Skitty_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/0.4bpp"); -const u32 gEventObjectPic_Skitty_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/1.4bpp"); -const u32 gEventObjectPic_Skitty_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/2.4bpp"); -const u32 gEventObjectPic_Kecleon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/0.4bpp"); -const u32 gEventObjectPic_Kecleon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/1.4bpp"); -const u32 gEventObjectPic_Kecleon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/2.4bpp"); -const u32 gEventObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/0.4bpp"); -const u32 gEventObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/1.4bpp"); -const u32 gEventObjectPic_Rayquaza_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/2.4bpp"); -const u32 gEventObjectPic_Rayquaza_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/3.4bpp"); -const u32 gEventObjectPic_Rayquaza_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/4.4bpp"); +const u32 gEventObjectPic_Skitty_[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); +const u32 gEventObjectPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); +const u32 gEventObjectPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); const u32 gEventObjectPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp"); -const u32 gEventObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/0.4bpp"); -const u32 gEventObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/1.4bpp"); -const u32 gEventObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/2.4bpp"); -const u32 gEventObjectPic_Pikachu_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/0.4bpp"); -const u32 gEventObjectPic_Pikachu_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/1.4bpp"); -const u32 gEventObjectPic_Pikachu_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/2.4bpp"); -const u32 gEventObjectPic_Azumarill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/0.4bpp"); -const u32 gEventObjectPic_Azumarill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/1.4bpp"); -const u32 gEventObjectPic_Azumarill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/2.4bpp"); -const u32 gEventObjectPic_Wingull_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/0.4bpp"); -const u32 gEventObjectPic_Wingull_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/3.4bpp"); -const u32 gEventObjectPic_Wingull_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/1.4bpp"); -const u32 gEventObjectPic_Wingull_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/4.4bpp"); -const u32 gEventObjectPic_Wingull_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/2.4bpp"); -const u32 gEventObjectPic_Wingull_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/5.4bpp"); +const u32 gEventObjectPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); +const u32 gEventObjectPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); +const u32 gEventObjectPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); +const u32 gEventObjectPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); const u32 gEventObjectPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); -const u32 gEventObjectPic_Azurill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/0.4bpp"); -const u32 gEventObjectPic_Azurill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/1.4bpp"); -const u32 gEventObjectPic_Azurill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/2.4bpp"); +const u32 gEventObjectPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); const u32 gEventObjectPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal"); const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal"); @@ -281,32 +252,12 @@ const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal"); -const u32 gEventObjectPic_VigorothCarryingBox_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp"); -const u32 gEventObjectPic_VigorothCarryingBox_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp"); -const u32 gEventObjectPic_VigorothCarryingBox_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp"); -const u32 gEventObjectPic_VigorothFacingAway_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.4bpp"); -const u32 gEventObjectPic_VigorothFacingAway_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.4bpp"); +const u32 gEventObjectPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp"); const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal"); const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.4bpp"); +const u32 gEventObjectPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp"); const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal"); -const u32 gEventObjectPic_Poochyena_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/0.4bpp"); -const u32 gEventObjectPic_Poochyena_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/1.4bpp"); -const u32 gEventObjectPic_Poochyena_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/2.4bpp"); -const u32 gEventObjectPic_Poochyena_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/3.4bpp"); -const u32 gEventObjectPic_Poochyena_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/4.4bpp"); -const u32 gEventObjectPic_Poochyena_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/5.4bpp"); -const u32 gEventObjectPic_Poochyena_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/6.4bpp"); -const u32 gEventObjectPic_Poochyena_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/7.4bpp"); -const u32 gEventObjectPic_Poochyena_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/8.4bpp"); +const u32 gEventObjectPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); const u16 gEventObjectPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal"); const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); @@ -653,48 +604,21 @@ const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics const u32 gEventObjectPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp"); const u32 gEventObjectPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp"); const u32 gEventObjectPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp"); -const u32 gEventObjectPic_Kirlia_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/0.4bpp"); -const u32 gEventObjectPic_Kirlia_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/1.4bpp"); -const u32 gEventObjectPic_Kirlia_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/2.4bpp"); -const u32 gEventObjectPic_Kirlia_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/3.4bpp"); -const u32 gEventObjectPic_Kirlia_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/4.4bpp"); -const u32 gEventObjectPic_Kirlia_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/5.4bpp"); -const u32 gEventObjectPic_Kirlia_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/6.4bpp"); -const u32 gEventObjectPic_Kirlia_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/7.4bpp"); -const u32 gEventObjectPic_Kirlia_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/8.4bpp"); -const u32 gEventObjectPic_Dusclops_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/0.4bpp"); -const u32 gEventObjectPic_Dusclops_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/1.4bpp"); -const u32 gEventObjectPic_Dusclops_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/2.4bpp"); -const u32 gEventObjectPic_Dusclops_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/3.4bpp"); -const u32 gEventObjectPic_Dusclops_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/4.4bpp"); -const u32 gEventObjectPic_Dusclops_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/5.4bpp"); -const u32 gEventObjectPic_Dusclops_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/6.4bpp"); -const u32 gEventObjectPic_Dusclops_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/7.4bpp"); -const u32 gEventObjectPic_Dusclops_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/8.4bpp"); +const u32 gEventObjectPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp"); +const u32 gEventObjectPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp"); const u32 gEventObjectPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp"); const u32 gEventObjectPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp"); const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal"); -const u32 gEventObjectPic_Sudowoodo_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/0.4bpp"); -const u32 gEventObjectPic_Sudowoodo_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/1.4bpp"); -const u32 gEventObjectPic_Sudowoodo_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/2.4bpp"); -const u32 gEventObjectPic_Mew_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/0.4bpp"); -const u32 gEventObjectPic_Mew_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/1.4bpp"); -const u32 gEventObjectPic_Mew_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/2.4bpp"); -const u32 gEventObjectPic_Mew_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/3.4bpp"); -const u32 gEventObjectPic_Mew_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/4.4bpp"); -const u32 gEventObjectPic_Mew_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/5.4bpp"); -const u32 gEventObjectPic_Mew_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/6.4bpp"); -const u32 gEventObjectPic_Mew_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/7.4bpp"); -const u32 gEventObjectPic_Mew_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/8.4bpp"); +const u32 gEventObjectPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp"); +const u32 gEventObjectPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp"); const u16 gEventObjectPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal"); const u32 gEventObjectPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp"); const u32 gEventObjectPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp"); const u16 gEventObjectPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal"); const u32 gEventObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); const u16 gEventObjectPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal"); -const u32 gEventObjectPic_Deoxys_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys/0.4bpp"); -const u32 gEventObjectPic_Deoxys_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys/1.4bpp"); +const u32 gEventObjectPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp"); const u32 gEventObjectPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp"); const u32 gEventObjectPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp"); const u32 gEventObjectPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp"); @@ -702,11 +626,9 @@ const u32 gEventObjectPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/peop const u32 gEventObjectPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp"); const u32 gEventObjectPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp"); const u32 gEventObjectPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp"); -const u32 gEventObjectPic_Lugia_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia/0.4bpp"); -const u32 gEventObjectPic_Lugia_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia/1.4bpp"); +const u32 gEventObjectPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp"); const u16 gEventObjectPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); -const u32 gEventObjectPic_HoOh_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh/0.4bpp"); -const u32 gEventObjectPic_HoOh_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh/1.4bpp"); +const u32 gEventObjectPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); const u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); #endif //GUARD_EVENT_OBJECT_GFX_H