diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-16 17:57:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-16 17:57:50 -0400 |
| commit | d574795b729742efb26b80a1c5b798cd0f58c3f4 (patch) | |
| tree | 46256c02f8d772d76a81c1ec2a9f4bd15fb05b0f /data/data3b.s | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
| parent | 5e12833b13223ecc6a5a9c91332ed71303358680 (diff) | |
Merge pull request #32 from Diegoisawesome/master
Extract baserom calls from data2.s and begin tidying up strings.s
Diffstat (limited to 'data/data3b.s')
| -rw-r--r-- | data/data3b.s | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/data/data3b.s b/data/data3b.s index 71d189254..3faa3d290 100644 --- a/data/data3b.s +++ b/data/data3b.s @@ -5,6 +5,9 @@ .section .rodata + .align 2 + .incbin "baserom.gba", 0x58d978, 0x2a0 + .align 2 gFieldEffectObjectPalette7:: @ 858DC18 .incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal" |