summaryrefslogtreecommitdiff
path: root/data/graphics
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-04 12:33:45 -0700
committerYamaArashi <shadow962@live.com>2016-07-04 12:33:45 -0700
commitbc9a63144df3bc22142f831fa5382f1f6aaf1ecb (patch)
treeb3157973428d90a62918ed1eb3a6c4f295d76118 /data/graphics
parent1a607583044c716b4f71354787df8217ab539913 (diff)
get rid of field effect graphics incbins
Diffstat (limited to 'data/graphics')
-rw-r--r--data/graphics/field_objects/field_effect_object_graphics.s18
1 files changed, 14 insertions, 4 deletions
diff --git a/data/graphics/field_objects/field_effect_object_graphics.s b/data/graphics/field_objects/field_effect_object_graphics.s
index 8006a8767..29b363a25 100644
--- a/data/graphics/field_objects/field_effect_object_graphics.s
+++ b/data/graphics/field_objects/field_effect_object_graphics.s
@@ -18,7 +18,14 @@ gFieldEffectObjectPic_ShadowLarge: @ 8368588
gFieldEffectObjectPic_ShadowExtraLarge: @ 8368608
.incbin "graphics/field_effect_objects/pics/shadow_extra_large.4bpp"
- .incbin "baserom.gba", 0x368a08, 0x160
+ .align 2
+ .space 0x120
+
+ .align 2
+
+gFieldEffectObjectPic_CutGrass: @ 8368B28
+ .incbin "graphics/field_effect_objects/pics/cut_grass.4bpp"
+ .incbin "graphics/field_effect_objects/pics/cut_grass.4bpp" @ included twice
.align 2
@@ -140,7 +147,7 @@ gFieldEffectObjectPic_Dust_1: @ 8369508
gFieldEffectObjectPic_Dust_2: @ 8369548
.incbin "graphics/field_effect_objects/pics/dust/2.4bpp"
- .incbin "baserom.gba", 0x369588, 0xc0
+ .incbin "graphics/field_effect_objects/unknown.bin"
.align 2
@@ -162,7 +169,10 @@ gFieldEffectObjectPic_JumpTallGrass_2: @ 83696C8
gFieldEffectObjectPic_JumpTallGrass_3: @ 8369708
.incbin "graphics/field_effect_objects/pics/jump_tall_grass/3.4bpp"
- .incbin "baserom.gba", 0x369748, 0x200
+ .incbin "graphics/field_effect_objects/pics/unused_grass/0.4bpp"
+ .incbin "graphics/field_effect_objects/pics/unused_grass/1.4bpp"
+ .incbin "graphics/field_effect_objects/pics/unused_grass/2.4bpp"
+ .incbin "graphics/field_effect_objects/pics/unused_grass/3.4bpp"
.align 2
@@ -189,7 +199,7 @@ gFieldEffectObjectPic_JumpLongGrass_3: @ 8369AC8
gFieldEffectObjectPic_JumpLongGrass_4: @ 8369B48
.incbin "graphics/field_effect_objects/pics/jump_long_grass/4.4bpp"
- .incbin "baserom.gba", 0x369bc8, 0x80
+ .incbin "graphics/field_effect_objects/pics/jump_long_grass/unused.4bpp"
.align 2