diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2017-09-17 23:42:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 23:42:43 -0400 |
| commit | abe72dca47f73231e45f778e6ceafe2e3b7f4158 (patch) | |
| tree | c3e4c4594198930a6adcadd9c6fd7d55bd330979 /data/data3b.s | |
| parent | 16f2e40576b29fd85366305b4165da3aff4aef0e (diff) | |
| parent | 74bda5b68088f08220cf3f1b9791e5900a6a9877 (diff) | |
Merge branch 'master' into sub_81700F8
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" |