diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 44 | ||||
| -rw-r--r-- | data/graphics/field_objects/field_effect_object_graphics.s | 18 |
2 files changed, 52 insertions, 10 deletions
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 |