summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-11-25 18:07:24 -0600
committercamthesaxman <cameronghall@cox.net>2017-11-25 18:07:24 -0600
commit37418d05c404aec70745e238796c11b464da33ef (patch)
treeda32e04d100701b005c8bdb230da6e53ae003198 /data
parentc9a21f43bd074e532c745560b1d7d412f6ea8456 (diff)
label and decompile more of field_weather_2
Diffstat (limited to 'data')
-rw-r--r--data/field_weather.s2
-rw-r--r--data/graphics.s4
2 files changed, 3 insertions, 3 deletions
diff --git a/data/field_weather.s b/data/field_weather.s
index 9ca3eef3a..f6f794092 100644
--- a/data/field_weather.s
+++ b/data/field_weather.s
@@ -24,7 +24,7 @@ gUnknown_0839AC68:: @ 839AC68
.align 2
gWeatherBubbleSpriteSheet:: @ 839AC70
- obj_tiles WeatherBubbleTiles, 0x40, 0x1205
+ obj_tiles gWeatherBubbleTiles, 0x40, 0x1205
.align 1
gUnknown_0839AC78:: @ 839AC78
diff --git a/data/graphics.s b/data/graphics.s
index d24039de6..f1c7c37a3 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