diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-31 01:12:36 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-31 01:12:36 -0400 |
| commit | b995ecd9ee7e5d52185e475486e46616702cf5c4 (patch) | |
| tree | 2adb5b5ffcc6ba975da13e75b507dd714b311b7b /data/data2.s | |
| parent | 77e755033c05a39c18b53e3a74bc777113e0581b (diff) | |
| parent | d5637762c3fd80a095061538c7bd874986e44b46 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'data/data2.s')
| -rw-r--r-- | data/data2.s | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/data/data2.s b/data/data2.s index e06bfaf69..0c8b67aa5 100644 --- a/data/data2.s +++ b/data/data2.s @@ -10981,6 +10981,7 @@ gUnknown_0839AE70:: @ 839AE70 .align 2 gUnknown_0839B1F0:: @ 839B1F0 .2byte 0x0807, 0x0808, 0x0809, 0x080a, 0x080b, 0x080c, 0x080d, 0x080e + Unknown_839B200: .incbin "baserom.gba", 0x0039b200, 0x7 Unknown_839B207: @@ -30120,11 +30121,8 @@ gUnknown_08411960:: @ 8411960 gUnknown_08411980:: @ 8411980 .incbin "graphics/misc/clock_small.4bpp.lz" -gUnknown_08411A10:: @ 8411A10 - .incbin "baserom.gba", 0x00411a10, 0x32 - -gUnknown_08411A42:: @ 8411A42 - .incbin "baserom.gba", 0x00411A42, 0x44c +@ 8411A10 + .include "data/mon_pokeblock_anims.s" .align 2 gSpriteAffineAnim_8411E90:: @ 8411E90 |