diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
| commit | 1ae3d9b57b0f4ad506a1bd7323e46d2fa768b6b7 (patch) | |
| tree | fca8b14b2e5e3a2390c1b890db2f56f6f8cff744 /data/evolution_graphics.s | |
| parent | 0a88d1042a80bcc703d05f1cf19527272424a03f (diff) | |
| parent | d32ec8bf7246468625ab68a2d62835d70b7ac98c (diff) | |
I hope this fixes merge conflicts
Diffstat (limited to 'data/evolution_graphics.s')
| -rw-r--r-- | data/evolution_graphics.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/evolution_graphics.s b/data/evolution_graphics.s index c357efb12..d6ad2e578 100644 --- a/data/evolution_graphics.s +++ b/data/evolution_graphics.s @@ -3,7 +3,7 @@ .section .rodata - .incbin "baserom.gba", 0x5f53c4, 0x48 + .incbin "baserom.gba", 0x5f53cc, 0x40 gUnknown_085F540C:: @ 85F540C .incbin "baserom.gba", 0x5f540c, 0x10 |