summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/rom5.s2
-rw-r--r--data/data2.s44
-rw-r--r--data/graphics/field_objects/field_effect_object_graphics.s18
-rw-r--r--graphics/field_effect_objects/pics/cut_grass.pngbin0 -> 160 bytes
-rw-r--r--graphics/field_effect_objects/pics/jump_long_grass/unused.pngbin0 -> 235 bytes
-rw-r--r--graphics/field_effect_objects/pics/unused_grass/0.pngbin0 -> 231 bytes
-rw-r--r--graphics/field_effect_objects/pics/unused_grass/1.pngbin0 -> 228 bytes
-rw-r--r--graphics/field_effect_objects/pics/unused_grass/2.pngbin0 -> 230 bytes
-rw-r--r--graphics/field_effect_objects/pics/unused_grass/3.pngbin0 -> 232 bytes
-rw-r--r--graphics/field_effect_objects/unknown.binbin0 -> 192 bytes
10 files changed, 53 insertions, 11 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index 2b379e9bf..d4ad0be1d 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -80831,7 +80831,7 @@ _080A2790: .4byte 0x0203923c
_080A2794: .4byte 0x0000ffff
_080A2798: .4byte 0x02020004
_080A279C: .4byte 0x0202e858
-_080A27A0: .4byte gUnknown_083C1600
+_080A27A0: .4byte gSpriteTemplate_CutGrass
_080A27A4: .4byte 0x0201fff0
thumb_func_end sub_80A2698
diff --git a/data/data2.s b/data/data2.s
index 2a7f6267e..8bbfc7a69 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -7743,18 +7743,50 @@ gUnknown_083C15AE: @ 83C15AE
gUnknown_083C15B4: @ 83C15B4
.incbin "baserom.gba", 0x003c15b4, 0x8
- .global gUnknown_083C15BC
-gUnknown_083C15BC: @ 83C15BC
- .incbin "baserom.gba", 0x003c15bc, 0x3C
+ .align 2
+gUnknown_083C15BC:: @ 83C15BC
+ .byte 9, 1, 0, 2
+ .byte 10, 3, 0, 4
+ .byte 8, 5, 0, 6
+ .byte 11, 7, 0, 8
+ .byte 14, 9, 0, 10
+ .byte 12, 11, 0, 12
+ .byte 13, 13, 0, 14
+ .byte -1, 15, 0, 10
+
+ .align 2
+gOamData_CutGrass:: @ 83C15DC
+ .2byte 0
+ .2byte 0
+ .2byte 0x1401
+
+ .align 2
+gSpriteAnim_CutGrass:: @ 83C15E4
+ obj_image_anim_frame 0, 30
+ obj_image_anim_jump 0
+
+ .align 2
+gSpriteAnimTable_CutGrass:: @ 83C15EC
+ .4byte gSpriteAnim_CutGrass
+
+ .align 2
+gSpriteImageTable_CutGrass:: @ 83C15F0
+ obj_frame_tiles gFieldEffectObjectPic_CutGrass, 0x20
.align 2
.global gFieldEffectObjectPaletteInfo6
gFieldEffectObjectPaletteInfo6: @ 83C15F8
obj_pal gFieldEffectObjectPalette6, 0x1000
- .global gUnknown_083C1600
-gUnknown_083C1600: @ 83C1600
- .incbin "baserom.gba", 0x003c1600, 0x18
+ .align 2
+gSpriteTemplate_CutGrass:: @ 83C1600
+ .2byte 0xFFFF @ tiles tag
+ .2byte 0x1000 @ palette tag
+ .4byte gOamData_CutGrass
+ .4byte gSpriteAnimTable_CutGrass
+ .4byte gSpriteImageTable_CutGrass
+ .4byte gDummySpriteAffineAnimTable
+ .4byte sub_80A2A48
.global gUnknown_083C1618
gUnknown_083C1618: @ 83C1618
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
diff --git a/graphics/field_effect_objects/pics/cut_grass.png b/graphics/field_effect_objects/pics/cut_grass.png
new file mode 100644
index 000000000..3c41d28b3
--- /dev/null
+++ b/graphics/field_effect_objects/pics/cut_grass.png
Binary files differ
diff --git a/graphics/field_effect_objects/pics/jump_long_grass/unused.png b/graphics/field_effect_objects/pics/jump_long_grass/unused.png
new file mode 100644
index 000000000..0a6311550
--- /dev/null
+++ b/graphics/field_effect_objects/pics/jump_long_grass/unused.png
Binary files differ
diff --git a/graphics/field_effect_objects/pics/unused_grass/0.png b/graphics/field_effect_objects/pics/unused_grass/0.png
new file mode 100644
index 000000000..2e16f15cb
--- /dev/null
+++ b/graphics/field_effect_objects/pics/unused_grass/0.png
Binary files differ
diff --git a/graphics/field_effect_objects/pics/unused_grass/1.png b/graphics/field_effect_objects/pics/unused_grass/1.png
new file mode 100644
index 000000000..dd33b0d88
--- /dev/null
+++ b/graphics/field_effect_objects/pics/unused_grass/1.png
Binary files differ
diff --git a/graphics/field_effect_objects/pics/unused_grass/2.png b/graphics/field_effect_objects/pics/unused_grass/2.png
new file mode 100644
index 000000000..345d454cd
--- /dev/null
+++ b/graphics/field_effect_objects/pics/unused_grass/2.png
Binary files differ
diff --git a/graphics/field_effect_objects/pics/unused_grass/3.png b/graphics/field_effect_objects/pics/unused_grass/3.png
new file mode 100644
index 000000000..087676102
--- /dev/null
+++ b/graphics/field_effect_objects/pics/unused_grass/3.png
Binary files differ
diff --git a/graphics/field_effect_objects/unknown.bin b/graphics/field_effect_objects/unknown.bin
new file mode 100644
index 000000000..34681627f
--- /dev/null
+++ b/graphics/field_effect_objects/unknown.bin
Binary files differ