diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-03 15:07:51 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-03 15:07:51 -0700 |
| commit | 231ea2f27c9abe0b19ae415cf2af2352555ed2d0 (patch) | |
| tree | 37735927f5c4e251c2fa5da313b2b08288d482ab /data/graphics | |
| parent | 764fdaf3813e9670441280eebeadd78d7bf14456 (diff) | |
base_emerald to baserom
Diffstat (limited to 'data/graphics')
| -rw-r--r-- | data/graphics/field_objects/field_object_graphics.s | 6 | ||||
| -rw-r--r-- | data/graphics/pokemon/mon_graphics.s | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/graphics/field_objects/field_object_graphics.s b/data/graphics/field_objects/field_object_graphics.s index 8d7decaf4..0e55eb146 100644 --- a/data/graphics/field_objects/field_object_graphics.s +++ b/data/graphics/field_objects/field_object_graphics.s @@ -5386,7 +5386,7 @@ gFieldEffectObjectPic_ShadowLarge:: @ 84F68B8 gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938 .incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp" - .incbin "base_emerald.gba", 0x4f6d38, 0x160 + .incbin "baserom.gba", 0x4f6d38, 0x160 .align 2 gFieldEffectObjectPalette6:: @ 84F6E98 @@ -5500,7 +5500,7 @@ gFieldEffectObjectPic_BikeHopTallGrass_2:: @ 84F7938 gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978 .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp" - .incbin "base_emerald.gba", 0x4f79b8, 0x200 + .incbin "baserom.gba", 0x4f79b8, 0x200 .align 2 gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8 @@ -5522,7 +5522,7 @@ gFieldEffectObjectPic_Unknown16_3:: @ 84F7D38 gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8 .incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp" - .incbin "base_emerald.gba", 0x4f7e38, 0x80 + .incbin "baserom.gba", 0x4f7e38, 0x80 .align 2 gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8 diff --git a/data/graphics/pokemon/mon_graphics.s b/data/graphics/pokemon/mon_graphics.s index 41c1a1131..45ddfe1b5 100644 --- a/data/graphics/pokemon/mon_graphics.s +++ b/data/graphics/pokemon/mon_graphics.s @@ -9250,7 +9250,7 @@ gMonShinyPalette_Deoxys:: @ 8D3B7D0 gMonIcon_Deoxys:: @ 8D3B7F8 .incbin "graphics/pokemon/icons/deoxys_icon.4bpp" - .incbin "base_emerald.gba", 0xd3bbf8, 0x8000 + .incbin "baserom.gba", 0xd3bbf8, 0x8000 .align 2 gMonFootprint_Deoxys:: @ 8D43BF8 |