From 9ce96141c8ac2316fca20b542be87ed7a151b4d0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 May 2021 16:23:01 -0400 Subject: [PATCH] Move event gfx resources, 1 --- graphics/field_effects/palettes/ash.pal | 19 ++++++ .../palettes/general_0.pal} | 0 .../palettes/general_1.pal} | 0 .../field_effects/palettes/small_sparkle.pal | 19 ++++++ .../field_effects/pics/bike_tire_tracks.png | Bin 0 -> 198 bytes .../pics/bird.png} | Bin .../pics/deep_sand_footprints.png | Bin 0 -> 209 bytes .../pics/hot_springs_water.png} | Bin .../pics}/jump_big_splash.png | Bin .../field_effects/pics/jump_small_splash.png | Bin 0 -> 209 bytes .../pics}/lavaridge_warp.png | Bin .../pics}/long_grass.png | Bin .../pics}/pop_out_of_ash.png | Bin .../field_effects/pics/sand_footprints.png | Bin 0 -> 189 bytes .../pics}/shadow_extra_large.png | Bin .../pics}/shadow_large.png | Bin .../pics}/shadow_medium.png | Bin .../pics}/shadow_small.png | Bin .../pics}/small_sparkle.png | Bin graphics/field_effects/pics/splash.png | Bin 0 -> 180 bytes .../pics}/underwater_bubbles.png | Bin graphics_file_rules.mk | 9 +-- .../object_events/object_event_graphics.h | 54 ++++++++---------- 23 files changed, 66 insertions(+), 35 deletions(-) create mode 100644 graphics/field_effects/palettes/ash.pal rename graphics/{object_events/palettes/8398FA8.pal => field_effects/palettes/general_0.pal} (100%) rename graphics/{object_events/palettes/8398FC8.pal => field_effects/palettes/general_1.pal} (100%) create mode 100644 graphics/field_effects/palettes/small_sparkle.pal create mode 100644 graphics/field_effects/pics/bike_tire_tracks.png rename graphics/{object_events/pics/effects/fly_blob.png => field_effects/pics/bird.png} (100%) create mode 100644 graphics/field_effects/pics/deep_sand_footprints.png rename graphics/{object_events/pics/unknown/839C508.png => field_effects/pics/hot_springs_water.png} (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/jump_big_splash.png (100%) create mode 100644 graphics/field_effects/pics/jump_small_splash.png rename graphics/{object_events/pics/effects => field_effects/pics}/lavaridge_warp.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/long_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/pop_out_of_ash.png (100%) create mode 100644 graphics/field_effects/pics/sand_footprints.png rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_extra_large.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_large.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_medium.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_small.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/small_sparkle.png (100%) create mode 100644 graphics/field_effects/pics/splash.png rename graphics/{object_events/pics/effects => field_effects/pics}/underwater_bubbles.png (100%) diff --git a/graphics/field_effects/palettes/ash.pal b/graphics/field_effects/palettes/ash.pal new file mode 100644 index 000000000..e3a76c035 --- /dev/null +++ b/graphics/field_effects/palettes/ash.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +98 98 98 +213 213 139 +172 172 90 +139 139 65 +230 246 205 +189 238 180 +131 222 180 +98 172 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/object_events/palettes/8398FA8.pal b/graphics/field_effects/palettes/general_0.pal similarity index 100% rename from graphics/object_events/palettes/8398FA8.pal rename to graphics/field_effects/palettes/general_0.pal diff --git a/graphics/object_events/palettes/8398FC8.pal b/graphics/field_effects/palettes/general_1.pal similarity index 100% rename from graphics/object_events/palettes/8398FC8.pal rename to graphics/field_effects/palettes/general_1.pal diff --git a/graphics/field_effects/palettes/small_sparkle.pal b/graphics/field_effects/palettes/small_sparkle.pal new file mode 100644 index 000000000..b170eb1f5 --- /dev/null +++ b/graphics/field_effects/palettes/small_sparkle.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 74 +255 255 255 +205 246 255 +156 213 255 +74 197 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/field_effects/pics/bike_tire_tracks.png b/graphics/field_effects/pics/bike_tire_tracks.png new file mode 100644 index 0000000000000000000000000000000000000000..b86f558ba1499539027d34e1277399473d7588e1 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ip*Z&OfzCAno?&_9%Tc-T~ z|Nq{zcYDu1o3rI!(wr?oB|z}**^+x#yRYsoKDs3e$o;F*qYk7POM?7@862M7NCR?Q zJY5_^G$tk|NIYuzt|#O06-l80 literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/effects/fly_blob.png b/graphics/field_effects/pics/bird.png similarity index 100% rename from graphics/object_events/pics/effects/fly_blob.png rename to graphics/field_effects/pics/bird.png diff --git a/graphics/field_effects/pics/deep_sand_footprints.png b/graphics/field_effects/pics/deep_sand_footprints.png new file mode 100644 index 0000000000000000000000000000000000000000..7068aba6c899008acc68dba2c85e82679543dd93 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt-1^c=zqu(RWw3+}kqc z|NsB@p1s?9_Su{*_mbvp0V)B4ch8pGyV`wqZ}HJBQ9$lrl^%5<#aI&L7tG-B>_!@p z7$Pw>IpF|T#eFBqn)eqZ3pDRpi!1b4r!VBWw|m91JI!6jd#W4GHF$oU*Z6X0 z_p+I059H2#eSdFm>xT*ly^8OAFJ|r*cX-!W$@WN&fkj#6RK8LBG@#K8p00i_>zopr E0Jsxb1poj5 literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/unknown/839C508.png b/graphics/field_effects/pics/hot_springs_water.png similarity index 100% rename from graphics/object_events/pics/unknown/839C508.png rename to graphics/field_effects/pics/hot_springs_water.png diff --git a/graphics/object_events/pics/effects/jump_big_splash.png b/graphics/field_effects/pics/jump_big_splash.png similarity index 100% rename from graphics/object_events/pics/effects/jump_big_splash.png rename to graphics/field_effects/pics/jump_big_splash.png diff --git a/graphics/field_effects/pics/jump_small_splash.png b/graphics/field_effects/pics/jump_small_splash.png new file mode 100644 index 0000000000000000000000000000000000000000..ea8e763f5de62eeab2c50c1c9b1f46117e3c17d0 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!VDxC`x5MdltF+`i0glbci)~JeRp-sy)9Gz z|NnpQ*}J`GpUv5FFKNyepb{W>_iV|%tKC=k79ZUb1?2u!=}`w#j3q&S!3+-1ZlnP@ z{+=$5AsjQ46ArLPOo&L>rp=t~(7`<6pqSJvsbgHzJh^=jEVXYCU1e!9g>gmqRK=-{ ziam-9D`Zu8E>4qT3p~vx*zh8uRUkpDfl<-Lgn{9@4Ex)p?w41AMl*Q2`njxgN@xNA D#|}%t literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/effects/lavaridge_warp.png b/graphics/field_effects/pics/lavaridge_warp.png similarity index 100% rename from graphics/object_events/pics/effects/lavaridge_warp.png rename to graphics/field_effects/pics/lavaridge_warp.png diff --git a/graphics/object_events/pics/effects/long_grass.png b/graphics/field_effects/pics/long_grass.png similarity index 100% rename from graphics/object_events/pics/effects/long_grass.png rename to graphics/field_effects/pics/long_grass.png diff --git a/graphics/object_events/pics/effects/pop_out_of_ash.png b/graphics/field_effects/pics/pop_out_of_ash.png similarity index 100% rename from graphics/object_events/pics/effects/pop_out_of_ash.png rename to graphics/field_effects/pics/pop_out_of_ash.png diff --git a/graphics/field_effects/pics/sand_footprints.png b/graphics/field_effects/pics/sand_footprints.png new file mode 100644 index 0000000000000000000000000000000000000000..68b5de234650932156b2dba06bfcac7217427813 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt-1^c=zqu(RWw3+}kqc z|NsB@p1s?9_Su{*_mbvp0V)B4ch8pGyV`wqZ}HJBQ9$lrl^%5<#aI&L7tG-B>_!@p zW9{kU7$Pw>IpF|T#eFBqn)eqZ3pDSs-}tI@U@v#TvEA%1cy@@~XJxBusy4X3pV{*1 jz1!RgJP#M1aAst<=OFc^^u^(HpfL=du6{1-oD!MOhLIB*-tA!Qt7BG$6;w z)5S4_V`g%K0`CSRiw#W~+b&$$V8Cvmt*hIZ@s=-vMX6!ghK7ht#>AWiO*1pL1(pmt XZmb0XO-tf|x*0rO{an^LB{Ts5q5eW3 literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/effects/underwater_bubbles.png b/graphics/field_effects/pics/underwater_bubbles.png similarity index 100% rename from graphics/object_events/pics/effects/underwater_bubbles.png rename to graphics/field_effects/pics/underwater_bubbles.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index e87b08888..8e39e0a91 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -14,6 +14,7 @@ ROULETTEGFXDIR := graphics/roulette SLOTMACHINEGFXDIR := graphics/slot_machine PSSGFXDIR := graphics/pokemon_storage EVENTOBJGFXDIR := graphics/object_events +FIELDEFFECTSGFXDIR := graphics/field_effects MISCGFXDIR := graphics/misc TEXTWINDOWGFXDIR := graphics/text_window SLOTMACHINEGFXDIR := graphics/slot_machine @@ -429,12 +430,12 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp @cat $^ >$@ -$(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 11 - -$(EVENTOBJGFXDIR)/pics/effects/underwater_bubbles.4bpp: %.4bpp: %.png +$(FIELDEFFECTSGFXDIR)/pics/underwater_bubbles.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 +$(FIELDEFFECTSGFXDIR)/pics/bike_tire_tracks.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + $(EVENTOBJGFXDIR)/pics/unknown/839BE08.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 1bf1c7df2..ce0315624 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -186,10 +186,10 @@ const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/m const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); const u16 gUnknown_8398008[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); const u16 gUnknown_8398028[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); -const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_small.4bpp"); -const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_medium.4bpp"); -const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_large.4bpp"); -const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); +const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/field_effects/pics/shadow_small.4bpp"); +const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/field_effects/pics/shadow_medium.4bpp"); +const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_large.4bpp"); +const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_extra_large.4bpp"); const u16 filler_8398188[0x90] = {}; const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); const u16 gUnknown_8398668[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); @@ -197,44 +197,36 @@ const u16 gUnknown_8398688[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gba const u16 gFieldEffectObjectPic_Ripple[] = INCBIN_U16("graphics/object_events/pics/unknown/83986A8.4bpp"); const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/object_events/pics/unknown/8398928.4bpp"); const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/object_events/pics/unknown/8398BA8.4bpp"); -const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/8398FA8.gbapal"); -const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/8398FC8.gbapal"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/general_0.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal"); const u16 filler_8398FE8[16] = {0}; const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/object_events/pics/unknown/8399008.4bpp"); -const u16 gUnknown_83990C8[] = INCBIN_U16("graphics/object_events/pics/unknown/83990C8.4bpp"); +UNUSED const u16 gFieldEffectObjectPic_UnusedGrass3[] = INCBIN_U16("graphics/object_events/pics/unknown/83990C8.4bpp"); const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399188.4bpp"); -const u16 gUnknown_8399288[] = INCBIN_U16("graphics/object_events/pics/unknown/8399288.4bpp"); +UNUSED const u16 gFieldEffectObjectPic_UnusedGrass4[] = INCBIN_U16("graphics/object_events/pics/unknown/8399288.4bpp"); const u16 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399488.4bpp"); const u16 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399788.4bpp"); const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/object_events/pics/unknown/8399C08.4bpp"); -const u16 gFieldEffectObjectPic_LongGrass[] = INCBIN_U16("graphics/object_events/pics/effects/long_grass.4bpp"); +const u16 gFieldEffectObjectPic_LongGrass[] = INCBIN_U16("graphics/field_effects/pics/long_grass.4bpp"); const u16 gFieldEffectObjectPic_TallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A008.4bpp"); const u16 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A288.4bpp"); -const u16 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U16("graphics/object_events/pics/unknown/839A388.4bpp"); -const u16 gUnknown_839A408[] = INCBIN_U16("graphics/object_events/pics/unknown/839A408.4bpp"); -const u16 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U16("graphics/object_events/pics/unknown/839A488.4bpp"); -const u16 gUnknown_839A508[] = INCBIN_U16("graphics/object_events/pics/unknown/839A508.4bpp"); -const u16 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U16("graphics/object_events/pics/unknown/839A588.4bpp"); -const u16 gUnknown_839A608[] = INCBIN_U16("graphics/object_events/pics/unknown/839A608.4bpp"); -const u16 gUnknown_839A688[] = INCBIN_U16("graphics/object_events/pics/unknown/839A688.4bpp"); -const u16 gUnknown_839A708[] = INCBIN_U16("graphics/object_events/pics/unknown/839A708.4bpp"); +const u16 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U16("graphics/field_effects/pics/sand_footprints.4bpp"); +const u16 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U16("graphics/field_effects/pics/deep_sand_footprints.4bpp"); +const u16 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U16("graphics/field_effects/pics/bike_tire_tracks.4bpp"); const u16 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U16("graphics/object_events/pics/unknown/839A788.4bpp"); const u16 gFieldEffectObjectPic_SandPile[] = INCBIN_U16("graphics/object_events/pics/unknown/839A988.4bpp"); -const u16 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U16("graphics/object_events/pics/effects/jump_big_splash.4bpp"); -const u16 gFieldEffectObjectPic_Splash[] = INCBIN_U16("graphics/object_events/pics/unknown/839AC48.4bpp"); -const u16 gUnknown_839AC88[] = INCBIN_U16("graphics/object_events/pics/unknown/839AC88.4bpp"); -const u16 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U16("graphics/object_events/pics/unknown/839ACC8.4bpp"); -const u16 gUnknown_839AD08[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD08.4bpp"); -const u16 gUnknown_839AD48[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD48.4bpp"); +const u16 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U16("graphics/field_effects/pics/jump_big_splash.4bpp"); +const u16 gFieldEffectObjectPic_Splash[] = INCBIN_U16("graphics/field_effects/pics/splash.4bpp"); +const u16 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U16("graphics/field_effects/pics/jump_small_splash.4bpp"); const u16 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD88.4bpp"); const u16 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B008.4bpp"); const u16 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B708.4bpp"); const u16 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U16("graphics/object_events/pics/unknown/839BE08.4bpp"); -const u16 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U16("graphics/object_events/pics/unknown/839C508.4bpp"); -const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.gbapal"); -const u16 gFieldEffectObjectPic_AshPuff[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.4bpp"); -const u16 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U16("graphics/object_events/pics/effects/lavaridge_warp.4bpp"); -const u16 gFieldEffectObjectPic_Bubbles[] = INCBIN_U16("graphics/object_events/pics/effects/underwater_bubbles.4bpp"); -const u16 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.4bpp"); -const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.gbapal"); -const u16 gFieldEffectObjectPic_Bird[] = INCBIN_U16("graphics/object_events/pics/effects/fly_blob.4bpp"); +const u16 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U16("graphics/field_effects/pics/hot_springs_water.4bpp"); +const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/field_effects/palettes/ash.gbapal"); +const u16 gFieldEffectObjectPic_AshPuff[] = INCBIN_U16("graphics/field_effects/pics/pop_out_of_ash.4bpp"); +const u16 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U16("graphics/field_effects/pics/lavaridge_warp.4bpp"); +const u16 gFieldEffectObjectPic_Bubbles[] = INCBIN_U16("graphics/field_effects/pics/underwater_bubbles.4bpp"); +const u16 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U16("graphics/field_effects/pics/small_sparkle.4bpp"); +const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/field_effects/palettes/small_sparkle.gbapal"); +const u16 gFieldEffectObjectPic_Bird[] = INCBIN_U16("graphics/field_effects/pics/bird.4bpp");