diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /data/graphics.s | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/graphics.s')
| -rw-r--r-- | data/graphics.s | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/data/graphics.s b/data/graphics.s index d24039de6..7792e8a9e 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2997,8 +2997,8 @@ gBattleAnimSpriteSheet_277:: @ 8E6DA54 .incbin "graphics/battle_anims/sprites/277.4bpp.lz" .align 2 -gWeatherFog1Tilemap:: @ 8E6DE48 - .incbin "graphics/weather/fog1.bin.lz" +gBattleAnimFogTilemap:: @ 8E6DE48 + .incbin "graphics/battle_anims/backgrounds/fog.bin.lz" .align 2 gBattleAnimSpritePalette_283:: @ 8E6DFC0 @@ -3960,6 +3960,9 @@ gUnknown_08E94510:: @ 8E94510 gUnknown_08E94550:: @ 8E94550 .incbin "graphics/unknown/unknown_E94550.bin" +gUnknown_08E94590:: @ 8E94590 + .incbin "graphics/unknown/unknown_E94590.bin" + gUnknown_08E945D0:: @ 8E945D0 .incbin "graphics/interface/wordgroup_layout.bin" |