diff options
author | YamaArashi <shadow962@live.com> | 2016-08-31 01:04:27 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-08-31 01:04:27 -0700 |
commit | 9922af5f3cfef491fc84721cd9c1bd1fe771e5c4 (patch) | |
tree | 3b3a0ddb0a76a82b5b7b2593335b05a38ac8a8f4 | |
parent | 74fa649273c38f63b0586312dc17ff96125c22ec (diff) |
field move light streak graphics
-rw-r--r-- | asm/rom5.s | 12 | ||||
-rw-r--r-- | data/data2.s | 34 | ||||
-rw-r--r-- | graphics/misc/darkness_field_move_streaks.pal | 19 | ||||
-rw-r--r-- | graphics/misc/darkness_field_move_streaks.png | bin | 0 -> 159 bytes | |||
-rw-r--r-- | graphics/misc/darkness_field_move_streaks_map.bin | bin | 0 -> 640 bytes | |||
-rw-r--r-- | graphics/misc/field_move_streaks.pal | 19 | ||||
-rw-r--r-- | graphics/misc/field_move_streaks.png | bin | 0 -> 157 bytes | |||
-rw-r--r-- | graphics/misc/field_move_streaks_map.bin | bin | 0 -> 640 bytes |
8 files changed, 66 insertions, 18 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 202114a9d..10f080e98 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -27630,9 +27630,9 @@ sub_80881C0: @ 80881C0 bx r0 .align 2, 0 _08088218: .4byte REG_BG0CNT -_0808821C: .4byte gUnknown_0839E914 +_0808821C: .4byte gFieldMoveStreaksTiles _08088220: .4byte 0x05000200 -_08088224: .4byte gUnknown_0839EB14 +_08088224: .4byte gFieldMoveStreaksPalette thumb_func_end sub_80881C0 thumb_func_start sub_8088228 @@ -27943,7 +27943,7 @@ _08088452: bx r0 .align 2, 0 _08088470: .4byte 0x06000140 -_08088474: .4byte gUnknown_0839EB34 +_08088474: .4byte gFieldMoveStreaksTilemap _08088478: .4byte 0x0000013f thumb_func_end sub_808843C @@ -28048,9 +28048,9 @@ sub_80884E8: @ 80884E8 bx r0 .align 2, 0 _08088544: .4byte REG_BG0CNT -_08088548: .4byte gUnknown_0839EDB4 +_08088548: .4byte gDarknessFieldMoveStreaksTiles _0808854C: .4byte 0x05000200 -_08088550: .4byte gUnknown_0839EE34 +_08088550: .4byte gDarknessFieldMoveStreaksPalette thumb_func_end sub_80884E8 thumb_func_start sub_8088554 @@ -28366,7 +28366,7 @@ _080887A8: bx r1 .align 2, 0 _080887B8: .4byte 0x06000140 -_080887BC: .4byte gUnknown_0839EE54 +_080887BC: .4byte gDarknessFieldMoveStreaksTilemap thumb_func_end sub_8088708 thumb_func_start sub_80887C0 diff --git a/data/data2.s b/data/data2.s index 276c2488d..ca086c4bd 100644 --- a/data/data2.s +++ b/data/data2.s @@ -11178,23 +11178,33 @@ gSpriteImage_839E7F4:: @ 839E7F4 gFieldEffectObjectPalette5: @ 839E8F4 .incbin "graphics/field_effect_objects/palettes/05.gbapal" -gUnknown_0839E914:: @ 839E914 - .incbin "baserom.gba", 0x0039e914, 0x200 +@ Graphics for the lights streaking past your Pokémon when it uses a field move. -gUnknown_0839EB14:: @ 839EB14 - .incbin "baserom.gba", 0x0039eb14, 0x20 + .align 2 +gFieldMoveStreaksTiles:: @ 839E914 + .incbin "graphics/misc/field_move_streaks.4bpp" + + .align 2 +gFieldMoveStreaksPalette:: @ 839EB14 + .incbin "graphics/misc/field_move_streaks.gbapal" + + .align 2 +gFieldMoveStreaksTilemap:: @ 839EB34 + .incbin "graphics/misc/field_move_streaks_map.bin" -gUnknown_0839EB34:: @ 839EB34 - .incbin "baserom.gba", 0x0039eb34, 0x280 +@ The following light streaks effect is used when the map is dark (e.g. a cave). -gUnknown_0839EDB4:: @ 839EDB4 - .incbin "baserom.gba", 0x0039edb4, 0x80 + .align 2 +gDarknessFieldMoveStreaksTiles:: @ 839EDB4 + .incbin "graphics/misc/darkness_field_move_streaks.4bpp" -gUnknown_0839EE34:: @ 839EE34 - .incbin "baserom.gba", 0x0039ee34, 0x20 + .align 2 +gDarknessFieldMoveStreaksPalette:: @ 839EE34 + .incbin "graphics/misc/darkness_field_move_streaks.gbapal" -gUnknown_0839EE54:: @ 839EE54 - .incbin "baserom.gba", 0x0039ee54, 0x280 + .align 2 +gDarknessFieldMoveStreaksTilemap:: @ 839EE54 + .incbin "graphics/misc/darkness_field_move_streaks_map.bin" .align 2 gUnknown_0839F0D4:: @ 839F0D4 diff --git a/graphics/misc/darkness_field_move_streaks.pal b/graphics/misc/darkness_field_move_streaks.pal new file mode 100644 index 000000000..37ea1ae61 --- /dev/null +++ b/graphics/misc/darkness_field_move_streaks.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 139 57 +0 0 0 +148 148 148 +197 197 197 +255 255 255 +123 156 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/misc/darkness_field_move_streaks.png b/graphics/misc/darkness_field_move_streaks.png Binary files differnew file mode 100644 index 000000000..825d695eb --- /dev/null +++ b/graphics/misc/darkness_field_move_streaks.png diff --git a/graphics/misc/darkness_field_move_streaks_map.bin b/graphics/misc/darkness_field_move_streaks_map.bin Binary files differnew file mode 100644 index 000000000..f7c2f2142 --- /dev/null +++ b/graphics/misc/darkness_field_move_streaks_map.bin diff --git a/graphics/misc/field_move_streaks.pal b/graphics/misc/field_move_streaks.pal new file mode 100644 index 000000000..12bc76261 --- /dev/null +++ b/graphics/misc/field_move_streaks.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/misc/field_move_streaks.png b/graphics/misc/field_move_streaks.png Binary files differnew file mode 100644 index 000000000..8becc4413 --- /dev/null +++ b/graphics/misc/field_move_streaks.png diff --git a/graphics/misc/field_move_streaks_map.bin b/graphics/misc/field_move_streaks_map.bin Binary files differnew file mode 100644 index 000000000..466f456be --- /dev/null +++ b/graphics/misc/field_move_streaks_map.bin |