From 0f623023635fd903ed066a3cd9424b7b1a2fef9e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 18 Oct 2016 19:01:53 -0700 Subject: move field effect object images --- .../field_objects/field_effect_object_graphics.s | 20 ++++++++++---------- .../pics/lavaridge_gym_warp/0.png | Bin 0 -> 185 bytes .../pics/lavaridge_gym_warp/1.png | Bin 0 -> 224 bytes .../pics/lavaridge_gym_warp/2.png | Bin 0 -> 232 bytes .../pics/lavaridge_gym_warp/3.png | Bin 0 -> 223 bytes .../pics/lavaridge_gym_warp/4.png | Bin 0 -> 214 bytes graphics/field_effect_objects/pics/sand_pile/0.png | Bin 0 -> 164 bytes graphics/field_effect_objects/pics/sand_pile/1.png | Bin 0 -> 176 bytes graphics/field_effect_objects/pics/sand_pile/2.png | Bin 0 -> 171 bytes graphics/field_effect_objects/pics/sparkle/0.png | Bin 0 -> 157 bytes graphics/field_effect_objects/pics/sparkle/1.png | Bin 0 -> 175 bytes graphics/field_effect_objects/pics/unknown_29/0.png | Bin 164 -> 0 bytes graphics/field_effect_objects/pics/unknown_29/1.png | Bin 176 -> 0 bytes graphics/field_effect_objects/pics/unknown_29/2.png | Bin 171 -> 0 bytes graphics/field_effect_objects/pics/unknown_33/0.png | Bin 185 -> 0 bytes graphics/field_effect_objects/pics/unknown_33/1.png | Bin 224 -> 0 bytes graphics/field_effect_objects/pics/unknown_33/2.png | Bin 232 -> 0 bytes graphics/field_effect_objects/pics/unknown_33/3.png | Bin 223 -> 0 bytes graphics/field_effect_objects/pics/unknown_33/4.png | Bin 214 -> 0 bytes graphics/field_effect_objects/pics/unknown_35/0.png | Bin 157 -> 0 bytes graphics/field_effect_objects/pics/unknown_35/1.png | Bin 175 -> 0 bytes 21 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 graphics/field_effect_objects/pics/lavaridge_gym_warp/0.png create mode 100644 graphics/field_effect_objects/pics/lavaridge_gym_warp/1.png create mode 100644 graphics/field_effect_objects/pics/lavaridge_gym_warp/2.png create mode 100644 graphics/field_effect_objects/pics/lavaridge_gym_warp/3.png create mode 100644 graphics/field_effect_objects/pics/lavaridge_gym_warp/4.png create mode 100644 graphics/field_effect_objects/pics/sand_pile/0.png create mode 100644 graphics/field_effect_objects/pics/sand_pile/1.png create mode 100644 graphics/field_effect_objects/pics/sand_pile/2.png create mode 100644 graphics/field_effect_objects/pics/sparkle/0.png create mode 100644 graphics/field_effect_objects/pics/sparkle/1.png delete mode 100644 graphics/field_effect_objects/pics/unknown_29/0.png delete mode 100644 graphics/field_effect_objects/pics/unknown_29/1.png delete mode 100644 graphics/field_effect_objects/pics/unknown_29/2.png delete mode 100644 graphics/field_effect_objects/pics/unknown_33/0.png delete mode 100644 graphics/field_effect_objects/pics/unknown_33/1.png delete mode 100644 graphics/field_effect_objects/pics/unknown_33/2.png delete mode 100644 graphics/field_effect_objects/pics/unknown_33/3.png delete mode 100644 graphics/field_effect_objects/pics/unknown_33/4.png delete mode 100644 graphics/field_effect_objects/pics/unknown_35/0.png delete mode 100644 graphics/field_effect_objects/pics/unknown_35/1.png diff --git a/data/graphics/field_objects/field_effect_object_graphics.s b/data/graphics/field_objects/field_effect_object_graphics.s index a2091f7cc..67865c4d0 100644 --- a/data/graphics/field_objects/field_effect_object_graphics.s +++ b/data/graphics/field_objects/field_effect_object_graphics.s @@ -309,15 +309,15 @@ gFieldEffectPic_Unknown19_3: @ 836ADC8 .align 2 gFieldEffectPic_SandPile_0: @ 836AE48 - .incbin "graphics/field_effect_objects/pics/unknown_29/0.4bpp" + .incbin "graphics/field_effect_objects/pics/sand_pile/0.4bpp" .align 2 gFieldEffectPic_SandPile_1: @ 836AE88 - .incbin "graphics/field_effect_objects/pics/unknown_29/1.4bpp" + .incbin "graphics/field_effect_objects/pics/sand_pile/1.4bpp" .align 2 gFieldEffectPic_SandPile_2: @ 836AEC8 - .incbin "graphics/field_effect_objects/pics/unknown_29/2.4bpp" + .incbin "graphics/field_effect_objects/pics/sand_pile/2.4bpp" .align 2 gFieldEffectPic_JumpBigSplash_0: @ 836AF08 @@ -489,23 +489,23 @@ gFieldEffectPic_PopOutOfAsh_4: @ 836CC68 .align 2 gFieldEffectPic_LavaridgeGymWarp_0: @ 836CCE8 - .incbin "graphics/field_effect_objects/pics/unknown_33/0.4bpp" + .incbin "graphics/field_effect_objects/pics/lavaridge_gym_warp/0.4bpp" .align 2 gFieldEffectPic_LavaridgeGymWarp_1: @ 836CD68 - .incbin "graphics/field_effect_objects/pics/unknown_33/1.4bpp" + .incbin "graphics/field_effect_objects/pics/lavaridge_gym_warp/1.4bpp" .align 2 gFieldEffectPic_LavaridgeGymWarp_2: @ 836CDE8 - .incbin "graphics/field_effect_objects/pics/unknown_33/2.4bpp" + .incbin "graphics/field_effect_objects/pics/lavaridge_gym_warp/2.4bpp" .align 2 gFieldEffectPic_LavaridgeGymWarp_3: @ 836CE68 - .incbin "graphics/field_effect_objects/pics/unknown_33/3.4bpp" + .incbin "graphics/field_effect_objects/pics/lavaridge_gym_warp/3.4bpp" .align 2 gFieldEffectPic_LavaridgeGymWarp_4: @ 836CEE8 - .incbin "graphics/field_effect_objects/pics/unknown_33/4.4bpp" + .incbin "graphics/field_effect_objects/pics/lavaridge_gym_warp/4.4bpp" .align 2 gFieldEffectPic_Bubbles_0: @ 836CF68 @@ -541,11 +541,11 @@ gFieldEffectPic_Bubbles_7: @ 836D668 .align 2 gFieldEffectPic_Sparkle_0: @ 836D768 - .incbin "graphics/field_effect_objects/pics/unknown_35/0.4bpp" + .incbin "graphics/field_effect_objects/pics/sparkle/0.4bpp" .align 2 gFieldEffectPic_Sparkle_1: @ 836D7E8 - .incbin "graphics/field_effect_objects/pics/unknown_35/1.4bpp" + .incbin "graphics/field_effect_objects/pics/sparkle/1.4bpp" .align 2 gFieldEffectObjectPalette3: @ 836D868 diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp/0.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp/0.png new file mode 100644 index 000000000..2241eabd3 Binary files /dev/null and b/graphics/field_effect_objects/pics/lavaridge_gym_warp/0.png differ diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp/1.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp/1.png new file mode 100644 index 000000000..5f90405d8 Binary files /dev/null and b/graphics/field_effect_objects/pics/lavaridge_gym_warp/1.png differ diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp/2.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp/2.png new file mode 100644 index 000000000..3f1c3a76a Binary files /dev/null and b/graphics/field_effect_objects/pics/lavaridge_gym_warp/2.png differ diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp/3.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp/3.png new file mode 100644 index 000000000..2696f4a5a Binary files /dev/null and b/graphics/field_effect_objects/pics/lavaridge_gym_warp/3.png differ diff --git a/graphics/field_effect_objects/pics/lavaridge_gym_warp/4.png b/graphics/field_effect_objects/pics/lavaridge_gym_warp/4.png new file mode 100644 index 000000000..c2d1785bf Binary files /dev/null and b/graphics/field_effect_objects/pics/lavaridge_gym_warp/4.png differ diff --git a/graphics/field_effect_objects/pics/sand_pile/0.png b/graphics/field_effect_objects/pics/sand_pile/0.png new file mode 100644 index 000000000..87fe91c97 Binary files /dev/null and b/graphics/field_effect_objects/pics/sand_pile/0.png differ diff --git a/graphics/field_effect_objects/pics/sand_pile/1.png b/graphics/field_effect_objects/pics/sand_pile/1.png new file mode 100644 index 000000000..c20fb34bb Binary files /dev/null and b/graphics/field_effect_objects/pics/sand_pile/1.png differ diff --git a/graphics/field_effect_objects/pics/sand_pile/2.png b/graphics/field_effect_objects/pics/sand_pile/2.png new file mode 100644 index 000000000..def972b20 Binary files /dev/null and b/graphics/field_effect_objects/pics/sand_pile/2.png differ diff --git a/graphics/field_effect_objects/pics/sparkle/0.png b/graphics/field_effect_objects/pics/sparkle/0.png new file mode 100644 index 000000000..c2ae128f7 Binary files /dev/null and b/graphics/field_effect_objects/pics/sparkle/0.png differ diff --git a/graphics/field_effect_objects/pics/sparkle/1.png b/graphics/field_effect_objects/pics/sparkle/1.png new file mode 100644 index 000000000..fe68b19fd Binary files /dev/null and b/graphics/field_effect_objects/pics/sparkle/1.png differ diff --git a/graphics/field_effect_objects/pics/unknown_29/0.png b/graphics/field_effect_objects/pics/unknown_29/0.png deleted file mode 100644 index 87fe91c97..000000000 Binary files a/graphics/field_effect_objects/pics/unknown_29/0.png and /dev/null differ diff --git a/graphics/field_effect_objects/pics/unknown_29/1.png b/graphics/field_effect_objects/pics/unknown_29/1.png deleted file mode 100644 index c20fb34bb..000000000 Binary files a/graphics/field_effect_objects/pics/unknown_29/1.png and /dev/null differ diff --git a/graphics/field_effect_objects/pics/unknown_29/2.png b/graphics/field_effect_objects/pics/unknown_29/2.png deleted file mode 100644 index def972b20..000000000 Binary files a/graphics/field_effect_objects/pics/unknown_29/2.png and /dev/null differ diff --git a/graphics/field_effect_objects/pics/unknown_33/0.png b/graphics/field_effect_objects/pics/unknown_33/0.png deleted file mode 100644 index 2241eabd3..000000000 Binary files a/graphics/field_effect_objects/pics/unknown_33/0.png and /dev/null differ diff --git a/graphics/field_effect_objects/pics/unknown_33/1.png b/graphics/field_effect_objects/pics/unknown_33/1.png deleted file mode 100644 index 5f90405d8..000000000 Binary files a/graphics/field_effect_objects/pics/unknown_33/1.png and /dev/null differ diff --git a/graphics/field_effect_objects/pics/unknown_33/2.png b/graphics/field_effect_objects/pics/unknown_33/2.png deleted file mode 100644 index 3f1c3a76a..000000000 Binary files a/graphics/field_effect_objects/pics/unknown_33/2.png and /dev/null differ diff --git a/graphics/field_effect_objects/pics/unknown_33/3.png b/graphics/field_effect_objects/pics/unknown_33/3.png deleted file mode 100644 index 2696f4a5a..000000000 Binary files a/graphics/field_effect_objects/pics/unknown_33/3.png and /dev/null differ diff --git a/graphics/field_effect_objects/pics/unknown_33/4.png b/graphics/field_effect_objects/pics/unknown_33/4.png deleted file mode 100644 index c2d1785bf..000000000 Binary files a/graphics/field_effect_objects/pics/unknown_33/4.png and /dev/null differ diff --git a/graphics/field_effect_objects/pics/unknown_35/0.png b/graphics/field_effect_objects/pics/unknown_35/0.png deleted file mode 100644 index c2ae128f7..000000000 Binary files a/graphics/field_effect_objects/pics/unknown_35/0.png and /dev/null differ diff --git a/graphics/field_effect_objects/pics/unknown_35/1.png b/graphics/field_effect_objects/pics/unknown_35/1.png deleted file mode 100644 index fe68b19fd..000000000 Binary files a/graphics/field_effect_objects/pics/unknown_35/1.png and /dev/null differ -- cgit v1.2.3